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 [2/9] slub: Use kmem_cache for the kmem_cache structure
Date: Tue, 31 Jul 2012 12:36:22 -0500 [thread overview]
Message-ID: <20120731173634.744568366@linux.com> (raw)
In-Reply-To: 20120731173620.432853182@linux.com
[-- Attachment #1: slub_use_kmem_cache --]
[-- Type: text/plain, Size: 1198 bytes --]
Do not use kmalloc() but kmem_cache_alloc() for the allocation
of the kmem_cache structures in slub.
This is the way its supposed to be. Recent merges lost
the freeing of the kmem_cache structure and so this is also
fixing memory leak on kmem_cache_destroy() by adding
the missing free action to sysfs_slab_remove().
Signed-off-by: Christoph Lameter <cl@linux.com>
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-07-31 11:58:40.617457553 -0500
+++ linux-2.6/mm/slub.c 2012-07-31 11:58:47.529574942 -0500
@@ -3938,7 +3938,7 @@
if (!n)
return NULL;
- s = kmalloc(kmem_size, GFP_KERNEL);
+ s = kmem_cache_alloc(kmem_cache, GFP_KERNEL);
if (s) {
if (kmem_cache_open(s, n,
size, align, flags, ctor)) {
@@ -5318,6 +5318,8 @@
kobject_uevent(&s->kobj, KOBJ_REMOVE);
kobject_del(&s->kobj);
kobject_put(&s->kobj);
+ kfree(s->name);
+ kmem_cache_free(kmem_cache, 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 ` Christoph Lameter [this message]
2012-08-01 8:42 ` Common [2/9] slub: Use kmem_cache for the kmem_cache structure Glauber Costa
2012-08-01 18:05 ` Christoph Lameter
2012-07-31 17:36 ` Common [3/9] Move list_add() to slab_common.c Christoph Lameter
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=20120731173634.744568366@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).