Re: [PATCH 07/13] KVM: SVM: Append "_enabled" to module-scoped SEV/SEV-ES control variables

[Tom Lendacky]

On 1/8/21 6:47 PM, Sean Christopherson wrote:

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.

Signed-off-by: Sean Christopherson <sea...@google.com>

Acked-by: Tom Lendacky <thomas.lenda...@amd.com>

---
  arch/x86/kvm/svm/sev.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 8ba93b8fa435..a024edabaca5 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -28,12 +28,12 @@
  #define __ex(x) __kvm_handle_fault_on_reboot(x)

/* 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);
@@ -213,7 +213,7 @@ static int sev_guest_init(struct kvm *kvm, struct 
kvm_sev_cmd *argp)

static int sev_es_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)

  {
-       if (!sev_es)
+       if (!sev_es_enabled)
                return -ENOTTY;

to_kvm_svm(kvm)->sev_info.es_active = true;

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

@@ -1257,7 +1257,7 @@ void __init sev_hardware_setup(void)
        bool sev_es_supported = false;
        bool sev_supported = false;

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

+       if (!IS_ENABLED(CONFIG_KVM_AMD_SEV) || !sev_enabled)
                goto out;

/* Does the CPU support SEV? */

@@ -1294,7 +1294,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? */

@@ -1309,8 +1309,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)