mm/slub: some debug enhancements for kmalloc objects
Subsystems (3)
v4 cover mm/slub: some debug enhancements for kmalloc objects
kmalloc's API family is critical for mm, and one of its nature is that it will round up the request size to a fixed one (mostly power of 2). When user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
The wastage is not a big issue for requests that get allocated/freed quickly, but may cause problems with objects that have longer life time, and there were some OOM cases in some extrem cases.
This patchset tries to :
* Add a debug method to track each kmalloced object's wastage info, and show the call stack of original allocation (depends on SLAB_STORE_USER flag)
* Extend the redzone sanity check to the extra kmalloced buffer than requested, to better detect un-legitimate access to it. (depends on SLAB_STORE_USER & SLAB_RED_ZONE)
The redzone part has been tested with code below:
for (shift = 3; shift <= 12; shift++) {
size = 1 << shift;
buf = kmalloc(size + 4, GFP_KERNEL);
/* We have 96, 196 kmalloc size, which is not power of 2 */
if (size == 64 || size == 128)
oob_size = 16;
else
oob_size = size - 4;
memset(buf + size + 4, 0xee, oob_size);
kfree(buf);
}Please help to review, thanks!
- Feng
---
Changelogs:
since v3:
* rebase against latest post 6.0-rc1 slab tree's 'for-next' branch.
* fix a bug reported by 0Day, that kmalloc-redzoned data and kasan's free meta data overlaps in the same kmalloc object data area
since v2:
* rebase against slab tree's 'for-next' branch
* fix pointer handling (Kefeng Wang)
* move kzalloc zeroing handling change to a separate patch (Vlastimil Babka)
* make 'orig_size' only depend on KMALLOC & STORE_USER flag bits (Vlastimil Babka)
since v1:
* limit the 'orig_size' to kmalloc objects only, and save it after track in metadata (Vlastimil Babka)
* fix a offset calculation problem in print_trailer
since RFC:
* fix problems in kmem_cache_alloc_bulk() and records sorting, improve the print format (Hyeonggon Yoo)
* fix a compiling issue found by 0Day bot
* update the commit log based info from iova developers
Feng Tang (4):
mm/slub: enable debugging memory wasting of kmalloc mm/slub: only zero the requested size of buffer for kzalloc
mm: kasan: Add free_meta size info in struct kasan_cache mm/slub: extend redzone check to cover extra allocated kmalloc space
than requested
include/linux/kasan.h | 2 + include/linux/slab.h | 2 + mm/kasan/common.c | 2 + mm/slab.c | 6 +- mm/slab.h | 13 +++- mm/slab_common.c | 4 + mm/slub.c | 168 +++++++++++++++++++++++++++++++++++++----- 7 files changed, 172 insertions(+), 25 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/4 mm/slub: enable debugging memory wasting of kmalloc
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
The wastage is not a big issue for requests that get allocated/freed quickly, but may cause problems with objects that have longer life time.
We've met a kernel boot OOM panic (v5.10), and from the dumped slab info:
[ 26.062145] kmalloc-2k 814056KB 814056KB
From debug we found there are huge number of 'struct iova_magazine', whose size is 1032 bytes (1024 + 8), so each allocation will waste 1016 bytes. Though the issue was solved by giving the right (bigger) size of RAM, it is still nice to optimize the size (either use a kmalloc friendly size or create a dedicated slab for it).
And from lkml archive, there was another crash kernel OOM case [1] back in 2019, which seems to be related with the similar slab waste situation, as the log is similar:
[ 4.332648] iommu: Adding device 0000:20:02.0 to group 16
[ 4.338946] swapper/0 invoked oom-killer: gfp_mask=0x6040c0(GFP_KERNEL|__GFP_COMP), nodemask=(null), order=0, oom_score_adj=0
...
[ 4.857565] kmalloc-2048 59164KB 59164KBThe crash kernel only has 256M memory, and 59M is pretty big here. (Note: the related code has been changed and optimised in recent kernel [2], these logs are just picked to demo the problem, also a patch changing its size to 1024 bytes has been merged)
So add an way to track each kmalloc's memory waste info, and leverage the existing SLUB debug framework (specifically SLUB_STORE_USER) to show its call stack of original allocation, so that user can evaluate the waste situation, identify some hot spots and optimize accordingly, for a better utilization of memory.
The waste info is integrated into existing interface:
'/sys/kernel/debug/slab/kmalloc-xx/alloc_traces', one example of 'kmalloc-4k' after boot is:
126 ixgbe_alloc_q_vector+0xa5/0x4a0 [ixgbe] waste=233856/1856 age=1493302/1493830/1494358 pid=1284 cpus=32 nodes=1
__slab_alloc.isra.86+0x52/0x80
__kmalloc_node+0x143/0x350
ixgbe_alloc_q_vector+0xa5/0x4a0 [ixgbe]
ixgbe_init_interrupt_scheme+0x1a6/0x730 [ixgbe]
ixgbe_probe+0xc8e/0x10d0 [ixgbe]
local_pci_probe+0x42/0x80
work_for_cpu_fn+0x13/0x20
process_one_work+0x1c5/0x390which means in 'kmalloc-4k' slab, there are 126 requests of 2240 bytes which got a 4KB space (wasting 1856 bytes each and 233856 bytes in total). And when system starts some real workload like multiple docker instances, there are more severe waste.
[1]. https://lkml.org/lkml/2019/8/12/266
[2]. https://lore.kernel.org/lkml/[email protected]/
[Thanks Hyeonggon for pointing out several bugs about sorting/format] [Thanks Vlastimil for suggesting way to reduce memory usage of
orig_size and keep it only for kmalloc objects]
--- include/linux/slab.h | 2 + mm/slub.c | 94 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 15 deletions(-)
include/linux/slab.h +2 -0
@@ -29,6 +29,8 @@#define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400U)/* DEBUG: Poison objects */ #define SLAB_POISON ((slab_flags_t __force)0x00000800U) +/* Indicate a kmalloc slab */ +#define SLAB_KMALLOC ((slab_flags_t __force)0x00001000U)/* Align objs on cache lines */ #define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U)/* Use GFP_DMA memory */
mm/slub.c +79 -15
234 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 6 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
[...]
Quoted 15 lines
static void *___slab_alloc(struct
kmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);return freelist; }
mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 7 lines
mm/slub.c +2
-0@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }
Maybe we can move set_track() and set_orig_size() to after slab_post_alloc_hook(). something like alloc/free hooks for debugging caches? (and drop orig_size parameter.)
Thanks!
Quoted 9 lines
mm/slub.c +1
-1@@ -3182,7 +3228,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,* pointer. */ static void *__slab_alloc (struct kmem_cache *s,gfp_t gfpflags,int node, -unsigned long addr,struct kmem_cache_cpu *c) +unsigned long addr,struct kmem_cache_cpu *c,unsigned int orig_size) {void *p;
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 22 lines · Hyeonggon Yoo
Quoted 6 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
[...]
Quoted 12 lines
static void *___slab_alloc(struct
kmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);
Quoted 13 lines
mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 10 lines
mm/slub.c +2
-0return freelist; }@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }Maybe we can move
set_track()andset_orig_size()to afterslab_post_alloc_hook(). something like alloc/free hooks for debugging caches? (and droporig_sizeparameter.)
Yep, we discussed this during v3 review
https://lore.kernel.org/lkml/[email protected]/
Will revisit this considering recent refactoring and the following kmalloc data redzone patches.
Thanks,
Feng
Quoted 1 line
Thanks!
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 37 lines · Feng Tang
Quoted 22 lines · Hyeonggon Yoo
Quoted 6 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
[...]
Quoted 12 lines
static void *___slab_alloc(struct
kmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);Quoted 13 lines
mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 10 lines
mm/slub.c +2
-0return freelist; }@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }Maybe we can move
set_track()andset_orig_size()to afterslab_post_alloc_hook(). something like alloc/free hooks for debugging caches? (and droporig_sizeparameter.)
Quoted 2 lines
Yep, we discussed this during v3 review
https://lore.kernel.org/lkml/[email protected]/
Ah, I missed that :) Thanks!
Considering the added cost (should be low) and races with validation, I think this approach will cost more than it get. Sorry for the noise.
p.s. I think I can review this series in few days. Thanks for your efforts!
Quoted 7 lines
Will revisit this considering recent refactoring and the following kmalloc data redzone patches.
Thanks,
FengQuoted 1 line
Thanks!
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
In reply to Feng TangQuoted 68 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
The wastage is not a big issue for requests that get allocated/freed quickly, but may cause problems with objects that have longer life time.
We've met a kernel boot OOM panic (v5.10), and from the dumped slab info:
[ 26.062145] kmalloc-2k 814056KB 814056KBFrom debug we found there are huge number of 'struct
iova_magazine', whose size is 1032 bytes (1024 + 8), so each allocation will waste 1016 bytes. Though the issue was solved by giving the right (bigger) size of RAM, it is still nice to optimize the size (either use a kmalloc friendly size or create a dedicated slab for it).And from lkml archive, there was another crash kernel OOM case [1] back in 2019, which seems to be related with the similar slab waste situation, as the log is similar:
[ 4.332648] iommu: Adding device 0000:20:02.0 to group 16 [ 4.338946] swapper/0 invoked oom-killer: gfp_mask=0x6040c0(GFP_KERNEL|__GFP_COMP), nodemask=(null), order=0, oom_score_adj=0 ... [ 4.857565] kmalloc-2048 59164KB 59164KBThe crash kernel only has 256M memory, and 59M is pretty big here. (Note: the related code has been changed and optimised in recent kernel [2], these logs are just picked to demo the problem, also a patch changing its size to 1024 bytes has been merged)
So add an way to track each kmalloc's memory waste info, and leverage the existing SLUB debug framework (specifically
SLUB_STORE_USER) to show its call stack of original allocation, so that user can evaluate the waste situation, identify some hot spots and optimize accordingly, for a better utilization of memory.The waste info is integrated into existing interface:
'/sys/kernel/debug/slab/kmalloc-xx/alloc_traces', one example of 'kmalloc-4k' after boot is:126
ixgbe_alloc_q_vector+0xa5/0x4a0[ixgbe] waste=233856/1856 age=1493302/1493830/1494358 pid=1284 cpus=32 nodes=1__slab_alloc.isra.86+0x52/0x80 __kmalloc_node+0x143/0x350 ixgbe_alloc_q_vector+0xa5/0x4a0 [ixgbe] ixgbe_init_interrupt_scheme+0x1a6/0x730 [ixgbe] ixgbe_probe+0xc8e/0x10d0 [ixgbe] local_pci_probe+0x42/0x80 work_for_cpu_fn+0x13/0x20 process_one_work+0x1c5/0x390which means in 'kmalloc-4k' slab, there are 126 requests of 2240 bytes which got a 4KB space (wasting 1856 bytes each and 233856 bytes in total). And when system starts some real workload like multiple docker instances, there are more severe waste.
[1]. https://lkml.org/lkml/2019/8/12/266
[2]. https://lore.kernel.org/lkml/[email protected]/[Thanks Hyeonggon for pointing out several bugs about sorting/format] [Thanks Vlastimil for suggesting way to reduce memory usage of
orig_sizeand keep it only for kmalloc objects]
Quoted 8 lines
Signed-off-by Feng Tang <[email protected]>Cc Robin Murphy <[email protected]>Cc John Garry <[email protected]>Cc Kefeng Wang <[email protected]>--- include/linux/slab.h | 2 + mm/slub.c | 94 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 15 deletions(-)
Would you update Documentation/mm/slub.rst as well? (alloc_traces part)
[...]
Quoted 16 lines
*/
static void *___slab_alloc(structkmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);return freelist; }
mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 7 lines
mm/slub.c +2
-0@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }
This patch is okay but with patch 4, init_object() initializes redzone/poison area using s->object_size, and init_kmalloc_object() fixes redzone/poison area using orig_size. Why not do it in init_object() in the first time?
Also, updating redzone/poison area after alloc_single_from_new_slab() (outside list_lock, after adding slab to list) will introduce races with validation.
So I think doing set_orig_size()/init_kmalloc_object() in alloc_debug_processing() would make more sense.
I can miss something, please kindly let me know if I did ;)
Anything else looks good to me.
Thanks!
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 79 lines · Hyeonggon Yoo
Quoted 68 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
The wastage is not a big issue for requests that get allocated/freed quickly, but may cause problems with objects that have longer life time.
We've met a kernel boot OOM panic (v5.10), and from the dumped slab info:
[ 26.062145] kmalloc-2k 814056KB 814056KBFrom debug we found there are huge number of 'struct
iova_magazine', whose size is 1032 bytes (1024 + 8), so each allocation will waste 1016 bytes. Though the issue was solved by giving the right (bigger) size of RAM, it is still nice to optimize the size (either use a kmalloc friendly size or create a dedicated slab for it).And from lkml archive, there was another crash kernel OOM case [1] back in 2019, which seems to be related with the similar slab waste situation, as the log is similar:
[ 4.332648] iommu: Adding device 0000:20:02.0 to group 16 [ 4.338946] swapper/0 invoked oom-killer: gfp_mask=0x6040c0(GFP_KERNEL|__GFP_COMP), nodemask=(null), order=0, oom_score_adj=0 ... [ 4.857565] kmalloc-2048 59164KB 59164KBThe crash kernel only has 256M memory, and 59M is pretty big here. (Note: the related code has been changed and optimised in recent kernel [2], these logs are just picked to demo the problem, also a patch changing its size to 1024 bytes has been merged)
So add an way to track each kmalloc's memory waste info, and leverage the existing SLUB debug framework (specifically
SLUB_STORE_USER) to show its call stack of original allocation, so that user can evaluate the waste situation, identify some hot spots and optimize accordingly, for a better utilization of memory.The waste info is integrated into existing interface:
'/sys/kernel/debug/slab/kmalloc-xx/alloc_traces', one example of 'kmalloc-4k' after boot is:126
ixgbe_alloc_q_vector+0xa5/0x4a0[ixgbe] waste=233856/1856 age=1493302/1493830/1494358 pid=1284 cpus=32 nodes=1__slab_alloc.isra.86+0x52/0x80 __kmalloc_node+0x143/0x350 ixgbe_alloc_q_vector+0xa5/0x4a0 [ixgbe] ixgbe_init_interrupt_scheme+0x1a6/0x730 [ixgbe] ixgbe_probe+0xc8e/0x10d0 [ixgbe] local_pci_probe+0x42/0x80 work_for_cpu_fn+0x13/0x20 process_one_work+0x1c5/0x390which means in 'kmalloc-4k' slab, there are 126 requests of 2240 bytes which got a 4KB space (wasting 1856 bytes each and 233856 bytes in total). And when system starts some real workload like multiple docker instances, there are more severe waste.
[1]. https://lkml.org/lkml/2019/8/12/266
[2]. https://lore.kernel.org/lkml/[email protected]/[Thanks Hyeonggon for pointing out several bugs about sorting/format] [Thanks Vlastimil for suggesting way to reduce memory usage of
orig_sizeand keep it only for kmalloc objects]Quoted 8 lines
Signed-off-by Feng Tang <[email protected]>Cc Robin Murphy <[email protected]>Cc John Garry <[email protected]>Cc Kefeng Wang <[email protected]>--- include/linux/slab.h | 2 + mm/slub.c | 94 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 15 deletions(-)
Quoted 2 lines
Would you update
Documentation/mm/slub.rstas well? (alloc_tracespart)
Sure, will do.
Quoted 31 lines
[...]
Quoted 16 lines
*/
static void *___slab_alloc(structkmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);return freelist; }mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 7 lines
mm/slub.c +2
-0@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?
Quoted 4 lines
Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.
Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in alloc_debug_processing() (through init_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)
In latest 'for-next' branch, one call path for alloc_debug_processing() is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processing
Adding 'orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'
Thanks,
Feng
Quoted 8 lines
I can miss something, please kindly let me know if I did ;)
Anything else looks good to me.
Thanks!Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 8 lines · Feng Tang
Quoted 7 lines · Hyeonggon Yoo
Quoted 6 lines · Feng Tang
kmalloc's API family is critical for mm, with one nature that it will round up the request size to a fixed one (mostly power of 2). Say when user requests memory for '2^n + 1' bytes, actually 2^(n+1) bytes could be allocated, so in worst case, there is around 50% memory space waste.
[...]
Quoted 65 lines
Quoted 11 lines
Quoted 9 lines
Signed-off-by Feng Tang <[email protected]>Cc Robin Murphy <[email protected]>Cc John Garry <[email protected]>Cc Kefeng Wang <[email protected]>--- include/linux/slab.h | 2 + mm/slub.c | 94 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 15 deletions(-)Quoted 2 lines
Would you update
Documentation/mm/slub.rstas well? (alloc_tracespart)Sure, will do.
Quoted 31 lines
[...]
Quoted 16 lines
*/
static void *___slab_alloc(structkmem_cache*s,gfp_tgfpflags, int node,mm/slub.c +2
-1- unsigned long addr, struct kmem_cache_cpu *c) + unsigned long addr, struct kmem_cache_cpu *c, unsigned int orig_size) { void *freelist;struct slab *slab;@@ -3115,6 +3158,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size);return freelist; }mm/slub.c static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, · line 3190
Quoted 7 lines
mm/slub.c +2
-0@@ -3140,6 +3184,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); +set_orig_size (s, freelist, orig_size); +return freelist; }This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Quoted 4 lines
Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processing
Quoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)
It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
On Sun, Sep 04, 2022 at 05:03:34PM +0800, Hyeonggon Yoo wrote:
[...]
Quoted 27 lines
Quoted 23 lines
Quoted 9 lines
This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processingQuoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'
Quoted 6 lines
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Thanks for the suggestion! I'm fine with it and just afraid other developers may dislike the extra parameter.
The race condition you mentioned is a valid concern, and I have thought about it, one way is moving the set_orig_size() after the redzone/poision setup, and in 'check_object()' we can detect whether the 'orig_size' is set, and skip that check if it's not set yet. As the manual validate_slab triggered from sysfs interface is a rare debug activity, I think skipping one object shouldn't hurt much.
Thanks,
Feng
Quoted 4 lines
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 39 lines · Feng Tang
On Sun, Sep 04, 2022 at 05:03:34PM +0800, Hyeonggon Yoo wrote:
[...]Quoted 27 lines
Quoted 23 lines
Quoted 9 lines
This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processingQuoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'Quoted 6 lines
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Thanks for the suggestion! I'm fine with it and just afraid other developers may dislike the extra parameter.
Quoted 6 lines
The race condition you mentioned is a valid concern, and I have thought about it, one way is moving the
set_orig_size()after the redzone/poision setup, and in 'check_object()' we can detect whether the 'orig_size' is set, and skip that check if it's not set yet. As the manualvalidate_slabtriggered from sysfs interface is a rare debug activity, I think skipping one object shouldn't hurt much.
That will require smp_wmb()/smp_rmb() pair to make sure that effects of set_orig_size() to be visible after redzone/poison setup.
Isn't it simpler to add a parameter?
Quoted 8 lines
Thanks,
FengQuoted 4 lines
Signature · 2 lines
Thanks, Hyeonggon
Signature · 2 lines
Thanks, Hyeonggon
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 47 lines · Hyeonggon Yoo
Quoted 39 lines · Feng Tang
On Sun, Sep 04, 2022 at 05:03:34PM +0800, Hyeonggon Yoo wrote:
[...]Quoted 27 lines
Quoted 23 lines
Quoted 9 lines
This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processingQuoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'Quoted 6 lines
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Thanks for the suggestion! I'm fine with it and just afraid other developers may dislike the extra parameter.
Quoted 6 lines
The race condition you mentioned is a valid concern, and I have thought about it, one way is moving the
set_orig_size()after the redzone/poision setup, and in 'check_object()' we can detect whether the 'orig_size' is set, and skip that check if it's not set yet. As the manualvalidate_slabtriggered from sysfs interface is a rare debug activity, I think skipping one object shouldn't hurt much.
Quoted 2 lines
That will require smp_wmb()/smp_rmb() pair to make sure that effects of
set_orig_size()to be visible after redzone/poison setup.
Yes, synchronization is needed here.
Quoted 1 line
Isn't it simpler to add a parameter?
OK, I can go this way in v5 if other developers are fine. thanks
- Feng
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 48 lines · Feng Tang
Quoted 47 lines · Hyeonggon Yoo
Quoted 45 lines · Feng Tang
On Sun, Sep 04, 2022 at 05:03:34PM +0800, Hyeonggon Yoo wrote:
[...]Quoted 27 lines
Quoted 23 lines
Quoted 9 lines
This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processingQuoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'Quoted 6 lines
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Thanks for the suggestion! I'm fine with it and just afraid other developers may dislike the extra parameter.
The race condition you mentioned is a valid concern, and I have thought about it, one way is moving the
set_orig_size()after the redzone/poision setup, and in 'check_object()' we can detect whether the 'orig_size' is set, and skip that check if it's not set yet. As the manualvalidate_slabtriggered from sysfs interface is a rare debug activity, I think skipping one object shouldn't hurt much.
Quoted 8 lines
Quoted 2 lines
That will require smp_wmb()/smp_rmb() pair to make sure that effects of
set_orig_size()to be visible after redzone/poison setup.Yes, synchronization is needed here.
Quoted 1 line
Isn't it simpler to add a parameter?
OK, I can go this way in v5 if other developers are fine. thanks
How about get_partial() instantiates an on-stack structure that contains gfpflags, ret_slab, orig_size and passes pointer to that to all the nested functions.
Would be similar to "struct alloc_context" in page allocation. Something like "struct partial_context pc"?
Quoted 1 line
- Feng
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 56 lines · Vlastimil Babka
Quoted 55 lines · Feng Tang
Quoted 47 lines · Hyeonggon Yoo
Quoted 39 lines · Feng Tang
On Sun, Sep 04, 2022 at 05:03:34PM +0800, Hyeonggon Yoo wrote:
[...]Quoted 27 lines
Quoted 23 lines
Quoted 9 lines
This patch is okay but with patch 4,
init_object()initializes redzone/poison area usings->object_size, andinit_kmalloc_object()fixes redzone/poison area usingorig_size. Why not do it ininit_object()in the first time?Also, updating redzone/poison area after
alloc_single_from_new_slab()(outsidelist_lock, after adding slab to list) will introduce races with validation.So I think doing set_orig_size()/init_kmalloc_object() in
alloc_debug_processing()would make more sense.Yes, this makes sense, and in v3, kmalloc redzone/poison setup was done in
alloc_debug_processing()(throughinit_object()). When rebasing to v4, I met the classical problem: how to pass 'orig_size' parameter :)In latest 'for-next' branch, one call path for
alloc_debug_processing()is
___slab_alloc
get_partial
get_any_partial
get_partial_node
alloc_debug_processingQuoted 3 lines
Adding '
orig_size' paramter to all these function looks horrible, and I couldn't figure out a good way and chosed to put those ops after 'set_track()'Quoted 6 lines
IMO adding a parameter to them isn't too horrible...
I don't see better solution than adding a parameter with current implementation. (Yeah, the code is quite complicated...)It won't affect performance to meaningful degree as most of allocations will be served from cpu slab or percpu partial list.
Thanks for the suggestion! I'm fine with it and just afraid other developers may dislike the extra parameter.
Quoted 6 lines
The race condition you mentioned is a valid concern, and I have thought about it, one way is moving the
set_orig_size()after the redzone/poision setup, and in 'check_object()' we can detect whether the 'orig_size' is set, and skip that check if it's not set yet. As the manualvalidate_slabtriggered from sysfs interface is a rare debug activity, I think skipping one object shouldn't hurt much.Quoted 2 lines
That will require smp_wmb()/smp_rmb() pair to make sure that effects of
set_orig_size()to be visible after redzone/poison setup.Yes, synchronization is needed here.
Quoted 1 line
Isn't it simpler to add a parameter?
Quoted 8 lines
Quoted 1 line
OK, I can go this way in v5 if other developers are fine. thanks
How about
get_partial()instantiates an on-stack structure that contains gfpflags,ret_slab,orig_sizeand passes pointer to that to all the nested functions.Would be similar to "struct
alloc_context" in page allocation. Something like "structpartial_contextpc"?
Yep! This would make the parameters passing much tidier. Will try this way.
More aggressively is to also embed the 'kmem_cache' parameter into it, but this may make the code look ambiguous.
Thanks,
Feng
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 6 lines · Feng Tang
Quoted 5 lines · Vlastimil Babka
How about
get_partial()instantiates an on-stack structure that contains gfpflags,ret_slab,orig_sizeand passes pointer to that to all the nested functions.
Quoted 8 lines
Quoted 2 lines
Would be similar to "struct
alloc_context" in page allocation. Something like "structpartial_contextpc"?Yep! This would make the parameters passing much tidier. Will try this way.
More aggressively is to also embed the '
kmem_cache' parameter into it, but this may make the code look ambiguous.
That one is used a lot everywhere, so it would be tedious to dereference it from a struct, and also might be a bit better code if it's in a register.
Quoted 4 lines
Thanks,
Feng
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 10 lines · Vlastimil Babka
Quoted 9 lines · Feng Tang
Quoted 7 lines · Vlastimil Babka
How about
get_partial()instantiates an on-stack structure that contains gfpflags,ret_slab,orig_sizeand passes pointer to that to all the nested functions.Would be similar to "struct
alloc_context" in page allocation. Something like "structpartial_contextpc"?
Quoted 8 lines
Quoted 5 lines
Yep! This would make the parameters passing much tidier. Will try this way.
More aggressively is to also embed the '
kmem_cache' parameter into it, but this may make the code look ambiguous.That one is used a lot everywhere, so it would be tedious to dereference it from a struct, and also might be a bit better code if it's in a register.
Got it. Following is the incremental patch for 1/4, which uses the 'partial_context' to pass parameters. And actually the 4/4 patch will benefit more from this refactoring, as the object initialization doesn't need to be separated and has race issue.
Thanks,
Feng
---
mm/slub.c +31 -24
@@ -194,6 +194,12 @@ DEFINE_STATIC_KEY_FALSE(slub_debug_enabled);#endif #endif /* CONFIG_SLUB_DEBUG */ +struct partial_context { +struct slab **slab; +gfp_t flags; +int orig_size; +}; +static inline bool kmem_cache_debug (struct kmem_cache *s) {return kmem_cache_debug_flags (s,SLAB_DEBUG_FLAGS );
@@ -1333,7 +1339,7 @@ static inline int alloc_consistency_checks(struct kmem_cache *s, } static noinline int alloc_debug_processing(struct kmem_cache *s, -struct slab *slab,void *object) +struct slab *slab,void *object,int orig_size) {if (s->flags &SLAB_CONSISTENCY_CHECKS ) {if (!alloc_consistency_checks (s, slab, object))
@@ -1342,6 +1348,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s,/* Success. Perform special debug activities for allocs */ trace (s, slab, object,1 ); +set_orig_size (s, object, orig_size);init_object (s, object,SLUB_RED_ACTIVE );return 1 ;
@@ -1610,7 +1617,7 @@ static inlinevoid 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) {return 0 ; } +struct slab *slab,void *object,int orig_size) {return 0 ; }static inline void set_orig_size (struct kmem_cache *s,void *object,unsigned int orig_size) {}
@@ -2042,7 +2049,7 @@ static inline void remove_partial(struct kmem_cache_node *n,* it to full list if it was the last free object. */ static void *alloc_single_from_partial (struct kmem_cache *s, -struct kmem_cache_node *n,struct slab *slab) +struct kmem_cache_node *n,struct slab *slab,int orig_size) {void *object;
@@ -2052,7 +2059,7 @@ static void *alloc_single_from_partial(struct kmem_cache *s, slab->freelist =get_freepointer (s, object); slab->inuse++; -if (!alloc_debug_processing (s, slab, object)) { +if (!alloc_debug_processing (s, slab, object, orig_size)) {remove_partial (n, slab);return NULL ; }
@@ -2071,7 +2078,7 @@ static void *alloc_single_from_partial(struct kmem_cache *s,* and put the slab to the partial (or full) list. */ static void *alloc_single_from_new_slab (struct kmem_cache *s, -struct slab *slab) +struct slab *slab,int orig_size) {int nid =slab_nid (slab);struct kmem_cache_node *n =get_node (s, nid);
@@ -2083,7 +2090,7 @@ static void *alloc_single_from_new_slab(struct kmem_cache *s, slab->freelist =get_freepointer (s, object); slab->inuse =1 ; -if (!alloc_debug_processing (s, slab, object)) +if (!alloc_debug_processing (s, slab, object, orig_size))/* * It's not really expected that this would fail on a * freshly allocated slab, but a concurrent memory
@@ -2161,7 +2168,7 @@ static inline bool pfmemalloc_match(struct slab *slab, gfp_t gfpflags);* Try to allocate a partial slab from a specific node. */ static void *get_partial_node (struct kmem_cache *s,struct kmem_cache_node *n, -struct slab **ret_slab,gfp_t gfpflags) +struct partial_context *pc) {struct slab *slab, *slab2;void *object =NULL ;
@@ -2181,11 +2188,11 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,list_for_each_entry_safe (slab, slab2, &n->partial, slab_list) {void *t; -if (!pfmemalloc_match (slab, gfpflags)) +if (!pfmemalloc_match (slab, pc->flags))continue ;if (kmem_cache_debug (s)) { - object =alloc_single_from_partial (s, n, slab); + object =alloc_single_from_partial (s, n, slab, pc->orig_size);if (object)break ;continue ;
@@ -2196,7 +2203,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,break ;if (!object) { - *ret_slab = slab; + *pc->slab = slab;stat (s,ALLOC_FROM_PARTIAL ); object = t; }else {
@@ -2220,14 +2227,13 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,/* * Get a slab from somewhere. Search in increasing NUMA distances. */ -static void *get_any_partial (struct kmem_cache *s,gfp_t flags, -struct slab **ret_slab) +static void *get_any_partial (struct kmem_cache *s,struct partial_context *pc) {#ifdef CONFIG_NUMA struct zonelist *zonelist;struct zoneref *z;struct zone *zone; -enum zone_type highest_zoneidx =gfp_zone (flags); +enum zone_type highest_zoneidx =gfp_zone (pc->flags);void *object;unsigned int cpuset_mems_cookie;
@@ -2255,15 +2261,15 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags, do { cpuset_mems_cookie = read_mems_allowed_begin(); - zonelist = node_zonelist(mempolicy_slab_node(), flags); + zonelist = node_zonelist(mempolicy_slab_node(), pc->flags); for_each_zone_zonelist(zone, z, zonelist, highest_zoneidx) { struct kmem_cache_node *n; n = get_node(s, zone_to_nid(zone)); - if (n && cpuset_zone_allowed(zone, flags) && + if (n && cpuset_zone_allowed(zone, pc->flags) && n->nr_partial > s->min_partial) { - object = get_partial_node(s, n, ret_slab, flags); + object = get_partial_node(s, n, pc); if (object) { /* * Don't check read_mems_allowed_retry()
@@ -2284,8 +2290,7 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags,/* * Get a partial slab, lock it and return it. */ -static void *get_partial (struct kmem_cache *s,gfp_t flags,int node, -struct slab **ret_slab) +static void *get_partial (struct kmem_cache *s,int node,struct partial_context *pc) {void *object;int searchnode = node;
@@ -2293,11 +2298,11 @@ static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,if (node ==NUMA_NO_NODE ) searchnode =numa_mem_id (); - object =get_partial_node (s,get_node (s, searchnode), ret_slab, flags); + object =get_partial_node (s,get_node (s, searchnode), pc);if (object || node !=NUMA_NO_NODE )return object; -return get_any_partial (s, flags, ret_slab); +return get_any_partial (s, pc); }#ifdef CONFIG_PREEMPTION
@@ -3022,6 +3027,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,void *freelist;struct slab *slab;unsigned long flags; +struct partial_context pc;stat (s,ALLOC_SLOWPATH );
@@ -3135,7 +3141,10 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, new_objects: - freelist =get_partial (s, gfpflags, node, &slab); + pc.flags = gfpflags; + pc.slab = &slab; + pc.orig_size = orig_size; + freelist =get_partial (s, node, &pc);if (freelist) goto check_new_slab;
@@ -3151,14 +3160,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,stat (s,ALLOC_SLAB );if (kmem_cache_debug (s)) { - freelist =alloc_single_from_new_slab (s, slab); + freelist =alloc_single_from_new_slab (s, slab, orig_size);if (unlikely (!freelist)) goto new_objects;if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); -set_orig_size (s, freelist, orig_size);return freelist; }
@@ -3184,7 +3192,6 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); -set_orig_size (s, freelist, orig_size);return freelist; }
Re: [PATCH v4 1/4] mm/slub: enable debugging memory wasting of kmalloc
Quoted 20 lines · Feng Tang
Quoted 10 lines · Vlastimil Babka
Quoted 9 lines · Feng Tang
Quoted 7 lines · Vlastimil Babka
How about
get_partial()instantiates an on-stack structure that contains gfpflags,ret_slab,orig_sizeand passes pointer to that to all the nested functions.Would be similar to "struct
alloc_context" in page allocation. Something like "structpartial_contextpc"?Quoted 8 lines
Quoted 5 lines
Yep! This would make the parameters passing much tidier. Will try this way.
More aggressively is to also embed the '
kmem_cache' parameter into it, but this may make the code look ambiguous.That one is used a lot everywhere, so it would be tedious to dereference it from a struct, and also might be a bit better code if it's in a register.
Quoted 7 lines
Got it. Following is the incremental patch for 1/4, which uses the '
partial_context' to pass parameters. And actually the 4/4 patch will benefit more from this refactoring, as the object initialization doesn't need to be separated and has race issue.Thanks,
Feng
Looks fine to me.
will review when next version arrives :)
Quoted 216 lines
---
mm/slub.c +31
-24@@ -194,6 +194,12 @@ DEFINE_STATIC_KEY_FALSE(slub_debug_enabled);#endif #endif /* CONFIG_SLUB_DEBUG */ +struct partial_context { +struct slab **slab; +gfp_t flags; +int orig_size; +}; +static inline bool kmem_cache_debug (struct kmem_cache *s) {return kmem_cache_debug_flags (s,SLAB_DEBUG_FLAGS );@@ -1333,7 +1339,7 @@ static inline int alloc_consistency_checks(struct kmem_cache *s, } static noinline int alloc_debug_processing(struct kmem_cache *s, -struct slab *slab,void *object) +struct slab *slab,void *object,int orig_size) {if (s->flags &SLAB_CONSISTENCY_CHECKS ) {if (!alloc_consistency_checks (s, slab, object))@@ -1342,6 +1348,7 @@ static noinline int alloc_debug_processing(struct kmem_cache *s,/* Success. Perform special debug activities for allocs */ trace (s, slab, object,1 ); +set_orig_size (s, object, orig_size);init_object (s, object,SLUB_RED_ACTIVE );return 1 ;@@ -1610,7 +1617,7 @@ static inlinevoid 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) {return 0 ; } +struct slab *slab,void *object,int orig_size) {return 0 ; }static inline void set_orig_size (struct kmem_cache *s,void *object,unsigned int orig_size) {}@@ -2042,7 +2049,7 @@ static inline void remove_partial(struct kmem_cache_node *n,* it to full list if it was the last free object. */ static void *alloc_single_from_partial (struct kmem_cache *s, -struct kmem_cache_node *n,struct slab *slab) +struct kmem_cache_node *n,struct slab *slab,int orig_size) {void *object;@@ -2052,7 +2059,7 @@ static void *alloc_single_from_partial(struct kmem_cache *s, slab->freelist =get_freepointer (s, object); slab->inuse++; -if (!alloc_debug_processing (s, slab, object)) { +if (!alloc_debug_processing (s, slab, object, orig_size)) {remove_partial (n, slab);return NULL ; }@@ -2071,7 +2078,7 @@ static void *alloc_single_from_partial(struct kmem_cache *s,* and put the slab to the partial (or full) list. */ static void *alloc_single_from_new_slab (struct kmem_cache *s, -struct slab *slab) +struct slab *slab,int orig_size) {int nid =slab_nid (slab);struct kmem_cache_node *n =get_node (s, nid);@@ -2083,7 +2090,7 @@ static void *alloc_single_from_new_slab(struct kmem_cache *s, slab->freelist =get_freepointer (s, object); slab->inuse =1 ; -if (!alloc_debug_processing (s, slab, object)) +if (!alloc_debug_processing (s, slab, object, orig_size))/* * It's not really expected that this would fail on a * freshly allocated slab, but a concurrent memory @@ -2161,7 +2168,7 @@ static inline bool pfmemalloc_match(struct slab *slab, gfp_t gfpflags);* Try to allocate a partial slab from a specific node. */ static void *get_partial_node (struct kmem_cache *s,struct kmem_cache_node *n, -struct slab **ret_slab,gfp_t gfpflags) +struct partial_context *pc) {struct slab *slab, *slab2;void *object =NULL ;@@ -2181,11 +2188,11 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,list_for_each_entry_safe (slab, slab2, &n->partial, slab_list) {void *t; -if (!pfmemalloc_match (slab, gfpflags)) +if (!pfmemalloc_match (slab, pc->flags))continue ;if (kmem_cache_debug (s)) { - object =alloc_single_from_partial (s, n, slab); + object =alloc_single_from_partial (s, n, slab, pc->orig_size);if (object)break ;continue ;@@ -2196,7 +2203,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,break ;if (!object) { - *ret_slab = slab; + *pc->slab = slab;stat (s,ALLOC_FROM_PARTIAL ); object = t; }else {@@ -2220,14 +2227,13 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,/* * Get a slab from somewhere. Search in increasing NUMA distances. */ -static void *get_any_partial (struct kmem_cache *s,gfp_t flags, -struct slab **ret_slab) +static void *get_any_partial (struct kmem_cache *s,struct partial_context *pc) {#ifdef CONFIG_NUMA struct zonelist *zonelist;struct zoneref *z;struct zone *zone; -enum zone_type highest_zoneidx =gfp_zone (flags); +enum zone_type highest_zoneidx =gfp_zone (pc->flags);void *object;unsigned int cpuset_mems_cookie;@@ -2255,15 +2261,15 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags, do { cpuset_mems_cookie = read_mems_allowed_begin(); - zonelist = node_zonelist(mempolicy_slab_node(), flags); + zonelist = node_zonelist(mempolicy_slab_node(), pc->flags); for_each_zone_zonelist(zone, z, zonelist, highest_zoneidx) { struct kmem_cache_node *n; n = get_node(s, zone_to_nid(zone)); - if (n && cpuset_zone_allowed(zone, flags) && + if (n && cpuset_zone_allowed(zone, pc->flags) && n->nr_partial > s->min_partial) { - object = get_partial_node(s, n, ret_slab, flags); + object = get_partial_node(s, n, pc); if (object) { /* * Don't check read_mems_allowed_retry()@@ -2284,8 +2290,7 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags,/* * Get a partial slab, lock it and return it. */ -static void *get_partial (struct kmem_cache *s,gfp_t flags,int node, -struct slab **ret_slab) +static void *get_partial (struct kmem_cache *s,int node,struct partial_context *pc) {void *object;int searchnode = node;@@ -2293,11 +2298,11 @@ static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,if (node ==NUMA_NO_NODE ) searchnode =numa_mem_id (); - object =get_partial_node (s,get_node (s, searchnode), ret_slab, flags); + object =get_partial_node (s,get_node (s, searchnode), pc);if (object || node !=NUMA_NO_NODE )return object; -return get_any_partial (s, flags, ret_slab); +return get_any_partial (s, pc); }#ifdef CONFIG_PREEMPTION @@ -3022,6 +3027,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,void *freelist;struct slab *slab;unsigned long flags; +struct partial_context pc;stat (s,ALLOC_SLOWPATH );@@ -3135,7 +3141,10 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, new_objects: - freelist =get_partial (s, gfpflags, node, &slab); + pc.flags = gfpflags; + pc.slab = &slab; + pc.orig_size = orig_size; + freelist =get_partial (s, node, &pc);if (freelist) goto check_new_slab;@@ -3151,14 +3160,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,stat (s,ALLOC_SLAB );if (kmem_cache_debug (s)) { - freelist =alloc_single_from_new_slab (s, slab); + freelist =alloc_single_from_new_slab (s, slab, orig_size);if (unlikely (!freelist)) goto new_objects;if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); -set_orig_size (s, freelist, orig_size);return freelist; }@@ -3184,7 +3192,6 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,*/ if (s->flags &SLAB_STORE_USER )set_track (s, freelist,TRACK_ALLOC , addr); -set_orig_size (s, freelist, orig_size);return freelist; }
Signature · 2 lines
Thanks, Hyeonggon
PATCH v4 2/4 mm/slub: only zero the requested size of buffer for kzalloc
In reply to Feng Tangkzalloc/kmalloc will round up the request size to a fixed size (mostly power of 2), so the allocated memory could be more than requested. Currently kzalloc family APIs will zero all the allocated memory.
To detect out-of-bound usage of the extra allocated memory, only zero the requested part, so that sanity check could be added to the extra space later.
For kzalloc users who will call ksize() later and utilize this extra space, please be aware that the space is not zeroed any more.
--- mm/slab.c | 6 +++--- mm/slab.h | 9 +++++++-- mm/slub.c | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-)
mm/slab.c +3 -3
@@ -3253,7 +3253,7 @@ slab_alloc_node(struct kmem_cache *cachep, struct list_lru *lru, gfp_t flags, init =slab_want_init_on_alloc (flags, cachep); out: -slab_post_alloc_hook (cachep, objcg, flags,1 , &objp, init); +slab_post_alloc_hook (cachep, objcg, flags,1 , &objp, init,0 );return objp; }
@@ -3506,13 +3506,13 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,* Done outside of the IRQ disabled section. */ slab_post_alloc_hook (s, objcg, flags, size, p, -slab_want_init_on_alloc (flags, s)); +slab_want_init_on_alloc (flags, s),0 );/* FIXME: Trace call missing. Christoph would like a bulk variant */ return size; error:local_irq_enable ();cache_alloc_debugcheck_after_bulk (s, flags, i, p, _RET_IP_); -slab_post_alloc_hook (s, objcg, flags, i, p, false); +slab_post_alloc_hook (s, objcg, flags, i, p, false,0 );kmem_cache_free_bulk (s, i, p);return 0 ; }
mm/slab.h +7 -2
@@ -720,12 +720,17 @@ static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s,static inline void slab_post_alloc_hook (struct kmem_cache *s,struct obj_cgroup *objcg,gfp_t flags, -size_t size,void **p,bool init) +size_t size,void **p,bool init, +unsigned int orig_size) {size_t i; flags &= gfp_allowed_mask; +/* If original request size(kmalloc) is not set, use object_size */ +if (!orig_size) + orig_size = s->object_size; +/* * As memory initialization might be integrated into KASAN, * kasan_slab_alloc and initialization memset must be
@@ -736,7 +741,7 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s,for (i =0 ; i < size; i++) { p[i] =kasan_slab_alloc (s, p[i], flags, init);if (p[i] && init && !kasan_has_integrated_init ()) -memset (p[i],0 , s->object_size); +memset (p[i],0 , orig_size);kmemleak_alloc_recursive (p[i], s->object_size,1 , s->flags, flags); }
mm/slub.c +3 -3
@@ -3360,7 +3360,7 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, struct list_l init =slab_want_init_on_alloc (gfpflags, s); out: -slab_post_alloc_hook (s, objcg, gfpflags,1 , &object, init); +slab_post_alloc_hook (s, objcg, gfpflags,1 , &object, init, orig_size);return object; }
@@ -3817,11 +3817,11 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,* Done outside of the IRQ disabled fastpath loop. */ slab_post_alloc_hook (s, objcg, flags, size, p, -slab_want_init_on_alloc (flags, s)); +slab_want_init_on_alloc (flags, s),0 );return i; error:slub_put_cpu_ptr (s->cpu_slab); -slab_post_alloc_hook (s, objcg, flags, i, p, false); +slab_post_alloc_hook (s, objcg, flags, i, p, false,0 );kmem_cache_free_bulk (s, i, p);return 0 ; }
Signature · 1 line
2.34.1
PATCH v4 3/4 mm: kasan: Add free_meta size info in struct kasan_cache
In reply to Feng TangWhen kasan is enabled for slab/slub, it may save kasan' free_meta data in the former part of slab object data area in slab object free path, which works fine.
There is ongoing effort to extend slub's debug function which will redzone the latter part of kmalloc object area, and when both of the debug are enabled, there is possible conflict, especially when the kmalloc object has small size, as caught by 0Day bot [1]
For better information for slab/slub, add free_meta's data size info 'kasan_cache', so that its users can take right action to avoid data conflict.
[1]. https://lore.kernel.org/lkml/YuYm3dWwpZwH58Hu@xsang-OptiPlex-9020/
--- include/linux/kasan.h | 2 ++ mm/kasan/common.c | 2 ++ 2 files changed, 4 insertions(+)
include/linux/kasan.h +2 -0
@@ -100,6 +100,8 @@ static inline bool kasan_has_integrated_init(void)struct kasan_cache {int alloc_meta_offset;int free_meta_offset; +/* size of free_meta data saved in object's data area */ +int free_meta_size_in_object;bool is_kmalloc; };
mm/kasan/common.c +2 -0
@@ -201,6 +201,8 @@ void __kasan_cache_create(struct kmem_cache *cache, unsigned int *size, cache->kasan_info.free_meta_offset =KASAN_NO_FREE_META ; *size = ok_size; } + }else { + cache->kasan_info.free_meta_size_in_object =sizeof (struct kasan_free_meta ); }/* Calculate size with optimal redzone. */
Signature · 1 line
2.34.1
PATCH v4 4/4 mm/slub: extend redzone check to cover extra allocated kmalloc space than requested
In reply to Feng Tangkmalloc will round up the request size to a fixed size (mostly power of 2), so there could be a extra space than what is requested, whose size is the actual buffer size minus original request size.
To better detect out of bound access or abuse of this space, add redzone sanity check for it.
And in current kernel, some kmalloc user already knows the existence of the space and utilizes it after calling 'ksize()' to know the real size of the allocated buffer. So we skip the redzone sanity check and kmalloc wastage debug for objects which have been called with ksize(), as treating them as legitimate users of the extra space.
--- mm/slab.h | 4 ++ mm/slab_common.c | 4 ++ mm/slub.c | 95 +++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 93 insertions(+), 10 deletions(-)
mm/slab.h +4 -0
@@ -875,4 +875,8 @@ void __check_heap_object(const void *ptr, unsigned long n, }#endif +#ifdef CONFIG_SLUB_DEBUG +extern void skip_orig_size_check (struct kmem_cache *s,const void *object); +#endif +#endif /* MM_SLAB_H */
mm/slab_common.c +4 -0
@@ -1001,6 +1001,10 @@ size_t __ksize(const void *object)return folio_size (folio); } +#ifdef CONFIG_SLUB_DEBUG +skip_orig_size_check (folio_slab (folio)->slab_cache, object); +#endif +return slab_ksize (folio_slab (folio)->slab_cache); }
mm/slub.c +85 -10
158 lines not on this page · raw message
Signature · 1 line
2.34.1