From nobody Mon May 11 06:18:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE55AC433F5 for ; Wed, 13 Apr 2022 03:11:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbiDMDOF (ORCPT ); Tue, 12 Apr 2022 23:14:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231570AbiDMDNy (ORCPT ); Tue, 12 Apr 2022 23:13:54 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03846424BD for ; Tue, 12 Apr 2022 20:11:34 -0700 (PDT) Received: from kwepemi100005.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KdSHp6gPbzgYbW; Wed, 13 Apr 2022 11:09:42 +0800 (CST) Received: from kwepemm600017.china.huawei.com (7.193.23.234) by kwepemi100005.china.huawei.com (7.221.188.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:31 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:31 +0800 From: Peng Liu To: , , , , , , , , , Subject: [PATCH v3 1/4] hugetlb: Fix wrong use of nr_online_nodes Date: Wed, 13 Apr 2022 03:29:12 +0000 Message-ID: <20220413032915.251254-2-liupeng256@huawei.com> X-Mailer: git-send-email 2.18.0.huawei.25 In-Reply-To: <20220413032915.251254-1-liupeng256@huawei.com> References: <20220413032915.251254-1-liupeng256@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Certain systems are designed to have sparse/discontiguous nodes. In this case, nr_online_nodes can not be used to walk through numa node. Also, a valid node may be greater than nr_online_nodes. However, in hugetlb, it is assumed that nodes are contiguous. Recheck all the places that use nr_online_nodes, and repair them one by one. Suggested-by: David Hildenbrand Fixes: 4178158ef8ca ("hugetlbfs: fix issue of preallocation of gigantic pag= es can't work") Fixes: b5389086ad7b ("hugetlbfs: extend the definition of hugepages paramet= er to support node allocation") Fixes: e79ce9832316 ("hugetlbfs: fix a truncation issue in hugepages parame= ter") Fixes: f9317f77a6e0 ("hugetlb: clean up potential spectre issue warnings") Signed-off-by: Peng Liu Reviewed-by: Baolin Wang Reviewed-by: Davidlohr Bueso Reviewed-by: Mike Kravetz --- mm/hugetlb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b34f50156f7e..5b5a2a5a742f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2979,7 +2979,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int n= id) struct huge_bootmem_page *m =3D NULL; /* initialize for clang */ int nr_nodes, node; =20 - if (nid !=3D NUMA_NO_NODE && nid >=3D nr_online_nodes) + if (nid !=3D NUMA_NO_NODE && !node_online(nid)) return 0; /* do node specific alloc */ if (nid !=3D NUMA_NO_NODE) { @@ -3088,7 +3088,7 @@ static void __init hugetlb_hstate_alloc_pages(struct = hstate *h) } =20 /* do node specific alloc */ - for (i =3D 0; i < nr_online_nodes; i++) { + for_each_online_node(i) { if (h->max_huge_pages_node[i] > 0) { hugetlb_hstate_alloc_pages_onenode(h, i); node_specific_alloc =3D true; @@ -4049,7 +4049,7 @@ static int __init hugetlb_init(void) default_hstate.max_huge_pages =3D default_hstate_max_huge_pages; =20 - for (i =3D 0; i < nr_online_nodes; i++) + for_each_online_node(i) default_hstate.max_huge_pages_node[i] =3D default_hugepages_in_node[i]; } @@ -4164,9 +4164,9 @@ static int __init hugepages_setup(char *s) pr_warn("HugeTLB: architecture can't support node specific alloc, igno= ring!\n"); return 0; } - if (tmp >=3D nr_online_nodes) + if (!node_online(tmp)) goto invalid; - node =3D array_index_nospec(tmp, nr_online_nodes); + node =3D array_index_nospec(tmp, MAX_NUMNODES); p +=3D count + 1; /* Parse hugepages */ if (sscanf(p, "%lu%n", &tmp, &count) !=3D 1) @@ -4294,7 +4294,7 @@ static int __init default_hugepagesz_setup(char *s) */ if (default_hstate_max_huge_pages) { default_hstate.max_huge_pages =3D default_hstate_max_huge_pages; - for (i =3D 0; i < nr_online_nodes; i++) + for_each_online_node(i) default_hstate.max_huge_pages_node[i] =3D default_hugepages_in_node[i]; if (hstate_is_gigantic(&default_hstate)) --=20 2.18.0.huawei.25 From nobody Mon May 11 06:18:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 653EBC433F5 for ; Wed, 13 Apr 2022 03:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231954AbiDMDN7 (ORCPT ); Tue, 12 Apr 2022 23:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231545AbiDMDNy (ORCPT ); Tue, 12 Apr 2022 23:13:54 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C3AA5373B for ; Tue, 12 Apr 2022 20:11:34 -0700 (PDT) Received: from kwepemi100001.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KdSHq5RTSzgYkk; Wed, 13 Apr 2022 11:09:43 +0800 (CST) Received: from kwepemm600017.china.huawei.com (7.193.23.234) by kwepemi100001.china.huawei.com (7.221.188.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:32 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:31 +0800 From: Peng Liu To: , , , , , , , , , Subject: [PATCH v3 2/4] hugetlb: Fix hugepages_setup when deal with pernode Date: Wed, 13 Apr 2022 03:29:13 +0000 Message-ID: <20220413032915.251254-3-liupeng256@huawei.com> X-Mailer: git-send-email 2.18.0.huawei.25 In-Reply-To: <20220413032915.251254-1-liupeng256@huawei.com> References: <20220413032915.251254-1-liupeng256@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hugepages can be specified to pernode since "hugetlbfs: extend the definition of hugepages parameter to support node allocation", but the following problem is observed. Confusing behavior is observed when both 1G and 2M hugepage is set after "numa=3Doff". cmdline hugepage settings: hugepagesz=3D1G hugepages=3D0:3,1:3 hugepagesz=3D2M hugepages=3D0:1024,1:1024 results: HugeTLB registered 1.00 GiB page size, pre-allocated 0 pages HugeTLB registered 2.00 MiB page size, pre-allocated 1024 pages Furthermore, confusing behavior can be also observed when an invalid node behind a valid node. To fix this, never allocate any typical hugepage when an invalid parameter is received. Fixes: b5389086ad7b ("hugetlbfs: extend the definition of hugepages paramet= er to support node allocation") Signed-off-by: Peng Liu Reviewed-by: David Hildenbrand Reviewed-by: Mike Kravetz --- mm/hugetlb.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5b5a2a5a742f..1930b6341f7e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4116,6 +4116,20 @@ bool __init __weak hugetlb_node_alloc_supported(void) { return true; } + +static void __init hugepages_clear_pages_in_node(void) +{ + if (!hugetlb_max_hstate) { + default_hstate_max_huge_pages =3D 0; + memset(default_hugepages_in_node, 0, + MAX_NUMNODES * sizeof(unsigned int)); + } else { + parsed_hstate->max_huge_pages =3D 0; + memset(parsed_hstate->max_huge_pages_node, 0, + MAX_NUMNODES * sizeof(unsigned int)); + } +} + /* * hugepages command line processing * hugepages normally follows a valid hugepagsz or default_hugepagsz @@ -4203,6 +4217,7 @@ static int __init hugepages_setup(char *s) =20 invalid: pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p); + hugepages_clear_pages_in_node(); return 0; } __setup("hugepages=3D", hugepages_setup); --=20 2.18.0.huawei.25 From nobody Mon May 11 06:18:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F050C433F5 for ; Wed, 13 Apr 2022 03:11:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231523AbiDMDOK (ORCPT ); Tue, 12 Apr 2022 23:14:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231897AbiDMDNz (ORCPT ); Tue, 12 Apr 2022 23:13:55 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7153E51594 for ; Tue, 12 Apr 2022 20:11:35 -0700 (PDT) Received: from kwepemi500021.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KdSKG0mgVzfYpR; Wed, 13 Apr 2022 11:10:58 +0800 (CST) Received: from kwepemm600017.china.huawei.com (7.193.23.234) by kwepemi500021.china.huawei.com (7.221.188.245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:33 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:32 +0800 From: Peng Liu To: , , , , , , , , , Subject: [PATCH v3 3/4] hugetlb: Fix return value of __setup handlers Date: Wed, 13 Apr 2022 03:29:14 +0000 Message-ID: <20220413032915.251254-4-liupeng256@huawei.com> X-Mailer: git-send-email 2.18.0.huawei.25 In-Reply-To: <20220413032915.251254-1-liupeng256@huawei.com> References: <20220413032915.251254-1-liupeng256@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When __setup() return '0', using invalid option values causes the entire kernel boot option string to be reported as Unknown. Hugetlb calls __setup() and will return '0' when set invalid parameter string. The following phenomenon is observed: cmdline: hugepagesz=3D1Y hugepages=3D1 dmesg: HugeTLB: unsupported hugepagesz=3D1Y HugeTLB: hugepages=3D1 does not follow a valid hugepagesz, ignoring Unknown kernel command line parameters "hugepagesz=3D1Y hugepages=3D1" Since hugetlb will print warning/error information before return for invalid parameter string, just use return '1' to avoid print again. Signed-off-by: Peng Liu Reviewed-by: Baolin Wang Reviewed-by: Davidlohr Bueso Reviewed-by: Mike Kravetz --- mm/hugetlb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1930b6341f7e..2e4d8d9fb7c6 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4149,7 +4149,7 @@ static int __init hugepages_setup(char *s) if (!parsed_valid_hugepagesz) { pr_warn("HugeTLB: hugepages=3D%s does not follow a valid hugepagesz, ign= oring\n", s); parsed_valid_hugepagesz =3D true; - return 0; + return 1; } =20 /* @@ -4165,7 +4165,7 @@ static int __init hugepages_setup(char *s) =20 if (mhp =3D=3D last_mhp) { pr_warn("HugeTLB: hugepages=3D specified twice without interleaving huge= pagesz=3D, ignoring hugepages=3D%s\n", s); - return 0; + return 1; } =20 while (*p) { @@ -4176,7 +4176,7 @@ static int __init hugepages_setup(char *s) if (p[count] =3D=3D ':') { if (!hugetlb_node_alloc_supported()) { pr_warn("HugeTLB: architecture can't support node specific alloc, igno= ring!\n"); - return 0; + return 1; } if (!node_online(tmp)) goto invalid; @@ -4218,7 +4218,7 @@ static int __init hugepages_setup(char *s) invalid: pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p); hugepages_clear_pages_in_node(); - return 0; + return 1; } __setup("hugepages=3D", hugepages_setup); =20 @@ -4239,7 +4239,7 @@ static int __init hugepagesz_setup(char *s) =20 if (!arch_hugetlb_valid_size(size)) { pr_err("HugeTLB: unsupported hugepagesz=3D%s\n", s); - return 0; + return 1; } =20 h =3D size_to_hstate(size); @@ -4254,7 +4254,7 @@ static int __init hugepagesz_setup(char *s) if (!parsed_default_hugepagesz || h !=3D &default_hstate || default_hstate.max_huge_pages) { pr_warn("HugeTLB: hugepagesz=3D%s specified twice, ignoring\n", s); - return 0; + return 1; } =20 /* @@ -4285,14 +4285,14 @@ static int __init default_hugepagesz_setup(char *s) parsed_valid_hugepagesz =3D false; if (parsed_default_hugepagesz) { pr_err("HugeTLB: default_hugepagesz previously specified, ignoring %s\n"= , s); - return 0; + return 1; } =20 size =3D (unsigned long)memparse(s, NULL); =20 if (!arch_hugetlb_valid_size(size)) { pr_err("HugeTLB: unsupported default_hugepagesz=3D%s\n", s); - return 0; + return 1; } =20 hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT); --=20 2.18.0.huawei.25 From nobody Mon May 11 06:18:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 584E4C433EF for ; Wed, 13 Apr 2022 03:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231979AbiDMDOP (ORCPT ); Tue, 12 Apr 2022 23:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231924AbiDMDNz (ORCPT ); Tue, 12 Apr 2022 23:13:55 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A51B33EB1 for ; Tue, 12 Apr 2022 20:11:36 -0700 (PDT) Received: from kwepemi100013.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KdSKG74kmzfYng; Wed, 13 Apr 2022 11:10:58 +0800 (CST) Received: from kwepemm600017.china.huawei.com (7.193.23.234) by kwepemi100013.china.huawei.com (7.221.188.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:34 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:33 +0800 From: Peng Liu To: , , , , , , , , , Subject: [PATCH v3 4/4] hugetlb: Clean up hugetlb_cma_reserve Date: Wed, 13 Apr 2022 03:29:15 +0000 Message-ID: <20220413032915.251254-5-liupeng256@huawei.com> X-Mailer: git-send-email 2.18.0.huawei.25 In-Reply-To: <20220413032915.251254-1-liupeng256@huawei.com> References: <20220413032915.251254-1-liupeng256@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use more generic functions to deal with issues related to online nodes. The changes will make the code simplified. Signed-off-by: Peng Liu Reviewed-by: Baolin Wang Reviewed-by: David Hildenbrand Reviewed-by: Davidlohr Bueso Reviewed-by: Mike Kravetz Reviewed-by: Muchun Song --- mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2e4d8d9fb7c6..4c529774cc08 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) if (hugetlb_cma_size_in_node[nid] =3D=3D 0) continue; =20 - if (!node_state(nid, N_ONLINE)) { + if (!node_online(nid)) { pr_warn("hugetlb_cma: invalid node %d specified\n", nid); hugetlb_cma_size -=3D hugetlb_cma_size_in_node[nid]; hugetlb_cma_size_in_node[nid] =3D 0; @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) } =20 reserved =3D 0; - for_each_node_state(nid, N_ONLINE) { + for_each_online_node(nid) { int res; char name[CMA_MAX_NAME]; =20 --=20 2.18.0.huawei.25