mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
mm/vmalloc: warn on invalid vmalloc gfp flags
Patch series "make vmalloc gfp flags usage more apparent", v4. We should do a better job at enforcing gfp flags for vmalloc. Right now, we have a kernel-doc for __vmalloc_node_range(), and hope callers pass in supported flags. If a caller were to pass in an unsupported flag, we may BUG, silently clear it, or completely ignore it. If we are more proactive about enforcing gfp flags, we can making sure callers know when they may be asking for unsupported behavior. This patchset lets vmalloc control the incoming gfp flags, and cleans up some hard to read gfp code. This patch (of 4): Vmalloc explicitly supports a list of flags, but we never enforce them. vmalloc has been trying to handle unsupported flags by clearing and setting flags wherever necessary. This is messy and makes the code harder to understand, when we could simply check for a supported input immediately instead. Define a helper mask and function telling callers they have passed in invalid flags, and clear those unsupported vmalloc flags. Link: https://lkml.kernel.org/r/20251121094405.40628-1-vishal.moola@gmail.com Link: https://lkml.kernel.org/r/20251121094405.40628-2-vishal.moola@gmail.com Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Suggested-by: Christoph Hellwig <hch@infradead.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: "Uladzislau Rezki (Sony)" <urezki@gmail.com> Acked-by: SeongJae Park <sj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
c1bd09994c
commit
07003531e0
26
mm/vmalloc.c
26
mm/vmalloc.c
@@ -3911,6 +3911,28 @@ fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* See __vmalloc_node_range() for a clear list of supported vmalloc flags.
|
||||
* This gfp lists all flags currently passed through vmalloc. Currently,
|
||||
* __GFP_ZERO is used by BPF and __GFP_NORETRY is used by percpu. Both drm
|
||||
* and BPF also use GFP_USER. Additionally, various users pass
|
||||
* GFP_KERNEL_ACCOUNT. Xfs uses __GFP_NOLOCKDEP.
|
||||
*/
|
||||
#define GFP_VMALLOC_SUPPORTED (GFP_KERNEL | GFP_ATOMIC | GFP_NOWAIT |\
|
||||
__GFP_NOFAIL | __GFP_ZERO | __GFP_NORETRY |\
|
||||
GFP_NOFS | GFP_NOIO | GFP_KERNEL_ACCOUNT |\
|
||||
GFP_USER | __GFP_NOLOCKDEP)
|
||||
|
||||
static gfp_t vmalloc_fix_flags(gfp_t flags)
|
||||
{
|
||||
gfp_t invalid_mask = flags & ~GFP_VMALLOC_SUPPORTED;
|
||||
|
||||
flags &= GFP_VMALLOC_SUPPORTED;
|
||||
WARN_ONCE(1, "Unexpected gfp: %#x (%pGg). Fixing up to gfp: %#x (%pGg). Fix your code!\n",
|
||||
invalid_mask, &invalid_mask, flags, &flags);
|
||||
return flags;
|
||||
}
|
||||
|
||||
/**
|
||||
* __vmalloc_node_range - allocate virtually contiguous memory
|
||||
* @size: allocation size
|
||||
@@ -4092,6 +4114,8 @@ EXPORT_SYMBOL_GPL(__vmalloc_node_noprof);
|
||||
|
||||
void *__vmalloc_noprof(unsigned long size, gfp_t gfp_mask)
|
||||
{
|
||||
if (unlikely(gfp_mask & ~GFP_VMALLOC_SUPPORTED))
|
||||
gfp_mask = vmalloc_fix_flags(gfp_mask);
|
||||
return __vmalloc_node_noprof(size, 1, gfp_mask, NUMA_NO_NODE,
|
||||
__builtin_return_address(0));
|
||||
}
|
||||
@@ -4131,6 +4155,8 @@ EXPORT_SYMBOL(vmalloc_noprof);
|
||||
*/
|
||||
void *vmalloc_huge_node_noprof(unsigned long size, gfp_t gfp_mask, int node)
|
||||
{
|
||||
if (unlikely(gfp_mask & ~GFP_VMALLOC_SUPPORTED))
|
||||
gfp_mask = vmalloc_fix_flags(gfp_mask);
|
||||
return __vmalloc_node_range_noprof(size, 1, VMALLOC_START, VMALLOC_END,
|
||||
gfp_mask, PAGE_KERNEL, VM_ALLOW_HUGE_VMAP,
|
||||
node, __builtin_return_address(0));
|
||||
|
||||
Reference in New Issue
Block a user