[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1375121151-dxyftdvy-mutt-n-horiguchi@ah.jp.nec.com>
Date: Mon, 29 Jul 2013 14:05:51 -0400
From: Naoya Horiguchi <n-horiguchi@...jp.nec.com>
To: Joonsoo Kim <iamjoonsoo.kim@....com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Rik van Riel <riel@...hat.com>, Mel Gorman <mgorman@...e.de>,
Michal Hocko <mhocko@...e.cz>,
"Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
Hugh Dickins <hughd@...gle.com>,
Davidlohr Bueso <davidlohr.bueso@...com>,
David Gibson <david@...son.dropbear.id.au>, linux-mm@...ck.org,
linux-kernel@...r.kernel.org, Joonsoo Kim <js1304@...il.com>,
Wanpeng Li <liwanp@...ux.vnet.ibm.com>,
Hillf Danton <dhillf@...il.com>
Subject: Re: [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@....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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists