Commit 7ecc9565 authored by Chen Wandun's avatar Chen Wandun Committed by Linus Torvalds
Browse files

mm/hugetlb: suppress wrong warning info when alloc gigantic page 

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: cf11e85f ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Roman Gushchin <guro@fb.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3272cfc2

mm/hugetlb.c

+2 −2
Original line number Diff line number Diff line
@@ -2529,7 +2529,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;
@@ -2547,7 +2547,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);

}