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 5/7] KVM: SVM: Handle vectoring error in check_emulate_instruction
Date: Tue, 17 Dec 2024 18:14:56 +0000 [thread overview]
Message-ID: <20241217181458.68690-6-iorlov@amazon.com> (raw)
In-Reply-To: <20241217181458.68690-1-iorlov@amazon.com>
Detect unhandleable vectoring in check_emulate_instruction to prevent
infinite loop on SVM and eliminate the difference in how intercepted #PF
during vectoring is handled on SVM and VMX.
Signed-off-by: Ivan Orlov <iorlov@amazon.com>
---
V1 -> V2:
- Detect the unhandleable vectoring error in svm_check_emulate_instruction
instead of handling it in the common MMU code (which is specific for
cached MMIO)
V2 -> V3:
- Use more generic function to check if emulation is allowed when
vectoring
arch/x86/kvm/svm/svm.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index dd15cc635655..e89c6fc2c4e6 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -4802,6 +4802,12 @@ static int svm_check_emulate_instruction(struct kvm_vcpu *vcpu, int emul_type,
bool smep, smap, is_user;
u64 error_code;
+ /* Check that emulation is possible during event vectoring */
+ if ((to_svm(vcpu)->vmcb->control.exit_int_info &
+ SVM_EXITINTINFO_TYPE_MASK) &&
+ !kvm_can_emulate_event_vectoring(emul_type))
+ return X86EMUL_UNHANDLEABLE_VECTORING;
+
/* Emulation is always possible when KVM has access to all guest state. */
if (!sev_guest(vcpu->kvm))
return X86EMUL_CONTINUE;
--
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 ` [PATCH v3 2/7] KVM: x86: Add emulation status for unhandleable vectoring Ivan Orlov
2024-12-18 18:23 ` 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 ` Ivan Orlov [this message]
2024-12-18 18:40 ` [PATCH v3 5/7] KVM: SVM: " 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-6-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