From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>,
Matt Mackall <mpm@selenic.com>,
Glauber Costa <glommer@parallels.com>,
Joonsoo Kim <js1304@gmail.com>
Subject: Common [3/9] Move list_add() to slab_common.c
Date: Tue, 31 Jul 2012 12:36:23 -0500 [thread overview]
Message-ID: <20120731173635.305083019@linux.com> (raw)
In-Reply-To: 20120731173620.432853182@linux.com
[-- Attachment #1: move_list_add --]
[-- Type: text/plain, Size: 3247 bytes --]
Move the code to append the new kmem_cache to the list of slab caches to
the kmem_cache_create code in the shared code.
This is possible now since the acquisition of the mutex was moved into
kmem_cache_create().
Reviewed-by: Glauber Costa <glommer@parallels.com>
Reviewed-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.c | 7 +++++--
mm/slab_common.c | 7 +++++++
mm/slub.c | 2 --
3 files changed, 12 insertions(+), 4 deletions(-)
Index: linux-2.6/mm/slab_common.c
===================================================================
--- linux-2.6.orig/mm/slab_common.c 2012-07-31 11:57:06.959870010 -0500
+++ linux-2.6/mm/slab_common.c 2012-07-31 11:59:47.226589653 -0500
@@ -98,6 +98,13 @@
s = __kmem_cache_create(name, size, align, flags, ctor);
+ /*
+ * Check if the slab has actually been created and if it was a
+ * real instatiation. Aliases do not belong on the list
+ */
+ if (s && s->refcount == 1)
+ list_add(&s->list, &slab_caches);
+
#ifdef CONFIG_DEBUG_VM
oops:
#endif
Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c 2012-07-31 11:46:01.524493044 -0500
+++ linux-2.6/mm/slab.c 2012-07-31 11:59:47.226589653 -0500
@@ -1538,6 +1538,7 @@
ARCH_KMALLOC_FLAGS|SLAB_PANIC,
NULL);
+ list_add(&sizes[INDEX_AC].cs_cachep->list, &slab_caches);
if (INDEX_AC != INDEX_L3) {
sizes[INDEX_L3].cs_cachep =
__kmem_cache_create(names[INDEX_L3].name,
@@ -1545,6 +1546,7 @@
ARCH_KMALLOC_MINALIGN,
ARCH_KMALLOC_FLAGS|SLAB_PANIC,
NULL);
+ list_add(&sizes[INDEX_L3].cs_cachep->list, &slab_caches);
}
slab_early_init = 0;
@@ -1563,6 +1565,7 @@
ARCH_KMALLOC_MINALIGN,
ARCH_KMALLOC_FLAGS|SLAB_PANIC,
NULL);
+ list_add(&sizes->cs_cachep->list, &slab_caches);
}
#ifdef CONFIG_ZONE_DMA
sizes->cs_dmacachep = __kmem_cache_create(
@@ -1572,6 +1575,7 @@
ARCH_KMALLOC_FLAGS|SLAB_CACHE_DMA|
SLAB_PANIC,
NULL);
+ list_add(&sizes->cs_dmacachep->list, &slab_caches);
#endif
sizes++;
names++;
@@ -2432,6 +2436,7 @@
}
cachep->ctor = ctor;
cachep->name = name;
+ cachep->refcount = 1;
if (setup_cpu_cache(cachep, gfp)) {
__kmem_cache_destroy(cachep);
@@ -2448,8 +2453,6 @@
slab_set_debugobj_lock_classes(cachep);
}
- /* cache setup completed, link it into the list */
- list_add(&cachep->list, &slab_caches);
return cachep;
}
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-07-31 11:58:47.529574942 -0500
+++ linux-2.6/mm/slub.c 2012-07-31 11:59:47.226589653 -0500
@@ -3944,7 +3944,6 @@
size, align, flags, ctor)) {
int r;
- list_add(&s->list, &slab_caches);
mutex_unlock(&slab_mutex);
r = sysfs_slab_add(s);
mutex_lock(&slab_mutex);
@@ -3952,7 +3951,6 @@
if (!r)
return s;
- list_del(&s->list);
kmem_cache_close(s);
}
kfree(s);
--
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-07-31 17:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 17:36 Common [0/9] Sl[auo]b: Common code rework V7 Christoph Lameter
2012-07-31 17:36 ` Common [1/9] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-07-31 17:36 ` Common [2/9] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-08-01 8:42 ` Glauber Costa
2012-08-01 18:05 ` Christoph Lameter
2012-07-31 17:36 ` Christoph Lameter [this message]
2012-07-31 17:36 ` Common [4/9] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-07-31 17:36 ` Common [5/9] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-07-31 17:36 ` Common [6/9] Move freeing of kmem_cache structure to common code Christoph Lameter
2012-07-31 17:36 ` Common [7/9] Get rid of __kmem_cache_destroy Christoph Lameter
2012-07-31 17:36 ` Common [8/9] Move duping of slab name to slab_common.c Christoph Lameter
2012-07-31 18:02 ` Christoph Lameter
2012-07-31 17:36 ` Common [9/9] Do slab aliasing call from common code Christoph Lameter
2012-08-02 7:24 ` Glauber Costa
2012-08-02 13:57 ` Christoph Lameter
2012-08-02 13:58 ` Glauber Costa
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=20120731173635.305083019@linux.com \
--to=cl@linux.com \
--cc=glommer@parallels.com \
--cc=js1304@gmail.com \
--cc=linux-mm@kvack.org \
--cc=mpm@selenic.com \
--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).