From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: Joonsoo Kim <js1304@gmail.com>,
Glauber Costa <glommer@parallels.com>,
linux-mm@kvack.org, David Rientjes <rientjes@google.com>
Subject: C12 [14/19] Move kmem_cache refcounting to common code
Date: Mon, 20 Aug 2012 20:50:39 +0000 [thread overview]
Message-ID: <0000013945cd3125-1c686fa7-3878-4d2a-ab45-fcdbab8ac0f2-000000@email.amazonses.com> (raw)
In-Reply-To: <20120820204021.494276880@linux.com>
Get rid of the refcount stuff in the allocators and do that
part of kmem_cache management in the common code.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.c | 1 -
mm/slab_common.c | 5 +++--
mm/slob.c | 2 --
mm/slub.c | 1 -
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c
index c2c1c88..32ba049 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2543,7 +2543,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
*/
BUG_ON(ZERO_OR_NULL_PTR(cachep->slabp_cache));
}
- cachep->refcount = 1;
err = setup_cpu_cache(cachep, gfp);
if (err) {
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 4640ef65..0dc1cde 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -125,11 +125,12 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
}
err = __kmem_cache_create(s, flags);
- if (!err)
+ if (!err) {
+ s->refcount = 1;
list_add(&s->list, &slab_caches);
- else {
+ } else {
kfree(s->name);
kmem_cache_free(kmem_cache, s);
}
diff --git a/mm/slob.c b/mm/slob.c
index 0df4943..3edfeaa 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -524,8 +524,6 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
if (c->align < align)
c->align = align;
- kmemleak_alloc(c, sizeof(struct kmem_cache), 1, GFP_KERNEL);
- c->refcount = 1;
return 0;
}
diff --git a/mm/slub.c b/mm/slub.c
index 744ba08..e8115c8 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3093,7 +3093,6 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
else
s->cpu_partial = 30;
- s->refcount = 1;
#ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 1000;
#endif
--
1.7.9.5
--
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/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-08-20 20:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120820204021.494276880@linux.com>
2012-08-20 20:47 ` C12 [01/19] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-08-20 20:50 ` C12 [03/19] Improve error handling in kmem_cache_create Christoph Lameter
2012-08-20 20:50 ` C12 [05/19] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-08-20 20:50 ` C12 [04/19] Move list_add() to slab_common.c Christoph Lameter
2012-08-20 20:50 ` C12 [02/19] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-08-20 20:50 ` C12 [01/19] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-08-20 20:50 ` C12 [06/19] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-08-20 20:50 ` C12 [11/19] Move sysfs_slab_add to common Christoph Lameter
2012-08-20 20:50 ` C12 [07/19] Move freeing of kmem_cache structure to common code Christoph Lameter
2012-08-20 20:50 ` C12 [12/19] Move kmem_cache allocations into " Christoph Lameter
2012-08-21 11:55 ` Glauber Costa
2012-08-21 20:58 ` Christoph Lameter
2012-08-22 8:42 ` Glauber Costa
2012-08-22 15:25 ` Christoph Lameter
2012-08-23 7:43 ` Glauber Costa
2012-08-23 13:49 ` Christoph Lameter
2012-08-23 13:57 ` Glauber Costa
2012-08-23 14:31 ` Christoph Lameter
2012-08-20 20:50 ` C12 [09/19] Move duping of slab name to slab_common.c Christoph Lameter
2012-08-20 20:50 ` C12 [10/19] Do slab aliasing call from common code Christoph Lameter
2012-08-20 20:50 ` C12 [13/19] Shrink __kmem_cache_create() parameter lists Christoph Lameter
2012-08-20 20:50 ` C12 [17/19] slub: Use a statically allocated kmem_cache boot structure for bootstrap Christoph Lameter
2012-08-20 20:50 ` C12 [08/19] Get rid of __kmem_cache_destroy Christoph Lameter
2012-08-20 20:50 ` C12 [16/19] Create common functions for boot slab creation Christoph Lameter
2012-08-22 9:26 ` Glauber Costa
2012-08-22 15:35 ` Christoph Lameter
2012-08-23 8:09 ` Glauber Costa
2012-08-23 13:58 ` Christoph Lameter
2012-08-20 20:50 ` Christoph Lameter [this message]
2012-08-20 21:01 ` C12 [19/19] Common alignment code Christoph Lameter
2012-08-20 21:01 ` C12 [15/19] slab: Simplify bootstrap Christoph Lameter
2012-08-20 21:01 ` C12 [18/19] slab: Use the new create_boot_cache function to simplify bootstrap 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=0000013945cd3125-1c686fa7-3878-4d2a-ab45-fcdbab8ac0f2-000000@email.amazonses.com \
--to=cl@linux.com \
--cc=glommer@parallels.com \
--cc=js1304@gmail.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