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 [7/9] Get rid of __kmem_cache_destroy
Date: Tue, 31 Jul 2012 12:36:27 -0500 [thread overview]
Message-ID: <20120731173637.513669218@linux.com> (raw)
In-Reply-To: 20120731173620.432853182@linux.com
[-- Attachment #1: no_slab_specific_kmem_cache_destroy --]
[-- Type: text/plain, Size: 4072 bytes --]
What is done there can be done in __kmem_cache_shutdown.
This affects RCU handling somewhat. On rcu free all slab allocators
do not refer to other management structures than the kmem_cache structure.
Therefore these other structures can be freed before the rcu deferred
free to the page allocator occurs.
Reviewed-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.c | 43 +++++++++++++++++++++----------------------
mm/slab.h | 1 -
mm/slab_common.c | 1 -
mm/slob.c | 4 ----
mm/slub.c | 10 +++++-----
5 files changed, 26 insertions(+), 33 deletions(-)
Index: linux-2.6/mm/slob.c
===================================================================
--- linux-2.6.orig/mm/slob.c 2012-07-31 12:20:10.139685656 -0500
+++ linux-2.6/mm/slob.c 2012-07-31 12:20:56.976501176 -0500
@@ -538,10 +538,6 @@
return c;
}
-void __kmem_cache_destroy(struct kmem_cache *c)
-{
-}
-
void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
{
void *b;
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-07-31 12:20:37.228157295 -0500
+++ linux-2.6/mm/slub.c 2012-07-31 12:20:56.976501176 -0500
@@ -3174,12 +3174,12 @@
int __kmem_cache_shutdown(struct kmem_cache *s)
{
- return kmem_cache_close(s);
-}
+ int rc = kmem_cache_close(s);
-void __kmem_cache_destroy(struct kmem_cache *s)
-{
- sysfs_slab_remove(s);
+ if (!rc)
+ sysfs_slab_remove(s);
+
+ return rc;
}
/********************************************************************
Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c 2012-07-31 12:20:10.143685717 -0500
+++ linux-2.6/mm/slab.c 2012-07-31 12:20:56.976501176 -0500
@@ -2047,26 +2047,6 @@
}
}
-void __kmem_cache_destroy(struct kmem_cache *cachep)
-{
- int i;
- struct kmem_list3 *l3;
-
- for_each_online_cpu(i)
- kfree(cachep->array[i]);
-
- /* NUMA: free the list3 structures */
- for_each_online_node(i) {
- l3 = cachep->nodelists[i];
- if (l3) {
- kfree(l3->shared);
- free_alien_cache(l3->alien);
- kfree(l3);
- }
- }
-}
-
-
/**
* calculate_slab_order - calculate size (page order) of slabs
* @cachep: pointer to the cache that is being created
@@ -2430,7 +2410,7 @@
cachep->refcount = 1;
if (setup_cpu_cache(cachep, gfp)) {
- __kmem_cache_destroy(cachep);
+ __kmem_cache_shutdown(cachep);
return NULL;
}
@@ -2605,7 +2585,26 @@
int __kmem_cache_shutdown(struct kmem_cache *cachep)
{
- return __cache_shrink(cachep);
+ int i;
+ struct kmem_list3 *l3;
+ int rc = __cache_shrink(cachep);
+
+ if (rc)
+ return rc;
+
+ for_each_online_cpu(i)
+ kfree(cachep->array[i]);
+
+ /* NUMA: free the list3 structures */
+ for_each_online_node(i) {
+ l3 = cachep->nodelists[i];
+ if (l3) {
+ kfree(l3->shared);
+ free_alien_cache(l3->alien);
+ kfree(l3);
+ }
+ }
+ return 0;
}
/*
Index: linux-2.6/mm/slab.h
===================================================================
--- linux-2.6.orig/mm/slab.h 2012-07-31 12:17:55.869349816 -0500
+++ linux-2.6/mm/slab.h 2012-07-31 12:20:56.976501176 -0500
@@ -37,6 +37,5 @@
size_t align, unsigned long flags, void (*ctor)(void *));
int __kmem_cache_shutdown(struct kmem_cache *);
-void __kmem_cache_destroy(struct kmem_cache *);
#endif
Index: linux-2.6/mm/slab_common.c
===================================================================
--- linux-2.6.orig/mm/slab_common.c 2012-07-31 12:20:10.139685656 -0500
+++ linux-2.6/mm/slab_common.c 2012-07-31 12:20:56.976501176 -0500
@@ -134,7 +134,6 @@
if (s->flags & SLAB_DESTROY_BY_RCU)
rcu_barrier();
- __kmem_cache_destroy(s);
kmem_cache_free(kmem_cache, s);
} else {
list_add(&s->list, &slab_caches);
--
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 ` 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 ` Christoph Lameter [this message]
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=20120731173637.513669218@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).