diff options
| author | Jesper Dangaard Brouer | 2016-03-15 22:53:41 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-16 00:55:16 +0100 |
| commit | 011eceaf0ad54e0916df8593ffc27b9f73d89fcf (patch) | |
| tree | 7c396213479f6a982309caaee5945055972f4faf /mm/slab.c | |
| parent | mm: fault-inject take over bootstrap kmem_cache check (diff) | |
| download | kernel-qcow2-linux-011eceaf0ad54e0916df8593ffc27b9f73d89fcf.tar.gz kernel-qcow2-linux-011eceaf0ad54e0916df8593ffc27b9f73d89fcf.tar.xz kernel-qcow2-linux-011eceaf0ad54e0916df8593ffc27b9f73d89fcf.zip | |
slab: use slab_pre_alloc_hook in SLAB allocator shared with SLUB
Deduplicate code in SLAB allocator functions slab_alloc() and
slab_alloc_node() by using the slab_pre_alloc_hook() call, which is now
shared between SLUB and SLAB.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mm/slab.c b/mm/slab.c index 95f344d79453..1857a652c928 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3144,14 +3144,10 @@ slab_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid, int slab_node = numa_mem_id(); flags &= gfp_allowed_mask; - - lockdep_trace_alloc(flags); - - if (should_failslab(cachep, flags)) + cachep = slab_pre_alloc_hook(cachep, flags); + if (unlikely(!cachep)) return NULL; - cachep = memcg_kmem_get_cache(cachep, flags); - cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); @@ -3232,14 +3228,10 @@ slab_alloc(struct kmem_cache *cachep, gfp_t flags, unsigned long caller) void *objp; flags &= gfp_allowed_mask; - - lockdep_trace_alloc(flags); - - if (should_failslab(cachep, flags)) + cachep = slab_pre_alloc_hook(cachep, flags); + if (unlikely(!cachep)) return NULL; - cachep = memcg_kmem_get_cache(cachep, flags); - cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); objp = __do_cache_alloc(cachep, flags); |