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

kaihuang · sean-jc · commit 7efb4d8a392a · 2024-09-09T20:13:55.000-07:00
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>
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
@@ -7963,6 +7963,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
`@@ -7963,6 +7963,7 @@ static __init void vmx_set_cpu_caps(void)`
`7963`	`7963`	`kvm_cpu_cap_clear(X86_FEATURE_SGX_LC);`
`7964`	`7964`	`kvm_cpu_cap_clear(X86_FEATURE_SGX1);`
`7965`	`7965`	`kvm_cpu_cap_clear(X86_FEATURE_SGX2);`
	`7966`	`+ kvm_cpu_cap_clear(X86_FEATURE_SGX_EDECCSSA);`
`7966`	`7967`	`}`
`7967`	`7968`
`7968`	`7969`	`if (vmx_umip_emulated())`