kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jinrong Liang <ljr.kernel@gmail.com>
To: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Like Xu <likexu@tencent.com>,
	Jim Mattson <jmattson@google.com>,
	Aaron Lewis <aaronlewis@google.com>,
	Wanpeng Li <wanpengli@tencent.com>,
	Jinrong Liang <cloudliang@tencent.com>,
	Jinrong Liang <ljr.kernel@gmail.com>,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] KVM: selftests: Test consistency of AMD PMU counters num
Date: Tue, 21 Nov 2023 19:54:54 +0800	[thread overview]
Message-ID: <20231121115457.76269-7-cloudliang@tencent.com> (raw)
In-Reply-To: <20231121115457.76269-1-cloudliang@tencent.com>

From: Jinrong Liang <cloudliang@tencent.com>

Add AMD test case to check if non-existent counters can be accessed
in guest. Nor will KVM emulate more counters than it can support.

Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
---
 .../selftests/kvm/x86_64/pmu_counters_test.c  | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
index 3c4081a508b0..b1502a446a55 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
@@ -761,6 +761,64 @@ static void test_amd_zen_events(void)
 	kvm_vm_free(vm);
 }
 
+static void guest_wr_rd_amd_counters(uint32_t pmc_msr, bool expect_gp,
+				     uint64_t test_val)
+{
+	uint8_t vector;
+	uint64_t val;
+
+	vector = wrmsr_safe(pmc_msr, test_val);
+	GUEST_ASSERT_PMC_MSR_ACCESS(WRMSR, pmc_msr, expect_gp, vector);
+
+	vector = rdmsr_safe(pmc_msr, &val);
+	GUEST_ASSERT_PMC_MSR_ACCESS(RDMSR, pmc_msr, expect_gp, vector);
+
+	if (!expect_gp)
+		GUEST_ASSERT_EQ(val, test_val);
+}
+
+static void guest_test_amd_counters_num(void)
+{
+	uint8_t i, flag, nr_amd_counters;
+	uint64_t ctrl_msr;
+	uint32_t pmc_msr;
+	bool expect_gp;
+
+	set_amd_counters(&nr_amd_counters, &ctrl_msr, &pmc_msr, &flag);
+
+	for (i = 0; i < nr_amd_counters * flag; i++) {
+		expect_gp = i >= nr_amd_counters;
+
+		guest_wr_rd_amd_counters(pmc_msr + i * flag, expect_gp, 0xffff);
+		guest_wr_rd_amd_counters(ctrl_msr + i * flag, expect_gp, 0);
+	}
+
+	GUEST_DONE();
+}
+
+static void test_amd_counters_num(void)
+{
+	bool kvm_pmu_is_perfmonv2 = kvm_cpu_has(X86_FEATURE_PERFMON_V2);
+	unsigned int i, nr_test = 1;
+	struct kvm_vcpu *vcpu;
+	struct kvm_vm *vm;
+
+	if (kvm_pmu_is_perfmonv2)
+		nr_test = AMD64_NR_COUNTERS_CORE;
+
+	for (i = 0; i <= nr_test; i++) {
+		vm = pmu_vm_create_with_one_vcpu(&vcpu,
+						 guest_test_amd_counters_num);
+
+		if (kvm_pmu_is_perfmonv2)
+			vcpu_set_cpuid_property(vcpu,
+						X86_PROPERTY_PMU_NR_CORE_COUNTERS, i);
+
+		run_vcpu(vcpu);
+		kvm_vm_free(vm);
+	}
+}
+
 int main(int argc, char *argv[])
 {
 	TEST_REQUIRE(kvm_is_pmu_enabled());
@@ -777,6 +835,7 @@ int main(int argc, char *argv[])
 		test_intel_counters();
 	} else if (host_cpu_is_amd) {
 		test_amd_zen_events();
+		test_amd_counters_num();
 	} else {
 		TEST_FAIL("Unknown CPU vendor");
 	}
-- 
2.39.3


  parent reply	other threads:[~2023-11-21 11:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-21 11:54 [PATCH 0/9] Test the consistency of AMD PMU counters and their features Jinrong Liang
2023-11-21 11:54 ` [PATCH 1/9] KVM: selftests: Add forced emulation check to fix #UD Jinrong Liang
2023-11-21 11:54 ` [PATCH 2/9] KVM: selftests: Test gp counters overflow interrupt handling Jinrong Liang
2023-11-21 11:54 ` [PATCH 3/9] KVM: selftests: Test fixed " Jinrong Liang
2023-11-21 11:54 ` [PATCH 4/9] KVM: selftests: Add x86 feature and properties for AMD PMU in processor.h Jinrong Liang
2023-11-21 11:54 ` [PATCH 5/9] KVM: selftests: Test AMD PMU performance counters basic functions Jinrong Liang
2023-11-21 11:54 ` Jinrong Liang [this message]
2023-11-21 11:54 ` [PATCH 7/9] KVM: selftests: Test consistency of PMU MSRs with AMD PMU version Jinrong Liang
2023-11-21 11:54 ` [PATCH 8/9] KVM: selftests: Test AMD Guest PerfCtrExtCore Jinrong Liang
2023-11-21 11:54 ` [PATCH 9/9] KVM: selftests: Test AMD Guest PerfMonV2 Jinrong Liang
2024-06-10 23:36 ` [PATCH 0/9] Test the consistency of AMD PMU counters and their features Colton Lewis
2024-06-11  3:48   ` Jinrong Liang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231121115457.76269-7-cloudliang@tencent.com \
    --to=ljr.kernel@gmail.com \
    --cc=aaronlewis@google.com \
    --cc=cloudliang@tencent.com \
    --cc=jmattson@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=likexu@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    --cc=wanpengli@tencent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).