Skip to content

Commit

Permalink
mm: micro-optimise slab to avoid a function call
Browse files Browse the repository at this point in the history
Getting and putting objects in SLAB currently requires a function call but
the bulk of the work is related to PFMEMALLOC reserves which are only
consumed when network-backed storage is critical.  Use an inline function
to determine if the function call is required.

Signed-off-by: Mel Gorman <[email protected]>
Cc: David Miller <[email protected]>
Cc: Neil Brown <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Christie <[email protected]>
Cc: Eric B Munson <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Sebastian Andrzej Siewior <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Christoph Lameter <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Mel Gorman authored and torvalds committed Aug 1, 2012
1 parent b4b9e35 commit 381760e
Showing 1 changed file with 26 additions and 2 deletions.
28 changes: 26 additions & 2 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
#include <linux/memory.h>
#include <linux/prefetch.h>

#include <net/sock.h>

#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/page.h>
Expand Down Expand Up @@ -965,7 +967,7 @@ static void recheck_pfmemalloc_active(struct kmem_cache *cachep,
spin_unlock_irqrestore(&l3->list_lock, flags);
}

static void *ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
static void *__ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
gfp_t flags, bool force_refill)
{
int i;
Expand Down Expand Up @@ -1012,7 +1014,20 @@ static void *ac_get_obj(struct kmem_cache *cachep, struct array_cache *ac,
return objp;
}

static void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
static inline void *ac_get_obj(struct kmem_cache *cachep,
struct array_cache *ac, gfp_t flags, bool force_refill)
{
void *objp;

if (unlikely(sk_memalloc_socks()))
objp = __ac_get_obj(cachep, ac, flags, force_refill);
else
objp = ac->entry[--ac->avail];

return objp;
}

static void *__ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
void *objp)
{
if (unlikely(pfmemalloc_active)) {
Expand All @@ -1022,6 +1037,15 @@ static void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
set_obj_pfmemalloc(&objp);
}

return objp;
}

static inline void ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
void *objp)
{
if (unlikely(sk_memalloc_socks()))
objp = __ac_put_obj(cachep, ac, objp);

ac->entry[ac->avail++] = objp;
}

Expand Down

0 comments on commit 381760e

Please sign in to comment.