From: Mel Gorman <mgorman@suse.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Linux-MM <linux-mm@kvack.org>,
Linux-Netdev <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>, Neil Brown <neilb@suse.de>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mel Gorman <mgorman@suse.de>
Subject: [PATCH 11/14] mm: Micro-optimise slab to avoid a function call
Date: Thu, 6 Oct 2011 13:41:47 +0100 [thread overview]
Message-ID: <1317904910-14095-12-git-send-email-mgorman@suse.de> (raw)
In-Reply-To: <1317904910-14095-1-git-send-email-mgorman@suse.de>
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 <mgorman@suse.de>
---
mm/slab.c | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c
index 25f69ec..31276f9 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -117,6 +117,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>
@@ -985,7 +987,7 @@ static void check_ac_pfmemalloc(struct kmem_cache *cachep,
ac->pfmemalloc = false;
}
-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;
@@ -1032,7 +1034,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)
{
struct slab *slabp;
@@ -1045,6 +1060,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;
}
--
1.7.3.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-10-06 12:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 12:41 [PATCH 00/14] Swap-over-NBD without deadlocking V7 Mel Gorman
2011-10-06 12:41 ` [PATCH 01/14] mm: Serialize access to min_free_kbytes Mel Gorman
2011-10-06 12:41 ` [PATCH 02/14] mm: sl[au]b: Add knowledge of PFMEMALLOC reserve pages Mel Gorman
2011-10-06 12:41 ` [PATCH 03/14] mm: Introduce __GFP_MEMALLOC to allow access to emergency reserves Mel Gorman
2011-10-06 12:41 ` [PATCH 04/14] mm: allow PF_MEMALLOC from softirq context Mel Gorman
2011-10-06 12:41 ` [PATCH 05/14] mm: Ignore mempolicies when using ALLOC_NO_WATERMARK Mel Gorman
2011-10-06 12:41 ` [PATCH 06/14] net: Introduce sk_allocation() to allow addition of GFP flags depending on the individual socket Mel Gorman
2011-10-06 12:41 ` [PATCH 07/14] netvm: Allow the use of __GFP_MEMALLOC by specific sockets Mel Gorman
2011-10-06 12:41 ` [PATCH 08/14] netvm: Allow skb allocation to use PFMEMALLOC reserves Mel Gorman
2011-10-06 12:41 ` [PATCH 09/14] netvm: Propagate page->pfmemalloc to skb Mel Gorman
2011-10-06 12:41 ` [PATCH 10/14] netvm: Set PF_MEMALLOC as appropriate during SKB processing Mel Gorman
2011-10-06 12:41 ` Mel Gorman [this message]
2011-10-06 12:41 ` [PATCH 12/14] nbd: Set SOCK_MEMALLOC for access to PFMEMALLOC reserves Mel Gorman
2011-10-06 12:41 ` [PATCH 13/14] mm: Throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage Mel Gorman
2011-10-06 12:41 ` [PATCH 14/14] mm: Account for the number of times direct reclaimers get throttled Mel Gorman
-- strict thread matches above, loose matches on Subject: below --
2011-09-09 10:57 [PATCH 00/14] Swap-over-NBD without deadlocking v6 Mel Gorman
2011-09-09 10:57 ` [PATCH 11/14] mm: Micro-optimise slab to avoid a function call Mel Gorman
2011-06-20 13:12 [PATCH 00/14] Swap-over-NBD without deadlocking v5 Mel Gorman
2011-06-20 13:12 ` [PATCH 11/14] mm: Micro-optimise slab to avoid a function call Mel Gorman
2011-06-09 8:02 [PATCH 00/14] Swap-over-NBD without deadlocking v4r3 Mel Gorman
2011-06-09 8:02 ` [PATCH 11/14] mm: Micro-optimise slab to avoid a function call Mel Gorman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317904910-14095-12-git-send-email-mgorman@suse.de \
--to=mgorman@suse.de \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).