From: cl@linux.com
From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>
Subject: [Slub cleanup 9/9] slub: pass page to node_match() instead of kmem_cache_cpu structure
Date: Wed, 09 May 2012 10:09:59 -0500 [thread overview]
Message-ID: <20120509151011.835746458@linux.com> (raw)
In-Reply-To: 20120509150950.243797150@linux.com
[-- Attachment #1: page_parameter_to_node_match --]
[-- Type: text/plain, Size: 1991 bytes --]
Avoid passing the kmem_cache_cpu pointer to node_match. This makes the
node_match function more generic and easier to understand.
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slub.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-04-10 10:33:26.850750391 -0500
+++ linux-2.6/mm/slub.c 2012-04-10 10:33:32.078750283 -0500
@@ -2050,10 +2050,10 @@ static void flush_all(struct kmem_cache
* Check if the objects in a per cpu structure fit numa
* locality expectations.
*/
-static inline int node_match(struct kmem_cache_cpu *c, int node)
+static inline int node_match(struct page *page, int node)
{
#ifdef CONFIG_NUMA
- if (node != NUMA_NO_NODE && page_to_nid(c->page) != node)
+ if (node != NUMA_NO_NODE && page_to_nid(page) != node)
return 0;
#endif
return 1;
@@ -2226,7 +2226,7 @@ static void *__slab_alloc(struct kmem_ca
goto new_slab;
redo:
- if (unlikely(!node_match(c, node))) {
+ if (unlikely(!node_match(page, node))) {
stat(s, ALLOC_NODE_MISMATCH);
deactivate_slab(s, page, c->freelist);
c->page = NULL;
@@ -2313,6 +2313,7 @@ static __always_inline void *slab_alloc(
{
void **object;
struct kmem_cache_cpu *c;
+ struct page *page;
unsigned long tid;
if (slab_pre_alloc_hook(s, gfpflags))
@@ -2338,7 +2339,8 @@ redo:
barrier();
object = c->freelist;
- if (unlikely(!object || !node_match(c, node)))
+ page = c->page;
+ if (unlikely(!object || !node_match(page, node)))
object = __slab_alloc(s, gfpflags, node, addr, c);
--
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:[~2012-05-09 15:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 15:09 [Slub cleanup 0/9] Slub: cleanups V2 cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 1/9] slub: Use freelist instead of "object" in __slab_alloc cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 2/9] slub: Add frozen check " cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 3/9] slub: Acquire_slab() avoid loop cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 4/9] slub: Simplify control flow in __slab_alloc() cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 5/9] slub: new_slab_objects() can also get objects from partial list cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 6/9] slub: Get rid of the node field cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 7/9] slub: Separate out kmem_cache_cpu processing from deactivate_slab cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 8/9] slub: Use page variable instead of c->page cl, Christoph Lameter
2012-05-09 15:09 ` cl, Christoph Lameter [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-23 20:16 [Slub cleanup 0/9] Slub: cleanups V1 Christoph Lameter
2012-01-23 20:16 ` [Slub cleanup 9/9] slub: pass page to node_match() instead of kmem_cache_cpu structure Christoph Lameter
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=20120509151011.835746458@linux.com \
--to=cl@linux.com \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
/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).