hugetlb-fix-wrong-use-of-nr_online_nodes.patch removed from -mm tree
The quilt patch titled
Subject: hugetlb: fix wrong use of nr_online_nodes
has been removed from the -mm tree. Its filename was
hugetlb-fix-wrong-use-of-nr_online_nodes.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: Peng Liu <[email protected]>
Subject: hugetlb: fix wrong use of nr_online_nodes
Patch series "hugetlb: Fix some incorrect behavior", v3.
This series fix three bugs of hugetlb:
1) Invalid use of nr_online_nodes;
2) Inconsistency between 1G hugepage and 2M hugepage;
3) Useless information in dmesg.
This patch (of 4):
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.
For sparse/discontiguous nodes, the current code may treat a valid node as invalid, and will fail to allocate all hugepages on a valid node that "nid >= nr_online_nodes".
As David suggested:
if (tmp >= nr_online_nodes) goto invalid;
Just imagine node 0 and node 2 are online, and node 1 is offline. Assuming that "node < 2" is valid is wrong.
Recheck all the places that use nr_online_nodes, and repair them one by one.
---
mm/hugetlb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~hugetlb-fix-wrong-use-of-nr_online_nodes +5 -7
@@ -2984,8 +2984,6 @@ int __alloc_bootmem_huge_page(struct hststruct huge_bootmem_page *m =NULL ;/* initialize for clang */ int nr_nodes, node; -if (nid !=NUMA_NO_NODE && nid >= nr_online_nodes) -return 0 ;/* do node specific alloc */ if (nid !=NUMA_NO_NODE ) { m = memblock_alloc_try_nid_raw(huge_page_size(h), huge_page_size(h),
@@ -3093,7 +3091,7 @@ static void __init hugetlb_hstate_alloc_ }/* do node specific alloc */ -for (i =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 = true;
@@ -4057,7 +4055,7 @@ static int __init hugetlb_init(void) default_hstate.max_huge_pages = default_hstate_max_huge_pages; -for (i =0 ; i < nr_online_nodes; i++) +for_each_online_node (i) default_hstate.max_huge_pages_node[i] = default_hugepages_in_node[i]; }
@@ -4172,9 +4170,9 @@ static int __init hugepages_setup(char *pr_warn ("HugeTLB: architecture can't support node specific alloc, ignoring!\n" );return 0 ; } -if (tmp >= nr_online_nodes) +if (tmp >=MAX_NUMNODES || !node_online (tmp)) goto invalid; - node =array_index_nospec (tmp, nr_online_nodes); + node =array_index_nospec (tmp,MAX_NUMNODES ); p += count +1 ;/* Parse hugepages */ if (sscanf (p,"%lu%n" , &tmp, &count) !=1 )
@@ -4302,7 +4300,7 @@ static int __init default_hugepagesz_set*/ if (default_hstate_max_huge_pages) { default_hstate.max_huge_pages = default_hstate_max_huge_pages; -for (i =0 ; i < nr_online_nodes; i++) +for_each_online_node (i) default_hstate.max_huge_pages_node[i] = default_hugepages_in_node[i];if (hstate_is_gigantic (&default_hstate))
_
Patches currently in -mm which might be from [email protected] are