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: C14 [11/14] Move sysfs_slab_add to common
Date: Wed, 5 Sep 2012 00:18:32 +0000 [thread overview]
Message-ID: <0000013993cae9d0-0682a7ce-0ba1-4361-acab-e31af05c2ab8-000000@email.amazonses.com> (raw)
In-Reply-To: <20120904230609.691088980@linux.com>
Simplify locking by moving the slab_add_sysfs after all locks
have been dropped. Eases the upcoming move to provide sysfs
support for all allocators.
Reviewed-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.h | 3 +++
mm/slab_common.c | 8 ++++++++
mm/slub.c | 15 ++-------------
3 files changed, 13 insertions(+), 13 deletions(-)
Index: linux/mm/slab.h
===================================================================
--- linux.orig/mm/slab.h 2012-09-04 18:00:16.830082166 -0500
+++ linux/mm/slab.h 2012-09-04 18:01:54.227602225 -0500
@@ -39,10 +39,13 @@ struct kmem_cache *__kmem_cache_create(c
#ifdef CONFIG_SLUB
struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
size_t align, unsigned long flags, void (*ctor)(void *));
+extern int sysfs_slab_add(struct kmem_cache *s);
#else
static inline struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
size_t align, unsigned long flags, void (*ctor)(void *))
{ return NULL; }
+static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; }
+
#endif
Index: linux/mm/slab_common.c
===================================================================
--- linux.orig/mm/slab_common.c 2012-09-04 18:00:16.830082166 -0500
+++ linux/mm/slab_common.c 2012-09-04 18:01:54.255602662 -0500
@@ -152,6 +152,14 @@ out_locked:
return NULL;
}
+ if (s->refcount == 1) {
+ err = sysfs_slab_add(s);
+ if (err)
+ printk(KERN_WARNING "kmem_cache_create(%s) failed to"
+ " create sysfs entry. Error %d\n",
+ name, err);
+ }
+
return s;
}
EXPORT_SYMBOL(kmem_cache_create);
Index: linux/mm/slub.c
===================================================================
--- linux.orig/mm/slub.c 2012-09-04 18:00:16.830082166 -0500
+++ linux/mm/slub.c 2012-09-04 18:01:54.267602849 -0500
@@ -202,12 +202,10 @@ struct track {
enum track_item { TRACK_ALLOC, TRACK_FREE };
#ifdef CONFIG_SYSFS
-static int sysfs_slab_add(struct kmem_cache *);
static int sysfs_slab_alias(struct kmem_cache *, const char *);
static void sysfs_slab_remove(struct kmem_cache *);
#else
-static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; }
static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p)
{ return 0; }
static inline void sysfs_slab_remove(struct kmem_cache *s) { }
@@ -3955,16 +3953,7 @@ struct kmem_cache *__kmem_cache_create(c
if (s) {
if (kmem_cache_open(s, name,
size, align, flags, ctor)) {
- int r;
-
- mutex_unlock(&slab_mutex);
- r = sysfs_slab_add(s);
- mutex_lock(&slab_mutex);
-
- if (!r)
- return s;
-
- kmem_cache_close(s);
+ return s;
}
kmem_cache_free(kmem_cache, s);
}
@@ -5258,7 +5247,7 @@ static char *create_unique_id(struct kme
return name;
}
-static int sysfs_slab_add(struct kmem_cache *s)
+int sysfs_slab_add(struct kmem_cache *s)
{
int err;
const char *name;
--
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-09-05 0:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120904230609.691088980@linux.com>
2012-09-04 23:06 ` C14 [01/14] [PATCH 10/28] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-09-04 23:06 ` C14 [02/14] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-09-04 23:18 ` C14 [05/14] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-09-04 23:18 ` C14 [09/14] Move duping of slab name to slab_common.c Christoph Lameter
2012-09-04 23:18 ` C14 [13/14] Shrink __kmem_cache_create() parameter lists Christoph Lameter
2012-09-04 23:38 ` C14 [04/14] Move list_add() to slab_common.c Christoph Lameter
2012-09-04 23:38 ` C14 [08/14] Get rid of __kmem_cache_destroy Christoph Lameter
2012-09-04 23:38 ` C14 [14/14] [PATCH 23/28] Move kmem_cache refcounting to common code Christoph Lameter
2012-09-05 0:18 ` C14 [10/14] Do slab aliasing call from " Christoph Lameter
2012-09-05 0:18 ` Christoph Lameter [this message]
2012-09-05 0:18 ` C14 [07/14] Move freeing of kmem_cache structure to " Christoph Lameter
2012-09-05 0:20 ` C14 [06/14] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-09-05 0:20 ` C14 [03/14] Improve error handling in kmem_cache_create Christoph Lameter
2012-09-05 0:20 ` C14 [12/14] Move kmem_cache allocations into common code 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=0000013993cae9d0-0682a7ce-0ba1-4361-acab-e31af05c2ab8-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