On 2/19/21 1:03 PM, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > The patch titled > Subject: mm/hugetlb: suppress wrong warning info when alloc gigantic page > has been removed from the -mm tree. Its filename was > mm-hugetlb-suppress-wrong-warning-info-when-alloc-gigantic-page.patch > > This patch was dropped because it was nacked Sorry Andrew (and everyone), My objection to this patch was incorrect. I did not look closely enough to notice that only a redundant warning is being removed. Upon closer examination, you can even add: Reviewed-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx> -- Mike Kravetz > > ------------------------------------------------------ > From: Chen Wandun <chenwandun@xxxxxxxxxx> > Subject: 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@xxxxxxxxxx > Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma") > Signed-off-by: Chen Wandun <chenwandun@xxxxxxxxxx> > Cc: Roman Gushchin <guro@xxxxxx> > Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > --- a/mm/hugetlb.c~mm-hugetlb-suppress-wrong-warning-info-when-alloc-gigantic-page > +++ a/mm/hugetlb.c > @@ -2529,7 +2529,7 @@ static void __init hugetlb_hstate_alloc_ > 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_ > h->max_huge_pages, buf, i); > h->max_huge_pages = i; > } > - > +free: > kfree(node_alloc_noretry); > } > > _ > > Patches currently in -mm which might be from chenwandun@xxxxxxxxxx are > >
