Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 361d575e authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

slab: make create_boot_cache() work with 32-bit sizes 

struct kmem_cache::size has always been "int", all those
"size_t size" are fake.

Link: http://lkml.kernel.org/r/20180305200730.15812-5-adobriyan@gmail.com


Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55de8b9c

mm/slab.h

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ struct kmem_cache *create_kmalloc_cache(const char *name, unsigned int size, 
			slab_flags_t flags, unsigned int useroffset,

			unsigned int usersize);

extern void create_boot_cache(struct kmem_cache *, const char *name,

			size_t size, slab_flags_t flags, size_t useroffset,

			size_t usersize);

			unsigned int size, slab_flags_t flags,

			unsigned int useroffset, unsigned int usersize);



int slab_unmergeable(struct kmem_cache *s);

struct kmem_cache *find_mergeable(size_t size, size_t align,

mm/slab_common.c

+4 −3
Original line number Diff line number Diff line
@@ -917,8 +917,9 @@ bool slab_is_available(void) 


#ifndef CONFIG_SLOB

/* Create a cache during boot when no slab services are available yet */

void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t size,

		slab_flags_t flags, size_t useroffset, size_t usersize)

void __init create_boot_cache(struct kmem_cache *s, const char *name,

		unsigned int size, slab_flags_t flags,

		unsigned int useroffset, unsigned int usersize)

{

	int err;
@@ -933,7 +934,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz 
	err = __kmem_cache_create(s, flags);



	if (err)

		panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",

		panic("Creation of kmalloc slab %s size=%u failed. Reason %d\n",

					name, size, err);



	s->refcount = -1;	/* Exempt from merging for now */