The following commit has been merged into the x86/bugs branch of tip: Commit-ID: 716f86b523d8ec3c17015ee0b03135c7aa6f2f08 Gitweb: https://git.kernel.org/tip/716f86b523d8ec3c17015ee0b03135c7aa6f2f08 Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Wed, 13 Nov 2024 13:28:33 +01:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Mon, 30 Dec 2024 17:56:00 +01:00 KVM: x86: Advertise SRSO_USER_KERNEL_NO to userspace SRSO_USER_KERNEL_NO denotes whether the CPU is affected by SRSO across user/kernel boundaries. Advertise it to guest userspace. Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Reviewed-by: Nikolay Borisov <nik.borisov@xxxxxxxx> Link: https://lore.kernel.org/r/20241202120416.6054-3-bp@xxxxxxxxxx --- arch/x86/kvm/cpuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index ae0b438..f7e2229 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -821,7 +821,7 @@ void kvm_set_cpu_caps(void) kvm_cpu_cap_mask(CPUID_8000_0021_EAX, F(NO_NESTED_DATA_BP) | F(LFENCE_RDTSC) | 0 /* SmmPgCfgLock */ | F(NULL_SEL_CLR_BASE) | F(AUTOIBRS) | 0 /* PrefetchCtlMsr */ | - F(WRMSR_XX_BASE_NS) + F(WRMSR_XX_BASE_NS) | F(SRSO_USER_KERNEL_NO) ); kvm_cpu_cap_check_and_set(X86_FEATURE_SBPB);
|