]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm/kasan: support non-blocking GFP in kasan_populate_vmalloc()
authorUladzislau Rezki (Sony) <urezki@gmail.com>
Tue, 7 Oct 2025 12:20:31 +0000 (14:20 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 15 Oct 2025 04:28:28 +0000 (21:28 -0700)
A "gfp_mask" is already passed to kasan_populate_vmalloc() as an argument
to respect GFPs from callers and KASAN uses it for its internal
allocations.

But apply_to_page_range() function ignores GFP flags due to a hard-coded
mask.

Wrap the call with memalloc_apply_gfp_scope()/memalloc_restore_scope() so
that non-blocking GFP flags(GFP_ATOMIC, GFP_NOWAIT) are respected.

Link: https://lkml.kernel.org/r/20251007122035.56347-7-urezki@gmail.com
Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Marco Elver <elver@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/kasan/shadow.c

index 5d2a876035d656809244a5a3e75a852aa2ba1de1..a30d84bfdd52bdfbba0ca2232d42d1c13b1c8599 100644 (file)
@@ -377,18 +377,10 @@ static int __kasan_populate_vmalloc(unsigned long start, unsigned long end, gfp_
                 * page tables allocations ignore external gfp mask, enforce it
                 * by the scope API
                 */
-               if ((gfp_mask & (__GFP_FS | __GFP_IO)) == __GFP_IO)
-                       flags = memalloc_nofs_save();
-               else if ((gfp_mask & (__GFP_FS | __GFP_IO)) == 0)
-                       flags = memalloc_noio_save();
-
+               flags = memalloc_apply_gfp_scope(gfp_mask);
                ret = apply_to_page_range(&init_mm, start, nr_pages * PAGE_SIZE,
                                          kasan_populate_vmalloc_pte, &data);
-
-               if ((gfp_mask & (__GFP_FS | __GFP_IO)) == __GFP_IO)
-                       memalloc_nofs_restore(flags);
-               else if ((gfp_mask & (__GFP_FS | __GFP_IO)) == 0)
-                       memalloc_noio_restore(flags);
+               memalloc_restore_scope(flags);
 
                ___free_pages_bulk(data.pages, nr_pages);
                if (ret)