lkml.org 
[lkml]   [2013]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 5/8] mbind: add hugepage migration code to mbind()
    From
    On Thu, Jul 25, 2013 at 12:55 PM, Naoya Horiguchi
    <n-horiguchi@ah.jp.nec.com> wrote:
    > This patch extends do_mbind() to handle vma with VM_HUGETLB set.
    > We will be able to migrate hugepage with mbind(2) after
    > applying the enablement patch which comes later in this series.
    >
    > ChangeLog v3:
    > - revert introducing migrate_movable_pages
    > - added alloc_huge_page_noerr free from ERR_VALUE
    >
    > ChangeLog v2:
    > - updated description and renamed patch title
    >
    > Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    > Acked-by: Andi Kleen <ak@linux.intel.com>
    > Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
    > ---
    Acked-by: Hillf Danton <dhillf@gmail.com>

    > include/linux/hugetlb.h | 3 +++
    > mm/hugetlb.c | 14 ++++++++++++++
    > mm/mempolicy.c | 4 +++-
    > 3 files changed, 20 insertions(+), 1 deletion(-)
    >
    > diff --git v3.11-rc1.orig/include/linux/hugetlb.h v3.11-rc1/include/linux/hugetlb.h
    > index c7a14a4..cae5539 100644
    > --- v3.11-rc1.orig/include/linux/hugetlb.h
    > +++ v3.11-rc1/include/linux/hugetlb.h
    > @@ -267,6 +267,8 @@ struct huge_bootmem_page {
    > };
    >
    > struct page *alloc_huge_page_node(struct hstate *h, int nid);
    > +struct page *alloc_huge_page_noerr(struct vm_area_struct *vma,
    > + unsigned long addr, int avoid_reserve);
    >
    > /* arch callback */
    > int __init alloc_bootmem_huge_page(struct hstate *h);
    > @@ -380,6 +382,7 @@ static inline pgoff_t basepage_index(struct page *page)
    > #else /* CONFIG_HUGETLB_PAGE */
    > struct hstate {};
    > #define alloc_huge_page_node(h, nid) NULL
    > +#define alloc_huge_page_noerr(v, a, r) NULL
    > #define alloc_bootmem_huge_page(h) NULL
    > #define hstate_file(f) NULL
    > #define hstate_sizelog(s) NULL
    > diff --git v3.11-rc1.orig/mm/hugetlb.c v3.11-rc1/mm/hugetlb.c
    > index 506d195..f6d8d67 100644
    > --- v3.11-rc1.orig/mm/hugetlb.c
    > +++ v3.11-rc1/mm/hugetlb.c
    > @@ -1195,6 +1195,20 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
    > return page;
    > }
    >
    > +/*
    > + * alloc_huge_page()'s wrapper which simply returns the page if allocation
    > + * succeeds, otherwise NULL. This function is called from new_vma_page(),
    > + * where no ERR_VALUE is expected to be returned.
    > + */
    > +struct page *alloc_huge_page_noerr(struct vm_area_struct *vma,
    > + unsigned long addr, int avoid_reserve)
    > +{
    > + struct page *page = alloc_huge_page(vma, addr, avoid_reserve);
    > + if (IS_ERR(page))
    > + page = NULL;
    > + return page;
    > +}
    > +
    > int __weak alloc_bootmem_huge_page(struct hstate *h)
    > {
    > struct huge_bootmem_page *m;
    > diff --git v3.11-rc1.orig/mm/mempolicy.c v3.11-rc1/mm/mempolicy.c
    > index d96afc1..4a03c14 100644
    > --- v3.11-rc1.orig/mm/mempolicy.c
    > +++ v3.11-rc1/mm/mempolicy.c
    > @@ -1183,6 +1183,8 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
    > vma = vma->vm_next;
    > }
    >
    > + if (PageHuge(page))
    > + return alloc_huge_page_noerr(vma, address, 1);
    > /*
    > * if !vma, alloc_page_vma() will use task or system default policy
    > */
    > @@ -1293,7 +1295,7 @@ static long do_mbind(unsigned long start, unsigned long len,
    > (unsigned long)vma,
    > MIGRATE_SYNC, MR_MEMPOLICY_MBIND);
    > if (nr_failed)
    > - putback_lru_pages(&pagelist);
    > + putback_movable_pages(&pagelist);
    > }
    >
    > if (nr_failed && (flags & MPOL_MF_STRICT))
    > --
    > 1.8.3.1
    >


    \
     
     \ /
      Last update: 2013-07-25 09:01    [W:3.739 / U:1.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site