From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: kvm list <kvm@vger.kernel.org>, Marcelo Tosatti <mtosatti@redhat.com> Subject: [PATCH 13/14] KVM: PPC: E500: Support hugetlbfs Date: Mon, 31 Oct 2011 08:53:15 +0100 [thread overview] Message-ID: <1320047596-20577-14-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1320047596-20577-1-git-send-email-agraf@suse.de> With hugetlbfs support emerging on e500, we should also support KVM backing its guest memory by it. This patch adds support for hugetlbfs into the e500 shadow mmu code. Signed-off-by: Alexander Graf <agraf@suse.de> Acked-by: Scott Wood <scottwood@freescale.com> --- v1 -> v2: - address scott's comments --- arch/powerpc/kvm/e500_tlb.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c index ec17148..1dd96a9 100644 --- a/arch/powerpc/kvm/e500_tlb.c +++ b/arch/powerpc/kvm/e500_tlb.c @@ -24,6 +24,7 @@ #include <linux/sched.h> #include <linux/rwsem.h> #include <linux/vmalloc.h> +#include <linux/hugetlb.h> #include <asm/kvm_ppc.h> #include <asm/kvm_e500.h> @@ -673,12 +674,31 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, pfn &= ~(tsize_pages - 1); break; } + } else if (vma && hva >= vma->vm_start && + (vma->vm_flags & VM_HUGETLB)) { + unsigned long psize = vma_kernel_pagesize(vma); + + tsize = (gtlbe->mas1 & MAS1_TSIZE_MASK) >> + MAS1_TSIZE_SHIFT; + + /* + * Take the largest page size that satisfies both host + * and guest mapping + */ + tsize = min(__ilog2(psize) - 10, tsize); + + /* + * e500 doesn't implement the lowest tsize bit, + * or 1K pages. + */ + tsize = max(BOOK3E_PAGESZ_4K, tsize & ~1); } up_read(¤t->mm->mmap_sem); } if (likely(!pfnmap)) { + unsigned long tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT); pfn = gfn_to_pfn_memslot(vcpu_e500->vcpu.kvm, slot, gfn); if (is_error_pfn(pfn)) { printk(KERN_ERR "Couldn't get real page for gfn %lx!\n", @@ -686,6 +706,10 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, kvm_release_pfn_clean(pfn); return; } + + /* Align guest and physical address to page map boundaries */ + pfn &= ~(tsize_pages - 1); + gvaddr &= ~((tsize_pages << PAGE_SHIFT) - 1); } /* Drop old ref and setup new one. */ -- 1.6.0.2
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: kvm list <kvm@vger.kernel.org>, Marcelo Tosatti <mtosatti@redhat.com> Subject: [PATCH 13/14] KVM: PPC: E500: Support hugetlbfs Date: Mon, 31 Oct 2011 07:53:15 +0000 [thread overview] Message-ID: <1320047596-20577-14-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1320047596-20577-1-git-send-email-agraf@suse.de> With hugetlbfs support emerging on e500, we should also support KVM backing its guest memory by it. This patch adds support for hugetlbfs into the e500 shadow mmu code. Signed-off-by: Alexander Graf <agraf@suse.de> Acked-by: Scott Wood <scottwood@freescale.com> --- v1 -> v2: - address scott's comments --- arch/powerpc/kvm/e500_tlb.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c index ec17148..1dd96a9 100644 --- a/arch/powerpc/kvm/e500_tlb.c +++ b/arch/powerpc/kvm/e500_tlb.c @@ -24,6 +24,7 @@ #include <linux/sched.h> #include <linux/rwsem.h> #include <linux/vmalloc.h> +#include <linux/hugetlb.h> #include <asm/kvm_ppc.h> #include <asm/kvm_e500.h> @@ -673,12 +674,31 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, pfn &= ~(tsize_pages - 1); break; } + } else if (vma && hva >= vma->vm_start && + (vma->vm_flags & VM_HUGETLB)) { + unsigned long psize = vma_kernel_pagesize(vma); + + tsize = (gtlbe->mas1 & MAS1_TSIZE_MASK) >> + MAS1_TSIZE_SHIFT; + + /* + * Take the largest page size that satisfies both host + * and guest mapping + */ + tsize = min(__ilog2(psize) - 10, tsize); + + /* + * e500 doesn't implement the lowest tsize bit, + * or 1K pages. + */ + tsize = max(BOOK3E_PAGESZ_4K, tsize & ~1); } up_read(¤t->mm->mmap_sem); } if (likely(!pfnmap)) { + unsigned long tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT); pfn = gfn_to_pfn_memslot(vcpu_e500->vcpu.kvm, slot, gfn); if (is_error_pfn(pfn)) { printk(KERN_ERR "Couldn't get real page for gfn %lx!\n", @@ -686,6 +706,10 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, kvm_release_pfn_clean(pfn); return; } + + /* Align guest and physical address to page map boundaries */ + pfn &= ~(tsize_pages - 1); + gvaddr &= ~((tsize_pages << PAGE_SHIFT) - 1); } /* Drop old ref and setup new one. */ -- 1.6.0.2
next prev parent reply other threads:[~2011-10-31 7:44 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-10-31 7:53 [PULL 00/14] ppc patch queue 2011-10-31 Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with preemption disabled Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 12:50 ` Avi Kivity 2011-10-31 12:50 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with Avi Kivity 2011-10-31 18:52 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with preemption disabled Scott Wood 2011-10-31 18:52 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with Scott Wood 2011-11-01 9:00 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with preemption disabled Avi Kivity 2011-11-01 9:00 ` [PATCH 01/14] KVM: PPC: e500: don't translate gfn to pfn with Avi Kivity 2011-10-31 7:53 ` [PATCH 02/14] KVM: PPC: e500: Eliminate preempt_disable in local_sid_destroy_all Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 03/14] KVM: PPC: e500: clear up confusion between host and guest entries Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 04/14] KVM: PPC: e500: MMU API Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 13:24 ` Avi Kivity 2011-10-31 13:24 ` Avi Kivity 2011-10-31 20:12 ` Scott Wood 2011-10-31 20:12 ` Scott Wood 2011-11-01 8:58 ` Avi Kivity 2011-11-01 8:58 ` Avi Kivity 2011-11-01 9:55 ` Avi Kivity 2011-11-01 9:55 ` Avi Kivity 2011-11-01 16:16 ` Scott Wood 2011-11-01 16:16 ` Scott Wood 2011-11-02 10:33 ` Avi Kivity 2011-11-02 10:33 ` Avi Kivity 2011-11-10 14:20 ` Alexander Graf 2011-11-10 14:20 ` Alexander Graf 2011-11-10 14:16 ` Avi Kivity 2011-11-10 14:16 ` Avi Kivity 2011-10-31 7:53 ` [PATCH 05/14] KVM: PPC: e500: tlbsx: fix tlb0 esel Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 06/14] KVM: PPC: e500: Don't hardcode PIR=0 Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 13:27 ` Avi Kivity 2011-10-31 13:27 ` Avi Kivity 2011-10-31 7:53 ` [PATCH 07/14] KVM: PPC: Fix build failure with HV KVM and CBE Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 08/14] Revert "KVM: PPC: Add support for explicit HIOR setting" Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 13:30 ` Avi Kivity 2011-10-31 13:30 ` [PATCH 08/14] Revert "KVM: PPC: Add support for explicit HIOR Avi Kivity 2011-10-31 23:49 ` [PATCH 08/14] Revert "KVM: PPC: Add support for explicit HIOR setting" Alexander Graf 2011-10-31 23:49 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 09/14] KVM: PPC: Add generic single register ioctls Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 13:36 ` Avi Kivity 2011-10-31 13:36 ` Avi Kivity 2011-10-31 17:26 ` Jan Kiszka 2011-10-31 17:26 ` Jan Kiszka 2011-11-10 14:22 ` Alexander Graf 2011-11-10 14:22 ` Alexander Graf 2011-11-10 16:05 ` Marcelo Tosatti 2011-11-10 16:05 ` Marcelo Tosatti 2011-11-10 16:49 ` Alexander Graf 2011-11-10 16:49 ` Alexander Graf 2011-11-10 17:35 ` Marcelo Tosatti 2011-11-10 17:35 ` Marcelo Tosatti 2011-11-15 23:45 ` Alexander Graf 2011-11-15 23:45 ` Alexander Graf 2011-11-23 12:47 ` Marcelo Tosatti 2011-11-23 12:47 ` Marcelo Tosatti 2011-12-19 12:58 ` Alexander Graf 2011-12-19 12:58 ` Alexander Graf 2011-12-19 17:29 ` Marcelo Tosatti 2011-12-19 17:29 ` Marcelo Tosatti 2011-10-31 7:53 ` [PATCH 10/14] KVM: PPC: Add support for explicit HIOR setting Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 11/14] KVM: PPC: Whitespace fix for kvm.h Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 12/14] KVM: Fix whitespace in kvm_para.h Alexander Graf 2011-10-31 7:53 ` Alexander Graf 2011-10-31 7:53 ` Alexander Graf [this message] 2011-10-31 7:53 ` [PATCH 13/14] KVM: PPC: E500: Support hugetlbfs Alexander Graf 2011-10-31 13:38 ` Avi Kivity 2011-10-31 13:38 ` Avi Kivity 2011-11-10 14:24 ` Alexander Graf 2011-11-10 14:24 ` Alexander Graf 2011-10-31 7:53 ` [PATCH 14/14] PPC: Fix race in mtmsr paravirt implementation Alexander Graf 2011-10-31 7:53 ` Alexander Graf
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=1320047596-20577-14-git-send-email-agraf@suse.de \ --to=agraf@suse.de \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@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: 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.