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 [07/14] Move freeing of kmem_cache structure to common code
Date: Wed, 5 Sep 2012 00:18:32 +0000 [thread overview]
Message-ID: <0000013993cae9f6-83e048c2-669a-46f2-9590-ed0afb78ff4a-000000@email.amazonses.com> (raw)
In-Reply-To: <20120904230609.691088980@linux.com>
The freeing action is basically the same in all slab allocators.
Move to the common kmem_cache_destroy() function.
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 | 1 -
mm/slab_common.c | 1 +
mm/slob.c | 2 --
mm/slub.c | 2 --
4 files changed, 1 insertion(+), 5 deletions(-)
Index: linux/mm/slab.c
===================================================================
--- linux.orig/mm/slab.c 2012-09-04 18:00:16.774081296 -0500
+++ linux/mm/slab.c 2012-09-04 18:01:56.855643242 -0500
@@ -2225,7 +2225,6 @@ void __kmem_cache_destroy(struct kmem_ca
kfree(l3);
}
}
- kmem_cache_free(kmem_cache, cachep);
}
Index: linux/mm/slab_common.c
===================================================================
--- linux.orig/mm/slab_common.c 2012-09-04 18:00:16.774081296 -0500
+++ linux/mm/slab_common.c 2012-09-04 18:01:56.871643489 -0500
@@ -154,6 +154,7 @@ void kmem_cache_destroy(struct kmem_cach
rcu_barrier();
__kmem_cache_destroy(s);
+ kmem_cache_free(kmem_cache, s);
} else {
list_add(&s->list, &slab_caches);
printk(KERN_ERR "kmem_cache_destroy %s: Slab cache still has objects\n",
Index: linux/mm/slob.c
===================================================================
--- linux.orig/mm/slob.c 2012-09-04 18:00:16.774081296 -0500
+++ linux/mm/slob.c 2012-09-04 18:01:56.863643366 -0500
@@ -540,8 +540,6 @@ struct kmem_cache *__kmem_cache_create(c
void __kmem_cache_destroy(struct kmem_cache *c)
{
- kmemleak_free(c);
- slob_free(c, sizeof(struct kmem_cache));
}
void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
Index: linux/mm/slub.c
===================================================================
--- linux.orig/mm/slub.c 2012-09-04 18:00:16.778081353 -0500
+++ linux/mm/slub.c 2012-09-04 18:01:56.883643678 -0500
@@ -213,7 +213,6 @@ static inline int sysfs_slab_alias(struc
static inline void sysfs_slab_remove(struct kmem_cache *s)
{
kfree(s->name);
- kmem_cache_free(kmem_cache, s);
}
#endif
@@ -5206,7 +5205,6 @@ static void kmem_cache_release(struct ko
struct kmem_cache *s = to_slab(kobj);
kfree(s->name);
- kmem_cache_free(kmem_cache, s);
}
static const struct sysfs_ops slab_sysfs_ops = {
--
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 [13/14] Shrink __kmem_cache_create() parameter lists 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 [05/14] Extract a common function for 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-04 23:38 ` C14 [08/14] Get rid of __kmem_cache_destroy Christoph Lameter
2012-09-04 23:38 ` C14 [04/14] Move list_add() to slab_common.c Christoph Lameter
2012-09-05 0:18 ` Christoph Lameter [this message]
2012-09-05 0:18 ` C14 [11/14] Move sysfs_slab_add to common Christoph Lameter
2012-09-05 0:18 ` C14 [10/14] Do slab aliasing call from common code 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 [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 [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=0000013993cae9f6-83e048c2-669a-46f2-9590-ed0afb78ff4a-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