From: Ivan Orlov <iorlov@amazon.com>
To: <bp@alien8.de>, <dave.hansen@linux.intel.com>, <mingo@redhat.com>,
<pbonzini@redhat.com>, <seanjc@google.com>, <shuah@kernel.org>,
<tglx@linutronix.de>
Cc: Ivan Orlov <iorlov@amazon.com>, <hpa@zytor.com>,
<kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-kselftest@vger.kernel.org>, <x86@kernel.org>,
<dwmw@amazon.co.uk>, <pdurrant@amazon.co.uk>,
<jalliste@amazon.co.uk>
Subject: [PATCH v3 2/7] KVM: x86: Add emulation status for unhandleable vectoring
Date: Tue, 17 Dec 2024 18:14:53 +0000 [thread overview]
Message-ID: <20241217181458.68690-3-iorlov@amazon.com> (raw)
In-Reply-To: <20241217181458.68690-1-iorlov@amazon.com>
Add emulation status for unhandleable vectoring, i.e. when KVM can't
emulate an instruction during vectoring. Such a situation can occur
if guest sets the IDT descriptor base to point to MMIO region, and
triggers an exception after that.
Exit to userspace with event delivery error when KVM can't emulate
an instruction when vectoring an event.
Signed-off-by: Ivan Orlov <iorlov@amazon.com>
---
V1 -> V2:
- This patch wasn't included in V1.
V2 -> V3:
- Make new X86EMUL_ code more generic to allow using it for any type
of unhandleable vectoring
arch/x86/kvm/kvm_emulate.h | 2 ++
arch/x86/kvm/x86.c | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h
index 10495fffb890..5bcf50ffc3de 100644
--- a/arch/x86/kvm/kvm_emulate.h
+++ b/arch/x86/kvm/kvm_emulate.h
@@ -88,6 +88,8 @@ struct x86_instruction_info {
#define X86EMUL_CMPXCHG_FAILED 4 /* cmpxchg did not see expected value */
#define X86EMUL_IO_NEEDED 5 /* IO is needed to complete emulation */
#define X86EMUL_INTERCEPTED 6 /* Intercepted by nested VMCB/VMCS */
+/* Vectroing can't be emulated */
+#define X86EMUL_UNHANDLEABLE_VECTORING 7
/* x86-specific emulation flags */
#define X86EMUL_F_WRITE BIT(0)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 7ce9cdb66f19..849a6fc364b3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9107,6 +9107,11 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
if (r == X86EMUL_RETRY_INSTR || r == X86EMUL_PROPAGATE_FAULT)
return 1;
+ if (r == X86EMUL_UNHANDLEABLE_VECTORING) {
+ kvm_prepare_event_vectoring_exit(vcpu, cr2_or_gpa);
+ return 0;
+ }
+
WARN_ON_ONCE(r != X86EMUL_UNHANDLEABLE);
return handle_emulation_failure(vcpu, emulation_type);
}
--
2.43.0
next prev parent reply other threads:[~2024-12-17 18:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-17 18:14 [PATCH v3 0/7] Enhance event delivery error handling Ivan Orlov
2024-12-17 18:14 ` [PATCH v3 1/7] KVM: x86: Add function for vectoring error generation Ivan Orlov
2024-12-17 18:14 ` Ivan Orlov [this message]
2024-12-18 18:23 ` [PATCH v3 2/7] KVM: x86: Add emulation status for unhandleable vectoring Sean Christopherson
2024-12-17 18:14 ` [PATCH v3 3/7] KVM: x86: Unprotect & retry before unhandleable vectoring check Ivan Orlov
2024-12-17 18:14 ` [PATCH v3 4/7] KVM: VMX: Handle vectoring error in check_emulate_instruction Ivan Orlov
2024-12-18 18:39 ` Sean Christopherson
2024-12-18 22:00 ` Ivan Orlov
2024-12-17 18:14 ` [PATCH v3 5/7] KVM: SVM: " Ivan Orlov
2024-12-18 18:40 ` Sean Christopherson
2024-12-17 18:14 ` [PATCH v3 6/7] selftests: KVM: extract lidt into helper function Ivan Orlov
2024-12-18 18:41 ` Sean Christopherson
2024-12-17 18:14 ` [PATCH v3 7/7] selftests: KVM: Add test case for MMIO during vectoring Ivan Orlov
2024-12-18 18:44 ` Sean Christopherson
2024-12-18 18:44 ` [PATCH v3 0/7] Enhance event delivery error handling Sean Christopherson
2024-12-18 21:57 ` Ivan Orlov
2024-12-19 2:40 ` Sean Christopherson
2024-12-19 23:19 ` Ivan Orlov
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=20241217181458.68690-3-iorlov@amazon.com \
--to=iorlov@amazon.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=dwmw@amazon.co.uk \
--cc=hpa@zytor.com \
--cc=jalliste@amazon.co.uk \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pdurrant@amazon.co.uk \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--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