From patchwork Mon Jul 6 08:44:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Song Bao Hua (Barry Song)" X-Patchwork-Id: 11645255 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A16513B4 for ; Mon, 6 Jul 2020 08:46:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EAE592075B for ; Mon, 6 Jul 2020 08:46:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAE592075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 272F86B000C; Mon, 6 Jul 2020 04:46:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 221FE6B000D; Mon, 6 Jul 2020 04:46:15 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 138706B000E; Mon, 6 Jul 2020 04:46:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id F04696B000C for ; Mon, 6 Jul 2020 04:46:14 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B5484180AD802 for ; Mon, 6 Jul 2020 08:46:14 +0000 (UTC) X-FDA: 77007019068.21.berry76_3901f3426eaa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 82935180442C2 for ; Mon, 6 Jul 2020 08:46:14 +0000 (UTC) X-Spam-Summary: 1,0,0,9bd8305b7adf18de,d41d8cd98f00b204,song.bao.hua@hisilicon.com,,RULES_HIT:41:355:379:541:582:800:960:973:988:989:1152:1260:1261:1277:1311:1313:1314:1345:1437:1515:1516:1518:1534:1541:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3867:3871:4250:4321:5007:6261:10004:10400:11026:11658:11914:12043:12296:12297:12438:12555:12679:12895:13069:13311:13357:13894:14093:14097:14181:14394:14721:21080:21451:21627:30054:30064:30070,0,RBL:45.249.212.190:@hisilicon.com:.lbl8.mailshell.net-64.201.201.201 62.14.2.100;04yrbtauhe4usgwgfjrkywmge4himypkani7s8ib59doy87u9b58cmfaa5shmef.xf9o6eoi77bs5jbajihfn81xtb3aebpc9bn8z4aqnom3cuajuka5if951kxtc5n.4-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: berry76_3901f3426eaa X-Filterd-Recvd-Size: 2702 Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Mon, 6 Jul 2020 08:46:13 +0000 (UTC) Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 49988AEF19DB153FA8A5; Mon, 6 Jul 2020 16:46:05 +0800 (CST) Received: from SWX921481.china.huawei.com (10.126.203.241) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Mon, 6 Jul 2020 16:45:55 +0800 From: Barry Song To: CC: , , , Barry Song , "Roman Gushchin" , Mike Kravetz , "Jonathan Cameron" Subject: [PATCH] mm/hugetlb: avoid hardcoding while checking if cma is reserved Date: Mon, 6 Jul 2020 20:44:05 +1200 Message-ID: <20200706084405.14236-1-song.bao.hua@hisilicon.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.126.203.241] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 82935180442C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: hugetlb_cma[0] can be NULL due to various reasons, for example, node0 has no memory. Thus, NULL hugetlb_cma[0] doesn't necessarily mean cma is not enabled. gigantic pages might have been reserved on other nodes. Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma") Cc: Roman Gushchin Cc: Mike Kravetz Cc: Jonathan Cameron Signed-off-by: Barry Song --- mm/hugetlb.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 57ece74e3aae..603aa854aa89 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2571,9 +2571,21 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) for (i = 0; i < h->max_huge_pages; ++i) { if (hstate_is_gigantic(h)) { - if (IS_ENABLED(CONFIG_CMA) && hugetlb_cma[0]) { - pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); - break; + if (IS_ENABLED(CONFIG_CMA)) { + int nid; + bool cma_reserved = false; + + for_each_node_state(nid, N_ONLINE) { + if (hugetlb_cma[nid]) { + pr_warn_once("HugeTLB: hugetlb_cma is reserved," + "skip boot time allocation\n"); + cma_reserved = true; + break; + } + } + + if (cma_reserved) + break; } if (!alloc_bootmem_huge_page(h)) break;