From: Ben Hutchings Subject: [PATCH 4.9] KVM: VMX: Expose SSBD properly to guests, 4.9 supplement Date: Tue, 12 Jun 2018 01:14:34 +0100 Message-ID: <20180612001433.GA14131@decadent.org.uk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="JYK4vJDZwFMowpUq" Cc: Konrad Rzeszutek Wilk , Thomas Gleixner , David Woodhouse , kvm@vger.kernel.org, stable@vger.kernel.org To: Greg Kroah-Hartman Return-path: Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-Id: kvm.vger.kernel.org --JYK4vJDZwFMowpUq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Fix an additional misuse of X86_FEATURE_SSBD in guest_cpuid_has_spec_ctrl(). This function was introduced in the backport of SSBD support to 4.9 and is not present upstream, so it was not fixed by commit 43462d908821 "KVM: VMX: Expose SSBD properly to guests." Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration") Signed-off-by: Ben Hutchings Cc: Konrad Rzeszutek Wilk Cc: Thomas Gleixner Cc: David Woodhouse Cc: kvm@vger.kernel.org --- arch/x86/kvm/cpuid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h index c38369781239..8a841b9d8f84 100644 --- a/arch/x86/kvm/cpuid.h +++ b/arch/x86/kvm/cpuid.h @@ -179,7 +179,7 @@ static inline bool guest_cpuid_has_spec_ctrl(struct kvm= _vcpu *vcpu) if (best && (best->ebx & bit(X86_FEATURE_AMD_IBRS))) return true; best =3D kvm_find_cpuid_entry(vcpu, 7, 0); - return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE= _SSBD))); + return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE= _SPEC_CTRL_SSBD))); } =20 static inline bool guest_cpuid_has_arch_capabilities(struct kvm_vcpu *vcpu) --JYK4vJDZwFMowpUq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBWx8Qaee/yOyVhhEJAQpp8w/9H98Toy0zi5gURokBPr7BaBNlQshQhMHq Pi3NsB4hJs4ZZOkg8nLQYejB7oSn9c0HuvlePAaNn/VJj1tumJfkmEg8f8l64p5i 5DYUjKkHVap9CZ7UAF5hkTo1WtrZUX5cdTv2q1WPY9TronFFcZHSyEPal3V5S6+h KXWNmo+eO0ZjvF8XjjcJdG/9in7LQUDhnSjoTnP/sHUJwjCh1rZk1lZmtWhYAKwu GbYFuAZHUwf7y4wsrliqN7U+GqLcFnuO1aDswEcYIrkbwwlIBL7d5FywqMvZw1xn 1wvJNuPVQbzsLUJrjUzEiLKC2Ief5HqpzfWJU0jPHAqmQMnc07C9ntfFICXM12Gb lpUuZ9y2xASEE1IL/pBS7M8RSkaFvacq4ab0CIb2MrTcnXZDrTdI6pCBcAMkmYoL OhZs6odpVscOKrnSO1YzaPPGT/VYP/6S72sEuJZtTjfnFcGDVhAUXh+4tFMBJOEm vqhFnnnW2JxxQ7+ucFRluYzsglQo8irliNqDUlXdIpVpOLy9+Evp8sgLZYdPrPaB u2ajZHp03mzzV+O/bxhRorNHnGAKbr47d4vdEUBlJvPJF1r48FErxDXPYlq40wQq RkQzu63hsV7GezTy6Ri1Yl0tI+zmdmvUtHxLiy3tJN3Rvvhk0+EojM7O1+hCLo2s Wzi7lp5NvbQ= =USh8 -----END PGP SIGNATURE----- --JYK4vJDZwFMowpUq--