Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758602Ab3G2SGP (ORCPT ); Mon, 29 Jul 2013 14:06:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12657 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756620Ab3G2SGO (ORCPT ); Mon, 29 Jul 2013 14:06:14 -0400 Date: Mon, 29 Jul 2013 14:05:51 -0400 From: Naoya Horiguchi To: Joonsoo Kim Cc: Andrew Morton , Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Hillf Danton Message-ID: <1375121151-dxyftdvy-mutt-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1375075929-6119-9-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> <1375075929-6119-9-git-send-email-iamjoonsoo.kim@lge.com> Subject: Re: [PATCH 08/18] mm, hugetlb: do hugepage_subpool_get_pages() when avoid_reserve Mime-Version: 1.0 Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Mutt-References: <1375075929-6119-9-git-send-email-iamjoonsoo.kim@lge.com> X-Mutt-Fcc: ~/Maildir/sent/ User-Agent: Mutt 1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1649 Lines: 48 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 > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/