From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: jroedel@suse.de, agraf@suse.de, valentine.sinitsyn@gmail.com,
jan.kiszka@siemens.com, gleb@cloudius-systems.com,
avi@cloudius-systems.com
Subject: [PATCH 3/4] KVM: x86: inject nested page faults on emulated instructions
Date: Tue, 2 Sep 2014 17:13:49 +0200 [thread overview]
Message-ID: <1409670830-14544-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1409670830-14544-1-git-send-email-pbonzini@redhat.com>
This is required for the following patch to work correctly. If a nested page
fault happens during emulation, we must inject a vmexit, not a page fault.
Luckily we already have the required machinery: it is enough to return
X86EMUL_INTERCEPTED instead of X86EMUL_PROPAGATE_FAULT.
Reported-by: Valentine Sinitsyn <valentine.sinitsyn@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/kvm/x86.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e4ed85e07a01..9e3b74c044ed 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -416,6 +416,16 @@ void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault)
vcpu->arch.mmu.inject_page_fault(vcpu, fault);
}
+static inline int kvm_propagate_or_intercept(struct kvm_vcpu *vcpu,
+ struct x86_exception *exception)
+{
+ if (likely(!exception->nested_page_fault))
+ return X86EMUL_PROPAGATE_FAULT;
+
+ vcpu->arch.mmu.inject_page_fault(vcpu, exception);
+ return X86EMUL_INTERCEPTED;
+}
+
void kvm_inject_nmi(struct kvm_vcpu *vcpu)
{
atomic_inc(&vcpu->arch.nmi_queued);
@@ -4122,7 +4132,7 @@ static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
int ret;
if (gpa == UNMAPPED_GVA)
- return X86EMUL_PROPAGATE_FAULT;
+ return kvm_propagate_or_intercept(vcpu, exception);
ret = kvm_read_guest_page(vcpu->kvm, gpa >> PAGE_SHIFT, data,
offset, toread);
if (ret < 0) {
@@ -4152,7 +4162,7 @@ static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
gpa_t gpa = vcpu->arch.walk_mmu->gva_to_gpa(vcpu, addr, access|PFERR_FETCH_MASK,
exception);
if (unlikely(gpa == UNMAPPED_GVA))
- return X86EMUL_PROPAGATE_FAULT;
+ return kvm_propagate_or_intercept(vcpu, exception);
offset = addr & (PAGE_SIZE-1);
if (WARN_ON(offset + bytes > PAGE_SIZE))
@@ -4203,7 +4213,7 @@ int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
int ret;
if (gpa == UNMAPPED_GVA)
- return X86EMUL_PROPAGATE_FAULT;
+ return kvm_propagate_or_intercept(vcpu, exception);
ret = kvm_write_guest(vcpu->kvm, gpa, data, towrite);
if (ret < 0) {
r = X86EMUL_IO_NEEDED;
@@ -4350,7 +4360,7 @@ static int emulator_read_write_onepage(unsigned long addr, void *val,
ret = vcpu_mmio_gva_to_gpa(vcpu, addr, &gpa, exception, write);
if (ret < 0)
- return X86EMUL_PROPAGATE_FAULT;
+ return kvm_propagate_or_intercept(vcpu, exception);
/* For APIC access vmexit */
if (ret)
--
1.8.3.1
next prev parent reply other threads:[~2014-09-02 15:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 15:13 [PATCH 0/4] KVM: nested x86: nested page faults fixes Paolo Bonzini
2014-09-02 15:13 ` [PATCH 1/4] KVM: x86: reserve bit 8 of non-leaf PDPEs and PML4Es in 64-bit mode on AMD Paolo Bonzini
2014-09-02 15:13 ` [PATCH 2/4] KVM: nSVM: propagate the NPF EXITINFO to the guest Paolo Bonzini
2014-09-02 16:33 ` Joerg Roedel
2014-09-02 16:46 ` Paolo Bonzini
2014-09-02 17:01 ` Paolo Bonzini
2014-09-02 17:01 ` Joerg Roedel
2014-09-02 17:47 ` Avi Kivity
2014-09-02 15:13 ` Paolo Bonzini [this message]
2014-09-04 7:02 ` [PATCH 3/4] KVM: x86: inject nested page faults on emulated instructions Gleb Natapov
2014-09-04 14:12 ` Paolo Bonzini
2014-09-04 15:05 ` Gleb Natapov
2014-09-04 17:17 ` Paolo Bonzini
2014-09-04 17:44 ` Paolo Bonzini
2014-09-05 9:47 ` Gleb Natapov
2014-09-02 15:13 ` [PATCH 4/4] KVM: x86: propagate exception from permission checks on the nested page fault Paolo Bonzini
2014-09-02 16:02 ` [PATCH 0/4] KVM: nested x86: nested page faults fixes Valentine Sinitsyn
2014-09-02 16:56 ` Paolo Bonzini
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=1409670830-14544-4-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=agraf@suse.de \
--cc=avi@cloudius-systems.com \
--cc=gleb@cloudius-systems.com \
--cc=jan.kiszka@siemens.com \
--cc=jroedel@suse.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=valentine.sinitsyn@gmail.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;
as well as URLs for NNTP newsgroup(s).