From: Kim Phillips <kim.phillips@amd.com>
To: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org, Babu Moger <Babu.Moger@amd.com>,
Borislav Petkov <bp@suse.de>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
Joao Martins <joao.m.martins@oracle.com>,
Jonathan Corbet <corbet@lwn.net>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
David Woodhouse <dwmw@amazon.co.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Juergen Gross <jgross@suse.com>,
Peter Zijlstra <peterz@infradead.org>,
Tony Luck <tony.luck@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
kvm@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/2] x86/cpu, kvm: Use CPU capabilities for CPUID[0x80000021].EAX
Date: Mon, 28 Nov 2022 17:00:43 -0600 [thread overview]
Message-ID: <849464c8-476a-9a14-afdb-cb8793dd6064@amd.com> (raw)
In-Reply-To: <Y39qUnlRx05eaGeb@zn.tnic>
On 11/24/22 6:57 AM, Borislav Petkov wrote:
> On Wed, Nov 23, 2022 at 06:04:48PM -0600, Kim Phillips wrote:
>> The AMD Zen4 Automatic IBRS feature bit resides in the 0x80000021 leaf,
>> for which there is already support for exposing Zen3 bits to the guest.
>>
>> Add AMD AutoIBRS feature bit support, including for the other bits,
>> using scattered/synthetic bits.
>>
>> Add the corresponding word to KVM's feature machinery so that AutoIBRS
>> gets advertized into the guest too.
>>
>> Co-developed-by: Babu Moger <Babu.Moger@amd.com>
>
> verify_tags: WARNING: Co-developed-by Babu Moger <Babu.Moger@amd.com> hasn't signed off on the patch!
OK, I'll add his signed-off-by.
>> Co-developed-by: Borislav Petkov <bp@suse.de>
>> Signed-off-by: Kim Phillips <kim.phillips@amd.com>
>
> ...
>
>> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>> index c92c49a0b35b..61cd33a848cc 100644
>> --- a/arch/x86/kvm/cpuid.c
>> +++ b/arch/x86/kvm/cpuid.c
>> @@ -730,6 +730,25 @@ void kvm_set_cpu_caps(void)
>> 0 /* SME */ | F(SEV) | 0 /* VM_PAGE_FLUSH */ | F(SEV_ES) |
>> F(SME_COHERENT));
>>
>> + /*
>> + * Pass down these bits:
>> + * EAX 0 NNDBP, Processor ignores nested data breakpoints
>> + * EAX 2 LAS, LFENCE always serializing
>> + * EAX 6 NSCB, Null selector clear base
>> + * EAX 8 Automatic IBRS
>> + *
>> + * Other defined bits are for MSRs that KVM does not expose:
>> + * EAX 3 SPCL, SMM page configuration lock
>> + * EAX 13 PCMSR, Prefetch control MSR
>> + */
>> + kvm_cpu_cap_init_scattered(CPUID_8000_0021_EAX,
>> + SF(NO_NESTED_DATA_BP) | SF(LFENCE_RDTSC) |
>> + SF(NULL_SEL_CLR_BASE) | SF(AUTOIBRS));
>> + if (static_cpu_has(X86_FEATURE_LFENCE_RDTSC))
>> + kvm_cpu_cap_set(X86_FEATURE_LFENCE_RDTSC);
>> + if (!static_cpu_has_bug(X86_BUG_NULL_SEG))
>> + kvm_cpu_cap_set(X86_FEATURE_NULL_SEL_CLR_BASE);
>
> So this looks backwards:
>
> if X86_FEATURE_NULL_SEL_CLR_BASE is set, then X86_BUG_NULL_SEG should
> not be.
Not sure I follow. That code (originally from commit f144c49e8c39
("KVM: x86: synthesize CPUID leaf 0x80000021h if useful") doesn't
negate that: the code is saying that if we don't have the bug, then
set the feature bit that says we don't have the bug.
> Which means, you'd have to update check_null_seg_clears_base() too.
Like this?:
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 73cc546e024d..bbe96d71ff5e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1682,11 +1682,6 @@ void check_null_seg_clears_base(struct cpuinfo_x86 *c)
if (!IS_ENABLED(CONFIG_X86_64))
return;
- /* Zen3 CPUs advertise Null Selector Clears Base in CPUID. */
- if (c->extended_cpuid_level >= 0x80000021 &&
- cpuid_eax(0x80000021) & BIT(6))
- return;
-
/*
* CPUID bit above wasn't set. If this kernel is still running
* as a HV guest, then the HV has decided not to advertize
@@ -1700,11 +1695,13 @@ void check_null_seg_clears_base(struct cpuinfo_x86 *c)
}
/*
+ * Zen3+ CPUs advertise Null Selector Clears Base in CPUID.
* Zen2 CPUs also have this behaviour, but no CPUID bit.
* 0x18 is the respective family for Hygon.
*/
- if ((c->x86 == 0x17 || c->x86 == 0x18) &&
- detect_null_seg_behavior())
+ if (cpu_has(X86_FEATURE_NULL_SEL_CLR_BASE) ||
+ ((c->x86 == 0x17 || c->x86 == 0x18) &&
+ detect_null_seg_behavior()))
return;
/* All the remaining ones are affected */
> Which means, you should make the X86_FEATURE_NULL_SEL_CLR_BASE bit
> addition a separate patch because this one is clearly doing too many
> things at once.
OK.
Thanks,
Kim
next prev parent reply other threads:[~2022-11-28 23:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 0:04 [PATCH v2 0/2] x86/cpu, kvm: Support AMD Automatic IBRS Kim Phillips
2022-11-24 0:04 ` [PATCH v2 1/2] x86/cpu, kvm: Use CPU capabilities for CPUID[0x80000021].EAX Kim Phillips
2022-11-24 12:57 ` Borislav Petkov
2022-11-28 23:00 ` Kim Phillips [this message]
2022-11-29 15:50 ` Borislav Petkov
2022-11-24 13:06 ` Borislav Petkov
2022-11-24 0:04 ` [PATCH v2 2/2] x86/cpu, kvm: Support AMD Automatic IBRS Kim Phillips
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=849464c8-476a-9a14-afdb-cb8793dd6064@amd.com \
--to=kim.phillips@amd.com \
--cc=Babu.Moger@amd.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=joao.m.martins@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/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).