KVM: SVM: Drop SEV-ES DebugSwap module param
Sean Christopherson
maintainercover KVM: SVM: Drop SEV-ES DebugSwap module param
Remove sev_es_debug_swap_enabled as it's no longer needed/useful, and mark sev_supported_vmsa_features as read-only after init.
Sean Christopherson (2):
KVM: SVM: Drop the module param to control SEV-ES DebugSwap
KVM: SVM: Tag sev_supported_vmsa_features as read-only after init
arch/x86/kvm/svm/sev.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
base-commit: 9448598b22c50c8a5bb77a9103e2d49f134c9578
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Sean Christopherson
maintainerPATCH 1/2 KVM: SVM: Drop the module param to control SEV-ES DebugSwap
Rip out the DebugSwap module param, as the sequence of events that led to its inclusion was one big mistake, the param no longer serves any purpose.
Commit d1f85fbe836e ("KVM: SEV: Enable data breakpoints in SEV-ES") goofed by not adding a way for the userspace VMM to control the feature. Functionally, that was fine, but it broke attestation signatures because SEV_FEATURES are included in the signature.
Commit 5abf6dceb066 ("SEV: disable SEV-ES DebugSwap by default") fixed that issue, but the underlying flaw of userspace not having a way to control SEV_FEATURES was still there.
That flaw was addressed by commit 4f5defae7089 ("KVM: SEV: introduce KVM_SEV_INIT2 operation"), and so then 4dd5ecacb9a4 ("KVM: SEV: allow SEV-ES DebugSwap again") re-enabled DebugSwap by default.
Now that the dust has settled, the module param doesn't serve any meaningful purpose.
--- arch/x86/kvm/svm/sev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/kvm/svm/sev.c +3 -8
@@ -53,9 +53,6 @@ module_param_named(sev_es, sev_es_enabled, bool, 0444);static bool sev_snp_enabled = true;module_param_named (sev_snp, sev_snp_enabled, bool,0444 ); -/* enable/disable SEV-ES DebugSwap support */ -static bool sev_es_debug_swap_enabled = true; -module_param_named (debug_swap, sev_es_debug_swap_enabled, bool,0444 );static u64 sev_supported_vmsa_features;static unsigned int nr_ciphertext_hiding_asids;
@@ -3150,12 +3147,10 @@ void __init sev_hardware_setup(void) sev_es_enabled = sev_es_supported; sev_snp_enabled = sev_snp_supported; -if (!sev_es_enabled || !cpu_feature_enabled (X86_FEATURE_DEBUG_SWAP ) || - !cpu_feature_enabled (X86_FEATURE_NO_NESTED_DATA_BP )) - sev_es_debug_swap_enabled = false; - sev_supported_vmsa_features =0 ; -if (sev_es_debug_swap_enabled) + +if (sev_es_enabled &&cpu_feature_enabled (X86_FEATURE_DEBUG_SWAP ) && +cpu_feature_enabled (X86_FEATURE_NO_NESTED_DATA_BP )) sev_supported_vmsa_features |=SVM_SEV_FEAT_DEBUG_SWAP ;if (sev_snp_enabled && tsc_khz &&cpu_feature_enabled (X86_FEATURE_SNP_SECURE_TSC ))
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Re: [PATCH 1/2] KVM: SVM: Drop the module param to control SEV-ES DebugSwap
Quoted 16 lines · Sean Christopherson
Rip out the DebugSwap module param, as the sequence of events that led to its inclusion was one big mistake, the param no longer serves any purpose.
Commit
d1f85fbe836e("KVM: SEV: Enable data breakpoints in SEV-ES") goofed by not adding a way for the userspace VMM to control the feature. Functionally, that was fine, but it broke attestation signatures becauseSEV_FEATURESare included in the signature.Commit
5abf6dceb066("SEV: disable SEV-ES DebugSwap by default") fixed that issue, but the underlying flaw of userspace not having a way to controlSEV_FEATURESwas still there.That flaw was addressed by commit
4f5defae7089("KVM: SEV: introduceKVM_SEV_INIT2operation"), and so then4dd5ecacb9a4("KVM: SEV: allow SEV-ES DebugSwap again") re-enabled DebugSwap by default.
Quoted 5 lines
Now that the dust has settled, the module param doesn't serve any meaningful purpose.
Cc Tom Lendacky <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 34 lines
--- arch/x86/kvm/svm/sev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)arch/x86/kvm/svm/sev.c +3
-8@@ -53,9 +53,6 @@ module_param_named(sev_es, sev_es_enabled, bool, 0444);static bool sev_snp_enabled = true;module_param_named (sev_snp, sev_snp_enabled, bool,0444 ); -/* enable/disable SEV-ES DebugSwap support */ -static bool sev_es_debug_swap_enabled = true; -module_param_named (debug_swap, sev_es_debug_swap_enabled, bool,0444 );static u64 sev_supported_vmsa_features;static unsigned int nr_ciphertext_hiding_asids;@@ -3150,12 +3147,10 @@ void __init sev_hardware_setup(void) sev_es_enabled = sev_es_supported; sev_snp_enabled = sev_snp_supported; -if (!sev_es_enabled || !cpu_feature_enabled (X86_FEATURE_DEBUG_SWAP ) || - !cpu_feature_enabled (X86_FEATURE_NO_NESTED_DATA_BP )) - sev_es_debug_swap_enabled = false; - sev_supported_vmsa_features =0 ; -if (sev_es_debug_swap_enabled) + +if (sev_es_enabled &&cpu_feature_enabled (X86_FEATURE_DEBUG_SWAP ) && +cpu_feature_enabled (X86_FEATURE_NO_NESTED_DATA_BP )) sev_supported_vmsa_features |=SVM_SEV_FEAT_DEBUG_SWAP ;if (sev_snp_enabled && tsc_khz &&cpu_feature_enabled (X86_FEATURE_SNP_SECURE_TSC ))
Sean Christopherson
maintainerPATCH 2/2 KVM: SVM: Tag sev_supported_vmsa_features as read-only after init
In reply to Sean ChristophersonTag sev_supported_vmsa_features with __ro_after_init as it's configured by sev_hardware_setup() and never written after initial configuration (and if it were, that'd be a blatant bug).
Opportunistically relocate the variable out of the module params area now that sev_es_debug_swap_enabled is gone (which largely motivated its original location).
--- arch/x86/kvm/svm/sev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +2 -2
@@ -53,8 +53,6 @@ module_param_named(sev_es, sev_es_enabled, bool, 0444);static bool sev_snp_enabled = true;module_param_named (sev_snp, sev_snp_enabled, bool,0444 ); -static u64 sev_supported_vmsa_features; -static unsigned int nr_ciphertext_hiding_asids;module_param_named (ciphertext_hiding_asids, nr_ciphertext_hiding_asids, uint,0444 );
@@ -81,6 +79,8 @@ module_param_named(ciphertext_hiding_asids, nr_ciphertext_hiding_asids, uint, 04static u64 snp_supported_policy_bits__ro_after_init ; +static u64 sev_supported_vmsa_features__ro_after_init ; +#define INITIAL_VMSA_GPA 0xFFFFFFFFF000static u8 sev_enc_bit;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Re: [PATCH 2/2] KVM: SVM: Tag sev_supported_vmsa_features as read-only after init
Quoted 9 lines · Sean Christopherson
Tag
sev_supported_vmsa_featureswith__ro_after_initas it's configured bysev_hardware_setup()and never written after initial configuration (and if it were, that'd be a blatant bug).Opportunistically relocate the variable out of the module params area now that
sev_es_debug_swap_enabledis gone (which largely motivated its original location).Signed-off-by Sean Christopherson <[email protected]>
Quoted 26 lines
--- arch/x86/kvm/svm/sev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/kvm/svm/sev.c +2
-2@@ -53,8 +53,6 @@ module_param_named(sev_es, sev_es_enabled, bool, 0444);static bool sev_snp_enabled = true;module_param_named (sev_snp, sev_snp_enabled, bool,0444 ); -static u64 sev_supported_vmsa_features; -static unsigned int nr_ciphertext_hiding_asids;module_param_named (ciphertext_hiding_asids, nr_ciphertext_hiding_asids, uint,0444 );@@ -81,6 +79,8 @@ module_param_named(ciphertext_hiding_asids, nr_ciphertext_hiding_asids, uint, 04static u64 snp_supported_policy_bits__ro_after_init ; +static u64 sev_supported_vmsa_features__ro_after_init ; +#define INITIAL_VMSA_GPA 0xFFFFFFFFF000static u8 sev_enc_bit;
Quoted 8 lines · Sean Christopherson
Remove
sev_es_debug_swap_enabledas it's no longer needed/useful, and marksev_supported_vmsa_featuresas read-only after init.Sean Christopherson (2):
KVM: SVM: Drop the module param to control SEV-ES DebugSwap
KVM: SVM: Tagsev_supported_vmsa_featuresas read-only after init[...]
Applied to kvm-x86 svm, thanks!
[1/2] KVM: SVM: Drop the module param to control SEV-ES DebugSwap
https://github.com/kvm-x86/linux/commit/9587dd7a7ebd [2/2] KVM: SVM: Tag sev_supported_vmsa_features as read-only after init https://github.com/kvm-x86/linux/commit/d23051f59a5b