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=off".
cmdline hugepage settings:
hugepagesz=1G hugepages=0:3,1:3
hugepagesz=2M hugepages=0: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 invalid
node behind valid node.
To fix this, hugetlb_hstate_alloc_pages should be called even when
hugepages_setup going to invalid.
Cc: <stable@xxxxxxxxxxxxxxx>
Fixes: b5389086ad7b ("hugetlbfs: extend the definition of hugepages parameter to support node allocation")
Signed-off-by: Peng Liu <liupeng256@xxxxxxxxxx>
---
mm/hugetlb.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b34f50156f7e..9cd746432ca9 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -4131,6 +4131,7 @@ static int __init hugepages_setup(char *s)
int count;
unsigned long tmp;
char *p = s;
+ int ret = 1;
if (!parsed_valid_hugepagesz) {
pr_warn("HugeTLB: hugepages=%s does not follow a valid hugepagesz, ignoring\n", s);
@@ -4189,6 +4190,7 @@ static int __init hugepages_setup(char *s)
}
}
+out:
/*
* Global state is always initialized later in hugetlb_init.
* But we need to allocate gigantic hstates here early to still
@@ -4199,11 +4201,12 @@ static int __init hugepages_setup(char *s)
last_mhp = mhp;
- return 1;
+ return ret;
invalid:
pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p);
- return 0;
+ ret = 0;
+ goto out;
}
__setup("hugepages=", hugepages_setup);
--
2.18.0.huawei.25
