From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: akpm@linux-foundation.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Jim Mattson" <jmattson@google.com>
Subject: [PATCH 3.16 02/12] kvm: nVMX: Allow L1 to intercept software exceptions (#BP and #OF)
Date: Fri, 24 Feb 2017 12:10:01 +0000 [thread overview]
Message-ID: <lsq.1487938201.41280412@decadent.org.uk> (raw)
In-Reply-To: <lsq.1487938201.529166958@decadent.org.uk>
3.16.41-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Jim Mattson <jmattson@google.com>
commit ef85b67385436ddc1998f45f1d6a210f935b3388 upstream.
When L2 exits to L0 due to "exception or NMI", software exceptions
(#BP and #OF) for which L1 has requested an intercept should be
handled by L1 rather than L0. Previously, only hardware exceptions
were forwarded to L1.
Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
arch/x86/kvm/vmx.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1073,10 +1073,10 @@ static inline int nested_cpu_has_ept(str
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_EPT);
}
-static inline bool is_exception(u32 intr_info)
+static inline bool is_nmi(u32 intr_info)
{
return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
- == (INTR_TYPE_HARD_EXCEPTION | INTR_INFO_VALID_MASK);
+ == (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);
}
static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
@@ -4838,7 +4838,7 @@ static int handle_exception(struct kvm_v
if (is_machine_check(intr_info))
return handle_machine_check(vcpu);
- if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR)
+ if (is_nmi(intr_info))
return 1; /* already handled by vmx_vcpu_run() */
if (is_no_device(intr_info)) {
@@ -6888,7 +6888,7 @@ static bool nested_vmx_exit_handled(stru
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
- if (!is_exception(intr_info))
+ if (is_nmi(intr_info))
return 0;
else if (is_page_fault(intr_info))
return enable_ept;
@@ -7185,8 +7185,7 @@ static void vmx_complete_atomic_exit(str
kvm_machine_check();
/* We need to handle NMIs before interrupts are enabled */
- if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&
- (exit_intr_info & INTR_INFO_VALID_MASK)) {
+ if (is_nmi(exit_intr_info)) {
kvm_before_handle_nmi(&vmx->vcpu);
asm("int $2");
kvm_after_handle_nmi(&vmx->vcpu);
next prev parent reply other threads:[~2017-02-24 13:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 12:10 [PATCH 3.16 00/12] 3.16.41-rc1 review Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 06/12] selinux: fix off-by-one in setprocattr Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 08/12] tmpfs: clear S_ISGID when setting posix ACLs Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 07/12] USB: serial: kl5kusb105: fix line-state error handling Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 12/12] tcp: avoid infinite loop in tcp_splice_read() Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 09/12] ip6_gre: fix ip6gre_err() invalid reads Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 03/12] ext4: validate s_first_meta_bg at mount time Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 01/12] mnt: Add a per mount namespace limit on the number of mounts Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 10/12] ipv4: keep skb->dst around in presence of IP options Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 11/12] dccp: fix freeing skb too early for IPV6_RECVPKTINFO Ben Hutchings
2017-02-24 12:10 ` Ben Hutchings [this message]
2017-02-24 12:10 ` [PATCH 3.16 05/12] KVM: x86: Introduce segmented_write_std Ben Hutchings
2017-02-24 12:10 ` [PATCH 3.16 04/12] KVM: x86: fix emulation of "MOV SS, null selector" Ben Hutchings
2017-02-24 16:19 ` [PATCH 3.16 00/12] 3.16.41-rc1 review Guenter Roeck
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=lsq.1487938201.41280412@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=akpm@linux-foundation.org \
--cc=jmattson@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=stable@vger.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
Powered by JetHome