Commit e8126bda authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

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



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: default avatarTom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: default avatarBrijesh Singh <brijesh.singh@amd.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210422021125.3417167-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fa13680f

arch/x86/kvm/svm/sev.c

+11 −0
Original line number Diff line number Diff line
@@ -44,6 +44,14 @@ 
#define MISC_CG_RES_SEV_ES MISC_CG_RES_TYPES

#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 int sev_flush_asids(void);

static DECLARE_RWSEM(sev_deactivate_lock);
@@ -1805,6 +1813,9 @@ void __init sev_hardware_setup(void) 
	bool sev_es_supported = false;

	bool sev_supported = false;



	if (!IS_ENABLED(CONFIG_KVM_AMD_SEV) || !sev || !npt_enabled)

		goto out;



	/* Does the CPU support SEV? */

	if (!boot_cpu_has(X86_FEATURE_SEV))

		goto out;

arch/x86/kvm/svm/svm.c

+2 −14
Original line number Diff line number Diff line
@@ -185,14 +185,6 @@ module_param(vls, int, 0444); 
static int vgif = true;

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;

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);

	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();

	} else {

		sev = false;

		sev_es = false;

	}



	svm_adjust_mmio_mask();

arch/x86/kvm/svm/svm.h

+0 −2
Original line number Diff line number Diff line
@@ -391,8 +391,6 @@ static inline bool gif_set(struct vcpu_svm *svm) 
/* svm.c */

#define MSR_INVALID				0xffffffffU



extern int sev;

extern int sev_es;

extern bool dump_invalid_vmcb;



u32 svm_msrpm_offset(u32 msr);