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 [15/19] create common create_kmalloc_cache()
Date: Thu, 02 Aug 2012 15:15:21 -0500 [thread overview]
Message-ID: <20120802201538.881772415@linux.com> (raw)
In-Reply-To: 20120802201506.266817615@linux.com
[-- Attachment #1: extract_create_kmalloc_cache --]
[-- Type: text/plain, Size: 4160 bytes --]
Use a special function to create kmalloc caches and use that function in
SLAB and SLUB.
Reviewed-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slab.c | 53 +++++++++++++++++++++++------------------------------
1 file changed, 23 insertions(+), 30 deletions(-)
Index: linux-2.6/mm/slab.c
===================================================================
--- linux-2.6.orig/mm/slab.c 2012-08-02 14:58:11.553429908 -0500
+++ linux-2.6/mm/slab.c 2012-08-02 14:58:17.657539215 -0500
@@ -1673,22 +1673,13 @@ void __init kmem_cache_init(void)
* bug.
*/
- sizes[INDEX_AC].cs_cachep = __kmem_cache_create(names[INDEX_AC].name,
- sizes[INDEX_AC].cs_size,
- ARCH_KMALLOC_MINALIGN,
- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
- NULL);
+ sizes[INDEX_AC].cs_cachep = create_kmalloc_cache(names[INDEX_AC].name,
+ sizes[INDEX_AC].cs_size, ARCH_KMALLOC_FLAGS);
- list_add(&sizes[INDEX_AC].cs_cachep->list, &slab_caches);
- if (INDEX_AC != INDEX_L3) {
+ if (INDEX_AC != INDEX_L3)
sizes[INDEX_L3].cs_cachep =
- __kmem_cache_create(names[INDEX_L3].name,
- sizes[INDEX_L3].cs_size,
- ARCH_KMALLOC_MINALIGN,
- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
- NULL);
- list_add(&sizes[INDEX_L3].cs_cachep->list, &slab_caches);
- }
+ create_kmalloc_cache(names[INDEX_L3].name,
+ sizes[INDEX_L3].cs_size, ARCH_KMALLOC_FLAGS);
slab_early_init = 0;
@@ -1700,23 +1691,14 @@ void __init kmem_cache_init(void)
* Note for systems short on memory removing the alignment will
* allow tighter packing of the smaller caches.
*/
- if (!sizes->cs_cachep) {
- sizes->cs_cachep = __kmem_cache_create(names->name,
- sizes->cs_size,
- ARCH_KMALLOC_MINALIGN,
- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
- NULL);
- list_add(&sizes->cs_cachep->list, &slab_caches);
- }
+ if (!sizes->cs_cachep)
+ sizes->cs_cachep = create_kmalloc_cache(names->name,
+ sizes->cs_size, ARCH_KMALLOC_FLAGS);
+
#ifdef CONFIG_ZONE_DMA
- sizes->cs_dmacachep = __kmem_cache_create(
- names->name_dma,
- sizes->cs_size,
- ARCH_KMALLOC_MINALIGN,
- ARCH_KMALLOC_FLAGS|SLAB_CACHE_DMA|
- SLAB_PANIC,
- NULL);
- list_add(&sizes->cs_dmacachep->list, &slab_caches);
+ sizes->cs_dmacachep = create_kmalloc_cache(
+ names->name_dma, sizes->cs_size,
+ SLAB_CACHE_DMA|ARCH_KMALLOC_FLAGS);
#endif
sizes++;
names++;
Index: linux-2.6/mm/slab.h
===================================================================
--- linux-2.6.orig/mm/slab.h 2012-08-02 14:58:11.541429693 -0500
+++ linux-2.6/mm/slab.h 2012-08-02 14:58:17.657539215 -0500
@@ -33,9 +33,12 @@ extern struct list_head slab_caches;
extern struct kmem_cache *kmem_cache;
/* Functions provided by the slab allocators */
-struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
+extern struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
size_t align, unsigned long flags, void (*ctor)(void *));
+extern struct kmem_cache *create_kmalloc_cache(const char *name, size_t size,
+ unsigned long flags);
+
#ifdef CONFIG_SLUB
struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
size_t align, unsigned long flags, void (*ctor)(void *));
Index: linux-2.6/mm/slab_common.c
===================================================================
--- linux-2.6.orig/mm/slab_common.c 2012-08-02 14:58:11.561430050 -0500
+++ linux-2.6/mm/slab_common.c 2012-08-02 14:58:17.657539215 -0500
@@ -177,3 +177,21 @@ int slab_is_available(void)
{
return slab_state >= UP;
}
+
+struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
+ unsigned long flags)
+{
+ struct kmem_cache *s;
+
+ s = __kmem_cache_create(name, size, ARCH_KMALLOC_MINALIGN,
+ flags, NULL);
+
+ if (s) {
+ list_add(&s->list, &slab_caches);
+ return s;
+ }
+
+ panic("Creation of kmalloc slab %s size=%ld failed.\n", name, size);
+ return NULL;
+}
+
--
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 ` Common [13/19] slub: Use a statically allocated kmem_cache boot structure for bootstrap Christoph Lameter
2012-08-02 20:15 ` Common [14/19] slub: Introduce function for opening boot caches Christoph Lameter
2012-08-02 20:15 ` Christoph Lameter [this message]
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=20120802201538.881772415@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.