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>, Alex Shi <alex.shi@intel.com>
Subject: [RFC] Common code 11/12] Move freeing of kmem_cache structure to common code
Date: Fri, 18 May 2012 11:19:17 -0500 [thread overview]
Message-ID: <20120518161933.271404153@linux.com> (raw)
In-Reply-To: 20120518161906.207356777@linux.com
[-- Attachment #1: common_kmem_cache_destroy --]
[-- Type: text/plain, Size: 2350 bytes --]
The freeing action is basically the same in all slab allocators.
Move to the common kmem_cache_destroy() function.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.c | 1 -
mm/slab_common.c | 1 +
mm/slob.c | 2 --
mm/slub.c | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
Index: linux-2.6/mm/slab_common.c
===================================================================
--- linux-2.6.orig/mm/slab_common.c 2012-05-18 03:37:23.772360311 -0500
+++ linux-2.6/mm/slab_common.c 2012-05-18 03:38:54.592358430 -0500
@@ -129,6 +129,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-2.6/mm/slob.c
===================================================================
--- linux-2.6.orig/mm/slob.c 2012-05-18 03:37:23.740360312 -0500
+++ linux-2.6/mm/slob.c 2012-05-18 03:37:48.184359806 -0500
@@ -572,8 +572,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-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-05-18 03:37:23.760360314 -0500
+++ linux-2.6/mm/slub.c 2012-05-18 03:37:48.184359806 -0500
@@ -3175,7 +3175,6 @@ int __kmem_cache_shutdown(struct kmem_ca
void __kmem_cache_destroy(struct kmem_cache *s)
{
- kfree(s);
sysfs_slab_remove(s);
}
Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c 2012-05-18 03:37:23.752360313 -0500
+++ linux-2.6/mm/slab.c 2012-05-18 03:37:48.188359801 -0500
@@ -2088,7 +2088,6 @@ void __kmem_cache_destroy(struct kmem_ca
kfree(l3);
}
}
- kmem_cache_free(kmem_cache, cachep);
}
--
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-18 16:19 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 16:19 [RFC] Common code 00/12] Sl[auo]b: Common functionality V2 Christoph Lameter
2012-05-18 16:19 ` [RFC] Common code 01/12] [slob] define page struct fields used in mm_types.h Christoph Lameter
2012-05-21 8:41 ` Glauber Costa
2012-05-22 14:22 ` JoonSoo Kim
2012-05-22 17:42 ` Christoph Lameter
2012-05-23 14:28 ` JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 02/12] [slab]: Use page struct fields instead of casting Christoph Lameter
2012-05-22 14:28 ` JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 03/12] Extract common fields from struct kmem_cache Christoph Lameter
2012-05-21 9:21 ` Glauber Costa
2012-05-22 14:39 ` JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 04/12] slabs: Extract common code for kmem_cache_create Christoph Lameter
2012-05-21 9:24 ` Glauber Costa
2012-05-21 13:48 ` Christoph Lameter
2012-05-22 15:08 ` JoonSoo Kim
2012-05-22 15:23 ` Glauber Costa
2012-05-22 17:49 ` Christoph Lameter
2012-05-18 16:19 ` [RFC] Common code 05/12] slabs: Common definition for boot state of the slab allocators Christoph Lameter
2012-05-21 9:26 ` Glauber Costa
2012-05-22 15:34 ` JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 06/12] slabs: Use a common mutex definition Christoph Lameter
2012-05-22 15:44 ` JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 07/12] slabs: Move kmem_cache_create mutex handling to common code Christoph Lameter
2012-05-22 16:19 ` JoonSoo Kim
2012-05-22 17:51 ` Christoph Lameter
2012-05-18 16:19 ` [RFC] Common code 09/12] slabs: Extract a common function for kmem_cache_destroy Christoph Lameter
2012-05-21 9:34 ` Glauber Costa
2012-05-21 18:13 ` Christoph Lameter
2012-05-21 19:19 ` Glauber Costa
2012-05-21 19:31 ` Christoph Lameter
2012-05-21 20:06 ` Glauber Costa
2012-05-21 20:54 ` Christoph Lameter
2012-05-23 15:39 ` JoonSoo Kim
2012-05-23 15:42 ` Christoph Lameter
2012-05-18 16:19 ` [RFC] Common code 10/12] sl[aub]: Use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-05-21 9:35 ` Glauber Costa
2012-05-23 16:17 ` JoonSoo Kim
2012-05-18 16:19 ` Christoph Lameter [this message]
2012-05-23 16:17 ` [RFC] Common code 11/12] Move freeing of kmem_cache structure to common code JoonSoo Kim
2012-05-18 16:19 ` [RFC] Common code 12/12] [slauob]: Get rid of __kmem_cache_destroy Christoph Lameter
2012-05-23 16:42 ` JoonSoo Kim
[not found] ` <20120518161931.570041085@linux.com>
2012-05-21 9:27 ` [RFC] Common code 08/12] slabs: list addition move to slab_common Glauber Costa
2012-05-22 16:22 ` JoonSoo Kim
2012-05-21 9:38 ` [RFC] Common code 00/12] Sl[auo]b: Common functionality V2 Glauber Costa
2012-05-21 13:51 ` Christoph Lameter
2012-05-21 14:15 ` Glauber Costa
2012-06-11 2:25 ` Alex Shi
2012-06-29 3:17 ` Alex Shi
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=20120518161933.271404153@linux.com \
--to=cl@linux.com \
--cc=alex.shi@intel.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).