From: "Yang, Weijiang" <weijiang.yang@intel.com>
To: Sean Christopherson <seanjc@google.com>
Cc: pbonzini@redhat.com, like.xu.linux@gmail.com,
jmattson@google.com, kvm@vger.kernel.org
Subject: Re: [kvm-unit-tests PATCH v2 1/3] x86: Remove perf enable bit from default config
Date: Fri, 17 Jun 2022 09:30:37 +0800 [thread overview]
Message-ID: <5e17314e-d9ff-7e93-e376-a1a19d53f44b@intel.com> (raw)
In-Reply-To: <Yqt2xBFkFZw3VaQT@google.com>
On 6/17/2022 2:30 AM, Sean Christopherson wrote:
> On Wed, Jun 15, 2022, Yang Weijiang wrote:
>> When pmu is disabled in KVM by enable_pmu=0, bit 7 of guest
>> MSR_IA32_MISC_ENABLE is cleared, but the default value of
>> the MSR assumes pmu is always available, this leads to test
>> failure. Change the logic to make it aligned with KVM config.
>>
>> Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
> Paolo's more generic approach is preferable, though even that can be more generic.
>
> https://lore.kernel.org/all/20220520183207.7952-1-pbonzini@redhat.com
Saw it , thanks! Maybe I just need to help Paolo resend the patch in my
series.
>
>> ---
>> x86/msr.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/x86/msr.c b/x86/msr.c
>> index 44fbb3b..fc05d6c 100644
>> --- a/x86/msr.c
>> +++ b/x86/msr.c
>> @@ -34,7 +34,7 @@ struct msr_info msr_info[] =
>> MSR_TEST(MSR_IA32_SYSENTER_ESP, addr_ul, false),
>> MSR_TEST(MSR_IA32_SYSENTER_EIP, addr_ul, false),
>> // reserved: 1:2, 4:6, 8:10, 13:15, 17, 19:21, 24:33, 35:63
>> - MSR_TEST(MSR_IA32_MISC_ENABLE, 0x400c51889, false),
>> + MSR_TEST(MSR_IA32_MISC_ENABLE, 0x400c51809, false),
>> MSR_TEST(MSR_IA32_CR_PAT, 0x07070707, false),
>> MSR_TEST(MSR_FS_BASE, addr_64, true),
>> MSR_TEST(MSR_GS_BASE, addr_64, true),
>> @@ -59,6 +59,8 @@ static void test_msr_rw(struct msr_info *msr, unsigned long long val)
>> */
>> if (msr->index == MSR_EFER)
>> val |= orig;
>> + if (msr->index == MSR_IA32_MISC_ENABLE)
>> + val |= MSR_IA32_MISC_ENABLE_EMON & orig;
>> wrmsr(msr->index, val);
>> r = rdmsr(msr->index);
>> wrmsr(msr->index, orig);
>> --
>> 2.31.1
>>
next prev parent reply other threads:[~2022-06-17 1:30 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 [this message]
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 ` [kvm-unit-tests PATCH v2 3/3] x86: Skip perf related tests " Yang Weijiang
2022-06-16 18:40 ` 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=5e17314e-d9ff-7e93-e376-a1a19d53f44b@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 \
--cc=seanjc@google.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