lkml.org 
[lkml]   [2013]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 08/18] mm, hugetlb: do hugepage_subpool_get_pages() when avoid_reserve
    On Mon, Jul 29, 2013 at 02:31:59PM +0900, Joonsoo Kim wrote:
    > When we try to get a huge page with avoid_reserve, we don't consume
    > a reserved page. So it is treated like as non-reserve case.

    This patch will be completely overwritten with 9/18.
    So is this patch necessary?

    Naoya Horiguchi

    > Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
    >
    > diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    > index 1426c03..749629e 100644
    > --- a/mm/hugetlb.c
    > +++ b/mm/hugetlb.c
    > @@ -1149,12 +1149,13 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
    > if (has_reserve < 0)
    > return ERR_PTR(-ENOMEM);
    >
    > - if (!has_reserve && (hugepage_subpool_get_pages(spool, 1) < 0))
    > + if ((!has_reserve || avoid_reserve)
    > + && (hugepage_subpool_get_pages(spool, 1) < 0))
    > return ERR_PTR(-ENOSPC);
    >
    > ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), &h_cg);
    > if (ret) {
    > - if (!has_reserve)
    > + if (!has_reserve || avoid_reserve)
    > hugepage_subpool_put_pages(spool, 1);
    > return ERR_PTR(-ENOSPC);
    > }
    > @@ -1167,7 +1168,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
    > hugetlb_cgroup_uncharge_cgroup(idx,
    > pages_per_huge_page(h),
    > h_cg);
    > - if (!has_reserve)
    > + if (!has_reserve || avoid_reserve)
    > hugepage_subpool_put_pages(spool, 1);
    > return ERR_PTR(-ENOSPC);
    > }
    > --
    > 1.7.9.5
    >


    \
     
     \ /
      Last update: 2013-07-29 20:21    [W:4.160 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site