From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v4 03/18] KVM: x86: introduce vcpu_mmio_gva_to_gpa to cleanup the code
Date: Tue, 12 Jul 2011 03:22:46 +0800 [thread overview]
Message-ID: <4E1B4D86.2000206@cn.fujitsu.com> (raw)
In-Reply-To: <4E1B4CF8.605@cn.fujitsu.com>
Introduce vcpu_mmio_gva_to_gpa to translate the gva to gpa, we can use it
to cleanup the code between read emulation and write emulation
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
arch/x86/kvm/x86.c | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 0b803f0..d77ac44 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3944,6 +3944,27 @@ out:
}
EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);
+static int vcpu_mmio_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva,
+ gpa_t *gpa, struct x86_exception *exception,
+ bool write)
+{
+ u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;
+
+ if (write)
+ access |= PFERR_WRITE_MASK;
+
+ *gpa = vcpu->arch.walk_mmu->gva_to_gpa(vcpu, gva, access, exception);
+
+ if (*gpa == UNMAPPED_GVA)
+ return -1;
+
+ /* For APIC access vmexit */
+ if ((*gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)
+ return 1;
+
+ return 0;
+}
+
static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt,
unsigned long addr,
void *val,
@@ -3951,8 +3972,8 @@ static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt,
struct x86_exception *exception)
{
struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
- gpa_t gpa;
- int handled;
+ gpa_t gpa;
+ int handled, ret;
if (vcpu->mmio_read_completed) {
memcpy(val, vcpu->mmio_data, bytes);
@@ -3962,13 +3983,12 @@ static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt,
return X86EMUL_CONTINUE;
}
- gpa = kvm_mmu_gva_to_gpa_read(vcpu, addr, exception);
+ ret = vcpu_mmio_gva_to_gpa(vcpu, addr, &gpa, exception, false);
- if (gpa == UNMAPPED_GVA)
+ if (ret < 0)
return X86EMUL_PROPAGATE_FAULT;
- /* For APIC access vmexit */
- if ((gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)
+ if (ret)
goto mmio;
if (kvm_read_guest_virt(ctxt, addr, val, bytes, exception)
@@ -4019,16 +4039,16 @@ static int emulator_write_emulated_onepage(unsigned long addr,
struct x86_exception *exception,
struct kvm_vcpu *vcpu)
{
- gpa_t gpa;
- int handled;
+ gpa_t gpa;
+ int handled, ret;
- gpa = kvm_mmu_gva_to_gpa_write(vcpu, addr, exception);
+ ret = vcpu_mmio_gva_to_gpa(vcpu, addr, &gpa, exception, true);
- if (gpa == UNMAPPED_GVA)
+ if (ret < 0)
return X86EMUL_PROPAGATE_FAULT;
/* For APIC access vmexit */
- if ((gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)
+ if (ret)
goto mmio;
if (emulator_write_phys(vcpu, gpa, val, bytes))
--
1.7.5.4
next prev parent reply other threads:[~2011-07-11 19:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-11 19:20 [PATCH v4 00/18] KVM: optimize for MMIO handled Xiao Guangrong
2011-07-11 19:21 ` [PATCH v4 01/18] KVM: MMU: fix walking shadow page table Xiao Guangrong
2011-07-11 19:22 ` [PATCH v4 02/18] KVM: MMU: do not update slot bitmap if spte is nonpresent Xiao Guangrong
2011-07-11 19:22 ` Xiao Guangrong [this message]
2011-07-11 19:23 ` [PATCH v4 04/18] KVM: MMU: cache mmio info on page fault path Xiao Guangrong
2011-07-11 19:24 ` [PATCH v4 05/18] KVM: MMU: optimize to handle dirty bit Xiao Guangrong
2011-07-11 19:25 ` [PATCH v4 06/18] KVM: MMU: cleanup for FNAME(fetch) Xiao Guangrong
2011-07-11 19:25 ` [PATCH v4 07/18] KVM: MMU: rename 'pt_write' to 'emulate' Xiao Guangrong
2011-07-11 19:26 ` [PATCH v4 08/18] KVM: MMU: count used shadow pages on prepareing path Xiao Guangrong
2011-07-11 19:27 ` [PATCH v4 09/18] KVM: MMU: split kvm_mmu_free_page Xiao Guangrong
2011-07-11 19:28 ` [PATCH v4 10/18] KVM: MMU: remove bypass_guest_pf Xiao Guangrong
2011-07-11 19:28 ` [PATCH v4 11/18] KVM: MMU: filter out the mmio pfn from the fault pfn Xiao Guangrong
2011-07-11 19:29 ` [PATCH v4 12/18] KVM: MMU: abstract some functions to handle " Xiao Guangrong
2011-07-11 19:30 ` [PATCH v4 13/18] KVM: MMU: introduce the rules to modify shadow page table Xiao Guangrong
2011-07-11 19:31 ` [PATCH v4 14/18] KVM: MMU: do not need atomicly to set/clear spte Xiao Guangrong
2011-07-11 19:32 ` [PATCH v4 15/18] KVM: MMU: lockless walking shadow page table Xiao Guangrong
2011-07-11 19:32 ` [PATCH v4 16/18] KVM: MMU: reorganize struct kvm_shadow_walk_iterator Xiao Guangrong
2011-07-11 19:33 ` [PATCH v4 17/18] KVM: MMU: mmio page fault support Xiao Guangrong
2011-07-12 20:00 ` [PATCH] KVM: x86: Apply required parentheses in __check_direct_spte_mmio_pf Jan Kiszka
2011-07-13 13:25 ` Avi Kivity
2011-07-11 19:34 ` [PATCH v4 18/18] KVM: MMU: trace mmio page fault Xiao Guangrong
2011-07-12 8:39 ` [PATCH v4 00/18] KVM: optimize for MMIO handled Avi Kivity
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=4E1B4D86.2000206@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.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