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: C12 [17/19] slub: Use a statically allocated kmem_cache boot structure for bootstrap
Date: Mon, 20 Aug 2012 20:50:39 +0000 [thread overview]
Message-ID: <0000013945cd33ec-8b760c0d-480a-44fd-bab2-fd7676b46f7a-000000@email.amazonses.com> (raw)
In-Reply-To: <20120820204021.494276880@linux.com>
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 | 41 +++++++++++------------------------------
1 file changed, 11 insertions(+), 30 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index 05d7c50..2610bcb 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3642,9 +3642,6 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
{
int node;
- list_add(&s->list, &slab_caches);
- s->refcount = -1;
-
for_each_node_state(node, N_NORMAL_MEMORY) {
struct kmem_cache_node *n = get_node(s, node);
struct page *p;
@@ -3661,13 +3658,13 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
}
}
+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())
@@ -3676,49 +3673,33 @@ void __init kmem_cache_init(void)
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;
create_boot_cache(kmem_cache_node, "kmem_cache_node",
- sizeof(struct kmem_cache_node), SLAB_HWCACHE_ALIGN);
+ sizeof(struct kmem_cache_node), SLAB_HWCACHE_ALIGN);
hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
/* Able to allocate the per node structures */
slab_state = PARTIAL;
- temp_kmem_cache = kmem_cache;
- create_boot_cache(kmem_cache, "kmem_cache", kmem_size, SLAB_HWCACHE_ALIGN);
+ create_boot_cache(&boot_kmem_cache, "kmem_cache", kmem_size,
+ SLAB_HWCACHE_ALIGN);
- 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 */
--
1.7.9.5
--
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-20 20:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120820204021.494276880@linux.com>
2012-08-20 20:47 ` C12 [01/19] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-08-20 20:50 ` C12 [05/19] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-08-20 20:50 ` C12 [03/19] Improve error handling in kmem_cache_create Christoph Lameter
2012-08-20 20:50 ` C12 [04/19] Move list_add() to slab_common.c Christoph Lameter
2012-08-20 20:50 ` C12 [01/19] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-08-20 20:50 ` C12 [02/19] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-08-20 20:50 ` C12 [11/19] Move sysfs_slab_add to common Christoph Lameter
2012-08-20 20:50 ` C12 [06/19] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-08-20 20:50 ` C12 [07/19] Move freeing of kmem_cache structure to common code Christoph Lameter
2012-08-20 20:50 ` C12 [12/19] Move kmem_cache allocations into " Christoph Lameter
2012-08-21 11:55 ` Glauber Costa
2012-08-21 20:58 ` Christoph Lameter
2012-08-22 8:42 ` Glauber Costa
2012-08-22 15:25 ` Christoph Lameter
2012-08-23 7:43 ` Glauber Costa
2012-08-23 13:49 ` Christoph Lameter
2012-08-23 13:57 ` Glauber Costa
2012-08-23 14:31 ` Christoph Lameter
2012-08-20 20:50 ` C12 [09/19] Move duping of slab name to slab_common.c Christoph Lameter
2012-08-20 20:50 ` C12 [10/19] Do slab aliasing call from common code Christoph Lameter
2012-08-20 20:50 ` C12 [13/19] Shrink __kmem_cache_create() parameter lists Christoph Lameter
2012-08-20 20:50 ` Christoph Lameter [this message]
2012-08-20 20:50 ` C12 [08/19] Get rid of __kmem_cache_destroy Christoph Lameter
2012-08-20 20:50 ` C12 [16/19] Create common functions for boot slab creation Christoph Lameter
2012-08-22 9:26 ` Glauber Costa
2012-08-22 15:35 ` Christoph Lameter
2012-08-23 8:09 ` Glauber Costa
2012-08-23 13:58 ` Christoph Lameter
2012-08-20 20:50 ` C12 [14/19] Move kmem_cache refcounting to common code Christoph Lameter
2012-08-20 21:01 ` C12 [19/19] Common alignment code Christoph Lameter
2012-08-20 21:01 ` C12 [15/19] slab: Simplify bootstrap Christoph Lameter
2012-08-20 21:01 ` C12 [18/19] slab: Use the new create_boot_cache function to simplify bootstrap 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=0000013945cd33ec-8b760c0d-480a-44fd-bab2-fd7676b46f7a-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