Commit 1ff3c890 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: SVM: Invert handling of SEV and SEV_ES feature flags 



Leave SEV and SEV_ES '0' in kvm_cpu_caps by default, and instead set them
in sev_set_cpu_caps() if SEV and SEV-ES support are fully enabled.  Aside
from the fact that sev_set_cpu_caps() is wildly misleading when it *clears*
capabilities, this will allow compiling out sev.c without falsely
advertising SEV/SEV-ES support in KVM_GET_SUPPORTED_CPUID.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMichael Roth <michael.roth@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-ID: <20240404121327.3107131-2-pbonzini@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9bc60f73

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ void kvm_set_cpu_caps(void) 
	kvm_cpu_cap_mask(CPUID_8000_000A_EDX, 0);



	kvm_cpu_cap_mask(CPUID_8000_001F_EAX,

		0 /* SME */ | F(SEV) | 0 /* VM_PAGE_FLUSH */ | F(SEV_ES) |

		0 /* SME */ | 0 /* SEV */ | 0 /* VM_PAGE_FLUSH */ | 0 /* SEV_ES */ |

		F(SME_COHERENT));



	kvm_cpu_cap_mask(CPUID_8000_0021_EAX,

arch/x86/kvm/svm/sev.c

+4 −4
Original line number Diff line number Diff line
@@ -2186,10 +2186,10 @@ void sev_vm_destroy(struct kvm *kvm) 


void __init sev_set_cpu_caps(void)

{

	if (!sev_enabled)

		kvm_cpu_cap_clear(X86_FEATURE_SEV);

	if (!sev_es_enabled)

		kvm_cpu_cap_clear(X86_FEATURE_SEV_ES);

	if (sev_enabled)

		kvm_cpu_cap_set(X86_FEATURE_SEV);

	if (sev_es_enabled)

		kvm_cpu_cap_set(X86_FEATURE_SEV_ES);

}



void __init sev_hardware_setup(void)