Commit c4cab557 authored by Hyeonggon Yoo's avatar Hyeonggon Yoo Committed by Vlastimil Babka
Browse files

mm/slab_common: cleanup kmalloc_large() 



Now that kmalloc_large() and kmalloc_large_node() do mostly same job,
make kmalloc_large() wrapper of kmalloc_large_node_notrace().

In the meantime, add missing flag fix code in
kmalloc_large_node_notrace().

Signed-off-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent bf37d791

mm/slab_common.c

+13 −22
Original line number Diff line number Diff line
@@ -905,28 +905,6 @@ gfp_t kmalloc_fix_flags(gfp_t flags) 
 * directly to the page allocator. We use __GFP_COMP, because we will need to

 * know the allocation order to free the pages properly in kfree.

 */

void *kmalloc_large(size_t size, gfp_t flags)

{

	void *ret = NULL;

	struct page *page;

	unsigned int order = get_order(size);



	if (unlikely(flags & GFP_SLAB_BUG_MASK))

		flags = kmalloc_fix_flags(flags);



	page = alloc_pages(flags | __GFP_COMP, order);

	if (likely(page)) {

		ret = page_address(page);

		mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B,

				      PAGE_SIZE << order);

	}

	ret = kasan_kmalloc_large(ret, size, flags);

	/* As ret might get tagged, call kmemleak hook after KASAN. */

	kmemleak_alloc(ret, size, 1, flags);

	trace_kmalloc(_RET_IP_, ret, NULL, size, PAGE_SIZE << order, flags);

	return ret;

}

EXPORT_SYMBOL(kmalloc_large);



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

{
@@ -934,6 +912,9 @@ void *kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) 
	void *ptr = NULL;

	unsigned int order = get_order(size);



	if (unlikely(flags & GFP_SLAB_BUG_MASK))

		flags = kmalloc_fix_flags(flags);



	flags |= __GFP_COMP;

	page = alloc_pages_node(node, flags, order);

	if (page) {
@@ -949,6 +930,16 @@ void *kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) 
	return ptr;

}



void *kmalloc_large(size_t size, gfp_t flags)

{

	void *ret = kmalloc_large_node_notrace(size, flags, NUMA_NO_NODE);



	trace_kmalloc(_RET_IP_, ret, NULL, size,

		      PAGE_SIZE << get_order(size), flags);

	return ret;

}

EXPORT_SYMBOL(kmalloc_large);



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

{

	void *ret = kmalloc_large_node_notrace(size, flags, node);