| Message ID | 20240905-work-kmem_cache_args-v4-16-ed45d5380679@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | slab: add struct kmem_cache_args | expand |
On Thu, Sep 05, 2024 at 09:56:59AM +0200, Christian Brauner wrote: > Make __kmem_cache_create() a static inline function. > > Signed-off-by: Christian Brauner <brauner@kernel.org> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> > --- > include/linux/slab.h | 13 ++++++++++--- > mm/slab_common.c | 38 -------------------------------------- > 2 files changed, 10 insertions(+), 41 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index d744397aa46f..597f6913cc0f 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -261,10 +261,17 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, > unsigned int object_size, > struct kmem_cache_args *args, > slab_flags_t flags); > +static inline struct kmem_cache * > +__kmem_cache_create(const char *name, unsigned int size, unsigned int align, > + slab_flags_t flags, void (*ctor)(void *)) > +{ > + struct kmem_cache_args kmem_args = { > + .align = align, > + .ctor = ctor, > + }; > > -struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size, > - unsigned int align, slab_flags_t flags, > - void (*ctor)(void *)); > + return __kmem_cache_create_args(name, size, &kmem_args, flags); > +} > > /** > * kmem_cache_create_usercopy - Create a cache with a region suitable > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 3477a3918afd..30000dcf0736 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -337,44 +337,6 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, > } > EXPORT_SYMBOL(__kmem_cache_create_args); > > -/** > - * __kmem_cache_create - Create a cache. > - * @name: A string which is used in /proc/slabinfo to identify this cache. > - * @size: The size of objects to be created in this cache. > - * @align: The required alignment for the objects. > - * @flags: SLAB flags > - * @ctor: A constructor for the objects. > - * > - * Cannot be called within a interrupt, but can be interrupted. > - * The @ctor is run when new pages are allocated by the cache. > - * > - * The flags are > - * > - * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5) > - * to catch references to uninitialised memory. > - * > - * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check > - * for buffer overruns. > - * > - * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware > - * cacheline. This can be beneficial if you're counting cycles as closely > - * as davem. > - * > - * Return: a pointer to the cache on success, NULL on failure. > - */ > -struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size, > - unsigned int align, slab_flags_t flags, > - void (*ctor)(void *)) > -{ > - struct kmem_cache_args kmem_args = { > - .align = align, > - .ctor = ctor, > - }; > - > - return __kmem_cache_create_args(name, size, &kmem_args, flags); > -} > -EXPORT_SYMBOL(__kmem_cache_create); > - > static struct kmem_cache *kmem_buckets_cache __ro_after_init; > > /** > > -- > 2.45.2 >
On Thu, Sep 05, 2024 at 09:56:59AM +0200, Christian Brauner wrote: > Make __kmem_cache_create() a static inline function. > > Signed-off-by: Christian Brauner <brauner@kernel.org> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> Nice series, thank you!
diff --git a/include/linux/slab.h b/include/linux/slab.h index d744397aa46f..597f6913cc0f 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -261,10 +261,17 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, unsigned int object_size, struct kmem_cache_args *args, slab_flags_t flags); +static inline struct kmem_cache * +__kmem_cache_create(const char *name, unsigned int size, unsigned int align, + slab_flags_t flags, void (*ctor)(void *)) +{ + struct kmem_cache_args kmem_args = { + .align = align, + .ctor = ctor, + }; -struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size, - unsigned int align, slab_flags_t flags, - void (*ctor)(void *)); + return __kmem_cache_create_args(name, size, &kmem_args, flags); +} /** * kmem_cache_create_usercopy - Create a cache with a region suitable diff --git a/mm/slab_common.c b/mm/slab_common.c index 3477a3918afd..30000dcf0736 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -337,44 +337,6 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, } EXPORT_SYMBOL(__kmem_cache_create_args); -/** - * __kmem_cache_create - Create a cache. - * @name: A string which is used in /proc/slabinfo to identify this cache. - * @size: The size of objects to be created in this cache. - * @align: The required alignment for the objects. - * @flags: SLAB flags - * @ctor: A constructor for the objects. - * - * Cannot be called within a interrupt, but can be interrupted. - * The @ctor is run when new pages are allocated by the cache. - * - * The flags are - * - * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5) - * to catch references to uninitialised memory. - * - * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check - * for buffer overruns. - * - * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware - * cacheline. This can be beneficial if you're counting cycles as closely - * as davem. - * - * Return: a pointer to the cache on success, NULL on failure. - */ -struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size, - unsigned int align, slab_flags_t flags, - void (*ctor)(void *)) -{ - struct kmem_cache_args kmem_args = { - .align = align, - .ctor = ctor, - }; - - return __kmem_cache_create_args(name, size, &kmem_args, flags); -} -EXPORT_SYMBOL(__kmem_cache_create); - static struct kmem_cache *kmem_buckets_cache __ro_after_init; /**
Make __kmem_cache_create() a static inline function. Signed-off-by: Christian Brauner <brauner@kernel.org> --- include/linux/slab.h | 13 ++++++++++--- mm/slab_common.c | 38 -------------------------------------- 2 files changed, 10 insertions(+), 41 deletions(-)