From: Joerg Roedel <joerg.roedel@amd.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 15/29] KVM: MMU: Make walk_addr_generic capable for two-level walking
Date: Fri, 10 Sep 2010 17:30:52 +0200 [thread overview]
Message-ID: <1284132667-18620-16-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1284132667-18620-1-git-send-email-joerg.roedel@amd.com>
This patch uses kvm_read_guest_page_tdp to make the
walk_addr_generic functions suitable for two-level page
table walking.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kvm/paging_tmpl.h | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index eefe363..f4e09d3 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -124,6 +124,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
unsigned index, pt_access, uninitialized_var(pte_access);
gpa_t pte_gpa;
bool eperm, present, rsvd_fault;
+ int offset;
+ u32 access = 0;
trace_kvm_mmu_pagetable_walk(addr, write_fault, user_fault,
fetch_fault);
@@ -153,12 +155,14 @@ walk:
index = PT_INDEX(addr, walker->level);
table_gfn = gpte_to_gfn(pte);
- pte_gpa = gfn_to_gpa(table_gfn);
- pte_gpa += index * sizeof(pt_element_t);
+ offset = index * sizeof(pt_element_t);
+ pte_gpa = gfn_to_gpa(table_gfn) + offset;
walker->table_gfn[walker->level - 1] = table_gfn;
walker->pte_gpa[walker->level - 1] = pte_gpa;
- if (kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte))) {
+ if (kvm_read_guest_page_mmu(vcpu, mmu, table_gfn, &pte,
+ offset, sizeof(pte),
+ PFERR_USER_MASK|PFERR_WRITE_MASK)) {
present = false;
break;
}
@@ -209,15 +213,27 @@ walk:
is_large_pte(pte) &&
mmu->root_level == PT64_ROOT_LEVEL)) {
int lvl = walker->level;
+ gpa_t real_gpa;
+ gfn_t gfn;
- walker->gfn = gpte_to_gfn_lvl(pte, lvl);
- walker->gfn += (addr & PT_LVL_OFFSET_MASK(lvl))
- >> PAGE_SHIFT;
+ gfn = gpte_to_gfn_lvl(pte, lvl);
+ gfn += (addr & PT_LVL_OFFSET_MASK(lvl)) >> PAGE_SHIFT;
if (PTTYPE == 32 &&
walker->level == PT_DIRECTORY_LEVEL &&
is_cpuid_PSE36())
- walker->gfn += pse36_gfn_delta(pte);
+ gfn += pse36_gfn_delta(pte);
+
+ access |= write_fault ? PFERR_WRITE_MASK : 0;
+ access |= fetch_fault ? PFERR_FETCH_MASK : 0;
+ access |= user_fault ? PFERR_USER_MASK : 0;
+
+ real_gpa = mmu->translate_gpa(vcpu, gfn_to_gpa(gfn),
+ access);
+ if (real_gpa == UNMAPPED_GVA)
+ return 0;
+
+ walker->gfn = real_gpa >> PAGE_SHIFT;
break;
}
--
1.7.0.4
next prev parent reply other threads:[~2010-09-10 15:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 15:30 [PATCH 0/29] Nested Paging Virtualization for KVM v4 Joerg Roedel
2010-09-10 15:30 ` [PATCH 01/29] KVM: MMU: Check for root_level instead of long mode Joerg Roedel
2010-09-10 15:30 ` [PATCH 02/29] KVM: MMU: Make tdp_enabled a mmu-context parameter Joerg Roedel
2010-09-10 15:30 ` [PATCH 03/29] KVM: MMU: Make set_cr3 a function pointer in kvm_mmu Joerg Roedel
2010-09-10 15:30 ` [PATCH 04/29] KVM: X86: Introduce a tdp_set_cr3 function Joerg Roedel
2010-09-10 15:30 ` [PATCH 05/29] KVM: MMU: Introduce get_cr3 function pointer Joerg Roedel
2010-09-10 15:30 ` [PATCH 06/29] KVM: MMU: Introduce inject_page_fault " Joerg Roedel
2010-09-10 15:30 ` [PATCH 07/29] KVM: MMU: Introduce kvm_init_shadow_mmu helper function Joerg Roedel
2010-09-10 15:30 ` [PATCH 08/29] KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu Joerg Roedel
2010-09-10 15:30 ` [PATCH 09/29] KVM: MMU: Track page fault data in struct vcpu Joerg Roedel
2010-09-10 15:30 ` [PATCH 10/29] KVM: MMU: Introduce generic walk_addr function Joerg Roedel
2010-09-10 15:30 ` [PATCH 11/29] KVM: MMU: Add infrastructure for two-level page walker Joerg Roedel
2010-09-10 15:30 ` [PATCH 12/29] KVM: X86: Introduce pointer to mmu context used for gva_to_gpa Joerg Roedel
2010-09-10 15:30 ` [PATCH 13/29] KVM: MMU: Implement nested gva_to_gpa functions Joerg Roedel
2010-09-10 15:30 ` [PATCH 14/29] KVM: X86: Add kvm_read_guest_page_mmu function Joerg Roedel
2010-09-10 15:30 ` Joerg Roedel [this message]
2010-09-10 15:30 ` [PATCH 16/29] KVM: MMU: Introduce kvm_read_nested_guest_page() Joerg Roedel
2010-09-10 15:30 ` [PATCH 17/29] KVM: MMU: Introduce init_kvm_nested_mmu() Joerg Roedel
2010-09-10 15:30 ` [PATCH 18/29] KVM: MMU: Propagate the right fault back to the guest after gva_to_gpa Joerg Roedel
2010-09-12 8:50 ` Avi Kivity
2010-09-10 15:30 ` [PATCH 19/29] KVM: X86: Propagate fetch faults Joerg Roedel
2010-09-10 15:30 ` [PATCH 20/29] KVM: MMU: Add kvm_mmu parameter to load_pdptrs function Joerg Roedel
2010-09-10 15:30 ` [PATCH 21/29] KVM: MMU: Introduce kvm_pdptr_read_mmu Joerg Roedel
2010-09-10 15:30 ` [PATCH 22/29] KVM: MMU: Refactor mmu_alloc_roots function Joerg Roedel
2010-09-10 15:31 ` [PATCH 23/29] KVM: MMU: Allow long mode shadows for legacy page tables Joerg Roedel
2010-09-10 15:31 ` [PATCH 24/29] KVM: MMU: Track NX state in struct kvm_mmu Joerg Roedel
2010-09-12 8:06 ` Avi Kivity
2010-09-10 15:31 ` [PATCH 25/29] KVM: SVM: Implement MMU helper functions for Nested Nested Paging Joerg Roedel
2010-09-10 15:31 ` [PATCH 26/29] KVM: SVM: Initialize Nested Nested MMU context on VMRUN Joerg Roedel
2010-09-10 15:31 ` [PATCH 27/29] KVM: SVM: Expect two more candiates for exit_int_info Joerg Roedel
2010-09-10 15:31 ` [PATCH 28/29] KVM: SVM: Report Nested Paging support to userspace Joerg Roedel
2010-09-10 15:31 ` [PATCH 29/29] KVM: X86: Report SVM bit to userspace only when supported Joerg Roedel
2010-09-12 8:56 ` [PATCH 0/29] Nested Paging Virtualization for KVM v4 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=1284132667-18620-16-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.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
all inboxes | Powered by JetHome®