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

KVM: SVM: Append "_enabled" to module-scoped SEV/SEV-ES control variables 



Rename sev and sev_es to sev_enabled and sev_es_enabled respectively to
better align with other KVM terminology, and to avoid pseudo-shadowing
when the variables are moved to sev.c in a future patch ('sev' is often
used for local struct kvm_sev_info pointers.

No functional change intended.

Acked-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-8-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9db0fd6

arch/x86/kvm/svm/sev.c

+12 −12
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ 
#endif



/* enable/disable SEV support */

static int sev = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);

module_param(sev, int, 0444);

static bool sev_enabled = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);

module_param_named(sev, sev_enabled, bool, 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 bool sev_es_enabled = IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT);

module_param_named(sev_es, sev_es_enabled, bool, 0444);



static u8 sev_enc_bit;

static int sev_flush_asids(void);
@@ -1495,7 +1495,7 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) 
	struct kvm_sev_cmd sev_cmd;

	int r;



	if (!svm_sev_enabled() || !sev)

	if (!svm_sev_enabled() || !sev_enabled)

		return -ENOTTY;



	if (!argp)
@@ -1514,7 +1514,7 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) 


	switch (sev_cmd.id) {

	case KVM_SEV_ES_INIT:

		if (!sev_es) {

		if (!sev_es_enabled) {

			r = -ENOTTY;

			goto out;

		}
@@ -1809,9 +1809,9 @@ void sev_vm_destroy(struct kvm *kvm) 


void __init sev_set_cpu_caps(void)

{

	if (!sev)

	if (!sev_enabled)

		kvm_cpu_cap_clear(X86_FEATURE_SEV);

	if (!sev_es)

	if (!sev_es_enabled)

		kvm_cpu_cap_clear(X86_FEATURE_SEV_ES);

}
@@ -1821,7 +1821,7 @@ 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)

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

		goto out;



	/* Does the CPU support SEV? */
@@ -1864,7 +1864,7 @@ void __init sev_hardware_setup(void) 
	sev_supported = true;



	/* SEV-ES support requested? */

	if (!sev_es)

	if (!sev_es_enabled)

		goto out;



	/* Does the CPU support SEV-ES? */
@@ -1883,8 +1883,8 @@ void __init sev_hardware_setup(void) 
	sev_es_supported = true;



out:

	sev = sev_supported;

	sev_es = sev_es_supported;

	sev_enabled = sev_supported;

	sev_es_enabled = sev_es_supported;

}



void sev_hardware_teardown(void)