From patchwork Tue Jun 16 22:31:31 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: 11608737 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 083436A2 for ; Tue, 16 Jun 2020 22:33:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CE77920B80 for ; Tue, 16 Jun 2020 22:33:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE77920B80 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 25D076B0006; Tue, 16 Jun 2020 18:33:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 20F176B0008; Tue, 16 Jun 2020 18:33:44 -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 14AF66B000A; Tue, 16 Jun 2020 18:33:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0142.hostedemail.com [216.40.44.142]) by kanga.kvack.org (Postfix) with ESMTP id F10356B0006 for ; Tue, 16 Jun 2020 18:33:43 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B27FA824556B for ; Tue, 16 Jun 2020 22:33:43 +0000 (UTC) X-FDA: 76936528326.12.dog72_010e19226e02 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 88A9E1801F9E3 for ; Tue, 16 Jun 2020 22:33:43 +0000 (UTC) X-Spam-Summary: 2,0,0,2b5cc102eaf976d5,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:1359:1437:1515:1516:1518:1534:1541:1711:1730:1747:1777:1792:2194:2198:2199:2200:2393:2559:2562:2693:2731:3138:3139:3140:3141:3142:3352:3865:3867:3868:4250:4321:5007:6261:7875:8603:10004:10400:11026:11658:11914:12295:12297:12438:12555:12895:12986:13069:13311:13357:13894:14181:14394:14721:21063:21080:21451:21627:30029:30030:30054:30064,0,RBL:45.249.212.35:@hisilicon.com:.lbl8.mailshell.net-62.2.2.100 64.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: dog72_010e19226e02 X-Filterd-Recvd-Size: 2442 Received: from huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Tue, 16 Jun 2020 22:33:42 +0000 (UTC) Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 538AE8A8B1807A1B4389; Wed, 17 Jun 2020 06:33:39 +0800 (CST) Received: from SWX921481.china.huawei.com (10.126.203.10) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.487.0; Wed, 17 Jun 2020 06:33:29 +0800 From: Barry Song To: , CC: , , , Barry Song , "Roman Gushchin" Subject: [PATCH v2 2/2] mm: hugetlb: fix the name of hugetlb CMA Date: Wed, 17 Jun 2020 10:31:31 +1200 Message-ID: <20200616223131.33828-3-song.bao.hua@hisilicon.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200616223131.33828-1-song.bao.hua@hisilicon.com> References: <20200616223131.33828-1-song.bao.hua@hisilicon.com> MIME-Version: 1.0 X-Originating-IP: [10.126.203.10] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 88A9E1801F9E3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: once we enable CMA_DEBUGFS, we will get the below errors: directory 'cma-hugetlb' with parent 'cma' already present we should have different names for different CMA areas. Acked-by: Roman Gushchin Reviewed-by: Mike Kravetz Signed-off-by: Barry Song --- -v2: rebase to 5.8-rc1 add acked-by and reviewed-by mm/hugetlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 57ece74e3aae..d54bb7e35005 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5692,12 +5692,14 @@ void __init hugetlb_cma_reserve(int order) reserved = 0; for_each_node_state(nid, N_ONLINE) { int res; + char name[20]; size = min(per_node, hugetlb_cma_size - reserved); size = round_up(size, PAGE_SIZE << order); + snprintf(name, 20, "hugetlb%d", nid); res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order, - 0, false, "hugetlb", + 0, false, name, &hugetlb_cma[nid], nid); if (res) { pr_warn("hugetlb_cma: reservation failed: err %d, node %d",