Introduce CONFIG_SLUB_TINY and deprecate SLOB
Subsystems (8)
cover Introduce CONFIG_SLUB_TINY and deprecate SLOB
Hi,
this continues the discussion from [1]. Reasons to remove SLOB are outlined there and no-one has objected so far. The last patch of this series therefore deprecates CONFIG_SLOB and updates all the defconfigs using CONFIG_SLOB=y in the tree.
There is a k210 board with 8MB RAM where switching to SLUB caused issues
[2] and the lkp bot wasn't also happy about code bloat [3]. To address both, this series introduces CONFIG_SLUB_TINY to perform some rather low-hanging fruit modifications to SLUB to reduce its memory overhead. This seems to have been successful at least in the k210 case [4]. I consider this as an acceptable tradeoff for getting rid of SLOB.
The series is also available in git:
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/linux.git/log/?h=slub-tiny-v1r2
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
[3] https://lore.kernel.org/all/Y25E9cJbhDAKi1vd@99bb1221be19/
[4] https://lore.kernel.org/all/[email protected]/
Vlastimil Babka (12):
mm, slab: ignore hardened usercopy parameters when disabled mm, slub: add CONFIG_SLUB_TINY
mm, slub: disable SYSFS support with CONFIG_SLUB_TINY
mm, slub: retain no free slabs on partial list with CONFIG_SLUB_TINY mm, slub: lower the default slub_max_order with CONFIG_SLUB_TINY mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY mm, slub: refactor free debug processing
mm, slub: split out allocations from pre/post hooks
mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
mm, slub: don't aggressively inline with CONFIG_SLUB_TINY mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
arch/arm/configs/clps711x_defconfig | 3 +- arch/arm/configs/collie_defconfig | 3 +- arch/arm/configs/multi_v4t_defconfig | 3 +- arch/arm/configs/omap1_defconfig | 3 +- arch/arm/configs/pxa_defconfig | 3 +- arch/arm/configs/tct_hammer_defconfig | 3 +- arch/arm/configs/xcep_defconfig | 3 +- arch/openrisc/configs/or1ksim_defconfig | 3 +- arch/openrisc/configs/simple_smp_defconfig | 3 +- arch/riscv/configs/nommu_k210_defconfig | 3 +- .../riscv/configs/nommu_k210_sdcard_defconfig | 3 +- arch/riscv/configs/nommu_virt_defconfig | 3 +- arch/sh/configs/rsk7201_defconfig | 3 +- arch/sh/configs/rsk7203_defconfig | 3 +- arch/sh/configs/se7206_defconfig | 3 +- arch/sh/configs/shmin_defconfig | 3 +- arch/sh/configs/shx3_defconfig | 3 +- include/linux/slab.h | 8 + include/linux/slub_def.h | 6 +- kernel/configs/tiny.config | 5 +- mm/Kconfig | 38 +- mm/Kconfig.debug | 2 +- mm/slab_common.c | 16 +- mm/slub.c | 415 ++++++++++++------ 24 files changed, 377 insertions(+), 164 deletions(-)
Signature · 1 line
2.38.1
PATCH 1/12 mm, slab: ignore hardened usercopy parameters when disabled
With CONFIG_HARDENED_USERCOPY not enabled, there are no __check_heap_object() checks happening that would use the kmem_cache useroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches. Thus ignore the values passed to cache creation and leave them zero when CONFIG_HARDENED_USERCOPY is disabled.
In a quick virtme boot test, this has reduced the number of caches in /proc/slabinfo from 131 to 111.
--- mm/slab_common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
mm/slab_common.c +5 -1
@@ -317,7 +317,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;
@@ -640,6 +641,9 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY )) + useroffset = usersize =0 ; + s->useroffset = useroffset; s->usersize = usersize;
Signature · 1 line
2.38.1
Re: [PATCH 01/12] mm, slab: ignore hardened usercopy parameters when disabled
Quoted 31 lines · Vlastimil Babka
With
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use thekmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches. Thus ignore the values passed to cache creation and leave them zero whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>---
mm/slab_common.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)mm/slab_common.c +2
-1@@ -317,7 +317,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;
mm/slab_common.c void __init create_boot_cache(struct kmem_cache *s, const char *name, · line 649
Quoted 9 lines
mm/slab_common.c +3
-0@@ -640,6 +641,9 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY )) + useroffset = usersize =0 ; + s->useroffset = useroffset; s->usersize = usersize;
"Always non-mergeable" is intentional here, but I do see the argument for not doing it under hardened-usercopy.
That said, if you keep this part, maybe go the full step and ifdef away useroffset/usersize's struct member definition and other logic, especially for SLUB_TINY benefits, so 2 ulongs are dropped from the cache struct?
-Kees
Signature · 1 line
Kees Cook
Re: [PATCH 01/12] mm, slab: ignore hardened usercopy parameters when disabled
Quoted 45 lines · Kees Cook
Quoted 31 lines · Vlastimil Babka
With
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use thekmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches. Thus ignore the values passed to cache creation and leave them zero whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>---
mm/slab_common.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)mm/slab_common.c +2
-1@@ -317,7 +317,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;mm/slab_common.c void __init create_boot_cache(struct kmem_cache *s, const char *name, · line 649
Quoted 9 lines
mm/slab_common.c +3
-0@@ -640,6 +641,9 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY )) + useroffset = usersize =0 ; + s->useroffset = useroffset; s->usersize = usersize;"Always non-mergeable" is intentional here, but I do see the argument for not doing it under hardened-usercopy.
Quoted 3 lines
That said, if you keep this part, maybe go the full step and ifdef away useroffset/usersize's struct member definition and other logic, especially for
SLUB_TINYbenefits, so 2 ulongs are dropped from the cache struct?
Okay, probably won't make much difference in practice, but for consistency... ----8<----
From 3cdb7b6ad16a9d95603b482969fa870f996ac9dc Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Wed, 16 Nov 2022 15:56:32 +0100
Subject: [PATCH] mm, slab: ignore hardened usercopy parameters when disabled
With CONFIG_HARDENED_USERCOPY not enabled, there are no __check_heap_object() checks happening that would use the struct kmem_cache useroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches.
Also the fields contribute to struct kmem_cache size unnecessarily when unused. Thus #ifdef them out completely when CONFIG_HARDENED_USERCOPY is disabled.
In a quick virtme boot test, this has reduced the number of caches in /proc/slabinfo from 131 to 111.
--- include/linux/slab_def.h | 2 ++ include/linux/slub_def.h | 2 ++ mm/slab.h | 2 -- mm/slab_common.c | 9 ++++++++- mm/slub.c | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-)
include/linux/slab_def.h +2 -0
@@ -80,8 +80,10 @@ struct kmem_cache {unsigned int *random_seq;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };
include/linux/slub_def.h +2 -0
@@ -136,8 +136,10 @@ struct kmem_cache {struct kasan_cache kasan_info;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };
mm/slab.h +0 -2
@@ -207,8 +207,6 @@ struct kmem_cache {unsigned int size;/* The aligned/padded/added on size */ unsigned int align;/* Alignment as calculated */ slab_flags_t flags;/* Active flags on the slab */ -unsigned int useroffset;/* Usercopy region offset */ -unsigned int usersize;/* Usercopy region size */ const char *name;/* Slab name for sysfs */ int refcount;/* Use counter */ void (*ctor)(void *);/* Called on object slot creation */
mm/slab_common.c +8 -1
@@ -143,8 +143,10 @@ int slab_unmergeable(struct kmem_cache *s)if (s->ctor)return 1 ; +#ifdef CONFIG_HARDENED_USERCOPY if (s->usersize)return 1 ; +#endif /* * We may have set a slab to be unmergeable during bootstrap.
@@ -223,8 +225,10 @@ static struct kmem_cache *create_cache(const char *name, s->size = s->object_size = object_size; s->align = align; s->ctor = ctor; +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);if (err)
@@ -317,7 +321,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;
@@ -640,8 +645,10 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);
mm/slub.c +4 -0
@@ -5502,11 +5502,13 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)SLAB_ATTR_RO (cache_dma);#endif +#ifdef CONFIG_HARDENED_USERCOPY static ssize_t usersize_show (struct kmem_cache *s,char *buf) {return sysfs_emit (buf,"%u\n" , s->usersize); }SLAB_ATTR_RO (usersize); +#endif static ssize_t destroy_by_rcu_show (struct kmem_cache *s,char *buf) {
@@ -5803,7 +5805,9 @@ static struct attribute *slab_attrs[] = {#ifdef CONFIG_FAILSLAB &failslab_attr.attr,#endif +#ifdef CONFIG_HARDENED_USERCOPY &usersize_attr.attr, +#endif #ifdef CONFIG_KFENCE &skip_kfence_attr.attr,#endif
Signature · 1 line
2.38.1
Re: [PATCH 01/12] mm, slab: ignore hardened usercopy parameters when disabled
Quoted 159 lines · Vlastimil Babka
Quoted 45 lines · Kees Cook
Quoted 31 lines · Vlastimil Babka
With
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use thekmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches. Thus ignore the values passed to cache creation and leave them zero whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>---
mm/slab_common.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)mm/slab_common.c +2
-1@@ -317,7 +317,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;mm/slab_common.c void __init create_boot_cache(struct kmem_cache *s, const char *name, · line 649
Quoted 9 lines
mm/slab_common.c +3
-0@@ -640,6 +641,9 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY )) + useroffset = usersize =0 ; + s->useroffset = useroffset; s->usersize = usersize;"Always non-mergeable" is intentional here, but I do see the argument for not doing it under hardened-usercopy.
Quoted 3 lines
That said, if you keep this part, maybe go the full step and ifdef away useroffset/usersize's struct member definition and other logic, especially for
SLUB_TINYbenefits, so 2 ulongs are dropped from the cache struct?Okay, probably won't make much difference in practice, but for consistency... ----8<----
From3cdb7b6ad16a9d95603b482969fa870f996ac9dcMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Wed, 16 Nov 2022 15:56:32 +0100
Subject: [PATCH] mm, slab: ignore hardened usercopy parameters when disabledWith
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use the structkmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches.Also the fields contribute to struct
kmem_cachesize unnecessarily when unused. Thus #ifdef them out completely whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab_def.h | 2 ++ include/linux/slub_def.h | 2 ++ mm/slab.h | 2 -- mm/slab_common.c | 9 ++++++++- mm/slub.c | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-)include/linux/slab_def.h +2
-0@@ -80,8 +80,10 @@ struct kmem_cache {unsigned int *random_seq;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };include/linux/slub_def.h +2
-0@@ -136,8 +136,10 @@ struct kmem_cache {struct kasan_cache kasan_info;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };mm/slab.h +0
-2@@ -207,8 +207,6 @@ struct kmem_cache {unsigned int size;/* The aligned/padded/added on size */ unsigned int align;/* Alignment as calculated */ slab_flags_t flags;/* Active flags on the slab */ -unsigned int useroffset;/* Usercopy region offset */ -unsigned int usersize;/* Usercopy region size */ const char *name;/* Slab name for sysfs */ int refcount;/* Use counter */ void (*ctor)(void *);/* Called on object slot creation */ mm/slab_common.c +6
-1@@ -143,8 +143,10 @@ int slab_unmergeable(struct kmem_cache *s)if (s->ctor)return 1 ; +#ifdef CONFIG_HARDENED_USERCOPY if (s->usersize)return 1 ; +#endif /* * We may have set a slab to be unmergeable during bootstrap. @@ -223,8 +225,10 @@ static struct kmem_cache *create_cache(const char *name, s->size = s->object_size = object_size; s->align = align; s->ctor = ctor; +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);if (err)@@ -317,7 +321,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset))
Quoted 1 line
usersize = useroffset = 0;
I think this change is no longer needed as slab_unmergeable() now does not check usersize when CONFIG_HARDENED_USERCOPY=n?
Quoted 43 lines
mm/slab_common.c +2
-0@@ -640,8 +645,10 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);mm/slub.c +4
-0@@ -5502,11 +5502,13 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)SLAB_ATTR_RO (cache_dma);#endif +#ifdef CONFIG_HARDENED_USERCOPY static ssize_t usersize_show (struct kmem_cache *s,char *buf) {return sysfs_emit (buf,"%u\n" , s->usersize); }SLAB_ATTR_RO (usersize); +#endif static ssize_t destroy_by_rcu_show (struct kmem_cache *s,char *buf) {@@ -5803,7 +5805,9 @@ static struct attribute *slab_attrs[] = {#ifdef CONFIG_FAILSLAB &failslab_attr.attr,#endif +#ifdef CONFIG_HARDENED_USERCOPY &usersize_attr.attr, +#endif #ifdef CONFIG_KFENCE &skip_kfence_attr.attr,#endif Signature · 1 line
2.38.1
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 01/12] mm, slab: ignore hardened usercopy parameters when disabled
Quoted 9 lines · Hyeonggon Yoo
mm/slab_common.c kmem_cache_create_usercopy(const char *name, · line 327
Quoted 6 lines
mm/slab_common.c +2
-1/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;I think this change is no longer needed as
slab_unmergeable()now does not check usersize whenCONFIG_HARDENED_USERCOPY=n?
True, but the code here still follows by
if (!usersize)
s = __kmem_cache_alias(name, size, align, flags, ctor);
So it seemed simplest just to leave it like that.
Hyeonggon Yoo
Reviewed-byRe: [PATCH 01/12] mm, slab: ignore hardened usercopy parameters when disabled
In reply to Vlastimil BabkaQuoted 201 lines · Vlastimil Babka
Quoted 45 lines · Kees Cook
Quoted 31 lines · Vlastimil Babka
With
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use thekmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches. Thus ignore the values passed to cache creation and leave them zero whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>---
mm/slab_common.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)mm/slab_common.c +2
-1@@ -317,7 +317,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;mm/slab_common.c void __init create_boot_cache(struct kmem_cache *s, const char *name, · line 649
Quoted 9 lines
mm/slab_common.c +3
-0@@ -640,6 +641,9 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY )) + useroffset = usersize =0 ; + s->useroffset = useroffset; s->usersize = usersize;"Always non-mergeable" is intentional here, but I do see the argument for not doing it under hardened-usercopy.
Quoted 3 lines
That said, if you keep this part, maybe go the full step and ifdef away useroffset/usersize's struct member definition and other logic, especially for
SLUB_TINYbenefits, so 2 ulongs are dropped from the cache struct?Okay, probably won't make much difference in practice, but for consistency... ----8<----
From3cdb7b6ad16a9d95603b482969fa870f996ac9dcMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Wed, 16 Nov 2022 15:56:32 +0100
Subject: [PATCH] mm, slab: ignore hardened usercopy parameters when disabledWith
CONFIG_HARDENED_USERCOPYnot enabled, there are no__check_heap_object()checks happening that would use the structkmem_cacheuseroffset and usersize fields. Yet the fields are still initialized, preventing merging of otherwise compatible caches.Also the fields contribute to struct
kmem_cachesize unnecessarily when unused. Thus #ifdef them out completely whenCONFIG_HARDENED_USERCOPYis disabled.In a quick virtme boot test, this has reduced the number of caches in
/proc/slabinfofrom 131 to 111.Cc Kees Cook <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab_def.h | 2 ++ include/linux/slub_def.h | 2 ++ mm/slab.h | 2 -- mm/slab_common.c | 9 ++++++++- mm/slub.c | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-)include/linux/slab_def.h +2
-0@@ -80,8 +80,10 @@ struct kmem_cache {unsigned int *random_seq;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };include/linux/slub_def.h +2
-0@@ -136,8 +136,10 @@ struct kmem_cache {struct kasan_cache kasan_info;#endif +#ifdef CONFIG_HARDENED_USERCOPY unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ +#endif struct kmem_cache_node *node[MAX_NUMNODES ]; };mm/slab.h +0
-2@@ -207,8 +207,6 @@ struct kmem_cache {unsigned int size;/* The aligned/padded/added on size */ unsigned int align;/* Alignment as calculated */ slab_flags_t flags;/* Active flags on the slab */ -unsigned int useroffset;/* Usercopy region offset */ -unsigned int usersize;/* Usercopy region size */ const char *name;/* Slab name for sysfs */ int refcount;/* Use counter */ void (*ctor)(void *);/* Called on object slot creation */ mm/slab_common.c +8
-1@@ -143,8 +143,10 @@ int slab_unmergeable(struct kmem_cache *s)if (s->ctor)return 1 ; +#ifdef CONFIG_HARDENED_USERCOPY if (s->usersize)return 1 ; +#endif /* * We may have set a slab to be unmergeable during bootstrap. @@ -223,8 +225,10 @@ static struct kmem_cache *create_cache(const char *name, s->size = s->object_size = object_size; s->align = align; s->ctor = ctor; +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);if (err)@@ -317,7 +321,8 @@ kmem_cache_create_usercopy(const char *name, flags &=CACHE_CREATE_MASK ;/* Fail closed on bad usersize of useroffset values. */ -if (WARN_ON (!usersize && useroffset) || +if (!IS_ENABLED (CONFIG_HARDENED_USERCOPY ) || +WARN_ON (!usersize && useroffset) ||WARN_ON (size < usersize || size - usersize < useroffset)) usersize = useroffset =0 ;@@ -640,8 +645,10 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, align =max (align, size); s->align =calculate_alignment (flags, align, size); +#ifdef CONFIG_HARDENED_USERCOPY s->useroffset = useroffset; s->usersize = usersize; +#endif err =__kmem_cache_create (s, flags);mm/slub.c +4
-0@@ -5502,11 +5502,13 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)SLAB_ATTR_RO (cache_dma);#endif +#ifdef CONFIG_HARDENED_USERCOPY static ssize_t usersize_show (struct kmem_cache *s,char *buf) {return sysfs_emit (buf,"%u\n" , s->usersize); }SLAB_ATTR_RO (usersize); +#endif static ssize_t destroy_by_rcu_show (struct kmem_cache *s,char *buf) {@@ -5803,7 +5805,9 @@ static struct attribute *slab_attrs[] = {#ifdef CONFIG_FAILSLAB &failslab_attr.attr,#endif +#ifdef CONFIG_HARDENED_USERCOPY &usersize_attr.attr, +#endif #ifdef CONFIG_KFENCE &skip_kfence_attr.attr,#endif Signature · 1 line
2.38.1
Looks good to me,
Signature · 2 lines
Thanks, Hyeonggon
PATCH 2/12 mm, slub: add CONFIG_SLUB_TINY
In reply to Vlastimil BabkaFor tiny systems that have used SLOB until now, SLUB might be impractical due to its higher memory usage. To help with that, introduce an option CONFIG_SLUB_TINY that modifies SLUB to use less memory. This is done by sacrificing scalability, security and debugging features, therefore not recommended for any system with more than 16MB RAM.
This commit introduces the option and uses it to set other related options in a way that reduces memory usage.
--- mm/Kconfig | 21 +++++++++++++++++---- mm/Kconfig.debug | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-)
mm/Kconfig +17 -4
@@ -230,6 +230,19 @@ config SLOB endchoice +config SLUB_TINY + bool "Configure SLUB for minimal memory footprint" + depends on SLUB && EXPERT + select SLAB_MERGE_DEFAULT + help + Configures the SLUB allocator in a way to achieve minimal memory + footprint, sacrificing scalability, debugging and other features. + This is intended only for the smallest system that had used the + SLOB allocator and is not recommended for systems with more than + 16MB RAM. + + If unsure, say N. + config SLAB_MERGE_DEFAULT bool "Allow slab caches to be merged" default y
@@ -247,7 +260,7 @@ config SLAB_MERGE_DEFAULT config SLAB_FREELIST_RANDOM bool "Randomize slab freelist" - depends on SLAB || SLUB + depends on SLAB || SLUB && !SLUB_TINY help Randomizes the freelist order used on creating new pages. This security feature reduces the predictability of the kernel slab
@@ -255,7 +268,7 @@ config SLAB_FREELIST_RANDOM config SLAB_FREELIST_HARDENED bool "Harden slab freelist metadata" - depends on SLAB || SLUB + depends on SLAB || SLUB && !SLUB_TINY help Many kernel heap attacks try to target slab cache metadata and other infrastructure. This options makes minor performance
@@ -267,7 +280,7 @@ config SLAB_FREELIST_HARDENED config SLUB_STATS default n bool "Enable SLUB performance statistics" - depends on SLUB && SYSFS + depends on SLUB && SYSFS && !SLUB_TINY help SLUB statistics are useful to debug SLUBs allocation behavior in order find ways to optimize the allocator. This should never be
@@ -279,7 +292,7 @@ config SLUB_STATS config SLUB_CPU_PARTIAL default y - depends on SLUB && SMP + depends on SLUB && SMP && !SLUB_TINY bool "SLUB per cpu partial cache" help Per cpu partial caches accelerate objects allocation and freeing
mm/Kconfig.debug +1 -1
@@ -56,7 +56,7 @@ config DEBUG_SLAB config SLUB_DEBUG default y bool "Enable SLUB debugging support" if EXPERT - depends on SLUB && SYSFS + depends on SLUB && SYSFS && !SLUB_TINY select STACKDEPOT if STACKTRACE_SUPPORT help SLUB has extensive debug support features. Disabling these can
Signature · 1 line
2.38.1
Re: [PATCH 02/12] mm, slub: add CONFIG_SLUB_TINY
Quoted 11 lines · Vlastimil Babka
For tiny systems that have used SLOB until now, SLUB might be impractical due to its higher memory usage. To help with that, introduce an option
CONFIG_SLUB_TINYthat modifies SLUB to use less memory. This is done by sacrificing scalability, security and debugging features, therefore not recommended for any system with more than 16MB RAM.This commit introduces the option and uses it to set other related options in a way that reduces memory usage.
Signed-off-by Vlastimil Babka <[email protected]>
Thanks!
Re: [PATCH 02/12] mm, slub: add CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 91 lines · Vlastimil Babka
For tiny systems that have used SLOB until now, SLUB might be impractical due to its higher memory usage. To help with that, introduce an option
CONFIG_SLUB_TINYthat modifies SLUB to use less memory. This is done by sacrificing scalability, security and debugging features, therefore not recommended for any system with more than 16MB RAM.This commit introduces the option and uses it to set other related options in a way that reduces memory usage.
Signed-off-by Vlastimil Babka <[email protected]>--- mm/Kconfig | 21 +++++++++++++++++---- mm/Kconfig.debug | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-)mm/Kconfig +17
-4@@ -230,6 +230,19 @@ config SLOB endchoice +config SLUB_TINY + bool "Configure SLUB for minimal memory footprint" + depends on SLUB && EXPERT + select SLAB_MERGE_DEFAULT + help + Configures the SLUB allocator in a way to achieve minimal memory + footprint, sacrificing scalability, debugging and other features. + This is intended only for the smallest system that had used the + SLOB allocator and is not recommended for systems with more than + 16MB RAM. + + If unsure, say N. + config SLAB_MERGE_DEFAULT bool "Allow slab caches to be merged" default y@@ -247,7 +260,7 @@ config SLAB_MERGE_DEFAULT config SLAB_FREELIST_RANDOM bool "Randomize slab freelist" - depends on SLAB || SLUB + depends on SLAB || SLUB && !SLUB_TINY help Randomizes the freelist order used on creating new pages. This security feature reduces the predictability of the kernel slab@@ -255,7 +268,7 @@ config SLAB_FREELIST_RANDOM config SLAB_FREELIST_HARDENED bool "Harden slab freelist metadata" - depends on SLAB || SLUB + depends on SLAB || SLUB && !SLUB_TINY help Many kernel heap attacks try to target slab cache metadata and other infrastructure. This options makes minor performance@@ -267,7 +280,7 @@ config SLAB_FREELIST_HARDENED config SLUB_STATS default n bool "Enable SLUB performance statistics" - depends on SLUB && SYSFS + depends on SLUB && SYSFS && !SLUB_TINY help SLUB statistics are useful to debug SLUBs allocation behavior in order find ways to optimize the allocator. This should never be@@ -279,7 +292,7 @@ config SLUB_STATS config SLUB_CPU_PARTIAL default y - depends on SLUB && SMP + depends on SLUB && SMP && !SLUB_TINY bool "SLUB per cpu partial cache" help Per cpu partial caches accelerate objects allocation and freeingmm/Kconfig.debug +1
-1@@ -56,7 +56,7 @@ config DEBUG_SLAB config SLUB_DEBUG default y bool "Enable SLUB debugging support" if EXPERT - depends on SLUB && SYSFS + depends on SLUB && SYSFS && !SLUB_TINY select STACKDEPOT if STACKTRACE_SUPPORT help SLUB has extensive debug support features. Disabling these canSignature · 1 line
2.38.1
small comment:
SLAB || (SLUB && !SLUB_TINY) would be easier to interpret than SLAB || SLUB && !SLUB_TINY
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 02/12] mm, slub: add CONFIG_SLUB_TINY
Quoted 1 line · Hyeonggon Yoo
Acked-by Hyeonggon Yoo <[email protected]>
Thanks.
Quoted 3 lines
small comment:
SLAB || (SLUB && !SLUB_TINY) would be easier to interpret than SLAB || SLUB && !SLUB_TINY
OK, will do.
PATCH 3/12 mm, slub: disable SYSFS support with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaCurrently SLUB enables its sysfs support depending unconditionally on the general CONFIG_SYSFS setting. To reduce the configuration combination space, make CONFIG_SLUB_TINY disable SLUB's sysfs support by reusing the existing SLAB_SUPPORTS_SYSFS define. It is unlikely that real tiny systems would combine CONFIG_SLUB_TINY with CONFIG_SYSFS, but a randconfig might.
--- include/linux/slub_def.h | 2 +- mm/slub.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/slub_def.h +1 -1
@@ -142,7 +142,7 @@ struct kmem_cache {struct kmem_cache_node *node[MAX_NUMNODES ]; }; -#ifdef CONFIG_SYSFS +#if defined(CONFIG_SYSFS ) && !defined(CONFIG_SLUB_TINY )#define SLAB_SUPPORTS_SYSFS void sysfs_slab_unlink (struct kmem_cache *);void sysfs_slab_release (struct kmem_cache *);
mm/slub.c +6 -6
@@ -298,7 +298,7 @@ struct track {enum track_item {TRACK_ALLOC ,TRACK_FREE }; -#ifdef CONFIG_SYSFS +#ifdef SLAB_SUPPORTS_SYSFS static int sysfs_slab_add (struct kmem_cache *);static int sysfs_slab_alias (struct kmem_cache *,const char *);#else
@@ -2935,7 +2935,7 @@ static noinline void free_debug_processing( }#endif /* CONFIG_SLUB_DEBUG */ -#if defined(CONFIG_SLUB_DEBUG ) || defined(CONFIG_SYSFS ) +#if defined(CONFIG_SLUB_DEBUG ) || defined(SLAB_SUPPORTS_SYSFS )static unsigned long count_partial (struct kmem_cache_node *n,int (*get_count)(struct slab *)) {
@@ -2949,7 +2949,7 @@ static unsigned long count_partial(struct kmem_cache_node *n,spin_unlock_irqrestore (&n->list_lock, flags);return x; } -#endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */ +#endif /* CONFIG_SLUB_DEBUG || SLAB_SUPPORTS_SYSFS */ static noinline voidslab_out_of_memory (struct kmem_cache *s,gfp_t gfpflags,int nid)
@@ -4924,7 +4924,7 @@ int __kmem_cache_create(struct kmem_cache *s, slab_flags_t flags)return 0 ; } -#ifdef CONFIG_SYSFS +#ifdef SLAB_SUPPORTS_SYSFS static int count_inuse (struct slab *slab) {return slab->inuse;
@@ -5182,7 +5182,7 @@ static void process_slab(struct loc_track *t, struct kmem_cache *s,#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_SLUB_DEBUG */ -#ifdef CONFIG_SYSFS +#ifdef SLAB_SUPPORTS_SYSFS enum slab_stat_type {SL_ALL ,/* All slabs */ SL_PARTIAL, /* Only partially allocated slabs */
@@ -6056,7 +6056,7 @@ static int __init slab_sysfs_init(void) }__initcall (slab_sysfs_init); -#endif /* CONFIG_SYSFS */ +#endif /* SLAB_SUPPORTS_SYSFS */ #if defined(CONFIG_SLUB_DEBUG ) && defined(CONFIG_DEBUG_FS )static int slab_debugfs_show (struct seq_file *seq,void *v)
Signature · 1 line
2.38.1
Roman Gushchin
reviewerRe: [PATCH 03/12] mm, slub: disable SYSFS support with CONFIG_SLUB_TINY
Quoted 6 lines · Vlastimil Babka
Currently SLUB enables its sysfs support depending unconditionally on the general
CONFIG_SYSFSsetting. To reduce the configuration combination space, makeCONFIG_SLUB_TINYdisable SLUB's sysfs support by reusing the existingSLAB_SUPPORTS_SYSFSdefine. It is unlikely that real tiny systems would combineCONFIG_SLUB_TINYwithCONFIG_SYSFS, but a randconfig might.
Hm, don't we want to introduce CONFIG_SLAB_SYSFS instead? I believe many users don't really need it, even if they don't need CONFIG_SLUB_TINY and they do have CONFIG_SYSFS.
Thanks!
Re: [PATCH 03/12] mm, slub: disable SYSFS support with CONFIG_SLUB_TINY
Quoted 11 lines · Roman Gushchin
Quoted 6 lines · Vlastimil Babka
Currently SLUB enables its sysfs support depending unconditionally on the general
CONFIG_SYSFSsetting. To reduce the configuration combination space, makeCONFIG_SLUB_TINYdisable SLUB's sysfs support by reusing the existingSLAB_SUPPORTS_SYSFSdefine. It is unlikely that real tiny systems would combineCONFIG_SLUB_TINYwithCONFIG_SYSFS, but a randconfig might.Hm, don't we want to introduce
CONFIG_SLAB_SYSFSinstead? I believe many users don't really need it, even if they don't needCONFIG_SLUB_TINYand they do haveCONFIG_SYSFS.
Dunno, adding more and more config options is generally frowned upon. Also tools might be using it to get more details than /proc/slabinfo does - i.e. tools/vm/slabinfo.c
Quoted 1 line
Thanks!
PATCH 4/12 mm, slub: retain no free slabs on partial list with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaSLUB will leave a number of slabs on the partial list even if they are empty, to avoid some slab freeing and reallocation. The goal of CONFIG_SLUB_TINY is to minimize memory overhead, so set the limits to 0 for immediate slab page freeing.
--- mm/slub.c | 5 +++++ 1 file changed, 5 insertions(+)
mm/slub.c +5 -0
@@ -241,6 +241,7 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s)/* Enable to log cmpxchg failures */ #undef SLUB_DEBUG_CMPXCHG +#ifndef CONFIG_SLUB_TINY /* * Minimum number of partial slabs. These will be left on the partial * lists even if they are empty. kmem_cache_shrink may reclaim them.
@@ -253,6 +254,10 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s)* sort the partial list by the number of objects in use. */ #define MAX_PARTIAL 10 +#else +#define MIN_PARTIAL 0 +#define MAX_PARTIAL 0 +#endif #define DEBUG_DEFAULT_FLAGS (SLAB_CONSISTENCY_CHECKS | SLAB_RED_ZONE | \ SLAB_POISON | SLAB_STORE_USER)
Signature · 1 line
2.38.1
Re: [PATCH 04/12] mm, slub: retain no free slabs on partial list with CONFIG_SLUB_TINY
Quoted 6 lines · Vlastimil Babka
SLUB will leave a number of slabs on the partial list even if they are empty, to avoid some slab freeing and reallocation. The goal of
CONFIG_SLUB_TINYis to minimize memory overhead, so set the limits to 0 for immediate slab page freeing.Signed-off-by Vlastimil Babka <[email protected]>
Thanks!
Re: [PATCH 04/12] mm, slub: retain no free slabs on partial list with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 36 lines · Vlastimil Babka
SLUB will leave a number of slabs on the partial list even if they are empty, to avoid some slab freeing and reallocation. The goal of
CONFIG_SLUB_TINYis to minimize memory overhead, so set the limits to 0 for immediate slab page freeing.Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 5 +++++ 1 file changed, 5 insertions(+)mm/slub.c +5
-0@@ -241,6 +241,7 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s)/* Enable to log cmpxchg failures */ #undef SLUB_DEBUG_CMPXCHG +#ifndef CONFIG_SLUB_TINY /* * Minimum number of partial slabs. These will be left on the partial * lists even if they are empty. kmem_cache_shrink may reclaim them. @@ -253,6 +254,10 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s)* sort the partial list by the number of objects in use. */ #define MAX_PARTIAL 10 +#else +#define MIN_PARTIAL 0 +#define MAX_PARTIAL 0 +#endif #define DEBUG_DEFAULT_FLAGS (SLAB_CONSISTENCY_CHECKS | SLAB_RED_ZONE | \ SLAB_POISON | SLAB_STORE_USER)Signature · 1 line
2.38.1
Signature · 2 lines
Thanks, Hyeonggon
PATCH 5/12 mm, slub: lower the default slub_max_order with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaWith CONFIG_SLUB_TINY we want to minimize memory overhead. By lowering the default slub_max_order we can make slab allocations use smaller pages. However depending on object sizes, order-0 might not be the best due to increased fragmentation. When testing on a 8MB RAM k210 system by Damien Le Moal [1], slub_max_order=1 had the best results, so use that as the default for CONFIG_SLUB_TINY.
[1] https://lore.kernel.org/all/[email protected]/
--- mm/slub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/slub.c +2 -1
@@ -3888,7 +3888,8 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);* take the list_lock. */ static unsigned int slub_min_order; -static unsigned int slub_max_order =PAGE_ALLOC_COSTLY_ORDER ; +static unsigned int slub_max_order = +IS_ENABLED (CONFIG_SLUB_TINY ) ?1 :PAGE_ALLOC_COSTLY_ORDER ;static unsigned int slub_min_objects;/*
Signature · 1 line
2.38.1
Re: [PATCH 05/12] mm, slub: lower the default slub_max_order with CONFIG_SLUB_TINY
Quoted 10 lines · Vlastimil Babka
With
CONFIG_SLUB_TINYwe want to minimize memory overhead. By lowering the defaultslub_max_orderwe can make slab allocations use smaller pages. However depending on object sizes, order-0 might not be the best due to increased fragmentation. When testing on a 8MB RAM k210 system by Damien Le Moal [1], slub_max_order=1 had the best results, so use that as the default forCONFIG_SLUB_TINY.[1] https://lore.kernel.org/all/[email protected]/
Signed-off-by Vlastimil Babka <[email protected]>
Thanks!
Re: [PATCH 05/12] mm, slub: lower the default slub_max_order with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 31 lines · Vlastimil Babka
With
CONFIG_SLUB_TINYwe want to minimize memory overhead. By lowering the defaultslub_max_orderwe can make slab allocations use smaller pages. However depending on object sizes, order-0 might not be the best due to increased fragmentation. When testing on a 8MB RAM k210 system by Damien Le Moal [1], slub_max_order=1 had the best results, so use that as the default forCONFIG_SLUB_TINY.[1] https://lore.kernel.org/all/[email protected]/
Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/slub.c +2
-1@@ -3888,7 +3888,8 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);* take the list_lock. */ static unsigned int slub_min_order; -static unsigned int slub_max_order =PAGE_ALLOC_COSTLY_ORDER ; +static unsigned int slub_max_order = +IS_ENABLED (CONFIG_SLUB_TINY ) ?1 :PAGE_ALLOC_COSTLY_ORDER ;static unsigned int slub_min_objects;/* Signature · 1 line
2.38.1
Signature · 2 lines
Thanks, Hyeonggon
PATCH 6/12 mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaDistinguishing kmalloc(__GFP_RECLAIMABLE) can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.
Thus with CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.
--- include/linux/slab.h | 4 ++++ mm/slab_common.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
include/linux/slab.h +4 -0
@@ -339,7 +339,11 @@ enum kmalloc_cache_type {#else KMALLOC_CGROUP,#endif +#ifndef CONFIG_SLUB_TINY KMALLOC_RECLAIM, +#else + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA,#endif
mm/slab_common.c +8 -2
@@ -770,10 +770,16 @@ EXPORT_SYMBOL(kmalloc_size_roundup);#define KMALLOC_CGROUP_NAME (sz)#endif +#ifndef CONFIG_SLUB_TINY +#define KMALLOC_RCL_NAME (sz) .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #sz, +#else +#define KMALLOC_RCL_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_RCL_NAME(__short_size) \ KMALLOC_CGROUP_NAME(__short_size) \ KMALLOC_DMA_NAME(__short_size) \ .size = __size, \
@@ -859,7 +865,7 @@ void __init setup_kmalloc_cache_index_table(void)static void __init new_kmalloc_cache (int idx,enum kmalloc_cache_type type,slab_flags_t flags) { -if (type ==KMALLOC_RECLAIM ) { +if ((KMALLOC_RECLAIM !=KMALLOC_NORMAL ) && (type ==KMALLOC_RECLAIM )) { flags |=SLAB_RECLAIM_ACCOUNT ; }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) {if (mem_cgroup_kmem_disabled ()) {
Signature · 1 line
2.38.1
Re: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
Quoted 9 lines · Vlastimil Babka
Distinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>
Fixed up in response to lkp report for a MEMCG_KMEM+SLUB_TINY combo:
---8<---
From c1ec0b924850a2863d061f316615d596176f15bb Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Tue, 15 Nov 2022 18:19:28 +0100
Subject: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with
CONFIG_SLUB_TINY
Distinguishing kmalloc(__GFP_RECLAIMABLE) can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.
Thus with CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.
--- include/linux/slab.h | 9 +++++++-- mm/slab_common.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)
include/linux/slab.h +7 -2
@@ -336,12 +336,17 @@ enum kmalloc_cache_type {#endif #ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, -#else -KMALLOC_CGROUP ,#endif +#ifdef CONFIG_SLUB_TINY + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#else KMALLOC_RECLAIM, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, +#endif +#ifdef CONFIG_MEMCG_KMEM +KMALLOC_CGROUP , #endifNR_KMALLOC_TYPES };
mm/slab_common.c +8 -2
@@ -770,10 +770,16 @@ EXPORT_SYMBOL(kmalloc_size_roundup);#define KMALLOC_CGROUP_NAME (sz)#endif +#ifndef CONFIG_SLUB_TINY +#define KMALLOC_RCL_NAME (sz) .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #sz, +#else +#define KMALLOC_RCL_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_RCL_NAME(__short_size) \ KMALLOC_CGROUP_NAME(__short_size) \ KMALLOC_DMA_NAME(__short_size) \ .size = __size, \
@@ -859,7 +865,7 @@ void __init setup_kmalloc_cache_index_table(void)static void __init new_kmalloc_cache (int idx,enum kmalloc_cache_type type,slab_flags_t flags) { -if (type ==KMALLOC_RECLAIM ) { +if ((KMALLOC_RECLAIM !=KMALLOC_NORMAL ) && (type ==KMALLOC_RECLAIM )) { flags |=SLAB_RECLAIM_ACCOUNT ; }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) {if (mem_cgroup_kmem_disabled ()) {
Signature · 1 line
2.38.1
Re: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
Quoted 47 lines · Vlastimil Babka
Quoted 9 lines · Vlastimil Babka
Distinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>Fixed up in response to lkp report for a MEMCG_KMEM+SLUB_TINY combo:
---8<---
Fromc1ec0b924850a2863d061f316615d596176f15bbMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Tue, 15 Nov 2022 18:19:28 +0100
Subject: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with
CONFIG_SLUB_TINYDistinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab.h | 9 +++++++-- mm/slab_common.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)include/linux/slab.h +3
-2@@ -336,12 +336,17 @@ enum kmalloc_cache_type {#endif #ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, -#else - KMALLOC_CGROUP,#endif +#ifdef CONFIG_SLUB_TINY + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#else
include/linux/slab.h enum kmalloc_cache_type { · line 352
Quoted 10 lines
include/linux/slab.h +4
-0KMALLOC_RECLAIM, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, +#endif +#ifdef CONFIG_MEMCG_KMEM +KMALLOC_CGROUP , #endifNR_KMALLOC_TYPES };
Can you please elaborate what the lkp report was about and how you fixed it? I'm not getting what the problem of previous version is.
Quoted 34 lines
mm/slab_common.c +8
-2@@ -770,10 +770,16 @@ EXPORT_SYMBOL(kmalloc_size_roundup);#define KMALLOC_CGROUP_NAME (sz)#endif +#ifndef CONFIG_SLUB_TINY +#define KMALLOC_RCL_NAME (sz) .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #sz, +#else +#define KMALLOC_RCL_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_RCL_NAME(__short_size) \ KMALLOC_CGROUP_NAME(__short_size) \ KMALLOC_DMA_NAME(__short_size) \ .size = __size, \@@ -859,7 +865,7 @@ void __init setup_kmalloc_cache_index_table(void)static void __init new_kmalloc_cache (int idx,enum kmalloc_cache_type type,slab_flags_t flags) { -if (type ==KMALLOC_RECLAIM ) { +if ((KMALLOC_RECLAIM !=KMALLOC_NORMAL ) && (type ==KMALLOC_RECLAIM )) { flags |=SLAB_RECLAIM_ACCOUNT ; }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) {if (mem_cgroup_kmem_disabled ()) {Signature · 1 line
2.38.1
Otherwise looks fine to me.
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
Quoted 54 lines · Hyeonggon Yoo
Quoted 53 lines · Vlastimil Babka
Quoted 9 lines · Vlastimil Babka
Distinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>Fixed up in response to lkp report for a MEMCG_KMEM+SLUB_TINY combo:
---8<---
Fromc1ec0b924850a2863d061f316615d596176f15bbMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Tue, 15 Nov 2022 18:19:28 +0100
Subject: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with
CONFIG_SLUB_TINYDistinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab.h | 9 +++++++-- mm/slab_common.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)include/linux/slab.h +6
-2@@ -336,12 +336,17 @@ enum kmalloc_cache_type {#endif #ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, -#else -KMALLOC_CGROUP ,#endif +#ifdef CONFIG_SLUB_TINY + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#else KMALLOC_RECLAIM, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, +#endif +#ifdef CONFIG_MEMCG_KMEM
Quoted 8 lines
include/linux/slab.h enum kmalloc_cache_type { · line 352
Quoted 4 lines
include/linux/slab.h +1
-0+KMALLOC_CGROUP , #endifNR_KMALLOC_TYPES };Can you please elaborate what the lkp report was about and how you fixed it? I'm not getting what the problem of previous version is.
Report here:
https://lore.kernel.org/all/[email protected]/
Problem is that if the preprocessing results in e.g. KMALLOC_NORMAL = 0,KMALLOC_DMA = KMALLOC_NORMALKMALLOC_CGROUP,KMALLOC_RECLAIM = KMALLOC_NORMAL, NR_KMALLOC_TYPES
then NR_KMALLOC_TYPES is not 2, but 1, because the enum's internal counter got reset to 0 by KMALLOC_RECLAIM = KMALLOC_NORMAL. A common gotcha :/
Re: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
Quoted 74 lines · Vlastimil Babka
Quoted 54 lines · Hyeonggon Yoo
Quoted 53 lines · Vlastimil Babka
Quoted 9 lines · Vlastimil Babka
Distinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>Fixed up in response to lkp report for a MEMCG_KMEM+SLUB_TINY combo:
---8<---
Fromc1ec0b924850a2863d061f316615d596176f15bbMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Tue, 15 Nov 2022 18:19:28 +0100
Subject: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with
CONFIG_SLUB_TINYDistinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab.h | 9 +++++++-- mm/slab_common.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)include/linux/slab.h +6
-2@@ -336,12 +336,17 @@ enum kmalloc_cache_type {#endif #ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, -#else -KMALLOC_CGROUP ,#endif +#ifdef CONFIG_SLUB_TINY + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#else KMALLOC_RECLAIM, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, +#endif +#ifdef CONFIG_MEMCG_KMEM Quoted 8 lines
include/linux/slab.h enum kmalloc_cache_type { · line 352
Quoted 4 lines
include/linux/slab.h +1
-0+KMALLOC_CGROUP , #endifNR_KMALLOC_TYPES };Can you please elaborate what the lkp report was about and how you fixed it? I'm not getting what the problem of previous version is.
Report here:
https://lore.kernel.org/all/[email protected]/Problem is that if the preprocessing results in e.g.
KMALLOC_NORMAL= 0,KMALLOC_DMA=KMALLOC_NORMALKMALLOC_CGROUP,KMALLOC_RECLAIM=KMALLOC_NORMAL,NR_KMALLOC_TYPES
Quoted 2 lines
then
NR_KMALLOC_TYPESis not 2, but 1, because the enum's internal counter got reset to 0 byKMALLOC_RECLAIM=KMALLOC_NORMAL. A common gotcha :/
Thanks for quick and kind explanation :)
That was easy to be missed.
Signature · 2 lines
Thanks, Hyeonggon
Hyeonggon Yoo
Reviewed-byRe: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 80 lines · Vlastimil Babka
Quoted 9 lines · Vlastimil Babka
Distinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>Fixed up in response to lkp report for a MEMCG_KMEM+SLUB_TINY combo:
---8<---
Fromc1ec0b924850a2863d061f316615d596176f15bbMon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Tue, 15 Nov 2022 18:19:28 +0100
Subject: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with
CONFIG_SLUB_TINYDistinguishing
kmalloc(__GFP_RECLAIMABLE)can help against fragmentation by grouping pages by mobility, but on tiny systems the extra memory overhead of separate set of kmalloc-rcl caches will probably be worse, and mobility grouping likely disabled anyway.Thus with
CONFIG_SLUB_TINY, don't create kmalloc-rcl caches and use the regular ones.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab.h | 9 +++++++-- mm/slab_common.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)include/linux/slab.h +7
-2@@ -336,12 +336,17 @@ enum kmalloc_cache_type {#endif #ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, -#else -KMALLOC_CGROUP ,#endif +#ifdef CONFIG_SLUB_TINY + KMALLOC_RECLAIM = KMALLOC_NORMAL, +#else KMALLOC_RECLAIM, +#endif #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, +#endif +#ifdef CONFIG_MEMCG_KMEM +KMALLOC_CGROUP , #endifNR_KMALLOC_TYPES };mm/slab_common.c +7
-1@@ -770,10 +770,16 @@ EXPORT_SYMBOL(kmalloc_size_roundup);#define KMALLOC_CGROUP_NAME (sz)#endif +#ifndef CONFIG_SLUB_TINY +#define KMALLOC_RCL_NAME (sz) .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #sz, +#else +#define KMALLOC_RCL_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_RCL_NAME(__short_size) \ KMALLOC_CGROUP_NAME(__short_size) \ KMALLOC_DMA_NAME(__short_size) \ .size = __size, \
mm/slab_common.c void __init setup_kmalloc_cache_index_table(void) · line 868
Quoted 5 lines
mm/slab_common.c +1
-1@@ -859,7 +865,7 @@ void __init setup_kmalloc_cache_index_table(void)static void __init new_kmalloc_cache (int idx,enum kmalloc_cache_type type,slab_flags_t flags) { -if (type ==KMALLOC_RECLAIM ) { +if ((KMALLOC_RECLAIM !=KMALLOC_NORMAL ) && (type ==KMALLOC_RECLAIM )) {
for consistency this can be:
if (IS_ENABLED(CONFIG_SLUB_TINY) && (type == KMALLOC_RECLAIM)) {But yeah, it's not a big deal.
Quoted 6 lines
mm/slab_common.c +0
-0flags |=SLAB_RECLAIM_ACCOUNT ; }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) {if (mem_cgroup_kmem_disabled ()) {Signature · 1 line
2.38.1
For either case:
Looks good to me.
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 06/12] mm, slub: don't create kmalloc-rcl caches with CONFIG_SLUB_TINY
Quoted 10 lines · Hyeonggon Yoo
mm/slab_common.c void __init setup_kmalloc_cache_index_table(void) · line 868
Quoted 6 lines
mm/slab_common.c +1
-1@@ -859,7 +865,7 @@ void __init setup_kmalloc_cache_index_table(void)static void __init new_kmalloc_cache (int idx,enum kmalloc_cache_type type,slab_flags_t flags) { -if (type ==KMALLOC_RECLAIM ) { +if ((KMALLOC_RECLAIM !=KMALLOC_NORMAL ) && (type ==KMALLOC_RECLAIM )) {for consistency this can be:
if (IS_ENABLED(CONFIG_SLUB_TINY) && (type == KMALLOC_RECLAIM)) {
My finger slipped :)
I mean:
if (!IS_ENABLED(CONFIG_SLUB_TINY) && (type == KMALLOC_RECLAIM)) {Signature · 2 lines
Thanks, Hyeonggon
PATCH 7/12 mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaSLAB_RECLAIM_ACCOUNT caches allocate their slab pages with __GFP_RECLAIMABLE and can help against fragmentation by grouping pages by mobility, but on tiny systems mobility grouping is likely disabled anyway and ignoring SLAB_RECLAIM_ACCOUNT might instead lead to merging of caches that are made incompatible just by the flag.
Thus with CONFIG_SLUB_TINY, make SLAB_RECLAIM_ACCOUNT ineffective.
--- include/linux/slab.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/slab.h +4 -0
@@ -129,7 +129,11 @@/* The following flags affect the page allocator grouping pages by mobility */ /* Objects are reclaimable */ +#ifndef CONFIG_SLUB_TINY #define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000U) +#else +#define SLAB_RECLAIM_ACCOUNT 0 +#endif #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */ /*
Signature · 1 line
2.38.1
Roman Gushchin
reviewerRe: [PATCH 07/12] mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY
Quoted 7 lines · Vlastimil Babka
SLAB_RECLAIM_ACCOUNTcaches allocate their slab pages with__GFP_RECLAIMABLEand can help against fragmentation by grouping pages by mobility, but on tiny systems mobility grouping is likely disabled anyway and ignoringSLAB_RECLAIM_ACCOUNTmight instead lead to merging of caches that are made incompatible just by the flag.Thus with
CONFIG_SLUB_TINY, makeSLAB_RECLAIM_ACCOUNTineffective.
Hm, do you see disabling all kernel memory accounting functionality with COFNIG_SLUB_TINY? I'd say yes. But in this case need to be consistent and disable it alltogether.
Thanks!
Re: [PATCH 07/12] mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY
Quoted 7 lines · Roman Gushchin
Quoted 6 lines · Vlastimil Babka
SLAB_RECLAIM_ACCOUNTcaches allocate their slab pages with__GFP_RECLAIMABLEand can help against fragmentation by grouping pages by mobility, but on tiny systems mobility grouping is likely disabled anyway and ignoringSLAB_RECLAIM_ACCOUNTmight instead lead to merging of caches that are made incompatible just by the flag.
Quoted 5 lines
Quoted 1 line
Thus with
CONFIG_SLUB_TINY, makeSLAB_RECLAIM_ACCOUNTineffective.Hm, do you see disabling all kernel memory accounting functionality with
COFNIG_SLUB_TINY? I'd say yes. But in this case need to be consistent and disable it alltogether.
SLAB_RECLAIM_ACCOUNT is kinda misnomer these days, as the only thing it does is to add __GFP_RECLAIMABLE to cache's gfp flags for the page allocator's mobility grouping. I guess the "ACCOUNT" part comes from being counted towards SReclaimable (vs SUnreclaim) in /proc/meminfo.
So currently SLUB_TINY has no effect on MEMCG_KMEM (which you probably meant). Using those two together has little sense and had I stumbled while making this series upon a code that would become complicated, I would have made SLUB_TINY disable MEMCG_KMEM, but that didn't happen so I left as is for now.
Quoted 1 line
Thanks!
Re: [PATCH 07/12] mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY
Quoted 4 lines · Vlastimil Babka
SLAB_RECLAIM_ACCOUNTis kinda misnomer these days, as the only thing it does is to add__GFP_RECLAIMABLEto cache's gfp flags for the page allocator's mobility grouping. I guess the "ACCOUNT" part comes from being counted towards SReclaimable (vs SUnreclaim) in/proc/meminfo.
Well these Sreclaimable etc counters visible in /proc/meminfo are used in the reclaim logic and are quite important there.
Re: [PATCH 07/12] mm, slab: ignore SLAB_RECLAIM_ACCOUNT with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 18 lines · Vlastimil Babka
SLAB_RECLAIM_ACCOUNTcaches allocate their slab pages with__GFP_RECLAIMABLEand can help against fragmentation by grouping pages by mobility, but on tiny systems mobility grouping is likely disabled anyway and ignoringSLAB_RECLAIM_ACCOUNTmight instead lead to merging of caches that are made incompatible just by the flag.Thus with
CONFIG_SLUB_TINY, makeSLAB_RECLAIM_ACCOUNTineffective.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slab.h | 4 ++++ 1 file changed, 4 insertions(+)include/linux/slab.h +0
-0
include/linux/slab.h line 135
Quoted 7 lines
include/linux/slab.h +3
-0@@ -129,7 +129,11 @@/* The following flags affect the page allocator grouping pages by mobility */ /* Objects are reclaimable */ +#ifndef CONFIG_SLUB_TINY #define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000U) +#else +#define SLAB_RECLAIM_ACCOUNT 0
Updating the last line above to:
#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0)
In response to:
https://lore.kernel.org/all/[email protected]/
Yeah it probably means that the other pre-existing flag variants that #define to 0 should be also adjusted to avoid these issues, but not as part of this series.
Quoted 4 lines
include/linux/slab.h +1
-0+#endif #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */ /*
PATCH 8/12 mm, slub: refactor free debug processing
In reply to Vlastimil BabkaSince commit c7323a5ad078 ("mm/slub: restrict sysfs validation to debug caches and make it safe"), caches with debugging enabled use the free_debug_processing() function to do both freeing checks and actual freeing to partial list under list_lock, bypassing the fast paths.
We will want to use the same path for CONFIG_SLUB_TINY, but without the debugging checks, so refactor the code so that free_debug_processing() does only the checks, while the freeing is handled by a new function free_to_partial_list().
For consistency, change return parameter alloc_debug_processing() from int to bool and correct the !SLUB_DEBUG variant to return true and not false. This didn't matter until now, but will in the following changes.
--- mm/slub.c | 154 +++++++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 71 deletions(-)
mm/slub.c +83 -71
@@ -1368,7 +1368,7 @@ static inline int alloc_consistency_checks(struct kmem_cache *s,return 1 ; } -static noinline int alloc_debug_processing(struct kmem_cache *s, +static noinline bool alloc_debug_processing(struct kmem_cache *s,struct slab *slab,void *object,int orig_size) {if (s->flags &SLAB_CONSISTENCY_CHECKS ) {
@@ -1380,7 +1380,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s,trace (s, slab, object,1 );set_orig_size (s, object, orig_size);init_object (s, object,SLUB_RED_ACTIVE ); -return 1 ; +return true; bad:if (folio_test_slab (slab_folio (slab))) {
@@ -1393,7 +1393,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s, slab->inuse = slab->objects; slab->freelist =NULL ; } -return 0 ; +return false; } static inline int free_consistency_checks(struct kmem_cache *s,
@@ -1646,17 +1646,17 @@ static inline void setup_object_debug(struct kmem_cache *s, void *object) {}static inline void setup_slab_debug (struct kmem_cache *s,struct slab *slab,void *addr) {} -static inline int alloc_debug_processing (struct kmem_cache *s, -struct slab *slab,void *object,int orig_size) {return 0 ; } +static inline bool alloc_debug_processing (struct kmem_cache *s, +struct slab *slab,void *object,int orig_size) {return true; } -static inline void free_debug_processing ( -struct kmem_cache *s,struct slab *slab, -void *head,void *tail,int bulk_cnt, -unsigned long addr) {} +static inline bool free_debug_processing (struct kmem_cache *s, +struct slab *slab,void *head,void *tail,int *bulk_cnt, +unsigned long addr,depot_stack_handle_t handle) {return true; }static inline void slab_pad_check (struct kmem_cache *s,struct slab *slab) {}static inline int check_object (struct kmem_cache *s,struct slab *slab,void *object,u8 val) {return 1 ; } +static inline depot_stack_handle_t set_track_prepare (void ) {return 0 ; }static inline void set_track (struct kmem_cache *s,void *object,enum track_item alloc,unsigned long addr) {} static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
@@ -2833,38 +2833,28 @@ static inline unsigned long node_nr_objs(struct kmem_cache_node *n) }/* Supports checking bulk free of a constructed freelist */ -static noinline void free_debug_processing( -struct kmem_cache *s,struct slab *slab, -void *head,void *tail,int bulk_cnt, -unsigned long addr) +static inline bool free_debug_processing (struct kmem_cache *s, +struct slab *slab,void *head,void *tail,int *bulk_cnt, +unsigned long addr,depot_stack_handle_t handle) { -struct kmem_cache_node *n =get_node (s,slab_nid (slab)); -struct slab *slab_free =NULL ; +bool checks_ok = false;void *object = head;int cnt =0 ; -unsigned long flags; -bool checks_ok = false; -depot_stack_handle_t handle =0 ; - -if (s->flags &SLAB_STORE_USER ) - handle =set_track_prepare (); - -spin_lock_irqsave (&n->list_lock, flags);if (s->flags &SLAB_CONSISTENCY_CHECKS ) {if (!check_slab (s, slab)) goto out; } -if (slab->inuse < bulk_cnt) { +if (slab->inuse < *bulk_cnt) {slab_err (s, slab,"Slab has %d allocated objects but %d are to be freed\n" , - slab->inuse, bulk_cnt); + slab->inuse, *bulk_cnt); goto out; } next_object: -if (++cnt > bulk_cnt) +if (++cnt > *bulk_cnt) goto out_cnt;if (s->flags &SLAB_CONSISTENCY_CHECKS ) {
@@ -2886,57 +2876,18 @@ static noinline void free_debug_processing( checks_ok = true; out_cnt: -if (cnt != bulk_cnt) +if (cnt != *bulk_cnt) {slab_err (s, slab,"Bulk free expected %d objects but found %d\n" , - bulk_cnt, cnt); - -out: -if (checks_ok) { -void *prior = slab->freelist; - -/* Perform the actual freeing while we still hold the locks */ - slab->inuse -= cnt; -set_freepointer (s, tail, prior); - slab->freelist = head; - -/* -* If the slab is empty, and node's partial list is full, -* it should be discarded anyway no matter it's on full or -* partial list. -*/ -if (slab->inuse ==0 && n->nr_partial >= s->min_partial) - slab_free = slab; - -if (!prior) { -/* was on full list */ -remove_full (s, n, slab); -if (!slab_free) { -add_partial (n, slab,DEACTIVATE_TO_TAIL ); -stat (s,FREE_ADD_PARTIAL ); - } - }else if (slab_free) { -remove_partial (n, slab); -stat (s,FREE_REMOVE_PARTIAL ); - } + *bulk_cnt, cnt); + *bulk_cnt = cnt; } -if (slab_free) { -/* -* Update the counters while still holding n->list_lock to -* prevent spurious validation warnings -*/ -dec_slabs_node (s,slab_nid (slab_free), slab_free->objects); - } - -spin_unlock_irqrestore (&n->list_lock, flags); +out:if (!checks_ok)slab_fix (s,"Object at 0x%p not freed" , object); -if (slab_free) { -stat (s,FREE_SLAB ); -free_slab (s, slab_free); - } + return checks_ok; }#endif /* CONFIG_SLUB_DEBUG */
@@ -3453,6 +3404,67 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) }EXPORT_SYMBOL (kmem_cache_alloc_node); +static noinline void free_to_partial_list( +struct kmem_cache *s,struct slab *slab, +void *head,void *tail,int bulk_cnt, +unsigned long addr) +{ +struct kmem_cache_node *n =get_node (s,slab_nid (slab)); +struct slab *slab_free =NULL ; +int cnt = bulk_cnt; +unsigned long flags; +depot_stack_handle_t handle =0 ; + +if (s->flags &SLAB_STORE_USER ) + handle =set_track_prepare (); + +spin_lock_irqsave (&n->list_lock, flags); + +if (free_debug_processing (s, slab, head, tail, &cnt, addr, handle)) { +void *prior = slab->freelist; + +/* Perform the actual freeing while we still hold the locks */ + slab->inuse -= cnt; +set_freepointer (s, tail, prior); + slab->freelist = head; + +/* +* If the slab is empty, and node's partial list is full, +* it should be discarded anyway no matter it's on full or +* partial list. +*/ +if (slab->inuse ==0 && n->nr_partial >= s->min_partial) + slab_free = slab; + +if (!prior) { +/* was on full list */ +remove_full (s, n, slab); +if (!slab_free) { +add_partial (n, slab,DEACTIVATE_TO_TAIL ); +stat (s,FREE_ADD_PARTIAL ); + } + }else if (slab_free) { +remove_partial (n, slab); +stat (s,FREE_REMOVE_PARTIAL ); + } + } + +if (slab_free) { +/* +* Update the counters while still holding n->list_lock to +* prevent spurious validation warnings +*/ +dec_slabs_node (s,slab_nid (slab_free), slab_free->objects); + } + +spin_unlock_irqrestore (&n->list_lock, flags); + +if (slab_free) { +stat (s,FREE_SLAB ); +free_slab (s, slab_free); + } +} +/* * Slow path handling. This may still be called frequently since objects * have a longer lifetime than the cpu slabs in most processing loads.
@@ -3479,7 +3491,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab,return ;if (kmem_cache_debug (s)) { -free_debug_processing (s, slab, head, tail, cnt, addr); +free_to_partial_list (s, slab, head, tail, cnt, addr);return ; }
Signature · 1 line
2.38.1
Re: [PATCH 08/12] mm, slub: refactor free debug processing
Quoted 263 lines · Vlastimil Babka
Since commit
c7323a5ad078("mm/slub: restrict sysfs validation to debug caches and make it safe"), caches with debugging enabled use thefree_debug_processing()function to do both freeing checks and actual freeing to partial list underlist_lock, bypassing the fast paths.We will want to use the same path for
CONFIG_SLUB_TINY, but without the debugging checks, so refactor the code so thatfree_debug_processing()does only the checks, while the freeing is handled by a new functionfree_to_partial_list().For consistency, change return parameter
alloc_debug_processing()from int to bool and correct the !SLUB_DEBUG variant to return true and not false. This didn't matter until now, but will in the following changes.Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 154 +++++++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 71 deletions(-)mm/slub.c +83
-71@@ -1368,7 +1368,7 @@ static inline int alloc_consistency_checks(struct kmem_cache *s,return 1 ; } -static noinline int alloc_debug_processing(struct kmem_cache *s, +static noinline bool alloc_debug_processing(struct kmem_cache *s,struct slab *slab,void *object,int orig_size) {if (s->flags &SLAB_CONSISTENCY_CHECKS ) {@@ -1380,7 +1380,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s,trace (s, slab, object,1 );set_orig_size (s, object, orig_size);init_object (s, object,SLUB_RED_ACTIVE ); -return 1 ; +return true; bad:if (folio_test_slab (slab_folio (slab))) {@@ -1393,7 +1393,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s, slab->inuse = slab->objects; slab->freelist =NULL ; } -return 0 ; +return false; } static inline int free_consistency_checks(struct kmem_cache *s,@@ -1646,17 +1646,17 @@ static inline void setup_object_debug(struct kmem_cache *s, void *object) {}static inline void setup_slab_debug (struct kmem_cache *s,struct slab *slab,void *addr) {} -static inline int alloc_debug_processing (struct kmem_cache *s, -struct slab *slab,void *object,int orig_size) {return 0 ; } +static inline bool alloc_debug_processing (struct kmem_cache *s, +struct slab *slab,void *object,int orig_size) {return true; } -static inline void free_debug_processing ( -struct kmem_cache *s,struct slab *slab, -void *head,void *tail,int bulk_cnt, -unsigned long addr) {} +static inline bool free_debug_processing (struct kmem_cache *s, +struct slab *slab,void *head,void *tail,int *bulk_cnt, +unsigned long addr,depot_stack_handle_t handle) {return true; }static inline void slab_pad_check (struct kmem_cache *s,struct slab *slab) {}static inline int check_object (struct kmem_cache *s,struct slab *slab,void *object,u8 val) {return 1 ; } +static inline depot_stack_handle_t set_track_prepare (void ) {return 0 ; }static inline void set_track (struct kmem_cache *s,void *object,enum track_item alloc,unsigned long addr) {} static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,@@ -2833,38 +2833,28 @@ static inline unsigned long node_nr_objs(struct kmem_cache_node *n) }/* Supports checking bulk free of a constructed freelist */ -static noinline void free_debug_processing( -struct kmem_cache *s,struct slab *slab, -void *head,void *tail,int bulk_cnt, -unsigned long addr) +static inline bool free_debug_processing (struct kmem_cache *s, +struct slab *slab,void *head,void *tail,int *bulk_cnt, +unsigned long addr,depot_stack_handle_t handle) { -struct kmem_cache_node *n =get_node (s,slab_nid (slab)); -struct slab *slab_free =NULL ; +bool checks_ok = false;void *object = head;int cnt =0 ; -unsigned long flags; -bool checks_ok = false; -depot_stack_handle_t handle =0 ; - -if (s->flags &SLAB_STORE_USER ) - handle =set_track_prepare (); - -spin_lock_irqsave (&n->list_lock, flags);if (s->flags &SLAB_CONSISTENCY_CHECKS ) {if (!check_slab (s, slab)) goto out; } -if (slab->inuse < bulk_cnt) { +if (slab->inuse < *bulk_cnt) {slab_err (s, slab,"Slab has %d allocated objects but %d are to be freed\n" , - slab->inuse, bulk_cnt); + slab->inuse, *bulk_cnt); goto out; } next_object: -if (++cnt > bulk_cnt) +if (++cnt > *bulk_cnt) goto out_cnt;if (s->flags &SLAB_CONSISTENCY_CHECKS ) {@@ -2886,57 +2876,18 @@ static noinline void free_debug_processing( checks_ok = true; out_cnt: -if (cnt != bulk_cnt) +if (cnt != *bulk_cnt) {slab_err (s, slab,"Bulk free expected %d objects but found %d\n" , - bulk_cnt, cnt); - -out: -if (checks_ok) { -void *prior = slab->freelist; - -/* Perform the actual freeing while we still hold the locks */ - slab->inuse -= cnt; -set_freepointer (s, tail, prior); - slab->freelist = head; - -/* -* If the slab is empty, and node's partial list is full, -* it should be discarded anyway no matter it's on full or -* partial list. -*/ -if (slab->inuse ==0 && n->nr_partial >= s->min_partial) - slab_free = slab; - -if (!prior) { -/* was on full list */ -remove_full (s, n, slab); -if (!slab_free) { -add_partial (n, slab,DEACTIVATE_TO_TAIL ); -stat (s,FREE_ADD_PARTIAL ); - } - }else if (slab_free) { -remove_partial (n, slab); -stat (s,FREE_REMOVE_PARTIAL ); - } + *bulk_cnt, cnt); + *bulk_cnt = cnt; } -if (slab_free) { -/* -* Update the counters while still holding n->list_lock to -* prevent spurious validation warnings -*/ -dec_slabs_node (s,slab_nid (slab_free), slab_free->objects); - } - -spin_unlock_irqrestore (&n->list_lock, flags); +out:if (!checks_ok)slab_fix (s,"Object at 0x%p not freed" , object); -if (slab_free) { -stat (s,FREE_SLAB ); -free_slab (s, slab_free); - } + return checks_ok; }#endif /* CONFIG_SLUB_DEBUG */ @@ -3453,6 +3404,67 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) }EXPORT_SYMBOL (kmem_cache_alloc_node); +static noinline void free_to_partial_list( +struct kmem_cache *s,struct slab *slab, +void *head,void *tail,int bulk_cnt, +unsigned long addr) +{ +struct kmem_cache_node *n =get_node (s,slab_nid (slab)); +struct slab *slab_free =NULL ; +int cnt = bulk_cnt; +unsigned long flags; +depot_stack_handle_t handle =0 ; + +if (s->flags &SLAB_STORE_USER ) + handle =set_track_prepare (); + +spin_lock_irqsave (&n->list_lock, flags); + +if (free_debug_processing (s, slab, head, tail, &cnt, addr, handle)) { +void *prior = slab->freelist; + +/* Perform the actual freeing while we still hold the locks */ + slab->inuse -= cnt; +set_freepointer (s, tail, prior); + slab->freelist = head; + +/* +* If the slab is empty, and node's partial list is full, +* it should be discarded anyway no matter it's on full or +* partial list. +*/ +if (slab->inuse ==0 && n->nr_partial >= s->min_partial) + slab_free = slab; + +if (!prior) { +/* was on full list */ +remove_full (s, n, slab); +if (!slab_free) { +add_partial (n, slab,DEACTIVATE_TO_TAIL ); +stat (s,FREE_ADD_PARTIAL ); + } + }else if (slab_free) { +remove_partial (n, slab); +stat (s,FREE_REMOVE_PARTIAL ); + } + } + +if (slab_free) { +/* +* Update the counters while still holding n->list_lock to +* prevent spurious validation warnings +*/ +dec_slabs_node (s,slab_nid (slab_free), slab_free->objects); + } + +spin_unlock_irqrestore (&n->list_lock, flags); + +if (slab_free) { +stat (s,FREE_SLAB ); +free_slab (s, slab_free); + } +} +/* * Slow path handling. This may still be called frequently since objects * have a longer lifetime than the cpu slabs in most processing loads. @@ -3479,7 +3491,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab,return ;if (kmem_cache_debug (s)) { -free_debug_processing (s, slab, head, tail, cnt, addr); +free_to_partial_list (s, slab, head, tail, cnt, addr);return ; }Signature · 1 line
2.38.1
Looks good to me.
Signature · 2 lines
Thanks, Hyeonggon
PATCH 9/12 mm, slub: split out allocations from pre/post hooks
In reply to Vlastimil BabkaIn the following patch we want to introduce CONFIG_SLUB_TINY allocation paths that don't use the percpu slab. To prepare, refactor the allocation functions:
Split out __slab_alloc_node() from slab_alloc_node() where the former does the actual allocation and the latter calls the pre/post hooks.
Analogically, split out __kmem_cache_alloc_bulk() from kmem_cache_alloc_bulk().
--- mm/slub.c | 127 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 50 deletions(-)
mm/slub.c +77 -50
@@ -2907,10 +2907,10 @@ static unsigned long count_partial(struct kmem_cache_node *n, }#endif /* CONFIG_SLUB_DEBUG || SLAB_SUPPORTS_SYSFS */ +#ifdef CONFIG_SLUB_DEBUG static noinline voidslab_out_of_memory (struct kmem_cache *s,gfp_t gfpflags,int nid) { -#ifdef CONFIG_SLUB_DEBUG static DEFINE_RATELIMIT_STATE(slub_oom_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);int node;
@@ -2941,8 +2941,11 @@ slab_out_of_memory(struct kmem_cache *s, gfp_t gfpflags, int nid)pr_warn (" node %d: slabs: %ld, objs: %ld, free: %ld\n" , node, nr_slabs, nr_objs, nr_free); } -#endif } +#else /* CONFIG_SLUB_DEBUG */ +static inline void +slab_out_of_memory (struct kmem_cache *s,gfp_t gfpflags,int nid) { } +#endif static inline bool pfmemalloc_match (struct slab *slab,gfp_t gfpflags) {
@@ -3239,45 +3242,13 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,return p; } -/* -* If the object has been wiped upon free, make sure it's fully initialized by -* zeroing out freelist pointer. -*/ -static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s, -void *obj) -{ -if (unlikely (slab_want_init_on_free (s)) && obj) -memset ((void *)((char *)kasan_reset_tag (obj) + s->offset), -0 ,sizeof (void *)); -} - -/* -* Inlined fastpath so that allocation functions (kmalloc, kmem_cache_alloc) -* have the fastpath folded into their functions. So no function call -* overhead for requests that can be satisfied on the fastpath. -* -* The fastpath works by first checking if the lockless freelist can be used. -* If not then __slab_alloc is called for slow processing. -* -* Otherwise we can simply pick the next object from the lockless free list. -*/ -static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru, +static __always_inline void *__slab_alloc_node(struct kmem_cache *s,gfp_t gfpflags,int node,unsigned long addr,size_t orig_size) { -void *object;struct kmem_cache_cpu *c;struct slab *slab;unsigned long tid; -struct obj_cgroup *objcg =NULL ; -bool init = false; - - s =slab_pre_alloc_hook (s, lru, &objcg,1 , gfpflags); -if (!s) -return NULL ; - - object =kfence_alloc (s, orig_size, gfpflags); -if (unlikely (object)) - goto out; +void *object; redo:/*
@@ -3347,6 +3318,48 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lstat (s,ALLOC_FASTPATH ); } +return object; +} + +/* +* If the object has been wiped upon free, make sure it's fully initialized by +* zeroing out freelist pointer. +*/ +static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s, +void *obj) +{ +if (unlikely (slab_want_init_on_free (s)) && obj) +memset ((void *)((char *)kasan_reset_tag (obj) + s->offset), +0 ,sizeof (void *)); +} + +/* +* Inlined fastpath so that allocation functions (kmalloc, kmem_cache_alloc) +* have the fastpath folded into their functions. So no function call +* overhead for requests that can be satisfied on the fastpath. +* +* The fastpath works by first checking if the lockless freelist can be used. +* If not then __slab_alloc is called for slow processing. +* +* Otherwise we can simply pick the next object from the lockless free list. +*/ +static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru, +gfp_t gfpflags,int node,unsigned long addr,size_t orig_size) +{ +void *object; +struct obj_cgroup *objcg =NULL ; +bool init = false; + + s =slab_pre_alloc_hook (s, lru, &objcg,1 , gfpflags); +if (!s) +return NULL ; + + object =kfence_alloc (s, orig_size, gfpflags); +if (unlikely (object)) + goto out; + + object =__slab_alloc_node (s, gfpflags, node, addr, orig_size); +maybe_wipe_obj_freeptr (s, object); init =slab_want_init_on_alloc (gfpflags, s);
@@ -3799,18 +3812,12 @@ void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p) }EXPORT_SYMBOL (kmem_cache_free_bulk); -/* Note that interrupts must be enabled when calling this function. */ -int kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags,size_t size, -void **p) +static inline int __kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags, +size_t size,void **p,struct obj_cgroup *objcg) {struct kmem_cache_cpu *c;int i; -struct obj_cgroup *objcg =NULL ; -/* memcg and kmem_cache debug support */ - s =slab_pre_alloc_hook (s,NULL , &objcg, size, flags); -if (unlikely (!s)) -return false;/* * Drain objects in the per cpu slab, while disabling local * IRQs, which protects against PREEMPT and interrupts
@@ -3864,18 +3871,38 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,local_unlock_irq (&s->cpu_slab->lock);slub_put_cpu_ptr (s->cpu_slab); -/* -* memcg and kmem_cache debug support and memory initialization. -* Done outside of the IRQ disabled fastpath loop. -*/ -slab_post_alloc_hook (s, objcg, flags, size, p, -slab_want_init_on_alloc (flags, s));return i; + error:slub_put_cpu_ptr (s->cpu_slab);slab_post_alloc_hook (s, objcg, flags, i, p, false);kmem_cache_free_bulk (s, i, p);return 0 ; + +} + +/* Note that interrupts must be enabled when calling this function. */ +int kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags,size_t size, +void **p) +{ +int i; +struct obj_cgroup *objcg =NULL ; + +/* memcg and kmem_cache debug support */ + s =slab_pre_alloc_hook (s,NULL , &objcg, size, flags); +if (unlikely (!s)) +return false; + + i =__kmem_cache_alloc_bulk (s, flags, size, p, objcg); + +/* +* memcg and kmem_cache debug support and memory initialization. +* Done outside of the IRQ disabled fastpath loop. +*/ +if (i !=0 ) +slab_post_alloc_hook (s, objcg, flags, size, p, +slab_want_init_on_alloc (flags, s)); +return i; }EXPORT_SYMBOL (kmem_cache_alloc_bulk);
Signature · 1 line
2.38.1
Re: [PATCH 09/12] mm, slub: split out allocations from pre/post hooks
Quoted 14 lines · Vlastimil Babka
In the following patch we want to introduce
CONFIG_SLUB_TINYallocation paths that don't use the percpu slab. To prepare, refactor the allocation functions:Split out
__slab_alloc_node()fromslab_alloc_node()where the former does the actual allocation and the latter calls the pre/post hooks.Analogically, split out
__kmem_cache_alloc_bulk()fromkmem_cache_alloc_bulk().Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 127 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 50 deletions(-)
[...]
Quoted 12 lines
mm/slub.c +12
-0+ +/* Note that interrupts must be enabled when calling this function. */ +int kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags,size_t size, +void **p) +{ +int i; +struct obj_cgroup *objcg =NULL ; + +/* memcg and kmem_cache debug support */ + s =slab_pre_alloc_hook (s,NULL , &objcg, size, flags); +if (unlikely (!s)) +return false;
mm/slub.c int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, · line 3904
Quoted 10 lines
mm/slub.c +10
-0+ + i =__kmem_cache_alloc_bulk (s, flags, size, p, objcg); + +/* +* memcg and kmem_cache debug support and memory initialization. +* Done outside of the IRQ disabled fastpath loop. +*/ +if (i !=0 ) +slab_post_alloc_hook (s, objcg, flags, size, p, +slab_want_init_on_alloc (flags, s));
This patch looks mostly good but wondering what happens if someone calls it with size == 0 so it does not call slab_post_alloc_hook()?
Quoted 7 lines
mm/slub.c +1
-0+return i; }EXPORT_SYMBOL (kmem_cache_alloc_bulk);Signature · 2 lines
-- 2.38.1
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 09/12] mm, slub: split out allocations from pre/post hooks
Quoted 35 lines · Hyeonggon Yoo
Quoted 14 lines · Vlastimil Babka
In the following patch we want to introduce
CONFIG_SLUB_TINYallocation paths that don't use the percpu slab. To prepare, refactor the allocation functions:Split out
__slab_alloc_node()fromslab_alloc_node()where the former does the actual allocation and the latter calls the pre/post hooks.Analogically, split out
__kmem_cache_alloc_bulk()fromkmem_cache_alloc_bulk().Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 127 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 50 deletions(-)[...]
Quoted 17 lines
(quoted diff) +17
-0+ +/* Note that interrupts must be enabled when calling this function. */ +int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, + void **p) +{ + int i; + struct obj_cgroup *objcg = NULL; + + /* memcg and kmem_cache debug support */ + s = slab_pre_alloc_hook(s, NULL, &objcg, size, flags); + if (unlikely(!s)) + return false; + + i = __kmem_cache_alloc_bulk(s, flags, size, p, objcg); + + /* + * memcg and kmem_cache debug support and memory initialization.
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ * Done outside of the IRQ disabled fastpath loop. + */ + if (i != 0) + slab_post_alloc_hook(s, objcg, flags, size, p, + slab_want_init_on_alloc(flags, s));This patch looks mostly good but wondering what happens if someone calls it with size == 0 so it does not call
slab_post_alloc_hook()?
Hmm looks like in that case we miss doing obj_cgroup_put(objcg) in memcg_slab_post_alloc_hook(). Good catch, thanks!
Fixing up, also a "return false" from int function (existed also before this patch).
----8<----
mm/slub.c +4 -1
@@ -3888,10 +3888,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,int i;struct obj_cgroup *objcg =NULL ; +if (!size) +return 0 ; +/* memcg and kmem_cache debug support */ s =slab_pre_alloc_hook (s,NULL , &objcg, size, flags);if (unlikely (!s)) -return false; +return 0 ; i =__kmem_cache_alloc_bulk (s, flags, size, p, objcg);
Hyeonggon Yoo
Reviewed-byRe: [PATCH 09/12] mm, slub: split out allocations from pre/post hooks
Quoted 60 lines · Vlastimil Babka
Quoted 35 lines · Hyeonggon Yoo
Quoted 14 lines · Vlastimil Babka
In the following patch we want to introduce
CONFIG_SLUB_TINYallocation paths that don't use the percpu slab. To prepare, refactor the allocation functions:Split out
__slab_alloc_node()fromslab_alloc_node()where the former does the actual allocation and the latter calls the pre/post hooks.Analogically, split out
__kmem_cache_alloc_bulk()fromkmem_cache_alloc_bulk().Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 127 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 50 deletions(-)[...]
Quoted 17 lines
(quoted diff) +17
-0+ +/* Note that interrupts must be enabled when calling this function. */ +int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, + void **p) +{ + int i; + struct obj_cgroup *objcg = NULL; + + /* memcg and kmem_cache debug support */ + s = slab_pre_alloc_hook(s, NULL, &objcg, size, flags); + if (unlikely(!s)) + return false; + + i = __kmem_cache_alloc_bulk(s, flags, size, p, objcg); + + /* + * memcg and kmem_cache debug support and memory initialization.Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ * Done outside of the IRQ disabled fastpath loop. + */ + if (i != 0) + slab_post_alloc_hook(s, objcg, flags, size, p, + slab_want_init_on_alloc(flags, s));This patch looks mostly good but wondering what happens if someone calls it with size == 0 so it does not call
slab_post_alloc_hook()?Hmm looks like in that case we miss doing
obj_cgroup_put(objcg)inmemcg_slab_post_alloc_hook(). Good catch, thanks!Fixing up, also a "return false" from int function (existed also before this patch).
----8<----
mm/slub.c +0
-0@@ -3888,10 +3888,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,int i;struct obj_cgroup *objcg =NULL ;
mm/slub.c int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, · line 3899
Quoted 10 lines
mm/slub.c +4
-1+if (!size) +return 0 ; +/* memcg and kmem_cache debug support */ s =slab_pre_alloc_hook (s,NULL , &objcg, size, flags);if (unlikely (!s)) -return false; +return 0 ; i =__kmem_cache_alloc_bulk (s, flags, size, p, objcg);
With that,
Thanks!
Signature · 2 lines
Thanks, Hyeonggon
PATCH 10/12 mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaSLUB gets most of its scalability by percpu slabs. However for CONFIG_SLUB_TINY the goal is minimal memory overhead, not scalability. Thus, #ifdef out the whole kmem_cache_cpu percpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.
This change builds on recent commit c7323a5ad078 ("mm/slub: restrict sysfs validation to debug caches and make it safe"), as caches with enabled debugging also avoid percpu slabs and all allocations and freeing ends up working with the partial list. With a bit more refactoring by the preceding patches, use the same code paths with CONFIG_SLUB_TINY.
--- include/linux/slub_def.h | 4 ++ mm/slub.c | 102 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 3 deletions(-)
include/linux/slub_def.h +4 -0
@@ -41,6 +41,7 @@ enum stat_item {CPU_PARTIAL_DRAIN ,/* Drain cpu partial to node partial */ NR_SLUB_STAT_ITEMS }; +#ifndef CONFIG_SLUB_TINY /* * When changing the layout, make sure freelist and tid are still compatible * with this_cpu_cmpxchg_double() alignment requirements.
@@ -57,6 +58,7 @@ struct kmem_cache_cpu {unsigned stat[NR_SLUB_STAT_ITEMS ]; #endif }; +#endif /* CONFIG_SLUB_TINY */ #ifdef CONFIG_SLUB_CPU_PARTIAL #define slub_percpu_partial (c) ((c)->partial)
@@ -88,7 +90,9 @@ struct kmem_cache_order_objects {* Slab cache management. */ struct kmem_cache { +#ifndef CONFIG_SLUB_TINY struct kmem_cache_cpu __percpu *cpu_slab; +#endif /* Used for retrieving partial slabs, etc. */ slab_flags_t flags;unsigned long min_partial;
mm/slub.c +99 -3
226 lines not on this page · raw message
Signature · 1 line
2.38.1
Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
Quoted 5 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.
[+Cc Dennis]
Wondering if we can reduce (or zero) early reservation of percpu area when #if !defined(CONFIG_SLUB) || defined(CONFIG_SLUB_TINY)?
Quoted 8 lines
This change builds on recent commit
c7323a5ad078("mm/slub: restrict sysfs validation to debug caches and make it safe"), as caches with enabled debugging also avoid percpu slabs and all allocations and freeing ends up working with the partial list. With a bit more refactoring by the preceding patches, use the same code paths withCONFIG_SLUB_TINY.Signed-off-by Vlastimil Babka <[email protected]>
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
Quoted 8 lines · Hyeonggon Yoo
Quoted 5 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.[+Cc Dennis]
+To: Baoquan also.
Quoted 2 lines
Wondering if we can reduce (or zero) early reservation of percpu area when #if !defined(CONFIG_SLUB) ||
defined(CONFIG_SLUB_TINY)?
Good point. I've sent a PR as it was [1], but (if merged) we can still improve that during RC series, if it means more memory saved thanks to less percpu usage with CONFIG_SLUB_TINY.
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/tag/?h=slab-for-6.2-rc1
Quoted 9 lines
Quoted 8 lines
This change builds on recent commit
c7323a5ad078("mm/slub: restrict sysfs validation to debug caches and make it safe"), as caches with enabled debugging also avoid percpu slabs and all allocations and freeing ends up working with the partial list. With a bit more refactoring by the preceding patches, use the same code paths withCONFIG_SLUB_TINY.Signed-off-by Vlastimil Babka <[email protected]>
Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
Hello,
Quoted 15 lines · Vlastimil Babka
Quoted 8 lines · Hyeonggon Yoo
Quoted 5 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.[+Cc Dennis]
+To: Baoquan also.
Quoted 2 lines
Wondering if we can reduce (or zero) early reservation of percpu area when #if !defined(CONFIG_SLUB) ||
defined(CONFIG_SLUB_TINY)?
Quoted 6 lines
Good point. I've sent a PR as it was [1], but (if merged) we can still improve that during RC series, if it means more memory saved thanks to less percpu usage with
CONFIG_SLUB_TINY.[1]
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/tag/?h=slab-for-6.2-rc1
The early reservation area not used at boot is then used to serve normal percpu allocations. Percpu allocates additional chunks based on a free page float count and is backed page by page, not all at once. I get slabs is the main motivator of early reservation, but if there are other users of percpu, then shrinking the early reservation area is a bit moot.
Thanks,
Dennis
Quoted 11 lines
Quoted 10 lines
Quoted 9 lines
This change builds on recent commit
c7323a5ad078("mm/slub: restrict sysfs validation to debug caches and make it safe"), as caches with enabled debugging also avoid percpu slabs and all allocations and freeing ends up working with the partial list. With a bit more refactoring by the preceding patches, use the same code paths withCONFIG_SLUB_TINY.Signed-off-by Vlastimil Babka <[email protected]>
Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
Quoted 14 lines · Dennis Zhou
Hello,
Quoted 11 lines · Vlastimil Babka
Quoted 8 lines · Hyeonggon Yoo
Quoted 5 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.[+Cc Dennis]
+To: Baoquan also.
Thanks for adding me.
Quoted 11 lines
Quoted 10 lines
Quoted 3 lines
Wondering if we can reduce (or zero) early reservation of percpu area when #if !defined(CONFIG_SLUB) ||
defined(CONFIG_SLUB_TINY)?Good point. I've sent a PR as it was [1], but (if merged) we can still improve that during RC series, if it means more memory saved thanks to less percpu usage with
CONFIG_SLUB_TINY.[1]
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/tag/?h=slab-for-6.2-rc1
Quoted 6 lines
The early reservation area not used at boot is then used to serve normal percpu allocations. Percpu allocates additional chunks based on a free page float count and is backed page by page, not all at once. I get slabs is the main motivator of early reservation, but if there are other users of percpu, then shrinking the early reservation area is a bit moot.
Agree. Before kmem_cache_init() is done, anyone calling alloc_percpu() can only get allocation done from early reservatoin of percpu area. So, unless we can make sure nobody need to call alloc_percpu() before kmem_cache_init() now and future.
The only drawback of early reservation is it's not so flexible. We can only dynamically create chunk to increase percpu areas when early reservation is run out, but can't shrink early reservation if system doesn't need that much.
So we may need weigh the two ideas:
- Not allowing to alloc_percpu() before kmem_cache_init();
- Keep early reservation, and think of a economic value for CONFIG_SLUB_TINY.
start_kernel()
->setup_per_cpu_areas();
......
->mm_init();
......
-->kmem_cache_init();__alloc_percpu()
-->pcpu_alloc()
--> succeed to allocate from early reservation
or
-->pcpu_create_chunk()
-->pcpu_alloc_chunk()
-->pcpu_mem_zalloc()Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
Quoted 36 lines · Baoquan He
Quoted 14 lines · Dennis Zhou
Hello,
Quoted 11 lines · Vlastimil Babka
Quoted 8 lines · Hyeonggon Yoo
Quoted 5 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.[+Cc Dennis]
+To: Baoquan also.
Thanks for adding me.
Quoted 11 lines
Quoted 10 lines
Quoted 3 lines
Wondering if we can reduce (or zero) early reservation of percpu area when #if !defined(CONFIG_SLUB) ||
defined(CONFIG_SLUB_TINY)?Good point. I've sent a PR as it was [1], but (if merged) we can still improve that during RC series, if it means more memory saved thanks to less percpu usage with
CONFIG_SLUB_TINY.[1]
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/tag/?h=slab-for-6.2-rc1Quoted 6 lines
The early reservation area not used at boot is then used to serve normal percpu allocations. Percpu allocates additional chunks based on a free page float count and is backed page by page, not all at once. I get slabs is the main motivator of early reservation, but if there are other users of percpu, then shrinking the early reservation area is a bit moot.
Quoted 4 lines
Agree. Before
kmem_cache_init()is done, anyone callingalloc_percpu()can only get allocation done from early reservatoin of percpu area. So, unless we can make sure nobody need to callalloc_percpu()beforekmem_cache_init()now and future.
Thank you both for explaination.
just googled and found random /proc/meminfo output of K210 board (6MB RAM, dual-core)
Given that even K210 board uses around 100kB of percpu area, might not be worth thing to do :(
Quoted 26 lines
The only drawback of early reservation is it's not so flexible. We can only dynamically create chunk to increase percpu areas when early reservation is run out, but can't shrink early reservation if system doesn't need that much.
So we may need weigh the two ideas:
- Not allowing toalloc_percpu()beforekmem_cache_init();
- Keep early reservation, and think of a economic value forCONFIG_SLUB_TINY.
start_kernel()
->setup_per_cpu_areas();
......->mm_init(); ...... -->kmem_cache_init();
__alloc_percpu()
-->pcpu_alloc()--> succeed to allocate from early reservation or -->pcpu_create_chunk() -->pcpu_alloc_chunk() -->pcpu_mem_zalloc()
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH 10/12] mm, slub: remove percpu slabs with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaQuoted 300 lines · Vlastimil Babka
SLUB gets most of its scalability by percpu slabs. However for
CONFIG_SLUB_TINYthe goal is minimal memory overhead, not scalability. Thus, #ifdef out the wholekmem_cache_cpupercpu structure and associated code. Additionally to the slab page savings, this reduces percpu allocator usage, and code size.This change builds on recent commit
c7323a5ad078("mm/slub: restrict sysfs validation to debug caches and make it safe"), as caches with enabled debugging also avoid percpu slabs and all allocations and freeing ends up working with the partial list. With a bit more refactoring by the preceding patches, use the same code paths withCONFIG_SLUB_TINY.Signed-off-by Vlastimil Babka <[email protected]>--- include/linux/slub_def.h | 4 ++ mm/slub.c | 102 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 3 deletions(-)include/linux/slub_def.h +4
-0@@ -41,6 +41,7 @@ enum stat_item {CPU_PARTIAL_DRAIN ,/* Drain cpu partial to node partial */ NR_SLUB_STAT_ITEMS }; +#ifndef CONFIG_SLUB_TINY /* * When changing the layout, make sure freelist and tid are still compatible * with this_cpu_cmpxchg_double() alignment requirements. @@ -57,6 +58,7 @@ struct kmem_cache_cpu {unsigned stat[NR_SLUB_STAT_ITEMS ]; #endif }; +#endif /* CONFIG_SLUB_TINY */ #ifdef CONFIG_SLUB_CPU_PARTIAL #define slub_percpu_partial (c) ((c)->partial)@@ -88,7 +90,9 @@ struct kmem_cache_order_objects {* Slab cache management. */ struct kmem_cache { +#ifndef CONFIG_SLUB_TINY struct kmem_cache_cpu __percpu *cpu_slab; +#endif /* Used for retrieving partial slabs, etc. */ slab_flags_t flags;unsigned long min_partial;mm/slub.c +99
-3@@ -337,10 +337,12 @@ static inline void stat(const struct kmem_cache *s, enum stat_item si)*/ static nodemask_t slab_nodes; +#ifndef CONFIG_SLUB_TINY /* * Workqueue used for flush_cpu_slab(). */ static struct workqueue_struct *flushwq; +#endif /******************************************************************** * Core slab cache functions @@ -386,10 +388,12 @@ static inline void *get_freepointer(struct kmem_cache *s, void *object)return freelist_dereference (s, object + s->offset); } +#ifndef CONFIG_SLUB_TINY static void prefetch_freepointer (const struct kmem_cache *s,void *object) {prefetchw (object + s->offset); } +#endif /* * When running under KMSAN, get_freepointer_safe() may return an uninitialized @@ -1681,11 +1685,13 @@ static inline void inc_slabs_node(struct kmem_cache *s, int node,static inline void dec_slabs_node (struct kmem_cache *s,int node,int objects) {} +#ifndef CONFIG_SLUB_TINY static bool freelist_corrupted (struct kmem_cache *s,struct slab *slab,void **freelist,void *nextfree) {return false; } +#endif #endif /* CONFIG_SLUB_DEBUG */ /* @@ -2219,7 +2225,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,if (!pfmemalloc_match (slab, pc->flags))continue ; -if (kmem_cache_debug (s)) { +if (IS_ENABLED (CONFIG_SLUB_TINY ) ||kmem_cache_debug (s)) { object =alloc_single_from_partial (s, n, slab, pc->orig_size);if (object)@@ -2334,6 +2340,8 @@ static void *get_partial(struct kmem_cache *s, int node, struct partial_contextreturn get_any_partial (s, pc); } +#ifndef CONFIG_SLUB_TINY +#ifdef CONFIG_PREEMPTION /* * Calculate the next globally unique transaction for disambiguation @@ -2347,7 +2355,7 @@ static void *get_partial(struct kmem_cache *s, int node, struct partial_context* different cpus. */ #define TID_STEP 1 -#endif +#endif /* CONFIG_PREEMPTION */ static inline unsigned long next_tid (unsigned long tid) {@@ -2808,6 +2816,13 @@ static int slub_cpu_dead(unsigned int cpu) return 0; } +#else /* CONFIG_SLUB_TINY */ +static inline void flush_all_cpus_locked (struct kmem_cache *s) { } +static inline void flush_all (struct kmem_cache *s) { } +static inline void __flush_cpu_slab (struct kmem_cache *s,int cpu) { } +static inline int slub_cpu_dead (unsigned int cpu) {return 0 ; } +#endif /* CONFIG_SLUB_TINY */ +/* * Check if the objects in a per cpu structure fit numa * locality expectations. @@ -2955,6 +2970,7 @@ static inline bool pfmemalloc_match(struct slab *slab, gfp_t gfpflags)return true; } +#ifndef CONFIG_SLUB_TINY /* * Check the slab->freelist and either transfer the freelist to the * per cpu freelist or deactivate the slab. @@ -3320,6 +3336,33 @@ static __always_inline void *__slab_alloc_node(struct kmem_cache *s, return object; } +#else /* CONFIG_SLUB_TINY */ +static void *__slab_alloc_node (struct kmem_cache *s, +gfp_t gfpflags,int node,unsigned long addr,size_t orig_size) +{ +struct partial_context pc; +struct slab *slab; +void *object; + + pc.flags = gfpflags; + pc.slab = &slab; + pc.orig_size = orig_size; + object =get_partial (s, node, &pc); + +if (object) +return object; + + slab =new_slab (s, gfpflags, node); +if (unlikely (!slab)) { +slab_out_of_memory (s, gfpflags, node); +return NULL ; + } + + object =alloc_single_from_new_slab (s, slab, orig_size); + +return object; +} +#endif /* CONFIG_SLUB_TINY */ /* * If the object has been wiped upon free, make sure it's fully initialized by @@ -3503,7 +3546,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab,if (kfence_free (head))return ; -if (kmem_cache_debug (s)) { +if (IS_ENABLED (CONFIG_SLUB_TINY ) ||kmem_cache_debug (s)) {free_to_partial_list (s, slab, head, tail, cnt, addr);return ; }@@ -3604,6 +3647,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab,discard_slab (s, slab); } +#ifndef CONFIG_SLUB_TINY /* * Fastpath with forced inlining to produce a kfree and kmem_cache_free that * can perform fastpath freeing without additional function calls. @@ -3678,6 +3722,16 @@ static __always_inline void do_slab_free(struct kmem_cache *s, }stat (s,FREE_FASTPATH ); } +#else /* CONFIG_SLUB_TINY */ +static void do_slab_free (struct kmem_cache *s, +struct slab *slab,void *head,void *tail, +int cnt,unsigned long addr) +{ +void *tail_obj = tail ? : head; + +__slab_free (s, slab, head, tail_obj, cnt, addr); +} +#endif /* CONFIG_SLUB_TINY */ static __always_inline void slab_free(struct kmem_cache *s, struct slab *slab, void *head, void *tail, void **p, int cnt,@@ -3812,6 +3866,7 @@ void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p) }EXPORT_SYMBOL (kmem_cache_free_bulk); +#ifndef CONFIG_SLUB_TINY static inline int __kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags,size_t size,void **p,struct obj_cgroup *objcg) {@@ -3880,6 +3935,36 @@ static inline int __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags,return 0 ; } +#else /* CONFIG_SLUB_TINY */ +static int __kmem_cache_alloc_bulk (struct kmem_cache *s,gfp_t flags, +size_t size,void **p,struct obj_cgroup *objcg) +{ +int i; + +for (i =0 ; i < size; i++) { +void *object =kfence_alloc (s, s->object_size, flags); + +if (unlikely (object)) { + p[i] = object; +continue ; + } + + p[i] =__slab_alloc_node (s, flags,NUMA_NO_NODE , + _RET_IP_, s->object_size); +if (unlikely (!p[i])) + goto error; + +maybe_wipe_obj_freeptr (s, p[i]); + } + +return i; + +error: +slab_post_alloc_hook (s, objcg, flags, i, p, false); +kmem_cache_free_bulk (s, i, p); +return 0 ; +} +#endif /* CONFIG_SLUB_TINY */ /* Note that interrupts must be enabled when calling this function. */ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,@@ -4059,6 +4144,7 @@ init_kmem_cache_node(struct kmem_cache_node *n)#endif } +#ifndef CONFIG_SLUB_TINY static inline int alloc_kmem_cache_cpus (struct kmem_cache *s) { BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE <@@ -4078,6 +4164,12 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s) return 1; } +#else +static inline int alloc_kmem_cache_cpus (struct kmem_cache *s) +{ +return 1 ; +} +#endif /* CONFIG_SLUB_TINY */ static struct kmem_cache *kmem_cache_node;@@ -4140,7 +4232,9 @@ static void free_kmem_cache_nodes(struct kmem_cache *s)void __kmem_cache_release (struct kmem_cache *s) {cache_random_seq_destroy (s); +#ifndef CONFIG_SLUB_TINY free_percpu (s->cpu_slab); +#endif free_kmem_cache_nodes (s); }@@ -4917,8 +5011,10 @@ void __init kmem_cache_init(void)void __init kmem_cache_init_late (void ) { +#ifndef CONFIG_SLUB_TINY flushwq =alloc_workqueue ("slub_flushwq" ,WQ_MEM_RECLAIM ,0 );WARN_ON (!flushwq); +#endif } struct kmem_cache *Signature · 1 line
2.38.1
For the record:
Looks good to me.
Signature · 2 lines
Thanks, Hyeonggon
PATCH 11/12 mm, slub: don't aggressively inline with CONFIG_SLUB_TINY
In reply to Vlastimil BabkaSLUB fastpaths use __always_inline to avoid function calls. With CONFIG_SLUB_TINY we would rather save the memory. Add a __fastpath_inline macro that's __always_inline normally but empty with CONFIG_SLUB_TINY.
bloat-o-meter results on x86_64 mm/slub.o:
add/remove: 3/1 grow/shrink: 1/8 up/down: 865/-1784 (-919)
Function old new delta kmem_cache_free 20 281 +261 slab_alloc_node.isra - 245 +245 slab_free.constprop.isra - 231 +231 __kmem_cache_alloc_lru.isra - 128 +128 __kmem_cache_release 88 83 -5 __kmem_cache_create 1446 1436 -10 __kmem_cache_free 271 142 -129 kmem_cache_alloc_node 330 127 -203 kmem_cache_free_bulk.part 826 613 -213 __kmem_cache_alloc_node 230 10 -220 kmem_cache_alloc_lru 325 12 -313 kmem_cache_alloc 325 10 -315 kmem_cache_free.part 376 - -376
Total: Before=26103, After=25184, chg -3.52%
--- mm/slub.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
mm/slub.c +10 -4
@@ -187,6 +187,12 @@ do { \#define USE_LOCKLESS_FAST_PATH () (false)#endif +#ifndef CONFIG_SLUB_TINY +#define __fastpath_inline __always_inline +#else +#define __fastpath_inline +#endif +#ifdef CONFIG_SLUB_DEBUG #ifdef CONFIG_SLUB_DEBUG_ON DEFINE_STATIC_KEY_TRUE (slub_debug_enabled);
@@ -3386,7 +3392,7 @@ static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s,* * Otherwise we can simply pick the next object from the lockless free list. */ -static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru, +static __fastpath_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags,int node,unsigned long addr,size_t orig_size) {void *object;
@@ -3412,13 +3418,13 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lreturn object; } -static __always_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru, +static __fastpath_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags,unsigned long addr,size_t orig_size) {return slab_alloc_node (s, lru, gfpflags,NUMA_NO_NODE , addr, orig_size); } -static __always_inline +static __fastpath_inline void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags) {
@@ -3733,7 +3739,7 @@ static void do_slab_free(struct kmem_cache *s, }#endif /* CONFIG_SLUB_TINY */ -static __always_inline void slab_free(struct kmem_cache *s, struct slab *slab, +static __fastpath_inline void slab_free(struct kmem_cache *s, struct slab *slab,void *head,void *tail,void **p,int cnt,unsigned long addr) {
Signature · 1 line
2.38.1
Re: [PATCH 11/12] mm, slub: don't aggressively inline with CONFIG_SLUB_TINY
Quoted 82 lines · Vlastimil Babka
SLUB fastpaths use
__always_inlineto avoid function calls. WithCONFIG_SLUB_TINYwe would rather save the memory. Add a__fastpath_inlinemacro that's__always_inlinenormally but empty withCONFIG_SLUB_TINY.bloat-o-meter results on
x86_64mm/slub.o:add/remove: 3/1 grow/shrink: 1/8 up/down: 865/-1784 (-919)
Function old new delta kmem_cache_free 20 281 +261 slab_alloc_node.isra - 245 +245 slab_free.constprop.isra - 231 +231 __kmem_cache_alloc_lru.isra - 128 +128 __kmem_cache_release 88 83 -5 __kmem_cache_create 1446 1436 -10 __kmem_cache_free 271 142 -129 kmem_cache_alloc_node 330 127 -203 kmem_cache_free_bulk.part 826 613 -213 __kmem_cache_alloc_node 230 10 -220 kmem_cache_alloc_lru 325 12 -313 kmem_cache_alloc 325 10 -315 kmem_cache_free.part 376 - -376Total: Before=26103, After=25184, chg -3.52%
Signed-off-by Vlastimil Babka <[email protected]>--- mm/slub.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)mm/slub.c +10
-4@@ -187,6 +187,12 @@ do { \#define USE_LOCKLESS_FAST_PATH () (false)#endif +#ifndef CONFIG_SLUB_TINY +#define __fastpath_inline __always_inline +#else +#define __fastpath_inline +#endif +#ifdef CONFIG_SLUB_DEBUG #ifdef CONFIG_SLUB_DEBUG_ON DEFINE_STATIC_KEY_TRUE (slub_debug_enabled);@@ -3386,7 +3392,7 @@ static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s,* * Otherwise we can simply pick the next object from the lockless free list. */ -static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru, +static __fastpath_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags,int node,unsigned long addr,size_t orig_size) {void *object;@@ -3412,13 +3418,13 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_lreturn object; } -static __always_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru, +static __fastpath_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags,unsigned long addr,size_t orig_size) {return slab_alloc_node (s, lru, gfpflags,NUMA_NO_NODE , addr, orig_size); } -static __always_inline +static __fastpath_inline void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru,gfp_t gfpflags) {@@ -3733,7 +3739,7 @@ static void do_slab_free(struct kmem_cache *s, }#endif /* CONFIG_SLUB_TINY */ -static __always_inline void slab_free(struct kmem_cache *s, struct slab *slab, +static __fastpath_inline void slab_free(struct kmem_cache *s, struct slab *slab,void *head,void *tail,void **p,int cnt,unsigned long addr) {Signature · 1 line
2.38.1
Signature · 2 lines
Thanks, Hyeonggon
PATCH 12/12 mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaAs explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing kfree() on objects allocated via kmem_cache_alloc().
As the first step, rename the CONFIG_SLOB option in the slab allocator configuration choice to CONFIG_SLOB_DEPRECATED. Add CONFIG_SLOB depending on CONFIG_SLOB_DEPRECATED as an internal option to avoid code churn. This will cause existing .config files and defconfigs with CONFIG_SLOB=y to silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.
To make SLUB more suitable replacement for SLOB, a CONFIG_SLUB_TINY option was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifying CONFIG_SLOB=y. As part of this patch, update them to select CONFIG_SLUB and CONFIG_SLUB_TINY.
[1] https://lore.kernel.org/all/[email protected]/
--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++- arch/openrisc/configs/or1ksim_defconfig | 3 ++- arch/openrisc/configs/simple_smp_defconfig | 3 ++- arch/riscv/configs/nommu_k210_defconfig | 3 ++- arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- arch/riscv/configs/nommu_virt_defconfig | 3 ++- arch/sh/configs/rsk7201_defconfig | 3 ++- arch/sh/configs/rsk7203_defconfig | 3 ++- arch/sh/configs/se7206_defconfig | 3 ++- arch/sh/configs/shmin_defconfig | 3 ++- arch/sh/configs/shx3_defconfig | 3 ++- kernel/configs/tiny.config | 5 +++-- mm/Kconfig | 17 +++++++++++++++-- 19 files changed, 52 insertions(+), 21 deletions(-)
arch/arm/configs/clps711x_defconfig +2 -1
@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y CONFIG_ARCH_P720T=y CONFIG_AEABI=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/arm/configs/collie_defconfig +2 -1
@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" CONFIG_FPE_NWFPE=y CONFIG_PM=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/arm/configs/multi_v4t_defconfig +2 -1
@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y
arch/arm/configs/omap1_defconfig +2 -1
@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=y
arch/arm/configs/pxa_defconfig +2 -1
@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_LDM_PARTITION=y CONFIG_CMDLINE_PARTITION=y CONFIG_BINFMT_MISC=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPACTION is not set CONFIG_NET=y CONFIG_PACKET=y
arch/arm/configs/tct_hammer_defconfig +2 -1
@@ -19,7 +19,8 @@ CONFIG_FPE_NWFPE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/arm/configs/xcep_defconfig +2 -1
@@ -26,7 +26,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLOCK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPAT_BRK is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y
arch/openrisc/configs/or1ksim_defconfig +2 -1
@@ -10,7 +10,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"
arch/openrisc/configs/simple_smp_defconfig +2 -1
@@ -16,7 +16,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="simple_smp"
arch/riscv/configs/nommu_k210_defconfig +2 -1
@@ -25,7 +25,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=y
arch/riscv/configs/nommu_k210_sdcard_defconfig +2 -1
@@ -17,7 +17,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=y
arch/riscv/configs/nommu_virt_defconfig +2 -1
@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=y
arch/sh/configs/rsk7201_defconfig +2 -1
@@ -10,7 +10,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_AIO is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not set
arch/sh/configs/rsk7203_defconfig +2 -1
@@ -11,7 +11,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not set
arch/sh/configs/se7206_defconfig +2 -1
@@ -21,7 +21,8 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y
arch/sh/configs/shmin_defconfig +2 -1
@@ -9,7 +9,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_BLK_DEV_BSG is not set CONFIG_CPU_SUBTYPE_SH7706=y CONFIG_MEMORY_START=0x0c000000
arch/sh/configs/shx3_defconfig +2 -1
@@ -20,7 +20,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=y
kernel/configs/tiny.config +3 -2
@@ -7,5 +7,6 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set # CONFIG_SLAB is not set -# CONFIG_SLUB is not set -CONFIG_SLOB=y +# CONFIG_SLOB_DEPRECATED is not set +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y
mm/Kconfig +15 -2
@@ -219,17 +219,30 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. -config SLOB +config SLOB_DEPRECATED depends on EXPERT - bool "SLOB (Simple Allocator)" + bool "SLOB (Simple Allocator - DEPRECATED)" depends on !PREEMPT_RT help + Deprecated and scheduled for removal in a few cycles. SLUB + recommended as replacement. CONFIG_SLUB_TINY can be considered + on systems with 16MB or less RAM. + + If you need SLOB to stay, please contact [email protected] and + people listed in the SLAB ALLOCATOR section of MAINTAINERS file, + with your use case. + SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but does not perform as well on large systems. endchoice +config SLOB + bool + default y + depends on SLOB_DEPRECATED + config SLUB_TINY bool "Configure SLUB for minimal memory footprint" depends on SLUB && EXPERT
Signature · 1 line
2.38.1
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
Hi,
Quoted 28 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.
Quoted 4 lines
[1] https://lore.kernel.org/all/[email protected]/
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>
A.
Quoted 332 lines
Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++- arch/openrisc/configs/or1ksim_defconfig | 3 ++- arch/openrisc/configs/simple_smp_defconfig | 3 ++- arch/riscv/configs/nommu_k210_defconfig | 3 ++- arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- arch/riscv/configs/nommu_virt_defconfig | 3 ++- arch/sh/configs/rsk7201_defconfig | 3 ++- arch/sh/configs/rsk7203_defconfig | 3 ++- arch/sh/configs/se7206_defconfig | 3 ++- arch/sh/configs/shmin_defconfig | 3 ++- arch/sh/configs/shx3_defconfig | 3 ++- kernel/configs/tiny.config | 5 +++-- mm/Kconfig | 17 +++++++++++++++-- 19 files changed, 52 insertions(+), 21 deletions(-)arch/arm/configs/clps711x_defconfig +2
-1@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y CONFIG_ARCH_P720T=y CONFIG_AEABI=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/collie_defconfig +2
-1@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" CONFIG_FPE_NWFPE=y CONFIG_PM=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/multi_v4t_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=yarch/arm/configs/omap1_defconfig +2
-1@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/pxa_defconfig +2
-1@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_LDM_PARTITION=y CONFIG_CMDLINE_PARTITION=y CONFIG_BINFMT_MISC=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPACTION is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/tct_hammer_defconfig +2
-1@@ -19,7 +19,8 @@ CONFIG_FPE_NWFPE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/xcep_defconfig +2
-1@@ -26,7 +26,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLOCK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPAT_BRK is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=yarch/openrisc/configs/or1ksim_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"arch/openrisc/configs/simple_smp_defconfig +2
-1@@ -16,7 +16,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="simple_smp"arch/riscv/configs/nommu_k210_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_k210_sdcard_defconfig +2
-1@@ -17,7 +17,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_virt_defconfig +2
-1@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=yarch/sh/configs/rsk7201_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_AIO is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/rsk7203_defconfig +2
-1@@ -11,7 +11,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/se7206_defconfig +2
-1@@ -21,7 +21,8 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=yarch/sh/configs/shmin_defconfig +2
-1@@ -9,7 +9,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_BLK_DEV_BSG is not set CONFIG_CPU_SUBTYPE_SH7706=y CONFIG_MEMORY_START=0x0c000000arch/sh/configs/shx3_defconfig +2
-1@@ -20,7 +20,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=ykernel/configs/tiny.config +3
-2@@ -7,5 +7,6 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set # CONFIG_SLAB is not set -# CONFIG_SLUB is not set -CONFIG_SLOB=y +# CONFIG_SLOB_DEPRECATED is not set +CONFIG_SLUB=y +CONFIG_SLUB_TINY=ymm/Kconfig +15
-2@@ -219,17 +219,30 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. -config SLOB +config SLOB_DEPRECATED depends on EXPERT - bool "SLOB (Simple Allocator)" + bool "SLOB (Simple Allocator - DEPRECATED)" depends on !PREEMPT_RT help + Deprecated and scheduled for removal in a few cycles. SLUB + recommended as replacement. CONFIG_SLUB_TINY can be considered + on systems with 16MB or less RAM. + + If you need SLOB to stay, please contact [email protected] and + people listed in the SLAB ALLOCATOR section of MAINTAINERS file, + with your use case. + SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but does not perform as well on large systems. endchoice +config SLOB + bool + default y + depends on SLOB_DEPRECATED + config SLUB_TINY bool "Configure SLUB for minimal memory footprint" depends on SLUB && EXPERTSignature · 1 line
2.38.1
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 23 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.
Quoted 4 lines
To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.
Hm I forgot - some of those defconfigs might not actually be for so tiny devices to need CONFIG_SLUB_TINY (or SLOB previously). For those it would make more sense to simply remove CONFIG_SLOB=y and leave it to the default choice, which is SLUB (without _TINY). Feel free to point those out to me and I'll adjust. Thanks.
Quoted 23 lines
[1] https://lore.kernel.org/all/[email protected]/
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 23 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.
Quoted 6 lines
To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.
For the riscv k210,
Also, if these patches do not change from what I tested, feel free to add:
Thanks !
Quoted 332 lines
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++- arch/openrisc/configs/or1ksim_defconfig | 3 ++- arch/openrisc/configs/simple_smp_defconfig | 3 ++- arch/riscv/configs/nommu_k210_defconfig | 3 ++- arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- arch/riscv/configs/nommu_virt_defconfig | 3 ++- arch/sh/configs/rsk7201_defconfig | 3 ++- arch/sh/configs/rsk7203_defconfig | 3 ++- arch/sh/configs/se7206_defconfig | 3 ++- arch/sh/configs/shmin_defconfig | 3 ++- arch/sh/configs/shx3_defconfig | 3 ++- kernel/configs/tiny.config | 5 +++-- mm/Kconfig | 17 +++++++++++++++-- 19 files changed, 52 insertions(+), 21 deletions(-)arch/arm/configs/clps711x_defconfig +2
-1@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y CONFIG_ARCH_P720T=y CONFIG_AEABI=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/collie_defconfig +2
-1@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" CONFIG_FPE_NWFPE=y CONFIG_PM=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/multi_v4t_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=yarch/arm/configs/omap1_defconfig +2
-1@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/pxa_defconfig +2
-1@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_LDM_PARTITION=y CONFIG_CMDLINE_PARTITION=y CONFIG_BINFMT_MISC=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPACTION is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/tct_hammer_defconfig +2
-1@@ -19,7 +19,8 @@ CONFIG_FPE_NWFPE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/xcep_defconfig +2
-1@@ -26,7 +26,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLOCK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPAT_BRK is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=yarch/openrisc/configs/or1ksim_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"arch/openrisc/configs/simple_smp_defconfig +2
-1@@ -16,7 +16,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="simple_smp"arch/riscv/configs/nommu_k210_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_k210_sdcard_defconfig +2
-1@@ -17,7 +17,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_virt_defconfig +2
-1@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=yarch/sh/configs/rsk7201_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_AIO is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/rsk7203_defconfig +2
-1@@ -11,7 +11,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/se7206_defconfig +2
-1@@ -21,7 +21,8 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=yarch/sh/configs/shmin_defconfig +2
-1@@ -9,7 +9,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_BLK_DEV_BSG is not set CONFIG_CPU_SUBTYPE_SH7706=y CONFIG_MEMORY_START=0x0c000000arch/sh/configs/shx3_defconfig +2
-1@@ -20,7 +20,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=ykernel/configs/tiny.config +3
-2@@ -7,5 +7,6 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set # CONFIG_SLAB is not set -# CONFIG_SLUB is not set -CONFIG_SLOB=y +# CONFIG_SLOB_DEPRECATED is not set +CONFIG_SLUB=y +CONFIG_SLUB_TINY=ymm/Kconfig +15
-2@@ -219,17 +219,30 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. -config SLOB +config SLOB_DEPRECATED depends on EXPERT - bool "SLOB (Simple Allocator)" + bool "SLOB (Simple Allocator - DEPRECATED)" depends on !PREEMPT_RT help + Deprecated and scheduled for removal in a few cycles. SLUB + recommended as replacement. CONFIG_SLUB_TINY can be considered + on systems with 16MB or less RAM. + + If you need SLOB to stay, please contact [email protected] and + people listed in the SLAB ALLOCATOR section of MAINTAINERS file, + with your use case. + SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but does not perform as well on large systems. endchoice +config SLOB + bool + default y + depends on SLOB_DEPRECATED + config SLUB_TINY bool "Configure SLUB for minimal memory footprint" depends on SLUB && EXPERT
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 9 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++-
These all seem fine to convert to SLUB_TINY
It might be a good idea to go through the arm defconfigs after 6.2 (which will remove a bunch of them) and check which of the others should use it as well, but that of course is unrelated to the mechanical conversion you do here.
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 43 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.[1] https://lore.kernel.org/all/[email protected]/
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>
Quoted 8 lines
Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>
Thanks!
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 232 lines · On Mon, 21 Nov 2022 09:12:02 PST (-0800), [email protected] wrote:
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.[1] https://lore.kernel.org/all/[email protected]/
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++- arch/openrisc/configs/or1ksim_defconfig | 3 ++- arch/openrisc/configs/simple_smp_defconfig | 3 ++- arch/riscv/configs/nommu_k210_defconfig | 3 ++- arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- arch/riscv/configs/nommu_virt_defconfig | 3 ++- arch/sh/configs/rsk7201_defconfig | 3 ++- arch/sh/configs/rsk7203_defconfig | 3 ++- arch/sh/configs/se7206_defconfig | 3 ++- arch/sh/configs/shmin_defconfig | 3 ++- arch/sh/configs/shx3_defconfig | 3 ++- kernel/configs/tiny.config | 5 +++-- mm/Kconfig | 17 +++++++++++++++-- 19 files changed, 52 insertions(+), 21 deletions(-)arch/arm/configs/clps711x_defconfig +2
-1@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y CONFIG_ARCH_P720T=y CONFIG_AEABI=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/collie_defconfig +2
-1@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" CONFIG_FPE_NWFPE=y CONFIG_PM=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/multi_v4t_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=yarch/arm/configs/omap1_defconfig +2
-1@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/pxa_defconfig +2
-1@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_LDM_PARTITION=y CONFIG_CMDLINE_PARTITION=y CONFIG_BINFMT_MISC=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPACTION is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/tct_hammer_defconfig +2
-1@@ -19,7 +19,8 @@ CONFIG_FPE_NWFPE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/xcep_defconfig +2
-1@@ -26,7 +26,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLOCK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPAT_BRK is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=yarch/openrisc/configs/or1ksim_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"arch/openrisc/configs/simple_smp_defconfig +2
-1@@ -16,7 +16,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="simple_smp"arch/riscv/configs/nommu_k210_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_k210_sdcard_defconfig +2
-1@@ -17,7 +17,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_virt_defconfig +0
-0
arch/riscv/configs/nommu_virt_defconfig CONFIG_EXPERT=y · line 29
Quoted 9 lines
arch/riscv/configs/nommu_virt_defconfig +2
-1@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=y
Though I don't have a K210 to test against, maybe Damien still does?
Quoted 120 lines
arch/sh/configs/rsk7201_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_AIO is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/rsk7203_defconfig +2
-1@@ -11,7 +11,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/se7206_defconfig +2
-1@@ -21,7 +21,8 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=yarch/sh/configs/shmin_defconfig +2
-1@@ -9,7 +9,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_BLK_DEV_BSG is not set CONFIG_CPU_SUBTYPE_SH7706=y CONFIG_MEMORY_START=0x0c000000arch/sh/configs/shx3_defconfig +2
-1@@ -20,7 +20,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=ykernel/configs/tiny.config +3
-2@@ -7,5 +7,6 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set # CONFIG_SLAB is not set -# CONFIG_SLUB is not set -CONFIG_SLOB=y +# CONFIG_SLOB_DEPRECATED is not set +CONFIG_SLUB=y +CONFIG_SLUB_TINY=ymm/Kconfig +15
-2@@ -219,17 +219,30 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. -config SLOB +config SLOB_DEPRECATED depends on EXPERT - bool "SLOB (Simple Allocator)" + bool "SLOB (Simple Allocator - DEPRECATED)" depends on !PREEMPT_RT help + Deprecated and scheduled for removal in a few cycles. SLUB + recommended as replacement. CONFIG_SLUB_TINY can be considered + on systems with 16MB or less RAM. + + If you need SLOB to stay, please contact [email protected] and + people listed in the SLAB ALLOCATOR section of MAINTAINERS file, + with your use case. + SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but does not perform as well on large systems. endchoice +config SLOB + bool + default y + depends on SLOB_DEPRECATED + config SLUB_TINY bool "Configure SLUB for minimal memory footprint" depends on SLUB && EXPERT
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
On 12/3/22 02:59, Palmer Dabbelt wrote:
[...]
Quoted 17 lines
Quoted 5 lines
arch/riscv/configs/nommu_virt_defconfig +0
-0arch/riscv/configs/nommu_virt_defconfig CONFIG_EXPERT=y · line 29
Quoted 9 lines
arch/riscv/configs/nommu_virt_defconfig +2
-1@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=yAcked-by Palmer Dabbelt <[email protected]>
Quoted 1 line
Though I don't have a K210 to test against, maybe Damien still does?
I did test and it is OK.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 12/12] mm, slob: rename CONFIG_SLOB to CONFIG_SLOB_DEPRECATED
In reply to Vlastimil BabkaQuoted 363 lines · Vlastimil Babka
As explained in [1], we would like to remove SLOB if possible.
- There are no known users that need its somewhat lower memory footprint so much that they cannot handle SLUB (after some modifications by the previous patches) instead.
- It is an extra maintenance burden, and a number of features are incompatible with it.
- It blocks the API improvement of allowing
kfree()on objects allocated viakmem_cache_alloc().As the first step, rename the
CONFIG_SLOBoption in the slab allocator configuration choice toCONFIG_SLOB_DEPRECATED. AddCONFIG_SLOBdepending onCONFIG_SLOB_DEPRECATEDas an internal option to avoid code churn. This will cause existing .config files and defconfigs withCONFIG_SLOB=yto silently switch to the default (and recommended replacement) SLUB, while still allowing SLOB to be configured by anyone that notices and needs it. But those should contact the slab maintainers and [email protected] as explained in the updated help. With no valid objections, the plan is to update the existing defconfigs to SLUB and remove SLOB in a few cycles.To make SLUB more suitable replacement for SLOB, a
CONFIG_SLUB_TINYoption was introduced to limit SLUB's memory overhead. There is a number of defconfigs specifyingCONFIG_SLOB=y. As part of this patch, update them to selectCONFIG_SLUBandCONFIG_SLUB_TINY.[1] https://lore.kernel.org/all/[email protected]/
Cc Russell King <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Janusz Krzysztofik <[email protected]>Cc Tony Lindgren <[email protected]>Cc Jonas Bonn <[email protected]>Cc Stefan Kristiansson <[email protected]>Cc Stafford Horne <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Rich Felker <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Josh Triplett <[email protected]>Cc Conor Dooley <[email protected]>Cc Damien Le Moal <[email protected]>Cc Christophe Leroy <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Cc <[email protected]>Signed-off-by Vlastimil Babka <[email protected]>--- arch/arm/configs/clps711x_defconfig | 3 ++- arch/arm/configs/collie_defconfig | 3 ++- arch/arm/configs/multi_v4t_defconfig | 3 ++- arch/arm/configs/omap1_defconfig | 3 ++- arch/arm/configs/pxa_defconfig | 3 ++- arch/arm/configs/tct_hammer_defconfig | 3 ++- arch/arm/configs/xcep_defconfig | 3 ++- arch/openrisc/configs/or1ksim_defconfig | 3 ++- arch/openrisc/configs/simple_smp_defconfig | 3 ++- arch/riscv/configs/nommu_k210_defconfig | 3 ++- arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++- arch/riscv/configs/nommu_virt_defconfig | 3 ++- arch/sh/configs/rsk7201_defconfig | 3 ++- arch/sh/configs/rsk7203_defconfig | 3 ++- arch/sh/configs/se7206_defconfig | 3 ++- arch/sh/configs/shmin_defconfig | 3 ++- arch/sh/configs/shx3_defconfig | 3 ++- kernel/configs/tiny.config | 5 +++-- mm/Kconfig | 17 +++++++++++++++-- 19 files changed, 52 insertions(+), 21 deletions(-)arch/arm/configs/clps711x_defconfig +2
-1@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y CONFIG_ARCH_P720T=y CONFIG_AEABI=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/collie_defconfig +2
-1@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" CONFIG_FPE_NWFPE=y CONFIG_PM=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/multi_v4t_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y CONFIG_JUMP_LABEL=y CONFIG_PARTITION_ADVANCED=y # CONFIG_COREDUMP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=yarch/arm/configs/omap1_defconfig +2
-1@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BINFMT_MISC=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/pxa_defconfig +2
-1@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_LDM_PARTITION=y CONFIG_CMDLINE_PARTITION=y CONFIG_BINFMT_MISC=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPACTION is not set CONFIG_NET=y CONFIG_PACKET=yarch/arm/configs/tct_hammer_defconfig +2
-1@@ -19,7 +19,8 @@ CONFIG_FPE_NWFPE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_SWAP is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=yarch/arm/configs/xcep_defconfig +2
-1@@ -26,7 +26,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLOCK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_COMPAT_BRK is not set # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_NET=yarch/openrisc/configs/or1ksim_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"arch/openrisc/configs/simple_smp_defconfig +2
-1@@ -16,7 +16,8 @@ CONFIG_EXPERT=y # CONFIG_AIO is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_MODULES=y # CONFIG_BLOCK is not set CONFIG_OPENRISC_BUILTIN_DTB="simple_smp"arch/riscv/configs/nommu_k210_defconfig +2
-1@@ -25,7 +25,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_k210_sdcard_defconfig +2
-1@@ -17,7 +17,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_CANAAN=y CONFIG_NONPORTABLE=yarch/riscv/configs/nommu_virt_defconfig +2
-1@@ -22,7 +22,8 @@ CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_MMU is not set CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=yarch/sh/configs/rsk7201_defconfig +2
-1@@ -10,7 +10,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_AIO is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/rsk7203_defconfig +2
-1@@ -11,7 +11,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y # CONFIG_BLK_DEV_BSG is not setarch/sh/configs/se7206_defconfig +2
-1@@ -21,7 +21,8 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y # CONFIG_ELF_CORE is not set # CONFIG_COMPAT_BRK is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=yarch/sh/configs/shmin_defconfig +2
-1@@ -9,7 +9,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y # CONFIG_BLK_DEV_BSG is not set CONFIG_CPU_SUBTYPE_SH7706=y CONFIG_MEMORY_START=0x0c000000arch/sh/configs/shx3_defconfig +2
-1@@ -20,7 +20,8 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_KALLSYMS_ALL=y -CONFIG_SLOB=y +CONFIG_SLUB=y +CONFIG_SLUB_TINY=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_MODULES=ykernel/configs/tiny.config +3
-2@@ -7,5 +7,6 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set # CONFIG_SLAB is not set -# CONFIG_SLUB is not set -CONFIG_SLOB=y +# CONFIG_SLOB_DEPRECATED is not set +CONFIG_SLUB=y +CONFIG_SLUB_TINY=ymm/Kconfig +15
-2@@ -219,17 +219,30 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. -config SLOB +config SLOB_DEPRECATED depends on EXPERT - bool "SLOB (Simple Allocator)" + bool "SLOB (Simple Allocator - DEPRECATED)" depends on !PREEMPT_RT help + Deprecated and scheduled for removal in a few cycles. SLUB + recommended as replacement. CONFIG_SLUB_TINY can be considered + on systems with 16MB or less RAM. + + If you need SLOB to stay, please contact [email protected] and + people listed in the SLAB ALLOCATOR section of MAINTAINERS file, + with your use case. + SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but does not perform as well on large systems. endchoice +config SLOB + bool + default y + depends on SLOB_DEPRECATED + config SLUB_TINY bool "Configure SLUB for minimal memory footprint" depends on SLUB && EXPERTSignature · 1 line
2.38.1
FTR,
Signature · 2 lines
Thanks, Hyeonggon
Quoted 6 lines · Vlastimil Babka
this continues the discussion from [1]. Reasons to remove SLOB are outlined there and no-one has objected so far. The last patch of this series therefore deprecates
CONFIG_SLOBand updates all the defconfigs usingCONFIG_SLOB=yin the tree.
Quoted 6 lines
There is a k210 board with 8MB RAM where switching to SLUB caused issues
[2] and the lkp bot wasn't also happy about code bloat [3]. To address both, this series introducesCONFIG_SLUB_TINYto perform some rather low-hanging fruit modifications to SLUB to reduce its memory overhead. This seems to have been successful at least in the k210 case [4]. I consider this as an acceptable tradeoff for getting rid of SLOB.
I agree that this is a great success for replacing SLOB on the smallest machines that have 32MB or less and have to run a a highly customized kernel, and this is probably enough to have a drop-in replacement without making any currently working system worse.
On the other hand, I have the feeling that we may want something a bit less aggressive than this for machines that are slightly less constrained, in particular when a single kernel needs to scale from 64MB to 512MB, which can happen e.g. on OpenWRT. I have seen a number of reports over the years that suggest that new kernels handle fragmentation and low memory worse than old ones, and it would be great to improve that again.
I can imagine those machines wanting to use sysfs in general but not for the slab caches, so having a separate knob to configure out the sysfs stuff could be useful without having to go all the way to SLUB_TINY.
For the options that trade off performance against lower fragmentation (MIN/MAX_PARTIAL, KMALLOC_RECLAIM, percpu slabs), I wonder if it's possible to have a boot time default based on the amount of RAM per CPU to have a better tuned system on most cases, rather than having to go to one extreme or the other at compile time.
Arnd
Quoted 20 lines · Arnd Bergmann
Quoted 6 lines · Vlastimil Babka
this continues the discussion from [1]. Reasons to remove SLOB are outlined there and no-one has objected so far. The last patch of this series therefore deprecates
CONFIG_SLOBand updates all the defconfigs usingCONFIG_SLOB=yin the tree.Quoted 6 lines
There is a k210 board with 8MB RAM where switching to SLUB caused issues
[2] and the lkp bot wasn't also happy about code bloat [3]. To address both, this series introducesCONFIG_SLUB_TINYto perform some rather low-hanging fruit modifications to SLUB to reduce its memory overhead. This seems to have been successful at least in the k210 case [4]. I consider this as an acceptable tradeoff for getting rid of SLOB.I agree that this is a great success for replacing SLOB on the smallest machines that have 32MB or less and have to run a a highly customized kernel, and this is probably enough to have a drop-in replacement without making any currently working system worse.
Quoted 7 lines
On the other hand, I have the feeling that we may want something a bit less aggressive than this for machines that are slightly less constrained, in particular when a single kernel needs to scale from 64MB to 512MB, which can happen e.g. on OpenWRT. I have seen a number of reports over the years that suggest that new kernels handle fragmentation and low memory worse than old ones, and it would be great to improve that again.
I see. That would need to study such reports and see if the problem there is actually SLUB, or the page allocator or something else entirely.
Quoted 4 lines
I can imagine those machines wanting to use sysfs in general but not for the slab caches, so having a separate knob to configure out the sysfs stuff could be useful without having to go all the way to
SLUB_TINY.
Right, but AFAIK that wouldn't save much except some text size and kobjects, so probably negligible for >32MB?
Quoted 6 lines
For the options that trade off performance against lower fragmentation (MIN/MAX_PARTIAL,
KMALLOC_RECLAIM, percpu slabs), I wonder if it's possible to have a boot time default based on the amount of RAM per CPU to have a better tuned system on most cases, rather than having to go to one extreme or the other at compile time.
Possible for some of these things, but for others that brings us back to the question what are the actual observed issues. If it's low memory in absolute number of pages, these can help, but if it's fragmentation (and the kind if RAM sizes should have page grouping by mobility enabled), ditching e.g. the KMALLOC_RECLAIM could make it worse. Unfortunately some of these tradeoffs can be rather unpredictable.
Thanks,
Vlastimil
Quoted 9 lines · Vlastimil Babka
Quoted 5 lines · Arnd Bergmann
On Mon, Nov 21, 2022, at 18:11, Vlastimil Babka wrote:
I can imagine those machines wanting to use sysfs in general but not for the slab caches, so having a separate knob to configure out the sysfs stuff could be useful without having to go all the way toSLUB_TINY.Right, but AFAIK that wouldn't save much except some text size and kobjects, so probably negligible for >32MB?
Makes sense, I assume you have a better idea of how much this could save. I'm not at all worried about the .text size, but my initial guess was that the metadata for sysfs would be noticeable.
Quoted 7 lines
Quoted 6 lines
For the options that trade off performance against lower fragmentation (MIN/MAX_PARTIAL,
KMALLOC_RECLAIM, percpu slabs), I wonder if it's possible to have a boot time default based on the amount of RAM per CPU to have a better tuned system on most cases, rather than having to go to one extreme or the other at compile time.
Quoted 6 lines
Possible for some of these things, but for others that brings us back to the question what are the actual observed issues. If it's low memory in absolute number of pages, these can help, but if it's fragmentation (and the kind if RAM sizes should have page grouping by mobility enabled), ditching e.g. the
KMALLOC_RECLAIMcould make it worse. Unfortunately some of these tradeoffs can be rather unpredictable.
Are there any obvious wins on memory uage? I would guess that it would be safe to e.g. ditch percpu slabs when running with less 128MB per CPU, and the MIN/MAX_PARTIAL values could easily be a function of the number of pages in total or per cpu, whichever makes most sense. As a side-effect, those could also grow slightly larger on huge systems by scaling them with log2(totalpages).
Arnd
Quoted 53 lines · Vlastimil Babka
Hi,
this continues the discussion from [1]. Reasons to remove SLOB are outlined there and no-one has objected so far. The last patch of this series therefore deprecates
CONFIG_SLOBand updates all the defconfigs usingCONFIG_SLOB=yin the tree.There is a k210 board with 8MB RAM where switching to SLUB caused issues
[2] and the lkp bot wasn't also happy about code bloat [3]. To address both, this series introducesCONFIG_SLUB_TINYto perform some rather low-hanging fruit modifications to SLUB to reduce its memory overhead. This seems to have been successful at least in the k210 case [4]. I consider this as an acceptable tradeoff for getting rid of SLOB.The series is also available in git:
https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/linux.git/log/?h=slub-tiny-v1r2[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
[3] https://lore.kernel.org/all/Y25E9cJbhDAKi1vd@99bb1221be19/
[4] https://lore.kernel.org/all/[email protected]/Vlastimil Babka (12):
mm, slab: ignore hardened usercopy parameters when disabled mm, slub: addCONFIG_SLUB_TINY
mm, slub: disable SYSFS support withCONFIG_SLUB_TINY
mm, slub: retain no free slabs on partial list withCONFIG_SLUB_TINYmm, slub: lower the defaultslub_max_orderwithCONFIG_SLUB_TINYmm, slub: don't create kmalloc-rcl caches withCONFIG_SLUB_TINYmm, slab: ignoreSLAB_RECLAIM_ACCOUNTwithCONFIG_SLUB_TINYmm, slub: refactor free debug processing
mm, slub: split out allocations from pre/post hooks
mm, slub: remove percpu slabs withCONFIG_SLUB_TINY
mm, slub: don't aggressively inline withCONFIG_SLUB_TINYmm, slob: renameCONFIG_SLOBtoCONFIG_SLOB_DEPRECATEDarch/arm/configs/clps711x_defconfig | 3 +- arch/arm/configs/collie_defconfig | 3 +- arch/arm/configs/multi_v4t_defconfig | 3 +- arch/arm/configs/omap1_defconfig | 3 +- arch/arm/configs/pxa_defconfig | 3 +- arch/arm/configs/tct_hammer_defconfig | 3 +- arch/arm/configs/xcep_defconfig | 3 +- arch/openrisc/configs/or1ksim_defconfig | 3 +- arch/openrisc/configs/simple_smp_defconfig | 3 +- arch/riscv/configs/nommu_k210_defconfig | 3 +- .../riscv/configs/nommu_k210_sdcard_defconfig | 3 +- arch/riscv/configs/nommu_virt_defconfig | 3 +- arch/sh/configs/rsk7201_defconfig | 3 +- arch/sh/configs/rsk7203_defconfig | 3 +- arch/sh/configs/se7206_defconfig | 3 +- arch/sh/configs/shmin_defconfig | 3 +- arch/sh/configs/shx3_defconfig | 3 +-
Quoted 8 lines
include/linux/slab.h | 8 + include/linux/slub_def.h | 6 +- kernel/configs/tiny.config | 5 +- mm/Kconfig | 38 +- mm/Kconfig.debug | 2 +- mm/slab_common.c | 16 +- mm/slub.c | 415 ++++++++++++------ 24 files changed, 377 insertions(+), 164 deletions(-)
For the series
Signature · 2 lines
Sincerely yours, Mike.