From 7341500f8b8624616f3760206765b1ea01e2b849 Mon Sep 17 00:00:00 2001 From: Sean Christopherson Date: Tue, 10 Mar 2026 16:48:18 -0700 Subject: [PATCH] KVM: SEV: Move standard VM-scoped helpers to detect SEV+ guests to sev.c Now that all external usage of the VM-scoped APIs to detect SEV+ guests is gone, drop the stubs provided for CONFIG_KVM_AMD_SEV=n builds and bury the "standard" APIs in sev.c. No functional change intended. Link: https://patch.msgid.link/20260310234829.2608037-11-seanjc@google.com Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.h | 17 ----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index f36c6694247c..56ace27f739c 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -107,6 +107,20 @@ static unsigned int nr_asids; static unsigned long *sev_asid_bitmap; static unsigned long *sev_reclaim_asid_bitmap; +static bool sev_guest(struct kvm *kvm) +{ + return ____sev_guest(kvm); +} +static bool sev_es_guest(struct kvm *kvm) +{ + return ____sev_es_guest(kvm); +} + +static bool sev_snp_guest(struct kvm *kvm) +{ + return ____sev_snp_guest(kvm); +} + static int snp_decommission_context(struct kvm *kvm); struct enc_region { diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index f14e2fe551cd..4c841e330aaf 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -390,20 +390,6 @@ static __always_inline bool ____sev_snp_guest(struct kvm *kvm) !WARN_ON_ONCE(!____sev_es_guest(kvm)); } -static __always_inline bool sev_guest(struct kvm *kvm) -{ - return ____sev_guest(kvm); -} -static __always_inline bool sev_es_guest(struct kvm *kvm) -{ - return ____sev_es_guest(kvm); -} - -static __always_inline bool sev_snp_guest(struct kvm *kvm) -{ - return ____sev_snp_guest(kvm); -} - static __always_inline bool is_sev_guest(struct kvm_vcpu *vcpu) { return ____sev_guest(vcpu->kvm); @@ -418,9 +404,6 @@ static __always_inline bool is_sev_snp_guest(struct kvm_vcpu *vcpu) return ____sev_snp_guest(vcpu->kvm); } #else -#define sev_guest(kvm) false -#define sev_es_guest(kvm) false -#define sev_snp_guest(kvm) false #define is_sev_guest(vcpu) false #define is_sev_es_guest(vcpu) false #define is_sev_snp_guest(vcpu) false