Skip to content

Commit 7774c8f

Browse files
committed
KVM: SVM: Wrap __svm_sev_es_vcpu_run() with #ifdef CONFIG_KVM_AMD_SEV
Compile (and link) __svm_sev_es_vcpu_run() if and only if SEV support is actually enabled. This will allow dropping non-existent 32-bit "support" from __svm_sev_es_vcpu_run() without causing undue confusion. Intentionally don't provide a stub (but keep the declaration), as any sane compiler, even with things like KASAN enabled, should eliminate the call to __svm_sev_es_vcpu_run() since sev_es_guest() unconditionally returns "false" if CONFIG_KVM_AMD_SEV=n. Reviewed-by: Tom Lendacky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 19597a7 commit 7774c8f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/x86/kvm/svm/vmenter.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ SYM_FUNC_START(__svm_vcpu_run)
291291

292292
SYM_FUNC_END(__svm_vcpu_run)
293293

294+
#ifdef CONFIG_KVM_AMD_SEV
294295
/**
295296
* __svm_sev_es_vcpu_run - Run a SEV-ES vCPU via a transition to SVM guest mode
296297
* @svm: struct vcpu_svm *
@@ -389,3 +390,4 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
389390
_ASM_EXTABLE(1b, 3b)
390391

391392
SYM_FUNC_END(__svm_sev_es_vcpu_run)
393+
#endif /* CONFIG_KVM_AMD_SEV */

0 commit comments

Comments
 (0)