From: Yang Weijiang <weijiang.yang@intel.com>
To: pbonzini@redhat.com
Cc: like.xu.linux@gmail.com, jmattson@google.com,
kvm@vger.kernel.org, Yang Weijiang <weijiang.yang@intel.com>
Subject: [kvm-unit-tests PATCH v2 3/3] x86: Skip perf related tests when pmu is disabled
Date: Wed, 15 Jun 2022 04:46:41 -0400 [thread overview]
Message-ID: <20220615084641.6977-4-weijiang.yang@intel.com> (raw)
In-Reply-To: <20220615084641.6977-1-weijiang.yang@intel.com>
When pmu is disabled in KVM, reading MSR_CORE_PERF_GLOBAL_CTRL
or executing rdpmc leads to #GP, so skip related tests in this case.
Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
---
x86/vmx_tests.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 4d581e7..dd6fc13 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -944,6 +944,16 @@ static void insn_intercept_main(void)
continue;
}
+ if (insn_table[cur_insn].flag == CPU_RDPMC) {
+ struct cpuid id = cpuid(10);
+
+ if (!(id.a & 0xff)) {
+ printf("\tFeature required for %s is not supported.\n",
+ insn_table[cur_insn].name);
+ continue;
+ }
+ }
+
if (insn_table[cur_insn].disabled) {
printf("\tFeature required for %s is not supported.\n",
insn_table[cur_insn].name);
@@ -7490,6 +7500,13 @@ static void test_perf_global_ctrl(u32 nr, const char *name, u32 ctrl_nr,
static void test_load_host_perf_global_ctrl(void)
{
+ struct cpuid id = cpuid(10);
+
+ if (!(id.a & 0xff)) {
+ report_skip("test_load_host_perf_global_ctrl");
+ return;
+ }
+
if (!(ctrl_exit_rev.clr & EXI_LOAD_PERF)) {
printf("\"load IA32_PERF_GLOBAL_CTRL\" exit control not supported\n");
return;
@@ -7502,6 +7519,13 @@ static void test_load_host_perf_global_ctrl(void)
static void test_load_guest_perf_global_ctrl(void)
{
+ struct cpuid id = cpuid(10);
+
+ if (!(id.a & 0xff)) {
+ report_skip("test_load_guest_perf_global_ctrl");
+ return;
+ }
+
if (!(ctrl_enter_rev.clr & ENT_LOAD_PERF)) {
printf("\"load IA32_PERF_GLOBAL_CTRL\" entry control not supported\n");
return;
--
2.31.1
next prev parent reply other threads:[~2022-06-15 8:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 8:46 [kvm-unit-tests PATCH v2 0/3] Fix up failures induced by !enable_pmu Yang Weijiang
2022-06-15 8:46 ` [kvm-unit-tests PATCH v2 1/3] x86: Remove perf enable bit from default config Yang Weijiang
2022-06-16 18:30 ` Sean Christopherson
2022-06-17 1:30 ` Yang, Weijiang
2022-06-15 8:46 ` [kvm-unit-tests PATCH v2 2/3] x86: Skip running test when pmu is disabled Yang Weijiang
2022-06-16 18:34 ` Sean Christopherson
2022-06-17 1:47 ` Yang, Weijiang
2022-06-15 8:46 ` Yang Weijiang [this message]
2022-06-16 18:40 ` [kvm-unit-tests PATCH v2 3/3] x86: Skip perf related tests " Sean Christopherson
2022-06-17 1:49 ` Yang, Weijiang
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=20220615084641.6977-4-weijiang.yang@intel.com \
--to=weijiang.yang@intel.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=like.xu.linux@gmail.com \
--cc=pbonzini@redhat.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