moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: SVM: Drop redundant svm_sev_enabled() helper

Browse Source 
Replace calls to svm_sev_enabled() with direct checks on sev_enabled, or
in the case of svm_mem_enc_op, simply drop the call to svm_sev_enabled().
This effectively replaces checks against a valid max_sev_asid with checks
against sev_enabled.  sev_enabled is forced off by sev_hardware_setup()
if max_sev_asid is invalid, all call sites are guaranteed to run after
sev_hardware_setup(), and all of the checks care about SEV being fully
enabled (as opposed to intentionally handling the scenario where
max_sev_asid is valid but SEV enabling fails due to OOM).

Reviewed by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210422021125.3417167-14-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2021-04-21 19:11:23 -07:00
committed by Paolo Bonzini
parent b95c221cac
commit a5c1c5aad6
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/svm/sev.c
View File

@@ -1500,7 +1500,7 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)
struct kvm_sev_cmd sev_cmd; struct kvm_sev_cmd sev_cmd;
int r; int r;
if (!svm_sev_enabled() || !sev_enabled) if (!sev_enabled)
return -ENOTTY; return -ENOTTY;
if (!argp) if (!argp)
@@ -1895,7 +1895,7 @@ out:
void sev_hardware_teardown(void) void sev_hardware_teardown(void)
{ {
if (!svm_sev_enabled()) if (!sev_enabled)
return; return;
bitmap_free(sev_asid_bitmap); bitmap_free(sev_asid_bitmap);
@@ -1908,7 +1908,7 @@ void sev_hardware_teardown(void)
int sev_cpu_init(struct svm_cpu_data *sd) int sev_cpu_init(struct svm_cpu_data *sd)
{ {
if (!svm_sev_enabled()) if (!sev_enabled)
return 0; return 0;
sd->sev_vmcbs = kcalloc(max_sev_asid + 1, sizeof(void *), GFP_KERNEL); sd->sev_vmcbs = kcalloc(max_sev_asid + 1, sizeof(void *), GFP_KERNEL);

5
arch/x86/kvm/svm/svm.h
View File

@@ -562,11 +562,6 @@ void svm_vcpu_unblocking(struct kvm_vcpu *vcpu);
extern unsigned int max_sev_asid; extern unsigned int max_sev_asid;
static inline bool svm_sev_enabled(void)
{
return IS_ENABLED(CONFIG_KVM_AMD_SEV) ? max_sev_asid : 0;
}
void sev_vm_destroy(struct kvm *kvm); void sev_vm_destroy(struct kvm *kvm);
int svm_mem_enc_op(struct kvm *kvm, void __user *argp); int svm_mem_enc_op(struct kvm *kvm, void __user *argp);
int svm_register_enc_region(struct kvm *kvm, int svm_register_enc_region(struct kvm *kvm,