[RFC,v1,04/15] mm/sl[auo]b: fold kmalloc_order() into kmalloc_large()

Commit Message

Hyeonggon Yoo March 8, 2022, 11:41 a.m. UTC

There is no caller of kmalloc_order() except kmalloc_large().
Fold it into kmalloc_large() and remove kmalloc_order{,_trace}().

Signed-off-by: Hyeonggon Yoo <[e-mail]>
---
 include/linux/slab.h | 13 ++-----------
 mm/slab_common.c     | 12 +++---------
 2 files changed, 5 insertions(+), 20 deletions(-)

Comments

Vlastimil Babka March 24, 2022, 4:27 p.m. UTC | #1

subject prefix could be mm/slab_common

On 3/8/22 12:41, Hyeonggon Yoo wrote:
> There is no caller of kmalloc_order() except kmalloc_large().
> Fold it into kmalloc_large() and remove kmalloc_order{,_trace}().
> 
> Signed-off-by: Hyeonggon Yoo <[e-mail]>

Reviewed-by: Vlastimil Babka <[e-mail]>

Patch

diff --git a/include/linux/slab.h b/include/linux/slab.h
index a5e3ad058817..aa14aba2b068 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -467,17 +467,8 @@  extern void *kmem_cache_alloc_node_trace(struct kmem_cache *s, gfp_t gfpflags,
 					 int node, size_t size) __assume_slab_alignment
 								__alloc_size(4);
 
-extern void *kmalloc_order(size_t size, gfp_t flags, unsigned int order) __assume_page_alignment
-									 __alloc_size(1);
-
-extern void *kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
-				__assume_page_alignment __alloc_size(1);
-
-static __always_inline __alloc_size(1) void *kmalloc_large(size_t size, gfp_t flags)
-{
-	unsigned int order = get_order(size);
-	return kmalloc_order_trace(size, flags, order);
-}
+extern void *kmalloc_large(size_t size, gfp_t flags) __assume_page_alignment
+						     __alloc_size(1);
 
 /**
  * kmalloc - allocate memory
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 2edb77056adc..1ba479f9d143 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -932,10 +932,11 @@  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_order(size_t size, gfp_t flags, unsigned int order)
+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);
@@ -950,17 +951,10 @@  void *kmalloc_order(size_t size, gfp_t flags, unsigned int order)
 	ret = kasan_kmalloc_large(ret, size, flags);
 	/* As ret might get tagged, call kmemleak hook after KASAN. */
 	kmemleak_alloc(ret, size, 1, flags);
-	return ret;
-}
-EXPORT_SYMBOL(kmalloc_order);
-
-void *kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
-{
-	void *ret = kmalloc_order(size, flags, order);
 	trace_kmalloc(_RET_IP_, ret, size, PAGE_SIZE << order, flags);
 	return ret;
 }
-EXPORT_SYMBOL(kmalloc_order_trace);
+EXPORT_SYMBOL(kmalloc_large);
 
 #ifdef CONFIG_SLAB_FREELIST_RANDOM
 /* Randomize a generic freelist */