tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

slub: kmalloc page allocator pass-through cleanup

This adds a proper function for kmalloc page allocator pass-through. While it
simplifies any code that does slab tracing code a lot, I think it's a
worthwhile cleanup in itself.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>

authored by

Pekka Enberg and committed by
Christoph Lameter eada35ef e51bfd0a

+12 -10
unified split
+6 -2
include/linux/slub_def.h
··· 188 void *kmem_cache_alloc(struct kmem_cache *, gfp_t); 189 void *__kmalloc(size_t size, gfp_t flags); 190 191 static __always_inline void *kmalloc(size_t size, gfp_t flags) 192 { 193 if (__builtin_constant_p(size)) { 194 if (size > PAGE_SIZE / 2) 195 - return (void *)__get_free_pages(flags | __GFP_COMP, 196 - get_order(size)); 197 198 if (!(flags & SLUB_DMA)) { 199 struct kmem_cache *s = kmalloc_slab(size);
··· 188 void *kmem_cache_alloc(struct kmem_cache *, gfp_t); 189 void *__kmalloc(size_t size, gfp_t flags); 190 191 + static __always_inline void *kmalloc_large(size_t size, gfp_t flags) 192 + { 193 + return (void *)__get_free_pages(flags | __GFP_COMP, get_order(size)); 194 + } 195 + 196 static __always_inline void *kmalloc(size_t size, gfp_t flags) 197 { 198 if (__builtin_constant_p(size)) { 199 if (size > PAGE_SIZE / 2) 200 + return kmalloc_large(size, flags); 201 202 if (!(flags & SLUB_DMA)) { 203 struct kmem_cache *s = kmalloc_slab(size);
+6 -8
mm/slub.c
··· 2671 struct kmem_cache *s; 2672 2673 if (unlikely(size > PAGE_SIZE / 2)) 2674 - return (void *)__get_free_pages(flags | __GFP_COMP, 2675 - get_order(size)); 2676 2677 s = get_slab(size, flags); 2678 ··· 2688 struct kmem_cache *s; 2689 2690 if (unlikely(size > PAGE_SIZE / 2)) 2691 - return (void *)__get_free_pages(flags | __GFP_COMP, 2692 - get_order(size)); 2693 2694 s = get_slab(size, flags); 2695 ··· 3217 struct kmem_cache *s; 3218 3219 if (unlikely(size > PAGE_SIZE / 2)) 3220 - return (void *)__get_free_pages(gfpflags | __GFP_COMP, 3221 - get_order(size)); 3222 s = get_slab(size, gfpflags); 3223 3224 if (unlikely(ZERO_OR_NULL_PTR(s))) ··· 3233 struct kmem_cache *s; 3234 3235 if (unlikely(size > PAGE_SIZE / 2)) 3236 - return (void *)__get_free_pages(gfpflags | __GFP_COMP, 3237 - get_order(size)); 3238 s = get_slab(size, gfpflags); 3239 3240 if (unlikely(ZERO_OR_NULL_PTR(s)))
··· 2671 struct kmem_cache *s; 2672 2673 if (unlikely(size > PAGE_SIZE / 2)) 2674 + return kmalloc_large(size, flags); 2675 2676 s = get_slab(size, flags); 2677 ··· 2689 struct kmem_cache *s; 2690 2691 if (unlikely(size > PAGE_SIZE / 2)) 2692 + return kmalloc_large(size, flags); 2693 2694 s = get_slab(size, flags); 2695 ··· 3219 struct kmem_cache *s; 3220 3221 if (unlikely(size > PAGE_SIZE / 2)) 3222 + return kmalloc_large(size, gfpflags); 3223 + 3224 s = get_slab(size, gfpflags); 3225 3226 if (unlikely(ZERO_OR_NULL_PTR(s))) ··· 3235 struct kmem_cache *s; 3236 3237 if (unlikely(size > PAGE_SIZE / 2)) 3238 + return kmalloc_large(size, gfpflags); 3239 + 3240 s = get_slab(size, gfpflags); 3241 3242 if (unlikely(ZERO_OR_NULL_PTR(s)))