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

mm/slub: move kmalloc_large_node() to slab_common.c 



In later patch SLAB will also pass requests larger than order-1 page
to page allocator. Move kmalloc_large_node() to slab_common.c.

Fold kmalloc_large_node_hook() into kmalloc_large_node() as there is
no other caller.

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 e4c98d68

include/linux/slab.h

+4 −0
Original line number Diff line number Diff line
@@ -491,6 +491,10 @@ static __always_inline void *kmem_cache_alloc_node_trace(struct kmem_cache *s, g 


void *kmalloc_large(size_t size, gfp_t flags) __assume_page_alignment

					      __alloc_size(1);



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

							     __alloc_size(1);



/**

 * kmalloc - allocate memory

 * @size: how many bytes of memory are required.

mm/slab_common.c

+22 −0
Original line number Diff line number Diff line
@@ -928,6 +928,28 @@ void *kmalloc_large(size_t size, gfp_t flags) 
}

EXPORT_SYMBOL(kmalloc_large);



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

{

	struct page *page;

	void *ptr = NULL;

	unsigned int order = get_order(size);



	flags |= __GFP_COMP;

	page = alloc_pages_node(node, flags, order);

	if (page) {

		ptr = page_address(page);

		mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B,

				      PAGE_SIZE << order);

	}



	ptr = kasan_kmalloc_large(ptr, size, flags);

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

	kmemleak_alloc(ptr, size, 1, flags);



	return ptr;

}

EXPORT_SYMBOL(kmalloc_large_node);



#ifdef CONFIG_SLAB_FREELIST_RANDOM

/* Randomize a generic freelist */

static void freelist_randomize(struct rnd_state *state, unsigned int *list,

mm/slub.c

+0 −25
Original line number Diff line number Diff line
@@ -1704,14 +1704,6 @@ static bool freelist_corrupted(struct kmem_cache *s, struct slab *slab, 
 * Hooks for other subsystems that check memory allocations. In a typical

 * production configuration these hooks all should produce no code at all.

 */

static inline void *kmalloc_large_node_hook(void *ptr, size_t size, gfp_t flags)

{

	ptr = kasan_kmalloc_large(ptr, size, flags);

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

	kmemleak_alloc(ptr, size, 1, flags);

	return ptr;

}



static __always_inline void kfree_hook(void *x)

{

	kmemleak_free(x);
@@ -4402,23 +4394,6 @@ static int __init setup_slub_min_objects(char *str) 


__setup("slub_min_objects=", setup_slub_min_objects);



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

{

	struct page *page;

	void *ptr = NULL;

	unsigned int order = get_order(size);



	flags |= __GFP_COMP;

	page = alloc_pages_node(node, flags, order);

	if (page) {

		ptr = page_address(page);

		mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B,

				      PAGE_SIZE << order);

	}



	return kmalloc_large_node_hook(ptr, size, flags);

}



static __always_inline

void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)

{