KVM: VMX: Also clear SGX EDECCSSA in KVM CPU caps when SGX is disabled

nefigtut · nefigtut · commit b49c65c468fb · 2024-10-24T21:05:40.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-22826 Upstream Status: merged into the linux.git commit 7efb4d8 Author: Kai Huang <kai.huang@intel.com> Date: Fri Sep 6 00:08:37 2024 +1200 KVM: VMX: Also clear SGX EDECCSSA in KVM CPU caps when SGX is disabled When SGX EDECCSSA support was added to KVM in commit 16a7fe3 ("KVM/VMX: Allow exposing EDECCSSA user leaf function to KVM guest"), it forgot to clear the X86_FEATURE_SGX_EDECCSSA bit in KVM CPU caps when KVM SGX is disabled. Fix it. Fixes: 16a7fe3 ("KVM/VMX: Allow exposing EDECCSSA user leaf function to KVM guest") Signed-off-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20240905120837.579102-1-kai.huang@intel.com Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Vladis Dronov <vdronov@redhat.com>
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
@@ -7999,6 +7999,7 @@ static __init void vmx_set_cpu_caps(void)
 		kvm_cpu_cap_clear(X86_FEATURE_SGX_LC);
 		kvm_cpu_cap_clear(X86_FEATURE_SGX1);
 		kvm_cpu_cap_clear(X86_FEATURE_SGX2);
+		kvm_cpu_cap_clear(X86_FEATURE_SGX_EDECCSSA);
 	}
 
 	if (vmx_umip_emulated())

Original file line number	Diff line number	Diff line change
`@@ -7999,6 +7999,7 @@ static __init void vmx_set_cpu_caps(void)`
`7999`	`7999`	`kvm_cpu_cap_clear(X86_FEATURE_SGX_LC);`
`8000`	`8000`	`kvm_cpu_cap_clear(X86_FEATURE_SGX1);`
`8001`	`8001`	`kvm_cpu_cap_clear(X86_FEATURE_SGX2);`
	`8002`	`+ kvm_cpu_cap_clear(X86_FEATURE_SGX_EDECCSSA);`
`8002`	`8003`	`}`
`8003`	`8004`
`8004`	`8005`	`if (vmx_umip_emulated())`