lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 460/663] mm/hugetlb: suppress wrong warning info when alloc gigantic page
    Date
    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 afe803dbcab1b..37672d8fa5c34 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -2517,7 +2517,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;
    @@ -2535,7 +2535,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


    \
     
     \ /
      Last update: 2021-03-02 01:11    [W:4.122 / U:0.716 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site