From: David Rientjes <rientjes@google.com>
To: Cliff Wickman <cpw@sgi.com>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
mgorman@suse.de, aarcange@redhat.com, dave.hansen@intel.com,
dsterba@suse.cz, hannes@cmpxchg.org, kosaki.motohiro@gmail.com,
kirill.shutemov@linux.intel.com, mpm@selenic.com,
n-horiguchi@ah.jp.nec.com, rdunlap@infradead.org
Subject: Re: [PATCH] mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas
Date: Wed, 1 May 2013 08:47:02 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.02.1305010843180.4547@chino.kir.corp.google.com> (raw)
In-Reply-To: <E1UXWpF-0006Ya-Br@eag09.americas.sgi.com>
On Wed, 1 May 2013, Cliff Wickman wrote:
> Index: linux/mm/pagewalk.c
> ===================================================================
> --- linux.orig/mm/pagewalk.c
> +++ linux/mm/pagewalk.c
> @@ -127,22 +127,6 @@ static int walk_hugetlb_range(struct vm_
> return 0;
> }
>
> -static struct vm_area_struct* hugetlb_vma(unsigned long addr, struct mm_walk *walk)
> -{
> - struct vm_area_struct *vma;
> -
> - /* We don't need vma lookup at all. */
> - if (!walk->hugetlb_entry)
> - return NULL;
> -
> - VM_BUG_ON(!rwsem_is_locked(&walk->mm->mmap_sem));
> - vma = find_vma(walk->mm, addr);
> - if (vma && vma->vm_start <= addr && is_vm_hugetlb_page(vma))
> - return vma;
> -
> - return NULL;
> -}
> -
> #else /* CONFIG_HUGETLB_PAGE */
> static struct vm_area_struct* hugetlb_vma(unsigned long addr, struct mm_walk *walk)
> {
> @@ -200,28 +184,46 @@ int walk_page_range(unsigned long addr,
>
> pgd = pgd_offset(walk->mm, addr);
> do {
> - struct vm_area_struct *vma;
> + struct vm_area_struct *vma = NULL;
>
> next = pgd_addr_end(addr, end);
>
> /*
> - * handle hugetlb vma individually because pagetable walk for
> - * the hugetlb page is dependent on the architecture and
> - * we can't handled it in the same manner as non-huge pages.
> + * Check any special vma's within this range.
> */
> - vma = hugetlb_vma(addr, walk);
> + VM_BUG_ON(!rwsem_is_locked(&walk->mm->mmap_sem));
I think this should be moved out of the iteration. It's currently inside
it even before your patch, but I think it's pointless.
> + vma = find_vma(walk->mm, addr);
> if (vma) {
> - if (vma->vm_end < next)
> + /*
> + * There are no page structures backing a VM_PFNMAP
> + * range, so allow no split_huge_page_pmd().
> + */
> + if (vma->vm_flags & VM_PFNMAP) {
> next = vma->vm_end;
> + pgd = pgd_offset(walk->mm, next);
> + continue;
> + }
What if end < vma->vm_end?
> /*
> - * Hugepage is very tightly coupled with vma, so
> - * walk through hugetlb entries within a given vma.
> + * Handle hugetlb vma individually because pagetable
> + * walk for the hugetlb page is dependent on the
> + * architecture and we can't handled it in the same
> + * manner as non-huge pages.
> */
> - err = walk_hugetlb_range(vma, addr, next, walk);
> - if (err)
> - break;
> - pgd = pgd_offset(walk->mm, next);
> - continue;
> + if (walk->hugetlb_entry && (vma->vm_start <= addr) &&
> + is_vm_hugetlb_page(vma)) {
> + if (vma->vm_end < next)
> + next = vma->vm_end;
> + /*
> + * Hugepage is very tightly coupled with vma,
> + * so walk through hugetlb entries within a
> + * given vma.
> + */
> + err = walk_hugetlb_range(vma, addr, next, walk);
> + if (err)
> + break;
> + pgd = pgd_offset(walk->mm, next);
> + continue;
> + }
> }
>
> if (pgd_none_or_clear_bad(pgd)) {
next prev parent reply other threads:[~2013-05-01 15:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 13:12 Cliff Wickman
2013-05-01 15:47 ` David Rientjes [this message]
2013-05-01 18:39 ` Cliff Wickman
2013-05-01 18:44 ` David Rientjes
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=alpine.DEB.2.02.1305010843180.4547@chino.kir.corp.google.com \
--to=rientjes@google.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cpw@sgi.com \
--cc=dave.hansen@intel.com \
--cc=dsterba@suse.cz \
--cc=hannes@cmpxchg.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=kosaki.motohiro@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mpm@selenic.com \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=rdunlap@infradead.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®