From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Jim Mattson <jmattson@google.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
Oliver Upton <oupton@google.com>, Peter Shier <pshier@google.com>
Subject: [PATCH v4 16/24] KVM: x86: Evaluate ability to inject SMI/NMI/IRQ after potential VM-Exit
Date: Sat, 23 Jul 2022 00:51:29 +0000 [thread overview]
Message-ID: <20220723005137.1649592-17-seanjc@google.com> (raw)
In-Reply-To: <20220723005137.1649592-1-seanjc@google.com>
Determine whether or not new events can be injected after checking nested
events. If a VM-Exit occurred during nested event handling, any previous
event that needed re-injection is gone from's KVM perspective; the event
is captured in the vmc*12 VM-Exit information, but doesn't exist in terms
of what needs to be done for entry to L1.
Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
---
arch/x86/kvm/x86.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 046c8c2fbd8f..fb9edbb6ee1a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9670,7 +9670,7 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu)
static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit)
{
- bool can_inject = !kvm_event_needs_reinjection(vcpu);
+ bool can_inject;
int r;
/*
@@ -9735,7 +9735,13 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool *req_immediate_exit)
if (r < 0)
goto out;
- /* try to inject new event if pending */
+ /*
+ * New events, other than exceptions, cannot be injected if KVM needs
+ * to re-inject a previous event. See above comments on re-injecting
+ * for why pending exceptions get priority.
+ */
+ can_inject = !kvm_event_needs_reinjection(vcpu);
+
if (vcpu->arch.exception.pending) {
/*
* Fault-class exceptions, except #DBs, set RF=1 in the RFLAGS
--
2.37.1.359.gd136c6c3e2-goog
next prev parent reply other threads:[~2022-07-23 0:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-23 0:51 [PATCH v4 00/24] KVM: x86: Event/exception fixes and cleanups Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 01/24] KVM: nVMX: Unconditionally purge queued/injected events on nested "exit" Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 02/24] KVM: VMX: Drop bits 31:16 when shoving exception error code into VMCS Sean Christopherson
2022-08-01 16:00 ` Maxim Levitsky
2022-07-23 0:51 ` [PATCH v4 03/24] KVM: x86: Don't check for code breakpoints when emulating on exception Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 04/24] KVM: nVMX: Treat General Detect #DB (DR7.GD=1) as fault-like Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 05/24] KVM: nVMX: Prioritize TSS T-flag #DBs over Monitor Trap Flag Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 06/24] KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1) Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 07/24] KVM: x86: Use DR7_GD macro instead of open coding check in emulator Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 08/24] KVM: nVMX: Ignore SIPI that arrives in L2 when vCPU is not in WFS Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 09/24] KVM: nVMX: Unconditionally clear mtf_pending on nested VM-Exit Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 10/24] KVM: VMX: Inject #PF on ENCLS as "emulated" #PF Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 11/24] KVM: x86: Rename kvm_x86_ops.queue_exception to inject_exception Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 12/24] KVM: x86: Make kvm_queued_exception a properly named, visible struct Sean Christopherson
2022-08-01 16:10 ` Maxim Levitsky
2022-07-23 0:51 ` [PATCH v4 13/24] KVM: x86: Formalize blocking of nested pending exceptions Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 14/24] KVM: x86: Use kvm_queue_exception_e() to queue #DF Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 15/24] KVM: x86: Hoist nested event checks above event injection logic Sean Christopherson
2022-07-23 0:51 ` Sean Christopherson [this message]
2022-07-23 0:51 ` [PATCH v4 17/24] KVM: nVMX: Add a helper to identify low-priority #DB traps Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 18/24] KVM: nVMX: Document priority of all known events on Intel CPUs Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 19/24] KVM: x86: Morph pending exceptions to pending VM-Exits at queue time Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 20/24] KVM: x86: Treat pending TRIPLE_FAULT requests as pending exceptions Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 21/24] KVM: VMX: Update MTF and ICEBP comments to document KVM's subtle behavior Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 22/24] KVM: x86: Rename inject_pending_events() to kvm_check_and_inject_events() Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 23/24] KVM: selftests: Use uapi header to get VMX and SVM exit reasons/codes Sean Christopherson
2022-07-23 0:51 ` [PATCH v4 24/24] KVM: selftests: Add an x86-only test to verify nested exception queueing Sean Christopherson
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=20220723005137.1649592-17-seanjc@google.com \
--to=seanjc@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlevitsk@redhat.com \
--cc=oupton@google.com \
--cc=pbonzini@redhat.com \
--cc=pshier@google.com \
/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
all inboxes | Powered by JetHome®