From: Avi Kivity <avi@qumranet.com>
To: kvm-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 26/40] KVM: MMU: add TDP support to the KVM MMU
Date: Mon, 31 Mar 2008 17:37:10 +0300 [thread overview]
Message-ID: <1206974244-9716-27-git-send-email-avi@qumranet.com> (raw)
In-Reply-To: <1206974244-9716-1-git-send-email-avi@qumranet.com>
From: Joerg Roedel <joerg.roedel@amd.com>
This patch contains the changes to the KVM MMU necessary for support of the
Nested Paging feature in AMD Barcelona and Phenom Processors.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
arch/x86/kvm/mmu.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++--
arch/x86/kvm/mmu.h | 6 ++++
2 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 33cd7c9..f7541fe 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1097,6 +1097,7 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
int i;
gfn_t root_gfn;
struct kvm_mmu_page *sp;
+ int metaphysical = 0;
root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT;
@@ -1105,14 +1106,20 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
hpa_t root = vcpu->arch.mmu.root_hpa;
ASSERT(!VALID_PAGE(root));
+ if (tdp_enabled)
+ metaphysical = 1;
sp = kvm_mmu_get_page(vcpu, root_gfn, 0,
- PT64_ROOT_LEVEL, 0, ACC_ALL, NULL);
+ PT64_ROOT_LEVEL, metaphysical,
+ ACC_ALL, NULL);
root = __pa(sp->spt);
++sp->root_count;
vcpu->arch.mmu.root_hpa = root;
return;
}
#endif
+ metaphysical = !is_paging(vcpu);
+ if (tdp_enabled)
+ metaphysical = 1;
for (i = 0; i < 4; ++i) {
hpa_t root = vcpu->arch.mmu.pae_root[i];
@@ -1126,7 +1133,7 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
} else if (vcpu->arch.mmu.root_level == 0)
root_gfn = 0;
sp = kvm_mmu_get_page(vcpu, root_gfn, i << 30,
- PT32_ROOT_LEVEL, !is_paging(vcpu),
+ PT32_ROOT_LEVEL, metaphysical,
ACC_ALL, NULL);
root = __pa(sp->spt);
++sp->root_count;
@@ -1160,6 +1167,36 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
error_code & PFERR_WRITE_MASK, gfn);
}
+static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,
+ u32 error_code)
+{
+ struct page *page;
+ int r;
+
+ ASSERT(vcpu);
+ ASSERT(VALID_PAGE(vcpu->arch.mmu.root_hpa));
+
+ r = mmu_topup_memory_caches(vcpu);
+ if (r)
+ return r;
+
+ down_read(¤t->mm->mmap_sem);
+ page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT);
+ if (is_error_page(page)) {
+ kvm_release_page_clean(page);
+ up_read(¤t->mm->mmap_sem);
+ return 1;
+ }
+ spin_lock(&vcpu->kvm->mmu_lock);
+ kvm_mmu_free_some_pages(vcpu);
+ r = __direct_map(vcpu, gpa, error_code & PFERR_WRITE_MASK,
+ gpa >> PAGE_SHIFT, page, TDP_ROOT_LEVEL);
+ spin_unlock(&vcpu->kvm->mmu_lock);
+ up_read(¤t->mm->mmap_sem);
+
+ return r;
+}
+
static void nonpaging_free(struct kvm_vcpu *vcpu)
{
mmu_free_roots(vcpu);
@@ -1253,7 +1290,35 @@ static int paging32E_init_context(struct kvm_vcpu *vcpu)
return paging64_init_context_common(vcpu, PT32E_ROOT_LEVEL);
}
-static int init_kvm_mmu(struct kvm_vcpu *vcpu)
+static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
+{
+ struct kvm_mmu *context = &vcpu->arch.mmu;
+
+ context->new_cr3 = nonpaging_new_cr3;
+ context->page_fault = tdp_page_fault;
+ context->free = nonpaging_free;
+ context->prefetch_page = nonpaging_prefetch_page;
+ context->shadow_root_level = TDP_ROOT_LEVEL;
+ context->root_hpa = INVALID_PAGE;
+
+ if (!is_paging(vcpu)) {
+ context->gva_to_gpa = nonpaging_gva_to_gpa;
+ context->root_level = 0;
+ } else if (is_long_mode(vcpu)) {
+ context->gva_to_gpa = paging64_gva_to_gpa;
+ context->root_level = PT64_ROOT_LEVEL;
+ } else if (is_pae(vcpu)) {
+ context->gva_to_gpa = paging64_gva_to_gpa;
+ context->root_level = PT32E_ROOT_LEVEL;
+ } else {
+ context->gva_to_gpa = paging32_gva_to_gpa;
+ context->root_level = PT32_ROOT_LEVEL;
+ }
+
+ return 0;
+}
+
+static int init_kvm_softmmu(struct kvm_vcpu *vcpu)
{
ASSERT(vcpu);
ASSERT(!VALID_PAGE(vcpu->arch.mmu.root_hpa));
@@ -1268,6 +1333,14 @@ static int init_kvm_mmu(struct kvm_vcpu *vcpu)
return paging32_init_context(vcpu);
}
+static int init_kvm_mmu(struct kvm_vcpu *vcpu)
+{
+ if (tdp_enabled)
+ return init_kvm_tdp_mmu(vcpu);
+ else
+ return init_kvm_softmmu(vcpu);
+}
+
static void destroy_kvm_mmu(struct kvm_vcpu *vcpu)
{
ASSERT(vcpu);
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index 1fce19e..e64e9f5 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -3,6 +3,12 @@
#include <linux/kvm_host.h>
+#ifdef CONFIG_X86_64
+#define TDP_ROOT_LEVEL PT64_ROOT_LEVEL
+#else
+#define TDP_ROOT_LEVEL PT32E_ROOT_LEVEL
+#endif
+
static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
{
if (unlikely(vcpu->kvm->arch.n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES))
--
1.5.4.5
next prev parent reply other threads:[~2008-03-31 14:47 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-31 14:36 [PATCH 00/40] KVM updates for the 2.6.26 merge window (part I) Avi Kivity
2008-03-31 14:36 ` [PATCH 01/40] KVM: MMU: Update shadow ptes on partial guest pte writes Avi Kivity
2008-03-31 14:36 ` [PATCH 02/40] KVM: MMU: Simplify hash table indexing Avi Kivity
2008-03-31 14:36 ` [PATCH 03/40] KVM: x86 emulator: add support for group decoding Avi Kivity
2008-03-31 14:36 ` [PATCH 04/40] KVM: x86 emulator: group decoding for group 1A Avi Kivity
2008-03-31 14:36 ` [PATCH 05/40] KVM: x86 emulator: Group decoding for group 3 Avi Kivity
2008-03-31 14:36 ` [PATCH 06/40] KVM: x86 emulator: Group decoding for groups 4 and 5 Avi Kivity
2008-03-31 14:36 ` [PATCH 07/40] KVM: x86 emulator: add group 7 decoding Avi Kivity
2008-03-31 14:36 ` [PATCH 08/40] KVM: constify function pointer tables Avi Kivity
2008-03-31 14:36 ` [PATCH 09/40] KVM: Only x86 has pio Avi Kivity
2008-03-31 14:36 ` [PATCH 10/40] KVM: x86 emulator: group decoding for group 1 instructions Avi Kivity
2008-03-31 14:36 ` [PATCH 11/40] KVM: MMU: Decouple mmio from shadow page tables Avi Kivity
2008-03-31 14:36 ` [PATCH 12/40] KVM: Limit vcpu mmap size to one page on non-x86 Avi Kivity
2008-03-31 14:36 ` [PATCH 13/40] KVM: VMX: Enable Virtual Processor Identification (VPID) Avi Kivity
2008-03-31 14:36 ` [PATCH 14/40] KVM: Use CONFIG_PREEMPT_NOTIFIERS around struct preempt_notifier Avi Kivity
2008-03-31 14:36 ` [PATCH 15/40] KVM: Disable pagefaults during copy_from_user_inatomic() Avi Kivity
2008-03-31 14:37 ` [PATCH 16/40] KVM: make EFER_RESERVED_BITS configurable for architecture code Avi Kivity
2008-03-31 14:37 ` [PATCH 17/40] KVM: align valid EFER bits with the features of the host system Avi Kivity
2008-03-31 14:37 ` [PATCH 18/40] KVM: VMX: unifdef the EFER specific code Avi Kivity
2008-03-31 14:37 ` [PATCH 19/40] KVM: allow access to EFER in 32bit KVM Avi Kivity
2008-03-31 14:37 ` [PATCH 20/40] KVM: SVM: move feature detection to hardware setup code Avi Kivity
2008-03-31 14:37 ` [PATCH 21/40] KVM: SVM: add detection of Nested Paging feature Avi Kivity
2008-03-31 14:37 ` [PATCH 22/40] KVM: SVM: add module parameter to disable Nested Paging Avi Kivity
2008-03-31 14:37 ` [PATCH 23/40] KVM: export information about NPT to generic x86 code Avi Kivity
2008-03-31 14:37 ` [PATCH 24/40] KVM: MMU: make the __nonpaging_map function generic Avi Kivity
2008-03-31 14:37 ` [PATCH 25/40] KVM: export the load_pdptrs() function to modules Avi Kivity
2008-03-31 14:37 ` Avi Kivity [this message]
2008-03-31 14:37 ` [PATCH 27/40] KVM: SVM: add support for Nested Paging Avi Kivity
2008-03-31 14:37 ` [PATCH 28/40] KVM: VMX: fix typo in VMX header define Avi Kivity
2008-03-31 14:37 ` [PATCH 29/40] KVM: SVM: let init_vmcb() take struct vcpu_svm as parameter Avi Kivity
2008-03-31 14:37 ` [PATCH 30/40] KVM: SVM: allocate the MSR permission map per VCPU Avi Kivity
2008-03-31 14:37 ` [PATCH 31/40] KVM: SVM: enable LBR virtualization Avi Kivity
2008-03-31 14:37 ` [PATCH 32/40] KVM: paravirtualized clocksource: host part Avi Kivity
2008-03-31 14:37 ` [PATCH 33/40] x86: KVM guest: paravirtualized clocksource Avi Kivity
2008-03-31 14:37 ` [PATCH 34/40] KVM: x86 emulator: add ad_mask static inline Avi Kivity
2008-03-31 14:37 ` [PATCH 35/40] KVM: x86 emulator: make register_address, address_mask static inlines Avi Kivity
2008-03-31 14:37 ` [PATCH 36/40] KVM: x86 emulator: make register_address_increment and JMP_REL " Avi Kivity
2008-03-31 14:37 ` [PATCH 37/40] KVM: Add API to retrieve the number of supported vcpus per vm Avi Kivity
2008-03-31 14:37 ` [PATCH 38/40] KVM: Increase vcpu count to 16 Avi Kivity
2008-03-31 14:37 ` [PATCH 39/40] KVM: Add API for determining the number of supported memory slots Avi Kivity
2008-03-31 14:37 ` [PATCH 40/40] KVM: Increase the number of user memory slots per vm 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=1206974244-9716-27-git-send-email-avi@qumranet.com \
--to=avi@qumranet.com \
--cc=joerg.roedel@amd.com \
--cc=kvm-devel@lists.sourceforge.net \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®