Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755452Ab3G2FgN (ORCPT ); Mon, 29 Jul 2013 01:36:13 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:47164 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755127Ab3G2FcX (ORCPT ); Mon, 29 Jul 2013 01:32:23 -0400 X-AuditID: 9c930197-b7bfbae000000e88-13-51f5fe64e945 From: Joonsoo Kim To: Andrew Morton Cc: 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 , Naoya Horiguchi , Hillf Danton , Joonsoo Kim Subject: [PATCH 08/18] mm, hugetlb: do hugepage_subpool_get_pages() when avoid_reserve Date: Mon, 29 Jul 2013 14:31:59 +0900 Message-Id: <1375075929-6119-9-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1418 Lines: 42 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. 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/