Commit 45d522d3 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: SVM: Macrofy SEV=n versions of sev_xxx_guest() 

Define sev_{,es_,snp_}guest() as "false" when SEV is disabled via Kconfig,
i.e. when CONFIG_KVM_AMD_SEV=n.  Despite the helpers being __always_inline,
gcc-12 is somehow incapable of realizing that the return value is a
compile-time constant and generates sub-optimal code.

Opportunistically clump the paths together to reduce the amount of
ifdeffery.

No functional change intended.

Link: https://lore.kernel.org/r/20241127234659.4046347-1-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 3522c419

arch/x86/kvm/svm/svm.h

+5 −12
Original line number Diff line number Diff line
@@ -358,39 +358,32 @@ static __always_inline struct kvm_sev_info *to_kvm_sev_info(struct kvm *kvm) 
	return &to_kvm_svm(kvm)->sev_info;

}



#ifdef CONFIG_KVM_AMD_SEV

static __always_inline bool sev_guest(struct kvm *kvm)

{

#ifdef CONFIG_KVM_AMD_SEV

	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;



	return sev->active;

#else

	return false;

#endif

}



static __always_inline bool sev_es_guest(struct kvm *kvm)

{

#ifdef CONFIG_KVM_AMD_SEV

	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;



	return sev->es_active && !WARN_ON_ONCE(!sev->active);

#else

	return false;

#endif

}



static __always_inline bool sev_snp_guest(struct kvm *kvm)

{

#ifdef CONFIG_KVM_AMD_SEV

	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;



	return (sev->vmsa_features & SVM_SEV_FEAT_SNP_ACTIVE) &&

	       !WARN_ON_ONCE(!sev_es_guest(kvm));

}

#else

	return false;

#define sev_guest(kvm) false

#define sev_es_guest(kvm) false

#define sev_snp_guest(kvm) false

#endif

}



static inline bool ghcb_gpa_is_registered(struct vcpu_svm *svm, u64 val)

{