From: Alexey Kardashevskiy <aik@amd.com>
To: <kvm@vger.kernel.org>
Cc: <x86@kernel.org>, <linux-kernel@vger.kernel.org>,
Tom Lendacky <thomas.lendacky@amd.com>,
Sean Christopherson <seanjc@google.com>,
"Alexey Kardashevskiy" <aik@amd.com>
Subject: [PATCH kernel 9/9] KVM: SVM: Don't try to pointlessly single-step SEV-ES guests for NMI window
Date: Thu, 15 Jun 2023 16:37:57 +1000 [thread overview]
Message-ID: <20230615063757.3039121-10-aik@amd.com> (raw)
In-Reply-To: <20230615063757.3039121-1-aik@amd.com>
From: Sean Christopherson <seanjc@google.com>
Bail early from svm_enable_nmi_window() for SEV-ES guests without trying
to enable single-step of the guest, as single-stepping an SEV-ES guest is
impossible and the guest is responsible for *telling* KVM when it is ready
for an new NMI to be injected.
Functionally, setting TF and RF in svm->vmcb->save.rflags is benign as the
field is ignored by hardware, but it's all kinds of confusing.
Signed-off-by: Sean Christopherson <seanjc@google.com>
[aik: removed the clause about "KVM suppresses EFER.SVME (see efer_trap())"]
Signed-off-by: Alexey Kardashevskiy <aik@amd.com>
---
Changes:
v6:
* new to the series
---
arch/x86/kvm/svm/svm.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 52f1d88e82a0..c9837a8667b7 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3824,6 +3824,19 @@ static void svm_enable_nmi_window(struct kvm_vcpu *vcpu)
if (svm_get_nmi_mask(vcpu) && !svm->awaiting_iret_completion)
return; /* IRET will cause a vm exit */
+ /*
+ * SEV-ES guests are responsible for signaling when a vCPU is ready to
+ * receive a new NMI, as SEV-ES guests can't be single-stepped, i.e.
+ * KVM can't intercept and single-step IRET to detect when NMIs are
+ * unblocked (architecturally speaking). See SVM_VMGEXIT_NMI_COMPLETE.
+ *
+ * Note, GIF is guaranteed to be '1' for SEV-ES guests as hardware
+ * ignores SEV-ES guest writes to EFER.SVME *and* CLGI/STGI are not
+ * supported NAEs in the GHCB protocol.
+ */
+ if (sev_es_guest(vcpu->kvm))
+ return;
+
if (!gif_set(svm)) {
if (vgif)
svm_set_intercept(svm, INTERCEPT_STGI);
--
2.40.1
next prev parent reply other threads:[~2023-06-15 6:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 6:37 [PATCH kernel 0/9] KVM: SEV: Enable AMD SEV-ES DebugSwap Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 1/9] KVM: SEV: move set_dr_intercepts/clr_dr_intercepts from the header Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 2/9] KVM: SEV: Move SEV's GP_VECTOR intercept setup to SEV Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 3/9] KVM: SVM: Rewrite sev_es_prepare_switch_to_guest()'s comment about swap types Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 4/9] KVM: SEV-ES: explicitly disable debug Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 5/9] KVM: SVM/SEV/SEV-ES: Rework intercepts Alexey Kardashevskiy
2023-06-30 21:49 ` Sean Christopherson
2023-07-03 2:01 ` Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 6/9] KVM: SEV: Enable data breakpoints in SEV-ES Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 7/9] KVM: SEV-ES: Eliminate #DB intercept when DebugSwap enabled Alexey Kardashevskiy
2023-06-15 6:37 ` [PATCH kernel 8/9] KVM: SVM: Don't defer NMI unblocking until next exit for SEV-ES guests Alexey Kardashevskiy
2023-06-15 6:37 ` Alexey Kardashevskiy [this message]
2023-06-15 7:13 ` [PATCH kernel 0/9 v6] KVM: SEV: Enable AMD SEV-ES DebugSwap Alexey Kardashevskiy
2023-06-23 1:35 ` Alexey Kardashevskiy
2023-06-23 14:19 ` Sean Christopherson
2023-06-30 2:08 ` Alexey Kardashevskiy
2023-06-30 21:52 ` Sean Christopherson
2023-07-20 19:01 ` Alexey Kardashevskiy
2023-07-28 23:49 ` [PATCH kernel 0/9] " Sean Christopherson
2023-07-29 1:57 ` Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230615063757.3039121-10-aik@amd.com \
--to=aik@amd.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seanjc@google.com \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox