2021-09-15 11:45:33

by Vasily Averin

Subject: [PATCH mm] mm/vmalloc: repair warn_alloc()s in __vmalloc_area_node()

Commit f255935b9767 ("mm: cleanup the gfp_mask handling in
__vmalloc_area_node") added __GFP_NOWARN to gfp_mask unconditionally
however it disabled all output inside warn_alloc() call.
This patch saves original gfp_mask and provides it to all warn_alloc() calls.

Fixes: f255935b9767 ("mm: cleanup the gfp_mask handling in __vmalloc_area_node")
Cc: Christoph Hellwig <[email protected]>

Signed-off-by: Vasily Averin <[email protected]>
---
mm/vmalloc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 551011399974..ff8538b1b28f 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2888,6 +2888,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
int node)
{
const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
+ const gfp_t orig_gfp_mask = gfp_mask;
unsigned long addr = (unsigned long)area->addr;
unsigned long size = get_vm_area_size(area);
unsigned long array_size;
@@ -2908,7 +2909,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
}

if (!area->pages) {
- warn_alloc(gfp_mask, NULL,
+ warn_alloc(orig_gfp_mask, NULL,
"vmalloc error: size %lu, failed to allocated page array size %lu",
nr_small_pages * PAGE_SIZE, array_size);
free_vm_area(area);
@@ -2928,7 +2929,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
* allocation request, free them via __vfree() if any.
*/
if (area->nr_pages != nr_small_pages) {
- warn_alloc(gfp_mask, NULL,
+ warn_alloc(orig_gfp_mask, NULL,
"vmalloc error: size %lu, page order %u, failed to allocate pages",
area->nr_pages * PAGE_SIZE, page_order);
goto fail;
@@ -2936,7 +2937,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,

if (vmap_pages_range(addr, addr + size, prot, area->pages,
page_shift) < 0) {
- warn_alloc(gfp_mask, NULL,
+ warn_alloc(orig_gfp_mask, NULL,
"vmalloc error: size %lu, failed to map pages",
area->nr_pages * PAGE_SIZE);
goto fail;
--
2.31.1

2021-09-15 13:53:03

by Christoph Hellwig

Subject: Re: [PATCH mm] mm/vmalloc: repair warn_alloc()s in __vmalloc_area_node()

On Wed, Sep 15, 2021 at 02:43:10PM +0300, Vasily Averin wrote:
> Commit f255935b9767 ("mm: cleanup the gfp_mask handling in
> __vmalloc_area_node") added __GFP_NOWARN to gfp_mask unconditionally
> however it disabled all output inside warn_alloc() call.
> This patch saves original gfp_mask and provides it to all warn_alloc() calls.
>
> Fixes: f255935b9767 ("mm: cleanup the gfp_mask handling in __vmalloc_area_node")
> Cc: Christoph Hellwig <[email protected]>
>
> Signed-off-by: Vasily Averin <[email protected]>

Looks fine, thanks.

Reviewed-by: Christoph Hellwig <[email protected]>

2021-09-16 06:04:17

by Muchun Song

Subject: Re: [PATCH mm] mm/vmalloc: repair warn_alloc()s in __vmalloc_area_node()

On Wed, Sep 15, 2021 at 7:43 PM Vasily Averin <[email protected]> wrote:
>
> Commit f255935b9767 ("mm: cleanup the gfp_mask handling in
> __vmalloc_area_node") added __GFP_NOWARN to gfp_mask unconditionally
> however it disabled all output inside warn_alloc() call.
> This patch saves original gfp_mask and provides it to all warn_alloc() calls.
>
> Fixes: f255935b9767 ("mm: cleanup the gfp_mask handling in __vmalloc_area_node")
> Cc: Christoph Hellwig <[email protected]>
>
> Signed-off-by: Vasily Averin <[email protected]>

LGTM. Thanks.

Reviewed-by: Muchun Song <[email protected]>