| From 1d579808a2adce35d818078ed3351e465594633b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Feb 2021 12:07:58 -0800 |
| Subject: mm/hugetlb: suppress wrong warning info when alloc gigantic page |
| |
| From: Chen Wandun <chenwandun@huawei.com> |
| |
| [ Upstream commit 7ecc956551f8a66618f71838c790a9b0b4f9ca10 ] |
| |
| If hugetlb_cma is enabled, it will skip boot time allocation when |
| allocating gigantic page, that doesn't means allocation failure, so |
| suppress this warning info. |
| |
| Link: https://lkml.kernel.org/r/20210219123909.13130-1-chenwandun@huawei.com |
| Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma") |
| Signed-off-by: Chen Wandun <chenwandun@huawei.com> |
| Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> |
| Cc: Roman Gushchin <guro@fb.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| mm/hugetlb.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/mm/hugetlb.c b/mm/hugetlb.c |
| index bc61eea60e07e..63d15f0a6629f 100644 |
| --- a/mm/hugetlb.c |
| +++ b/mm/hugetlb.c |
| @@ -2520,7 +2520,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) |
| if (hstate_is_gigantic(h)) { |
| if (hugetlb_cma_size) { |
| pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); |
| - break; |
| + goto free; |
| } |
| if (!alloc_bootmem_huge_page(h)) |
| break; |
| @@ -2538,7 +2538,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) |
| h->max_huge_pages, buf, i); |
| h->max_huge_pages = i; |
| } |
| - |
| +free: |
| kfree(node_alloc_noretry); |
| } |
| |
| -- |
| 2.27.0 |
| |
