Commit 2e8000b8 authored by Kees Cook's avatar Kees Cook Committed by Vlastimil Babka
Browse files

mm/slab: Introduce kvmalloc_buckets_node() that can take kmem_buckets argument 



Plumb kmem_buckets arguments through kvmalloc_node_noprof() so it is
possible to provide an API to perform kvmalloc-style allocations with
a particular set of buckets. Introduce kvmalloc_buckets_node() that takes a
kmem_buckets argument.

Signed-off-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent 67f2df3b

include/linux/slab.h

+3 −1
Original line number Diff line number Diff line
@@ -799,7 +799,9 @@ static inline __alloc_size(1) void *kzalloc_noprof(size_t size, gfp_t flags) 
#define kzalloc(...)				alloc_hooks(kzalloc_noprof(__VA_ARGS__))

#define kzalloc_node(_size, _flags, _node)	kmalloc_node(_size, (_flags)|__GFP_ZERO, _node)



extern void *kvmalloc_node_noprof(size_t size, gfp_t flags, int node) __alloc_size(1);

void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node) __alloc_size(1);

#define kvmalloc_node_noprof(size, flags, node)	\

	__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(size, NULL), flags, node)

#define kvmalloc_node(...)			alloc_hooks(kvmalloc_node_noprof(__VA_ARGS__))



#define kvmalloc(_size, _flags)			kvmalloc_node(_size, _flags, NUMA_NO_NODE)

mm/util.c

+5 −4
Original line number Diff line number Diff line
@@ -594,9 +594,10 @@ unsigned long vm_mmap(struct file *file, unsigned long addr, 
EXPORT_SYMBOL(vm_mmap);



/**

 * kvmalloc_node - attempt to allocate physically contiguous memory, but upon

 * __kvmalloc_node - attempt to allocate physically contiguous memory, but upon

 * failure, fall back to non-contiguous (vmalloc) allocation.

 * @size: size of the request.

 * @b: which set of kmalloc buckets to allocate from.

 * @flags: gfp mask for the allocation - must be compatible (superset) with GFP_KERNEL.

 * @node: numa node to allocate from

 *
@@ -609,7 +610,7 @@ EXPORT_SYMBOL(vm_mmap); 
 *

 * Return: pointer to the allocated memory of %NULL in case of failure

 */

void *kvmalloc_node_noprof(size_t size, gfp_t flags, int node)

void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node)

{

	gfp_t kmalloc_flags = flags;

	void *ret;
@@ -631,7 +632,7 @@ void *kvmalloc_node_noprof(size_t size, gfp_t flags, int node) 
		kmalloc_flags &= ~__GFP_NOFAIL;

	}



	ret = kmalloc_node_noprof(size, kmalloc_flags, node);

	ret = __kmalloc_node_noprof(PASS_BUCKET_PARAMS(size, b), kmalloc_flags, node);



	/*

	 * It doesn't really make sense to fallback to vmalloc for sub page
@@ -660,7 +661,7 @@ void *kvmalloc_node_noprof(size_t size, gfp_t flags, int node) 
			flags, PAGE_KERNEL, VM_ALLOW_HUGE_VMAP,

			node, __builtin_return_address(0));

}

EXPORT_SYMBOL(kvmalloc_node_noprof);

EXPORT_SYMBOL(__kvmalloc_node_noprof);



/**

 * kvfree() - Free memory.