x86/sev: Do not handle #VC for DR7 read/write
PATCH v5 1/1 x86/sev: Do not handle #VC for DR7 read/write
With MSR_AMD64_SEV_DEBUG_SWAP enabled, the guest is not expected to receive a #VC for reads or writes of DR7.
Update the SNP_FEATURES_PRESENT mask with MSR_AMD64_SNP_DEBUG_SWAP so an SNP guest doesn't gracefully terminate during SNP feature negotiation if MSR_AMD64_SEV_DEBUG_SWAP is enabled.
Since a guest is not expected to receive a #VC on DR7 accesses when MSR_AMD64_SEV_DEBUG_SWAP is enabled, return an error from the #VC handler in this situation.
---
The KVM part of DebugSwap went to kvm-x86 tree:
https://lore.kernel.org/all/[email protected]/
but it is been suggested that this one can go via TIP:
https://lore.kernel.org/all/[email protected]/
I am trying to bribe now by reviewing patches (internally), does this work? :) Thanks,
---
Changes:
v5:
* rebased on latest TIP
v4:
* rebased on top of SNP feature negotiation
v2:
* use new bit definition
--- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/kernel/sev.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/sev.c +1 -1
@@ -365,7 +365,7 @@ static void enforce_vmpl0(void)* by the guest kernel. As and when a new feature is implemented in the * guest kernel, a corresponding bit should be added to the mask. */ -#define SNP_FEATURES_PRESENT (0) +#define SNP_FEATURES_PRESENT MSR_AMD64_SNP_DEBUG_SWAPu64 snp_get_unsupported_features (u64 status) {
arch/x86/kernel/sev.c +6 -0
@@ -1575,6 +1575,9 @@ static enum es_result vc_handle_dr7_write(struct ghcb *ghcb,long val, *reg =vc_insn_get_rm (ctxt);enum es_result ret; +if (sev_status &MSR_AMD64_SNP_DEBUG_SWAP ) +return ES_VMM_ERROR ; +if (!reg)return ES_DECODE_FAILED ;
@@ -1612,6 +1615,9 @@ static enum es_result vc_handle_dr7_read(struct ghcb *ghcb,struct sev_es_runtime_data *data =this_cpu_read (runtime_data);long *reg =vc_insn_get_rm (ctxt); +if (sev_status &MSR_AMD64_SNP_DEBUG_SWAP ) +return ES_VMM_ERROR ; +if (!reg)return ES_DECODE_FAILED ;
Signature · 1 line
2.41.0
Borislav Petkov
maintainerQuoted 15 lines · Alexey Kardashevskiy
With
MSR_AMD64_SEV_DEBUG_SWAPenabled, the guest is not expected to receive a #VC for reads or writes of DR7.Update the
SNP_FEATURES_PRESENTmask withMSR_AMD64_SNP_DEBUG_SWAPso an SNP guest doesn't gracefully terminate during SNP feature negotiation ifMSR_AMD64_SEV_DEBUG_SWAPis enabled.Since a guest is not expected to receive a #VC on DR7 accesses when
MSR_AMD64_SEV_DEBUG_SWAPis enabled, return an error from the #VC handler in this situation.Signed-off-by Alexey Kardashevskiy <[email protected]>Reviewed-by Carlos Bilbao <[email protected]>Reviewed-by Tom Lendacky <[email protected]>Reviewed-by Pankaj Gupta <[email protected]>
Quoted 8 lines
---
The KVM part of DebugSwap went to kvm-x86 tree:
https://lore.kernel.org/all/[email protected]/
but it is been suggested that this one can go via TIP:
https://lore.kernel.org/all/[email protected]/
I am trying to bribe now by reviewing patches (internally), does this work? :) Thanks,
Oh yeah, most definitely! Anyone can bribe me when helping out with review.
I very much appreciate people helping out with review so thanks!
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteThe following commit has been merged into the x86/sev branch of tip:
The following commit has been merged into the x86/sev branch of tip:
Commit-ID: e221804dad4e6fe3a0cf192ba3c42cd2f328bdac Gitweb: https://git.kernel.org/tip/e221804dad4e6fe3a0cf192ba3c42cd2f328bdac Author: Alexey Kardashevskiy <[email protected]> AuthorDate: Wed, 16 Aug 2023 12:21:22 +10:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Wed, 16 Aug 2023 10:13:42 +02:00
x86/sev: Do not handle #VC for DR7 read/write
With MSR_AMD64_SEV_DEBUG_SWAP enabled, the guest is not expected to receive a #VC for reads or writes of DR7.
Update the SNP_FEATURES_PRESENT mask with MSR_AMD64_SNP_DEBUG_SWAP so an SNP guest doesn't gracefully terminate during SNP feature negotiation if MSR_AMD64_SEV_DEBUG_SWAP is enabled.
Since a guest is not expected to receive a #VC on DR7 accesses when MSR_AMD64_SEV_DEBUG_SWAP is enabled, return an error from the #VC handler in this situation.
--- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/kernel/sev.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/sev.c +1 -1
@@ -365,7 +365,7 @@ static void enforce_vmpl0(void)* by the guest kernel. As and when a new feature is implemented in the * guest kernel, a corresponding bit should be added to the mask. */ -#define SNP_FEATURES_PRESENT (0) +#define SNP_FEATURES_PRESENT MSR_AMD64_SNP_DEBUG_SWAPvoid snp_check_features (void ) {
arch/x86/kernel/sev.c +6 -0
@@ -1575,6 +1575,9 @@ static enum es_result vc_handle_dr7_write(struct ghcb *ghcb,long val, *reg =vc_insn_get_rm (ctxt);enum es_result ret; +if (sev_status &MSR_AMD64_SNP_DEBUG_SWAP ) +return ES_VMM_ERROR ; +if (!reg)return ES_DECODE_FAILED ;
@@ -1612,6 +1615,9 @@ static enum es_result vc_handle_dr7_read(struct ghcb *ghcb,struct sev_es_runtime_data *data =this_cpu_read (runtime_data);long *reg =vc_insn_get_rm (ctxt); +if (sev_status &MSR_AMD64_SNP_DEBUG_SWAP ) +return ES_VMM_ERROR ; +if (!reg)return ES_DECODE_FAILED ;