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

slab, slub, slob: add slab_flags_t

Add sparse-checked slab_flags_t for struct kmem_cache::flags (SLAB_POISON,
etc).

SLAB is bloated temporarily by switching to "unsigned long", but only
temporarily.

Link: http://lkml.kernel.org/r/20171021100225.GA22428@avx2

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3ba0744
...@@ -660,7 +660,7 @@ static struct ecryptfs_cache_info { ...@@ -660,7 +660,7 @@ static struct ecryptfs_cache_info {
struct kmem_cache **cache; struct kmem_cache **cache;
const char *name; const char *name;
size_t size; size_t size;
unsigned long flags; slab_flags_t flags;
void (*ctor)(void *obj); void (*ctor)(void *obj);
} ecryptfs_cache_infos[] = { } ecryptfs_cache_infos[] = {
{ {
......
...@@ -104,7 +104,7 @@ kmem_zone_init(int size, char *zone_name) ...@@ -104,7 +104,7 @@ kmem_zone_init(int size, char *zone_name)
} }
static inline kmem_zone_t * static inline kmem_zone_t *
kmem_zone_init_flags(int size, char *zone_name, unsigned long flags, kmem_zone_init_flags(int size, char *zone_name, slab_flags_t flags,
void (*construct)(void *)) void (*construct)(void *))
{ {
return kmem_cache_create(zone_name, size, 0, flags, construct); return kmem_cache_create(zone_name, size, 0, flags, construct);
......
...@@ -46,7 +46,7 @@ void kasan_alloc_pages(struct page *page, unsigned int order); ...@@ -46,7 +46,7 @@ void kasan_alloc_pages(struct page *page, unsigned int order);
void kasan_free_pages(struct page *page, unsigned int order); void kasan_free_pages(struct page *page, unsigned int order);
void kasan_cache_create(struct kmem_cache *cache, size_t *size, void kasan_cache_create(struct kmem_cache *cache, size_t *size,
unsigned long *flags); slab_flags_t *flags);
void kasan_cache_shrink(struct kmem_cache *cache); void kasan_cache_shrink(struct kmem_cache *cache);
void kasan_cache_shutdown(struct kmem_cache *cache); void kasan_cache_shutdown(struct kmem_cache *cache);
...@@ -95,7 +95,7 @@ static inline void kasan_free_pages(struct page *page, unsigned int order) {} ...@@ -95,7 +95,7 @@ static inline void kasan_free_pages(struct page *page, unsigned int order) {}
static inline void kasan_cache_create(struct kmem_cache *cache, static inline void kasan_cache_create(struct kmem_cache *cache,
size_t *size, size_t *size,
unsigned long *flags) {} slab_flags_t *flags) {}
static inline void kasan_cache_shrink(struct kmem_cache *cache) {} static inline void kasan_cache_shrink(struct kmem_cache *cache) {}
static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} static inline void kasan_cache_shutdown(struct kmem_cache *cache) {}
......
...@@ -48,14 +48,14 @@ extern void kmemleak_not_leak_phys(phys_addr_t phys) __ref; ...@@ -48,14 +48,14 @@ extern void kmemleak_not_leak_phys(phys_addr_t phys) __ref;
extern void kmemleak_ignore_phys(phys_addr_t phys) __ref; extern void kmemleak_ignore_phys(phys_addr_t phys) __ref;
static inline void kmemleak_alloc_recursive(const void *ptr, size_t size, static inline void kmemleak_alloc_recursive(const void *ptr, size_t size,
int min_count, unsigned long flags, int min_count, slab_flags_t flags,
gfp_t gfp) gfp_t gfp)
{ {
if (!(flags & SLAB_NOLEAKTRACE)) if (!(flags & SLAB_NOLEAKTRACE))
kmemleak_alloc(ptr, size, min_count, gfp); kmemleak_alloc(ptr, size, min_count, gfp);
} }
static inline void kmemleak_free_recursive(const void *ptr, unsigned long flags) static inline void kmemleak_free_recursive(const void *ptr, slab_flags_t flags)
{ {
if (!(flags & SLAB_NOLEAKTRACE)) if (!(flags & SLAB_NOLEAKTRACE))
kmemleak_free(ptr); kmemleak_free(ptr);
...@@ -76,7 +76,7 @@ static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count, ...@@ -76,7 +76,7 @@ static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
{ {
} }
static inline void kmemleak_alloc_recursive(const void *ptr, size_t size, static inline void kmemleak_alloc_recursive(const void *ptr, size_t size,
int min_count, unsigned long flags, int min_count, slab_flags_t flags,
gfp_t gfp) gfp_t gfp)
{ {
} }
...@@ -94,7 +94,7 @@ static inline void kmemleak_free(const void *ptr) ...@@ -94,7 +94,7 @@ static inline void kmemleak_free(const void *ptr)
static inline void kmemleak_free_part(const void *ptr, size_t size) static inline void kmemleak_free_part(const void *ptr, size_t size)
{ {
} }
static inline void kmemleak_free_recursive(const void *ptr, unsigned long flags) static inline void kmemleak_free_recursive(const void *ptr, slab_flags_t flags)
{ {
} }
static inline void kmemleak_free_percpu(const void __percpu *ptr) static inline void kmemleak_free_percpu(const void __percpu *ptr)
......
...@@ -21,13 +21,20 @@ ...@@ -21,13 +21,20 @@
* Flags to pass to kmem_cache_create(). * Flags to pass to kmem_cache_create().
* The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set. * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
*/ */
#define SLAB_CONSISTENCY_CHECKS 0x00000100UL /* DEBUG: Perform (expensive) checks on alloc/free */ /* DEBUG: Perform (expensive) checks on alloc/free */
#define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */ #define SLAB_CONSISTENCY_CHECKS ((slab_flags_t __force)0x00000100UL)
#define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */ /* DEBUG: Red zone objs in a cache */
#define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */ #define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400UL)
#define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */ /* DEBUG: Poison objects */
#define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */ #define SLAB_POISON ((slab_flags_t __force)0x00000800UL)
#define SLAB_PANIC 0x00040000UL /* Panic if kmem_cache_create() fails */ /* Align objs on cache lines */
#define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000UL)
/* Use GFP_DMA memory */
#define SLAB_CACHE_DMA ((slab_flags_t __force)0x00004000UL)
/* DEBUG: Store the last owner for bug hunting */
#define SLAB_STORE_USER ((slab_flags_t __force)0x00010000UL)
/* Panic if kmem_cache_create() fails */
#define SLAB_PANIC ((slab_flags_t __force)0x00040000UL)
/* /*
* SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS! * SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS!
* *
...@@ -65,44 +72,51 @@ ...@@ -65,44 +72,51 @@
* *
* Note that SLAB_TYPESAFE_BY_RCU was originally named SLAB_DESTROY_BY_RCU. * Note that SLAB_TYPESAFE_BY_RCU was originally named SLAB_DESTROY_BY_RCU.
*/ */
#define SLAB_TYPESAFE_BY_RCU 0x00080000UL /* Defer freeing slabs to RCU */ /* Defer freeing slabs to RCU */
#define SLAB_MEM_SPREAD 0x00100000UL /* Spread some memory over cpuset */ #define SLAB_TYPESAFE_BY_RCU ((slab_flags_t __force)0x00080000UL)
#define SLAB_TRACE 0x00200000UL /* Trace allocations and frees */ /* Spread some memory over cpuset */
#define SLAB_MEM_SPREAD ((slab_flags_t __force)0x00100000UL)
/* Trace allocations and frees */
#define SLAB_TRACE ((slab_flags_t __force)0x00200000UL)
/* Flag to prevent checks on free */ /* Flag to prevent checks on free */
#ifdef CONFIG_DEBUG_OBJECTS #ifdef CONFIG_DEBUG_OBJECTS
# define SLAB_DEBUG_OBJECTS 0x00400000UL # define SLAB_DEBUG_OBJECTS ((slab_flags_t __force)0x00400000UL)
#else #else
# define SLAB_DEBUG_OBJECTS 0x00000000UL # define SLAB_DEBUG_OBJECTS ((slab_flags_t __force)0x00000000UL)
#endif #endif
#define SLAB_NOLEAKTRACE 0x00800000UL /* Avoid kmemleak tracing */ /* Avoid kmemleak tracing */
#define SLAB_NOLEAKTRACE ((slab_flags_t __force)0x00800000UL)
/* Don't track use of uninitialized memory */ /* Don't track use of uninitialized memory */
#ifdef CONFIG_KMEMCHECK #ifdef CONFIG_KMEMCHECK
# define SLAB_NOTRACK 0x01000000UL # define SLAB_NOTRACK ((slab_flags_t __force)0x01000000UL)
#else #else
# define SLAB_NOTRACK 0x00000000UL # define SLAB_NOTRACK ((slab_flags_t __force)0x00000000UL)
#endif #endif
/* Fault injection mark */
#ifdef CONFIG_FAILSLAB #ifdef CONFIG_FAILSLAB
# define SLAB_FAILSLAB 0x02000000UL /* Fault injection mark */ # define SLAB_FAILSLAB ((slab_flags_t __force)0x02000000UL)
#else #else
# define SLAB_FAILSLAB 0x00000000UL # define SLAB_FAILSLAB ((slab_flags_t __force)0x00000000UL)
#endif #endif
/* Account to memcg */
#if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB) #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
# define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */ # define SLAB_ACCOUNT ((slab_flags_t __force)0x04000000UL)
#else #else
# define SLAB_ACCOUNT 0x00000000UL # define SLAB_ACCOUNT ((slab_flags_t __force)0x00000000UL)
#endif #endif
#ifdef CONFIG_KASAN #ifdef CONFIG_KASAN
#define SLAB_KASAN 0x08000000UL #define SLAB_KASAN ((slab_flags_t __force)0x08000000UL)
#else #else
#define SLAB_KASAN 0x00000000UL #define SLAB_KASAN ((slab_flags_t __force)0x00000000UL)
#endif #endif
/* The following flags affect the page allocator grouping pages by mobility */ /* The following flags affect the page allocator grouping pages by mobility */
#define SLAB_RECLAIM_ACCOUNT 0x00020000UL /* Objects are reclaimable */ /* Objects are reclaimable */
#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000UL)
#define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */
/* /*
* ZERO_SIZE_PTR will be returned for zero sized kmalloc requests. * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests.
...@@ -128,7 +142,7 @@ void __init kmem_cache_init(void); ...@@ -128,7 +142,7 @@ void __init kmem_cache_init(void);
bool slab_is_available(void); bool slab_is_available(void);
struct kmem_cache *kmem_cache_create(const char *, size_t, size_t, struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
unsigned long, slab_flags_t,
void (*)(void *)); void (*)(void *));
void kmem_cache_destroy(struct kmem_cache *); void kmem_cache_destroy(struct kmem_cache *);
int kmem_cache_shrink(struct kmem_cache *); int kmem_cache_shrink(struct kmem_cache *);
......
...@@ -20,7 +20,7 @@ struct kmem_cache { ...@@ -20,7 +20,7 @@ struct kmem_cache {
struct reciprocal_value reciprocal_buffer_size; struct reciprocal_value reciprocal_buffer_size;
/* 2) touched by every alloc & free from the backend */ /* 2) touched by every alloc & free from the backend */
unsigned int flags; /* constant flags */ slab_flags_t flags; /* constant flags */
unsigned int num; /* # of objs per slab */ unsigned int num; /* # of objs per slab */
/* 3) cache_grow/shrink */ /* 3) cache_grow/shrink */
......
...@@ -82,7 +82,7 @@ struct kmem_cache_order_objects { ...@@ -82,7 +82,7 @@ struct kmem_cache_order_objects {
struct kmem_cache { struct kmem_cache {
struct kmem_cache_cpu __percpu *cpu_slab; struct kmem_cache_cpu __percpu *cpu_slab;
/* Used for retriving partial slabs etc */ /* Used for retriving partial slabs etc */
unsigned long flags; slab_flags_t flags;
unsigned long min_partial; unsigned long min_partial;
int size; /* The size of an object including meta data */ int size; /* The size of an object including meta data */
int object_size; /* The size of an object without meta data */ int object_size; /* The size of an object without meta data */
......
...@@ -156,6 +156,7 @@ typedef u32 dma_addr_t; ...@@ -156,6 +156,7 @@ typedef u32 dma_addr_t;
#endif #endif
typedef unsigned __bitwise gfp_t; typedef unsigned __bitwise gfp_t;
typedef unsigned long __bitwise slab_flags_t;
typedef unsigned __bitwise fmode_t; typedef unsigned __bitwise fmode_t;
#ifdef CONFIG_PHYS_ADDR_T_64BIT #ifdef CONFIG_PHYS_ADDR_T_64BIT
......
...@@ -1105,7 +1105,7 @@ struct proto { ...@@ -1105,7 +1105,7 @@ struct proto {
struct kmem_cache *slab; struct kmem_cache *slab;
unsigned int obj_size; unsigned int obj_size;
int slab_flags; slab_flags_t slab_flags;
struct percpu_counter *orphan_count; struct percpu_counter *orphan_count;
......
...@@ -337,7 +337,7 @@ static size_t optimal_redzone(size_t object_size) ...@@ -337,7 +337,7 @@ static size_t optimal_redzone(size_t object_size)
} }
void kasan_cache_create(struct kmem_cache *cache, size_t *size, void kasan_cache_create(struct kmem_cache *cache, size_t *size,
unsigned long *flags) slab_flags_t *flags)
{ {
int redzone_adjust; int redzone_adjust;
int orig_size = *size; int orig_size = *size;
......
...@@ -252,8 +252,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent) ...@@ -252,8 +252,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
MAKE_LIST((cachep), (&(ptr)->slabs_free), slabs_free, nodeid); \ MAKE_LIST((cachep), (&(ptr)->slabs_free), slabs_free, nodeid); \
} while (0) } while (0)
#define CFLGS_OBJFREELIST_SLAB (0x40000000UL) #define CFLGS_OBJFREELIST_SLAB ((slab_flags_t __force)0x40000000UL)
#define CFLGS_OFF_SLAB (0x80000000UL) #define CFLGS_OFF_SLAB ((slab_flags_t __force)0x80000000UL)
#define OBJFREELIST_SLAB(x) ((x)->flags & CFLGS_OBJFREELIST_SLAB) #define OBJFREELIST_SLAB(x) ((x)->flags & CFLGS_OBJFREELIST_SLAB)
#define OFF_SLAB(x) ((x)->flags & CFLGS_OFF_SLAB) #define OFF_SLAB(x) ((x)->flags & CFLGS_OFF_SLAB)
...@@ -441,7 +441,7 @@ static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep) ...@@ -441,7 +441,7 @@ static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep)
* Calculate the number of objects and left-over bytes for a given buffer size. * Calculate the number of objects and left-over bytes for a given buffer size.
*/ */
static unsigned int cache_estimate(unsigned long gfporder, size_t buffer_size, static unsigned int cache_estimate(unsigned long gfporder, size_t buffer_size,
unsigned long flags, size_t *left_over) slab_flags_t flags, size_t *left_over)
{ {
unsigned int num; unsigned int num;
size_t slab_size = PAGE_SIZE << gfporder; size_t slab_size = PAGE_SIZE << gfporder;
...@@ -1759,7 +1759,7 @@ static void slabs_destroy(struct kmem_cache *cachep, struct list_head *list) ...@@ -1759,7 +1759,7 @@ static void slabs_destroy(struct kmem_cache *cachep, struct list_head *list)
* towards high-order requests, this should be changed. * towards high-order requests, this should be changed.
*/ */
static size_t calculate_slab_order(struct kmem_cache *cachep, static size_t calculate_slab_order(struct kmem_cache *cachep,
size_t size, unsigned long flags) size_t size, slab_flags_t flags)
{ {
size_t left_over = 0; size_t left_over = 0;
int gfporder; int gfporder;
...@@ -1886,8 +1886,8 @@ static int __ref setup_cpu_cache(struct kmem_cache *cachep, gfp_t gfp) ...@@ -1886,8 +1886,8 @@ static int __ref setup_cpu_cache(struct kmem_cache *cachep, gfp_t gfp)
return 0; return 0;
} }
unsigned long kmem_cache_flags(unsigned long object_size, slab_flags_t kmem_cache_flags(unsigned long object_size,
unsigned long flags, const char *name, slab_flags_t flags, const char *name,
void (*ctor)(void *)) void (*ctor)(void *))
{ {
return flags; return flags;
...@@ -1895,7 +1895,7 @@ unsigned long kmem_cache_flags(unsigned long object_size, ...@@ -1895,7 +1895,7 @@ unsigned long kmem_cache_flags(unsigned long object_size,
struct kmem_cache * struct kmem_cache *
__kmem_cache_alias(const char *name, size_t size, size_t align, __kmem_cache_alias(const char *name, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *)) slab_flags_t flags, void (*ctor)(void *))
{ {
struct kmem_cache *cachep; struct kmem_cache *cachep;
...@@ -1913,7 +1913,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align, ...@@ -1913,7 +1913,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
} }
static bool set_objfreelist_slab_cache(struct kmem_cache *cachep, static bool set_objfreelist_slab_cache(struct kmem_cache *cachep,
size_t size, unsigned long flags) size_t size, slab_flags_t flags)
{ {
size_t left; size_t left;
...@@ -1936,7 +1936,7 @@ static bool set_objfreelist_slab_cache(struct kmem_cache *cachep, ...@@ -1936,7 +1936,7 @@ static bool set_objfreelist_slab_cache(struct kmem_cache *cachep,
} }
static bool set_off_slab_cache(struct kmem_cache *cachep, static bool set_off_slab_cache(struct kmem_cache *cachep,
size_t size, unsigned long flags) size_t size, slab_flags_t flags)
{ {
size_t left; size_t left;
...@@ -1970,7 +1970,7 @@ static bool set_off_slab_cache(struct kmem_cache *cachep, ...@@ -1970,7 +1970,7 @@ static bool set_off_slab_cache(struct kmem_cache *cachep,
} }
static bool set_on_slab_cache(struct kmem_cache *cachep, static bool set_on_slab_cache(struct kmem_cache *cachep,
size_t size, unsigned long flags) size_t size, slab_flags_t flags)
{ {
size_t left; size_t left;
...@@ -2006,8 +2006,7 @@ static bool set_on_slab_cache(struct kmem_cache *cachep, ...@@ -2006,8 +2006,7 @@ static bool set_on_slab_cache(struct kmem_cache *cachep,
* cacheline. This can be beneficial if you're counting cycles as closely * cacheline. This can be beneficial if you're counting cycles as closely
* as davem. * as davem.
*/ */
int int __kmem_cache_create(struct kmem_cache *cachep, slab_flags_t flags)
__kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
{ {
size_t ralign = BYTES_PER_WORD; size_t ralign = BYTES_PER_WORD;
gfp_t gfp; gfp_t gfp;
......
...@@ -21,7 +21,7 @@ struct kmem_cache { ...@@ -21,7 +21,7 @@ struct kmem_cache {
unsigned int object_size;/* The original size of the object */ unsigned int object_size;/* The original size of the object */
unsigned int size; /* The aligned/padded/added on size */ unsigned int size; /* The aligned/padded/added on size */
unsigned int align; /* Alignment as calculated */ unsigned int align; /* Alignment as calculated */
unsigned long flags; /* Active flags on the slab */ slab_flags_t flags; /* Active flags on the slab */
const char *name; /* Slab name for sysfs */ const char *name; /* Slab name for sysfs */
int refcount; /* Use counter */ int refcount; /* Use counter */
void (*ctor)(void *); /* Called on object slot creation */ void (*ctor)(void *); /* Called on object slot creation */
...@@ -79,13 +79,13 @@ extern const struct kmalloc_info_struct { ...@@ -79,13 +79,13 @@ extern const struct kmalloc_info_struct {
unsigned long size; unsigned long size;
} kmalloc_info[]; } kmalloc_info[];
unsigned long calculate_alignment(unsigned long flags, unsigned long calculate_alignment(slab_flags_t flags,
unsigned long align, unsigned long size); unsigned long align, unsigned long size);
#ifndef CONFIG_SLOB #ifndef CONFIG_SLOB
/* Kmalloc array related functions */ /* Kmalloc array related functions */
void setup_kmalloc_cache_index_table(void); void setup_kmalloc_cache_index_table(void);
void create_kmalloc_caches(unsigned long); void create_kmalloc_caches(slab_flags_t);
/* Find the kmalloc slab corresponding for a certain size */ /* Find the kmalloc slab corresponding for a certain size */
struct kmem_cache *kmalloc_slab(size_t, gfp_t); struct kmem_cache *kmalloc_slab(size_t, gfp_t);
...@@ -93,32 +93,32 @@ struct kmem_cache *kmalloc_slab(size_t, gfp_t); ...@@ -93,32 +93,32 @@ struct kmem_cache *kmalloc_slab(size_t, gfp_t);
/* Functions provided by the slab allocators */ /* Functions provided by the slab allocators */
extern int __kmem_cache_create(struct kmem_cache *, unsigned long flags); int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags);
extern struct kmem_cache *create_kmalloc_cache(const char *name, size_t size, extern struct kmem_cache *create_kmalloc_cache(const char *name, size_t size,
unsigned long flags); slab_flags_t flags);
extern void create_boot_cache(struct kmem_cache *, const char *name, extern void create_boot_cache(struct kmem_cache *, const char *name,
size_t size, unsigned long flags); size_t size, slab_flags_t flags);
int slab_unmergeable(struct kmem_cache *s); int slab_unmergeable(struct kmem_cache *s);
struct kmem_cache *find_mergeable(size_t size, size_t align, struct kmem_cache *find_mergeable(size_t size, size_t align,
unsigned long flags, const char *name, void (*ctor)(void *)); slab_flags_t flags, const char *name, void (*ctor)(void *));
#ifndef CONFIG_SLOB #ifndef CONFIG_SLOB
struct kmem_cache * struct kmem_cache *
__kmem_cache_alias(const char *name, size_t size, size_t align, __kmem_cache_alias(const char *name, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *)); slab_flags_t flags, void (*ctor)(void *));
unsigned long kmem_cache_flags(unsigned long object_size, slab_flags_t kmem_cache_flags(unsigned long object_size,
unsigned long flags, const char *name, slab_flags_t flags, const char *name,
void (*ctor)(void *)); void (*ctor)(void *));
#else #else
static inline struct kmem_cache * static inline struct kmem_cache *
__kmem_cache_alias(const char *name, size_t size, size_t align, __kmem_cache_alias(const char *name, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *)) slab_flags_t flags, void (*ctor)(void *))
{ return NULL; } { return NULL; }
static inline unsigned long kmem_cache_flags(unsigned long object_size, static inline slab_flags_t kmem_cache_flags(unsigned long object_size,
unsigned long flags, const char *name, slab_flags_t flags, const char *name,
void (*ctor)(void *)) void (*ctor)(void *))
{ {
return flags; return flags;
......
...@@ -291,7 +291,7 @@ int slab_unmergeable(struct kmem_cache *s) ...@@ -291,7 +291,7 @@ int slab_unmergeable(struct kmem_cache *s)
} }
struct kmem_cache *find_mergeable(size_t size, size_t align, struct kmem_cache *find_mergeable(size_t size, size_t align,
unsigned long flags, const char *name, void (*ctor)(void *)) slab_flags_t flags, const char *name, void (*ctor)(void *))
{ {
struct kmem_cache *s; struct kmem_cache *s;
...@@ -341,7 +341,7 @@ struct kmem_cache *find_mergeable(size_t size, size_t align, ...@@ -341,7 +341,7 @@ struct kmem_cache *find_mergeable(size_t size, size_t align,
* Figure out what the alignment of the objects will be given a set of * Figure out what the alignment of the objects will be given a set of
* flags, a user specified alignment and the size of the objects. * flags, a user specified alignment and the size of the objects.
*/ */
unsigned long calculate_alignment(unsigned long flags, unsigned long calculate_alignment(slab_flags_t flags,
unsigned long align, unsigned long size) unsigned long align, unsigned long size)
{ {
/* /*
...@@ -366,7 +366,7 @@ unsigned long calculate_alignment(unsigned long flags, ...@@ -366,7 +366,7 @@ unsigned long calculate_alignment(unsigned long flags,
static struct kmem_cache *create_cache(const char *name, static struct kmem_cache *create_cache(const char *name,
size_t object_size, size_t size, size_t align, size_t object_size, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *), slab_flags_t flags, void (*ctor)(void *),
struct mem_cgroup *memcg, struct kmem_cache *root_cache) struct mem_cgroup *memcg, struct kmem_cache *root_cache)
{ {
struct kmem_cache *s; struct kmem_cache *s;
...@@ -431,7 +431,7 @@ out_free_cache: ...@@ -431,7 +431,7 @@ out_free_cache:
*/ */
struct kmem_cache * struct kmem_cache *
kmem_cache_create(const char *name, size_t size, size_t align, kmem_cache_create(const char *name, size_t size, size_t align,
unsigned long flags, void (*ctor)(void *)) slab_flags_t flags, void (*ctor)(void *))
{ {
struct kmem_cache *s = NULL; struct kmem_cache *s = NULL;
const char *cache_name; const char *cache_name;
...@@ -879,7 +879,7 @@ bool slab_is_available(void) ...@@ -879,7 +879,7 @@ bool slab_is_available(void)
#ifndef CONFIG_SLOB #ifndef CONFIG_SLOB
/* Create a cache during boot when no slab services are available yet */ /* 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, void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t size,
unsigned long flags) slab_flags_t flags)
{ {
int err; int err;
...@@ -899,7 +899,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz ...@@ -899,7 +899,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
} }
struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
unsigned long flags) slab_flags_t flags)
{ {
struct kmem_cache *s = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT); struct kmem_cache *s = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT);
...@@ -1057,7 +1057,7 @@ void __init setup_kmalloc_cache_index_table(void) ...@@ -1057,7 +1057,7 @@ void __init setup_kmalloc_cache_index_table(void)
} }
} }