LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features
@ 2018-05-25 17:16 Waiman Long
  2018-05-25 19:50 ` Radim Krčmář
  0 siblings, 1 reply; 3+ messages in thread
From: Waiman Long @ 2018-05-25 17:16 UTC (permalink / raw)
  To: Paolo Bonzini, Radim Krčmář,
	Thomas Gleixner, Ingo Molnar, H. Peter Anvin
  Cc: x86, kvm, linux-kernel, Waiman Long

As the SSBD bit in kvm_cpuid_7_0_edx_x86_features has been renamed to
SPEC_CTRL_SSBD in the commit 52817587e706 ("x86/cpufeatures: Disentangle
SSBD enumeration"). The corresponding name change needed to be made in
the KVM code as well.

Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")

Signed-off-by: Waiman Long <longman@redhat.com>
---
 arch/x86/kvm/cpuid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index ced8511..598461e 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -407,8 +407,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
 
 	/* cpuid 7.0.edx*/
 	const u32 kvm_cpuid_7_0_edx_x86_features =
-		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) | F(SSBD) |
-		F(ARCH_CAPABILITIES);
+		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |
+		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES);
 
 	/* all calls to cpuid_count() should be made on the same cpu */
 	get_cpu();
-- 
1.8.3.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features
  2018-05-25 17:16 [PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features Waiman Long
@ 2018-05-25 19:50 ` Radim Krčmář
  2018-05-28  6:14   ` Thomas Gleixner
  0 siblings, 1 reply; 3+ messages in thread
From: Radim Krčmář @ 2018-05-25 19:50 UTC (permalink / raw)
  To: Thomas Gleixner
  Cc: Paolo Bonzini, Waiman Long, Ingo Molnar, H. Peter Anvin, x86,
	kvm, linux-kernel

2018-05-25 13:16-0400, Waiman Long:
> As the SSBD bit in kvm_cpuid_7_0_edx_x86_features has been renamed to
> SPEC_CTRL_SSBD in the commit 52817587e706 ("x86/cpufeatures: Disentangle
> SSBD enumeration"). The corresponding name change needed to be made in
> the KVM code as well.
> 
> Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")
> 
> Signed-off-by: Waiman Long <longman@redhat.com>
> ---

Thomas, are you taking this one?

>  arch/x86/kvm/cpuid.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index ced8511..598461e 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -407,8 +407,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
>  
>  	/* cpuid 7.0.edx*/
>  	const u32 kvm_cpuid_7_0_edx_x86_features =
> -		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) | F(SSBD) |
> -		F(ARCH_CAPABILITIES);
> +		F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |
> +		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES);
>  
>  	/* all calls to cpuid_count() should be made on the same cpu */
>  	get_cpu();
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features
  2018-05-25 19:50 ` Radim Krčmář
@ 2018-05-28  6:14   ` Thomas Gleixner
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Gleixner @ 2018-05-28  6:14 UTC (permalink / raw)
  To: Radim Krčmář
  Cc: Paolo Bonzini, Waiman Long, Ingo Molnar, H. Peter Anvin, x86,
	kvm, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

On Fri, 25 May 2018, Radim Krčmář wrote:

> 2018-05-25 13:16-0400, Waiman Long:
> > As the SSBD bit in kvm_cpuid_7_0_edx_x86_features has been renamed to
> > SPEC_CTRL_SSBD in the commit 52817587e706 ("x86/cpufeatures: Disentangle
> > SSBD enumeration"). The corresponding name change needed to be made in
> > the KVM code as well.
> > 
> > Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")
> > 
> > Signed-off-by: Waiman Long <longman@redhat.com>
> > ---
> 
> Thomas, are you taking this one?

Konrad sent the same fix, which is already upstream 

0aa48468d009 ("KVM/VMX: Expose SSBD properly to guests")

Thanks,

	tglx

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-05-28  6:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-25 17:16 [PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features Waiman Long
2018-05-25 19:50 ` Radim Krčmář
2018-05-28  6:14   ` Thomas Gleixner

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).