mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 20/24] KVM: x86: Treat pending TRIPLE_FAULT requests as pending exceptions
Date: Sat, 23 Jul 2022 00:51:33 +0000	[thread overview]
Message-ID: <20220723005137.1649592-21-seanjc@google.com> (raw)
In-Reply-To: <20220723005137.1649592-1-seanjc@google.com>

Treat pending TRIPLE_FAULTS as pending exceptions.  A triple fault is an
exception for all intents and purposes, it's just not tracked as such
because there's no vector associated the exception.  E.g. if userspace
were to set vcpu->request_interrupt_window while running L2 and L2 hit a
triple fault, a triple fault nested VM-Exit should be synthesized to L1
before exiting to userspace with KVM_EXIT_IRQ_WINDOW_OPEN.

Link: https://lore.kernel.org/all/YoVHAIGcFgJit1qp@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
---
 arch/x86/kvm/x86.c | 3 ---
 arch/x86/kvm/x86.h | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6c77411fc570..d714f335749c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -12657,9 +12657,6 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu)
 	if (kvm_xen_has_pending_events(vcpu))
 		return true;
 
-	if (kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu))
-		return true;
-
 	return false;
 }
 
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 256745d1a2c3..a784ff90740b 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -85,7 +85,8 @@ int kvm_check_nested_events(struct kvm_vcpu *vcpu);
 static inline bool kvm_is_exception_pending(struct kvm_vcpu *vcpu)
 {
 	return vcpu->arch.exception.pending ||
-	       vcpu->arch.exception_vmexit.pending;
+	       vcpu->arch.exception_vmexit.pending ||
+	       kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu);
 }
 
 static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)
-- 
2.37.1.359.gd136c6c3e2-goog


  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 ` [PATCH v4 16/24] KVM: x86: Evaluate ability to inject SMI/NMI/IRQ after potential VM-Exit Sean Christopherson
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 ` Sean Christopherson [this message]
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-21-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®