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

KVM: SVM: Move SEV module params/variables to sev.c

Browse Source 
Unconditionally invoke sev_hardware_setup() when configuring SVM and
handle clearing the module params/variable 'sev' and 'sev_es' in
sev_hardware_setup().  This allows making said variables static within
sev.c and reduces the odds of a collision with guest code, e.g. the guest
side of things has already laid claim to 'sev_enabled'.

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-5-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2021-04-21 19:11:14 -07:00
committed by Paolo Bonzini
parent fa13680f56
commit e8126bdaf1
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,14 @@
#define MISC_CG_RES_SEV_ES MISC_CG_RES_TYPES #define MISC_CG_RES_SEV_ES MISC_CG_RES_TYPES
#endif #endif
/* enable/disable SEV support */
static int sev = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);
module_param(sev, int, 0444);
/* enable/disable SEV-ES support */
static int sev_es = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);
module_param(sev_es, int, 0444);
static u8 sev_enc_bit; static u8 sev_enc_bit;
static int sev_flush_asids(void); static int sev_flush_asids(void);
static DECLARE_RWSEM(sev_deactivate_lock); static DECLARE_RWSEM(sev_deactivate_lock);
@@ -1805,6 +1813,9 @@ void __init sev_hardware_setup(void)
bool sev_es_supported = false; bool sev_es_supported = false;
bool sev_supported = false; bool sev_supported = false;
if (!IS_ENABLED(CONFIG_KVM_AMD_SEV) || !sev || !npt_enabled)
goto out;
/* Does the CPU support SEV? */ /* Does the CPU support SEV? */
if (!boot_cpu_has(X86_FEATURE_SEV)) if (!boot_cpu_has(X86_FEATURE_SEV))
goto out; goto out;

14
arch/x86/kvm/svm/svm.c
View File

@@ -185,14 +185,6 @@ module_param(vls, int, 0444);
static int vgif = true; static int vgif = true;
module_param(vgif, int, 0444); module_param(vgif, int, 0444);
/* enable/disable SEV support */
int sev = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);
module_param(sev, int, 0444);
/* enable/disable SEV-ES support */
int sev_es = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);
module_param(sev_es, int, 0444);
bool __read_mostly dump_invalid_vmcb; bool __read_mostly dump_invalid_vmcb;
module_param(dump_invalid_vmcb, bool, 0644); module_param(dump_invalid_vmcb, bool, 0644);
@@ -996,12 +988,8 @@ static __init int svm_hardware_setup(void)
kvm_configure_mmu(npt_enabled, get_max_npt_level(), PG_LEVEL_1G); kvm_configure_mmu(npt_enabled, get_max_npt_level(), PG_LEVEL_1G);
pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis"); pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis");
if (IS_ENABLED(CONFIG_KVM_AMD_SEV) && sev && npt_enabled) { /* Note, SEV setup consumes npt_enabled. */
sev_hardware_setup(); sev_hardware_setup();
} else {
sev = false;
sev_es = false;
}
svm_adjust_mmio_mask(); svm_adjust_mmio_mask();

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

@@ -391,8 +391,6 @@ static inline bool gif_set(struct vcpu_svm *svm)
/* svm.c */ /* svm.c */
#define MSR_INVALID 0xffffffffU #define MSR_INVALID 0xffffffffU
extern int sev;
extern int sev_es;
extern bool dump_invalid_vmcb; extern bool dump_invalid_vmcb;
u32 svm_msrpm_offset(u32 msr); u32 svm_msrpm_offset(u32 msr);