From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFE284DD6CA for ; Wed, 3 Jun 2026 23:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780528753; cv=none; b=BgWDJYR0zMHD7jEmo6PA8aXLrpByLnG4SiYXMDplj1yJ22kzg0kKV/lorV/8TAjLF2A1Lo0flmLZ8E5EkvvGOfsv+Rmvw7DAFEbDt6QVnh1+Z1tvyTUPAVn6L+bx3hKw26Qqyk0WzeVExTnrKfLxLu1Xx3MDzgqGZHfcb0PNUeM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780528753; c=relaxed/simple; bh=JlVNuBH3ZTrsFDPhxWaTdMzb4rxpIfWyCAqBn64489c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OuvjA4ZxCnPwi2chNJVPYhA0n+VoFSkib/xRZa1WBC4nNoh6cRlFbI1ZSVch/4rvFQiOP2P9TiY11GmJk8f+/lZSDCDamntDXOQZL24z54+2xX6C1AXODUD5bN1yusPaySh306HCjtWJBocurLUO51QLR7jhTrMk3zvfNPXC20s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TjiWUoCs; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TjiWUoCs" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-36db995d083so45664a91.0 for ; Wed, 03 Jun 2026 16:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780528750; x=1781133550; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=XkLs+pFHj7cSRYqiRASqlr+WFuql8+seMsgEbvBQP6s=; b=TjiWUoCsD/HeR1kAtZMoxmGhImWMaA8YD0oKatFnLLy7tyZjtgyfOtdIzYPU3Xkxau A0LU9y6+v9PAoYYW0y595Ikp6jiCe1INeIWMfBc2679mwC8SD3f4TLjlviVticQoyXEg Z83DQMOtgcTfZ+1cOT2X3OfYHDlbnisaKR2iBThdfuvwDO2FAp4UdnTES3FWr2/eqq6t vzrWPhs8LWZJ+HgD1EqntgjSJd3C6kYcgukPzHkzqj4gjqSrbrMubFc1LLCvXsD2cTE6 8PRAwo9S/xZkGYN2RzY04UcSu8/HNRTbGlrG2OjS72GiPL0nAPUTpnZ6GmSbSNyPC4KV TbSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780528750; x=1781133550; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XkLs+pFHj7cSRYqiRASqlr+WFuql8+seMsgEbvBQP6s=; b=JuyBC/Dkq8Rtsm2m7UqPoJs8xaz5IJprLznlOYztFUyQMJvVV0d0WfUw2jLfO+lNFU TVR23fMS8Y9omS7UlTxs4PqIzGmiGhEVKPydAhHRmyLfy2VGdEB3TMAMUOaCY9kPETx+ wP7Wwz1S1LFFT0qWMcZ5GV09e71cb2ypnmMuOftyndJKehsK2xiMS7VqugMThh153jRm bikAMPciqrMvNzrvyNjdbZUrMR+ruw2tHycZGdkGdYLVxrKd7y9IfnbuznBXN3ykSHjh a8VjehVQtZQyThYWQcvuQAIMbyHuC+1m+HIIA8xsZTcle/AZHFaYY9x79Hekid5r8GDE 5b9w== X-Forwarded-Encrypted: i=1; AFNElJ8JvcKt0bDIVH1VFdk5tKtBa0ztOYBEyVG+sXzH3qKdwRgMYvV0IqDaIi3y8NwbJH7vKcHh1xOhUY+jwrA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxo9wsOjh6kgINYdzHo2QWtYsO3xkrPV6K7QPP+LIiYaAr0HqMC cjudvoyHvzalxPl6DGHZZS/Ggiqw1VJhb2CKLsK0yKeFBcl4wtGTdgMFJp9P/MfcklwWrGk5bkK te8lsqw== X-Received: from pjtf7.prod.google.com ([2002:a17:90a:c287:b0:36b:8553:3c3a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d46:b0:36b:218c:719e with SMTP id 98e67ed59e1d1-36e32f1667dmr4975212a91.21.1780528749979; Wed, 03 Jun 2026 16:19:09 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 3 Jun 2026 16:19:05 -0700 In-Reply-To: <20260603231905.1738487-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260603231905.1738487-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260603231905.1738487-3-seanjc@google.com> Subject: [PATCH 2/2] KVM: selftests: Add regression test for mediated PMU fixed counter filter bug From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Sashiko Content-Type: text/plain; charset="UTF-8" Add a regression test where KVM would inadvertently ignore PMU event filters on writes that change _some_ bits in FIXED_CTR_CTRL, but not the enable bits for PMCs that are denied to the guest. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86/pmu_event_filter_test.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c index c1232344fda8..84e4c6ca67a3 100644 --- a/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c @@ -731,6 +731,8 @@ static void test_filter_ioctl(struct kvm_vcpu *vcpu) static void intel_run_fixed_counter_guest_code(u8 idx) { + u8 nr_fixed_counters = this_cpu_property(X86_PROPERTY_PMU_NR_FIXED_COUNTERS); + for (;;) { wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, 0); wrmsr(MSR_CORE_PERF_FIXED_CTR0 + idx, 0); @@ -738,6 +740,10 @@ static void intel_run_fixed_counter_guest_code(u8 idx) /* Only OS_EN bit is enabled for fixed counter[idx]. */ wrmsr(MSR_CORE_PERF_FIXED_CTR_CTRL, FIXED_PMC_CTRL(idx, FIXED_PMC_KERNEL)); wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, FIXED_PMC_GLOBAL_CTRL_ENABLE(idx)); + if (nr_fixed_counters > 1) + wrmsr(MSR_CORE_PERF_FIXED_CTR_CTRL, + FIXED_PMC_CTRL(idx, FIXED_PMC_KERNEL) | + FIXED_PMC_CTRL((idx + 1) % nr_fixed_counters, FIXED_PMC_KERNEL)); __asm__ __volatile__("loop ." : "+c"((int){NUM_BRANCHES})); wrmsr(MSR_CORE_PERF_GLOBAL_CTRL, 0); -- 2.54.0.1032.g2f8565e1d1-goog