From: "Joerg Roedel" <joerg.roedel@amd.com> To: "Avi Kivity" <avi@qumranet.com>, kvm-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: "Joerg Roedel" <joerg.roedel@amd.com> Subject: [PATCH 7/8] MMU: add HAP support to the KVM MMU Date: Fri, 25 Jan 2008 21:53:12 +0100 [thread overview] Message-ID: <1201294393-22613-8-git-send-email-joerg.roedel@amd.com> (raw) In-Reply-To: <1201294393-22613-1-git-send-email-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> --- arch/x86/kvm/mmu.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++- arch/x86/kvm/mmu.h | 6 ++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index dfbcf5e..bce27ca 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1072,6 +1072,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; @@ -1080,8 +1081,11 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) hpa_t root = vcpu->arch.mmu.root_hpa; ASSERT(!VALID_PAGE(root)); + if (kvm_x86_ops->hap_enabled()) + metaphysical = 1; sp = kvm_mmu_get_page(vcpu, root_gfn, 0, - PT64_ROOT_LEVEL, 0, ACC_ALL, NULL, NULL); + PT64_ROOT_LEVEL, metaphysical, + ACC_ALL, NULL, NULL); root = __pa(sp->spt); ++sp->root_count; vcpu->arch.mmu.root_hpa = root; @@ -1135,6 +1139,36 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, error_code & PFERR_WRITE_MASK, gfn); } +static int hap_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, HAP_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); @@ -1228,7 +1262,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_hap_mmu(struct kvm_vcpu *vcpu) +{ + struct kvm_mmu *context = &vcpu->arch.mmu; + + context->new_cr3 = nonpaging_new_cr3; + context->page_fault = hap_page_fault; + context->free = nonpaging_free; + context->prefetch_page = nonpaging_prefetch_page; + context->shadow_root_level = HAP_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)); @@ -1243,6 +1305,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 (kvm_x86_ops->hap_enabled()) + return init_kvm_hap_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..ef880a5 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 HAP_ROOT_LEVEL PT64_ROOT_LEVEL +#else +#define HAP_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.3.7
WARNING: multiple messages have this Message-ID (diff)
From: "Joerg Roedel" <joerg.roedel-5C7GfCeVMHo@public.gmane.org> To: "Avi Kivity" <avi-atKUWr5tajBWk0Htik3J/w@public.gmane.org>, kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org> Subject: [PATCH 7/8] MMU: add HAP support to the KVM MMU Date: Fri, 25 Jan 2008 21:53:12 +0100 [thread overview] Message-ID: <1201294393-22613-8-git-send-email-joerg.roedel@amd.com> (raw) In-Reply-To: <1201294393-22613-1-git-send-email-joerg.roedel-5C7GfCeVMHo@public.gmane.org> 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-5C7GfCeVMHo@public.gmane.org> --- arch/x86/kvm/mmu.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++- arch/x86/kvm/mmu.h | 6 ++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index dfbcf5e..bce27ca 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1072,6 +1072,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; @@ -1080,8 +1081,11 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) hpa_t root = vcpu->arch.mmu.root_hpa; ASSERT(!VALID_PAGE(root)); + if (kvm_x86_ops->hap_enabled()) + metaphysical = 1; sp = kvm_mmu_get_page(vcpu, root_gfn, 0, - PT64_ROOT_LEVEL, 0, ACC_ALL, NULL, NULL); + PT64_ROOT_LEVEL, metaphysical, + ACC_ALL, NULL, NULL); root = __pa(sp->spt); ++sp->root_count; vcpu->arch.mmu.root_hpa = root; @@ -1135,6 +1139,36 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, error_code & PFERR_WRITE_MASK, gfn); } +static int hap_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, HAP_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); @@ -1228,7 +1262,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_hap_mmu(struct kvm_vcpu *vcpu) +{ + struct kvm_mmu *context = &vcpu->arch.mmu; + + context->new_cr3 = nonpaging_new_cr3; + context->page_fault = hap_page_fault; + context->free = nonpaging_free; + context->prefetch_page = nonpaging_prefetch_page; + context->shadow_root_level = HAP_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)); @@ -1243,6 +1305,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 (kvm_x86_ops->hap_enabled()) + return init_kvm_hap_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..ef880a5 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 HAP_ROOT_LEVEL PT64_ROOT_LEVEL +#else +#define HAP_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.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
next prev parent reply other threads:[~2008-01-25 20:54 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2008-01-25 20:53 [PATCH][RFC] SVM: Add Support for Nested Paging in AMD Fam16 CPUs Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 20:53 ` [PATCH 1/8] SVM: move feature detection to hardware setup code Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 20:53 ` [PATCH 2/8] SVM: add detection of Nested Paging feature Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 20:53 ` [PATCH 3/8] SVM: add module parameter to disable Nested Paging Joerg Roedel 2008-01-25 21:35 ` [kvm-devel] " Anthony Liguori 2008-01-25 21:35 ` Anthony Liguori 2008-01-25 22:10 ` [kvm-devel] " Joerg Roedel 2008-01-25 22:10 ` Joerg Roedel 2008-01-26 18:38 ` [kvm-devel] " Avi Kivity 2008-01-26 18:38 ` Avi Kivity 2008-01-26 1:47 ` [kvm-devel] [PATCH 3/8] SVM: add module parameter to disable NestedPaging Nakajima, Jun 2008-01-26 1:47 ` Nakajima, Jun 2008-01-26 7:25 ` [kvm-devel] " Joerg Roedel 2008-01-26 7:25 ` Joerg Roedel 2008-01-26 9:49 ` [kvm-devel] " Alexey Eremenko 2008-01-26 9:49 ` Alexey Eremenko 2008-01-26 10:06 ` [kvm-devel] " Joerg Roedel 2008-01-26 10:06 ` Joerg Roedel 2008-01-26 16:36 ` [kvm-devel] " Anthony Liguori 2008-01-26 16:36 ` Anthony Liguori 2008-01-26 18:23 ` [kvm-devel] " Avi Kivity 2008-01-25 20:53 ` [PATCH 4/8] X86: export information about NPT to generic x86 code Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 21:37 ` [kvm-devel] " Anthony Liguori 2008-01-25 21:37 ` Anthony Liguori 2008-01-25 21:40 ` [kvm-devel] " Anthony Liguori 2008-01-25 21:40 ` Anthony Liguori 2008-01-27 8:40 ` [kvm-devel] " Avi Kivity 2008-01-27 8:40 ` Avi Kivity 2008-01-25 20:53 ` [PATCH 5/8] MMU: make the __nonpaging_map function generic Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 20:53 ` [PATCH 6/8] X86: export the load_pdptrs() function to modules Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel [this message] 2008-01-25 20:53 ` [PATCH 7/8] MMU: add HAP support to the KVM MMU Joerg Roedel 2008-01-25 20:53 ` [PATCH 8/8] SVM: add support for Nested Paging Joerg Roedel 2008-01-25 20:53 ` Joerg Roedel 2008-01-27 8:52 ` [kvm-devel] " Avi Kivity 2008-01-27 8:52 ` Avi Kivity 2008-01-27 9:41 ` [kvm-devel] " Joerg Roedel 2008-01-27 9:41 ` Joerg Roedel 2008-01-27 9:51 ` [kvm-devel] " Avi Kivity 2008-01-27 9:51 ` Avi Kivity 2008-01-27 10:05 ` [kvm-devel] " Joerg Roedel 2008-01-27 10:05 ` Joerg Roedel 2008-01-27 10:24 ` [kvm-devel] " Avi Kivity 2008-01-27 10:24 ` Avi Kivity 2008-01-25 21:32 ` [kvm-devel] [PATCH][RFC] SVM: Add Support for Nested Paging in AMD Fam16 CPUs Anthony Liguori 2008-01-25 21:32 ` Anthony Liguori 2008-01-25 22:47 ` [kvm-devel] " Joerg Roedel 2008-01-25 22:47 ` Joerg Roedel 2008-01-26 1:57 ` [kvm-devel] " Nakajima, Jun 2008-01-26 1:57 ` Nakajima, Jun 2008-01-27 8:57 ` [kvm-devel] " Avi Kivity 2008-01-27 8:57 ` Avi Kivity 2008-01-27 9:51 ` [kvm-devel] " Joerg Roedel 2008-01-27 9:51 ` Joerg Roedel 2008-01-28 3:20 ` [kvm-devel] " Jeremy Fitzhardinge 2008-01-28 3:20 ` Jeremy Fitzhardinge 2008-01-28 11:08 ` [kvm-devel] " Avi Kivity 2008-01-28 11:08 ` Avi Kivity 2008-02-07 12:09 ` [kvm-devel] " Joerg Roedel 2008-02-07 12:09 ` Joerg Roedel 2008-02-10 10:35 ` [kvm-devel] " Avi Kivity 2008-02-10 10:35 ` 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=1201294393-22613-8-git-send-email-joerg.roedel@amd.com \ --to=joerg.roedel@amd.com \ --cc=avi@qumranet.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.