From: Christoph Lameter <cl@linux.com>
To: Glauber Costa <glommer@parallels.com>
Cc: Pekka Enberg <penberg@kernel.org>,
linux-mm@kvack.org, David Rientjes <rientjes@google.com>,
Joonsoo Kim <js1304@gmail.com>
Subject: Common [13/19] slub: Use a statically allocated kmem_cache boot structure for bootstrap
Date: Thu, 02 Aug 2012 15:15:19 -0500 [thread overview]
Message-ID: <20120802201537.792112551@linux.com> (raw)
In-Reply-To: 20120802201506.266817615@linux.com
[-- Attachment #1: slub_static_init --]
[-- Type: text/plain, Size: 3240 bytes --]
Simplify bootstrap by statically allocated two kmem_cache structures. These are
freed after bootup is complete. Allows us to no longer worry about calculations
of sizes of kmem_cache structures during bootstrap.
Reviewed-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slub.c | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-08-01 14:52:12.944165176 -0500
+++ linux-2.6/mm/slub.c 2012-08-01 14:57:05.201430270 -0500
@@ -3686,13 +3686,13 @@
}
}
+static __initdata struct kmem_cache boot_kmem_cache,
+ boot_kmem_cache_node;
+
void __init kmem_cache_init(void)
{
int i;
- int caches = 0;
- struct kmem_cache *temp_kmem_cache;
- int order;
- struct kmem_cache *temp_kmem_cache_node;
+ int caches = 2;
unsigned long kmalloc_size;
if (debug_guardpage_minorder())
@@ -3701,19 +3701,10 @@
kmem_size = offsetof(struct kmem_cache, node) +
nr_node_ids * sizeof(struct kmem_cache_node *);
- /* Allocate two kmem_caches from the page allocator */
kmalloc_size = ALIGN(kmem_size, cache_line_size());
- order = get_order(2 * kmalloc_size);
- kmem_cache = (void *)__get_free_pages(GFP_NOWAIT, order);
-
- /*
- * Must first have the slab cache available for the allocations of the
- * struct kmem_cache_node's. There is special bootstrap code in
- * kmem_cache_open for slab_state == DOWN.
- */
- kmem_cache_node = (void *)kmem_cache + kmalloc_size;
+ kmem_cache_node = &boot_kmem_cache_node;
- kmem_cache_open(kmem_cache_node, "kmem_cache_node",
+ kmem_cache_open(&boot_kmem_cache_node, "kmem_cache_node",
sizeof(struct kmem_cache_node),
0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
@@ -3722,29 +3713,21 @@
/* Able to allocate the per node structures */
slab_state = PARTIAL;
- temp_kmem_cache = kmem_cache;
- kmem_cache_open(kmem_cache, "kmem_cache", kmem_size,
+ kmem_cache_open(&boot_kmem_cache, "kmem_cache", kmem_size,
0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
- kmem_cache = kmem_cache_alloc(kmem_cache, GFP_NOWAIT);
- memcpy(kmem_cache, temp_kmem_cache, kmem_size);
+ kmem_cache = kmem_cache_alloc(&boot_kmem_cache, GFP_NOWAIT);
+ memcpy(kmem_cache, &boot_kmem_cache, kmem_size);
/*
* Allocate kmem_cache_node properly from the kmem_cache slab.
* kmem_cache_node is separately allocated so no need to
* update any list pointers.
*/
- temp_kmem_cache_node = kmem_cache_node;
-
kmem_cache_node = kmem_cache_alloc(kmem_cache, GFP_NOWAIT);
- memcpy(kmem_cache_node, temp_kmem_cache_node, kmem_size);
+ memcpy(kmem_cache_node, &boot_kmem_cache_node, kmem_size);
kmem_cache_bootstrap_fixup(kmem_cache_node);
-
- caches++;
kmem_cache_bootstrap_fixup(kmem_cache);
- caches++;
- /* Free temporary boot structure */
- free_pages((unsigned long)temp_kmem_cache, order);
/* Now we can use the kmem_cache to allocate kmalloc slabs */
--
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-08-02 20:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-02 20:15 Common [00/19] Sl[auo]b: Common code rework V9 Christoph Lameter
2012-08-02 20:15 ` Common [01/19] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-08-02 20:37 ` David Rientjes
2012-08-02 20:42 ` Christoph Lameter
2012-08-02 20:47 ` David Rientjes
2012-08-03 13:45 ` Christoph Lameter
2012-08-02 20:15 ` Common [02/19] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-08-02 20:52 ` David Rientjes
2012-08-03 14:07 ` Christoph Lameter
2012-08-03 13:20 ` Glauber Costa
2012-08-03 13:52 ` Christoph Lameter
2012-08-03 13:53 ` Glauber Costa
2012-08-03 14:02 ` Christoph Lameter
2012-08-02 20:15 ` Common [03/19] Rename oops label Christoph Lameter
2012-08-02 20:45 ` David Rientjes
2012-08-02 20:15 ` Common [04/19] Improve error handling in kmem_cache_create Christoph Lameter
2012-08-02 20:58 ` David Rientjes
2012-08-02 20:15 ` Common [05/19] Move list_add() to slab_common.c Christoph Lameter
2012-08-02 21:18 ` David Rientjes
2012-08-02 20:15 ` Common [06/19] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-08-02 20:15 ` Common [07/19] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-08-02 20:15 ` Common [08/19] Move freeing of kmem_cache structure to common code Christoph Lameter
2012-08-02 20:15 ` Common [09/19] Get rid of __kmem_cache_destroy Christoph Lameter
2012-08-02 20:15 ` Common [10/19] Move duping of slab name to slab_common.c Christoph Lameter
2012-08-02 20:15 ` Common [11/19] Do slab aliasing call from common code Christoph Lameter
2012-08-02 20:15 ` Common [12/19] Move sysfs_slab_add to common Christoph Lameter
2012-08-02 20:15 ` Christoph Lameter [this message]
2012-08-02 20:15 ` Common [14/19] slub: Introduce function for opening boot caches Christoph Lameter
2012-08-02 20:15 ` Common [15/19] create common create_kmalloc_cache() Christoph Lameter
2012-08-02 20:15 ` Common [16/19] Move kmem_cache allocations into common code Christoph Lameter
2012-08-02 20:15 ` Common [17/19] Shrink __kmem_cache_create() parameter lists Christoph Lameter
2012-08-02 20:15 ` Common [18/19] Move kmem_cache refcounting to common code Christoph Lameter
2012-08-02 20:15 ` Common [19/19] Common alignment code Christoph Lameter
2012-08-03 13:09 ` Common [00/19] Sl[auo]b: Common code rework V9 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=20120802201537.792112551@linux.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;
as well as URLs for NNTP newsgroup(s).