mm: memcg/slab: Fix objcg pointer array handling problem
Subsystems (5)
v4 cover mm: memcg/slab: Fix objcg pointer array handling problem
v4:
- Incorporate suggestions from others like setting SLAB_ACCOUNT for KMALLOC_CGROUP caches into patch 2.
- Add a new patch 3 to disable caches merging for KMALLOC_NORMAL caches as suggested by Roman.
v3:
- Update patch 2 commit log and rework kmalloc_type() to make it easier to read.
v2:
- Take suggestion from Vlastimil to use a new set of kmalloc-cg-* to handle the objcg pointer array allocation and freeing problems.
Since the merging of the new slab memory controller in v5.9, the page structure stores a pointer to objcg pointer array for slab pages. When the slab has no used objects, it can be freed in free_slab() which will call kfree() to free the objcg pointer array in memcg_alloc_page_obj_cgroups(). If it happens that the objcg pointer array is the last used object in its slab, that slab may then be freed which may caused kfree() to be called again.
With the right workload, the slab cache may be set up in a way that allows the recursive kfree() calling loop to nest deep enough to cause a kernel stack overflow and panic the system. In fact, we have a reproducer that can cause kernel stack overflow on a s390 system involving kmalloc-rcl-256 and kmalloc-rcl-128 slabs with the following kfree() loop recursively called 74 times:
[ 285.520739] [<000000000ec432fc>] kfree+0x4bc/0x560 [ 285.520740] [<000000000ec43466>] __free_slab+0xc6/0x228 [ 285.520741] [<000000000ec41fc2>] __slab_free+0x3c2/0x3e0 [ 285.520742] [<000000000ec432fc>] kfree+0x4bc/0x560 :
While investigating this issue, I also found an issue on the allocation side. If the objcg pointer array happen to come from the same slab or a circular dependency linkage is formed with multiple slabs, those affected slabs can never be freed again.
This patch series addresses these two issues by introducing a new set of kmalloc-cg-<n> caches split from kmalloc-<n> caches. The new set will only contain non-reclaimable and non-dma objects that are accounted in memory cgroups whereas the old set are now for unaccounted objects only. By making this split, all the objcg pointer arrays will come from the kmalloc-<n> caches, but those caches will never hold any objcg pointer array. As a result, deeply nested kfree() call and the unfreeable slab problems are now gone.
Waiman Long (3):
mm: memcg/slab: Properly set up gfp flags for objcg pointer array
mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
include/linux/slab.h | 41 ++++++++++++++++++++++++++++++++--------- mm/memcontrol.c | 8 ++++++++ mm/slab.h | 1 - mm/slab_common.c | 32 ++++++++++++++++++++++++-------- 4 files changed, 64 insertions(+), 18 deletions(-)
Signature · 1 line
2.18.1
PATCH v4 1/3 mm: memcg/slab: Properly set up gfp flags for objcg pointer array
Since the merging of the new slab memory controller in v5.9, the page structure may store a pointer to obj_cgroup pointer array for slab pages. Currently, only the __GFP_ACCOUNT bit is masked off. However, the array is not readily reclaimable and doesn't need to come from the DMA buffer. So those GFP bits should be masked off as well.
Do the flag bit clearing at memcg_alloc_page_obj_cgroups() to make sure that it is consistently applied no matter where it is called.
--- mm/memcontrol.c | 8 ++++++++ mm/slab.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)
mm/memcontrol.c +8 -0
@@ -2863,6 +2863,13 @@ static struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *objcg) }#ifdef CONFIG_MEMCG_KMEM +/* +* The allocated objcg pointers array is not accounted directly. +* Moreover, it should not come from DMA buffer and is not readily +* reclaimable. So those GFP bits should be masked off. +*/ +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | __GFP_ACCOUNT) +int memcg_alloc_page_obj_cgroups (struct page *page,struct kmem_cache *s,gfp_t gfp,bool new_page) {
@@ -2870,6 +2877,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,unsigned long memcg_data;void *vec; + gfp &= ~OBJCGS_CLEAR_MASK ; vec =kcalloc_node (objects,sizeof (struct obj_cgroup *), gfp,page_to_nid (page));if (!vec)
mm/slab.h +0 -1
@@ -309,7 +309,6 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,if (!memcg_kmem_enabled () || !objcg)return ; - flags &= ~__GFP_ACCOUNT;for (i =0 ; i < size; i++) {if (likely (p[i])) { page =virt_to_head_page (p[i]);
Signature · 1 line
2.18.1
Re: [PATCH v4 1/3] mm: memcg/slab: Properly set up gfp flags for objcg pointer array
Quoted 6 lines · Waiman Long
Since the merging of the new slab memory controller in v5.9, the page structure may store a pointer to
obj_cgrouppointer array for slab pages. Currently, only the__GFP_ACCOUNTbit is masked off. However, the array is not readily reclaimable and doesn't need to come from the DMA buffer. So those GFP bits should be masked off as well.
Quoted 6 lines
Do the flag bit clearing at
memcg_alloc_page_obj_cgroups()to make sure that it is consistently applied no matter where it is called.Fixes 286e04b8ed7a ("mm: memcg/slab: allocate obj_cgroups for non-root slab pages")Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>
Re: [PATCH v4 1/3] mm: memcg/slab: Properly set up gfp flags for objcg pointer array
In reply to Waiman LongQuoted 6 lines · Waiman Long
Since the merging of the new slab memory controller in v5.9, the page structure may store a pointer to
obj_cgrouppointer array for slab pages. Currently, only the__GFP_ACCOUNTbit is masked off. However, the array is not readily reclaimable and doesn't need to come from the DMA buffer. So those GFP bits should be masked off as well.
Quoted 6 lines
Do the flag bit clearing at
memcg_alloc_page_obj_cgroups()to make sure that it is consistently applied no matter where it is called.Fixes 286e04b8ed7a ("mm: memcg/slab: allocate obj_cgroups for non-root slab pages")Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>
Quoted 44 lines
--- mm/memcontrol.c | 8 ++++++++ mm/slab.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)mm/memcontrol.c +8
-0@@ -2863,6 +2863,13 @@ static struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *objcg) }#ifdef CONFIG_MEMCG_KMEM +/* +* The allocated objcg pointers array is not accounted directly. +* Moreover, it should not come from DMA buffer and is not readily +* reclaimable. So those GFP bits should be masked off. +*/ +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | __GFP_ACCOUNT) +int memcg_alloc_page_obj_cgroups (struct page *page,struct kmem_cache *s,gfp_t gfp,bool new_page) {@@ -2870,6 +2877,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,unsigned long memcg_data;void *vec; + gfp &= ~OBJCGS_CLEAR_MASK ; vec =kcalloc_node (objects,sizeof (struct obj_cgroup *), gfp,page_to_nid (page));if (!vec)mm/slab.h +0
-1@@ -309,7 +309,6 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,if (!memcg_kmem_enabled () || !objcg)return ; - flags &= ~__GFP_ACCOUNT;for (i =0 ; i < size; i++) {if (likely (p[i])) { page =virt_to_head_page (p[i]);
PATCH v4 2/3 mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Waiman LongThere are currently two problems in the way the objcg pointer array (memcg_data) in the page structure is being allocated and freed.
On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the obj_cgroup array) in the slab.
When it is freed, the objcg pointer array object may be the last one in its slab and hence causes kfree() to be called again. With the right workload, the slab cache may be set up in a way that allows the recursive kfree() calling loop to nest deep enough to cause a kernel stack overflow and panic the system.
One way to solve this problem is to split the kmalloc-<n> caches (KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.
With this change, all the objcg pointer array objects will come from KMALLOC_NORMAL caches which won't have their objcg pointer arrays. So both the recursive kfree() problem and non-freeable slab problem are gone.
Since both the KMALLOC_NORMAL and KMALLOC_CGROUP caches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.
The new KMALLOC_CGROUP is added between KMALLOC_NORMAL and KMALLOC_RECLAIM so that the first for loop in create_kmalloc_caches() will include the newly added caches without change.
--- include/linux/slab.h | 41 ++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 49 insertions(+), 17 deletions(-)
include/linux/slab.h +32 -9
@@ -305,12 +305,23 @@ static inline void __check_heap_object(const void *ptr, unsigned long n,/* * Whenever changing this, take care of that kmalloc_type() and * create_kmalloc_caches() still work as intended. +* +* KMALLOC_NORMAL can contain only unaccounted objects whereas KMALLOC_CGROUP +* is for accounted but unreclaimable and non-dma objects. All the other +* kmem caches can have both accounted and unaccounted objects. */ enum kmalloc_cache_type {KMALLOC_NORMAL =0 , +#ifdef CONFIG_MEMCG_KMEM +KMALLOC_CGROUP , +#else +KMALLOC_CGROUP =KMALLOC_NORMAL , +#endif KMALLOC_RECLAIM ,#ifdef CONFIG_ZONE_DMA KMALLOC_DMA , +#else +KMALLOC_DMA =KMALLOC_NORMAL ,#endif NR_KMALLOC_TYPES };
@@ -319,24 +330,36 @@ enum kmalloc_cache_type {extern struct kmem_cache * kmalloc_caches[NR_KMALLOC_TYPES ][KMALLOC_SHIFT_HIGH +1 ]; +/* +* Define gfp bits that should not be set for KMALLOC_NORMAL. +*/ +#define KMALLOC_NOT_NORMAL_BITS \ + (__GFP_RECLAIMABLE | \ + (IS_ENABLED(CONFIG_ZONE_DMA) ? __GFP_DMA : 0) | \ + (IS_ENABLED(CONFIG_MEMCG_KMEM) ? __GFP_ACCOUNT : 0)) + static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags) { -#ifdef CONFIG_ZONE_DMA /* * The most common case is KMALLOC_NORMAL, so test for it -* with a single branch for both flags. +* with a single branch for all the relevant flags. */ -if (likely ((flags & (__GFP_DMA | __GFP_RECLAIMABLE)) ==0 )) +if (likely ((flags &KMALLOC_NOT_NORMAL_BITS ) ==0 ))return KMALLOC_NORMAL ;/* -* At least one of the flags has to be set. If both are, __GFP_DMA -* is more important. +* At least one of the flags has to be set. Their priorities in +* decreasing order are: +* 1) __GFP_DMA +* 2) __GFP_RECLAIMABLE +* 3) __GFP_ACCOUNT */ -return flags & __GFP_DMA ?KMALLOC_DMA :KMALLOC_RECLAIM ; -#else -return flags & __GFP_RECLAIMABLE ?KMALLOC_RECLAIM :KMALLOC_NORMAL ; -#endif +if (IS_ENABLED (CONFIG_ZONE_DMA ) && (flags & __GFP_DMA)) +return KMALLOC_DMA ; +if (!IS_ENABLED (CONFIG_MEMCG_KMEM ) || (flags & __GFP_RECLAIMABLE)) +return KMALLOC_RECLAIM ; +else +return KMALLOC_CGROUP ; }/*
mm/slab_common.c +17 -8
@@ -727,21 +727,25 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) }#ifdef CONFIG_ZONE_DMA -#define INIT_KMALLOC_INFO (__size, __short_size) \ -{ \ - .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ - .name[KMALLOC_DMA] = "dma-kmalloc-" #__short_size, \ - .size = __size, \ -} +#define KMALLOC_DMA_NAME (sz) .name[KMALLOC_DMA] = "dma-kmalloc-" #sz, +#else +#define KMALLOC_DMA_NAME (sz) +#endif + +#ifdef CONFIG_MEMCG_KMEM +#define KMALLOC_CGROUP_NAME (sz) .name[KMALLOC_CGROUP] = "kmalloc-cg-" #sz,#else +#define KMALLOC_CGROUP_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_CGROUP_NAME(__short_size) \ + KMALLOC_DMA_NAME(__short_size) \ .size = __size, \ } -#endif /* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time.
@@ -830,6 +834,8 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) {if (type ==KMALLOC_RECLAIM ) flags |=SLAB_RECLAIM_ACCOUNT ; +else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) + flags |=SLAB_ACCOUNT ; kmalloc_caches[type][idx] = create_kmalloc_cache( kmalloc_info[idx].name[type],
@@ -847,6 +853,9 @@ void __init create_kmalloc_caches(slab_flags_t flags)int i;enum kmalloc_cache_type type; +/* +* Including KMALLOC_CGROUP if CONFIG_MEMCG_KMEM defined +*/ for (type =KMALLOC_NORMAL ; type <=KMALLOC_RECLAIM ; type++) {for (i =KMALLOC_SHIFT_LOW ; i <=KMALLOC_SHIFT_HIGH ; i++) {if (!kmalloc_caches[type][i])
Signature · 1 line
2.18.1
Re: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 32 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.
Quoted 7 lines
The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>
Re: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Waiman LongQuoted 32 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.
Quoted 7 lines
The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>
A last nitpick: the new caches -cg should perhaps not be created when cgroup_memory_nokmem == true because kmemcg was disabled by the respective boot param.
Re: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 37 lines · Vlastimil Babka
Quoted 36 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.
Quoted 7 lines
Quoted 3 lines
Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>A last nitpick: the new caches -cg should perhaps not be created when
cgroup_memory_nokmem== true because kmemcg was disabled by the respective boot param.
It is a nice to have feature. However, the nokmem kernel parameter isn't used that often. The cgroup_memory_nokmem variable is private to memcontrol.c and is not directly accessible. I will take a look on that, but it will be a follow-on patch. I am not planning to change the current patchset unless there are other issues coming up.
Cheers,
Longman
Re: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Waiman LongQuoted 32 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.
Quoted 7 lines
The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>
I still believe the cgroup.memory=nokmem parameter should be respected, otherwise the caches are not only created, but also used. I offer this followup for squashing into your patch if you and Andrew agree:
----8<----
From c87378d437d9a59b8757033485431b4721c74173 Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Thu, 6 May 2021 17:53:21 +0200
Subject: [PATCH] mm: memcg/slab: don't create kmalloc-cg caches with
cgroup.memory=nokmem
The caches should not be created when kmemcg is disabled on boot, otherwise they are also filled by kmalloc(__GFP_ACCOUNT) allocations. When booted with cgroup.memory=nokmem, link the kmalloc_caches[KMALLOC_CGROUP] entries to KMALLOC_NORMAL entries instead.
--- mm/internal.h | 5 +++++ mm/memcontrol.c | 2 +- mm/slab_common.c | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)
mm/internal.h +5 -0
@@ -135,6 +135,11 @@ extern void putback_lru_page(struct page *page);*/ extern pmd_t *mm_find_pmd (struct mm_struct *mm,unsigned long address); +/* +* in mm/memcontrol.c: +*/ +extern bool cgroup_memory_nokmem; +/* * in mm/page_alloc.c */
mm/memcontrol.c +1 -1
@@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_active_memcg);static bool cgroup_memory_nosocket;/* Kernel memory accounting disabled? */ -static bool cgroup_memory_nokmem; +bool cgroup_memory_nokmem;/* Whether the swap controller is active */ #ifdef CONFIG_MEMCG_SWAP
mm/slab_common.c +7 -2
@@ -832,10 +832,15 @@ 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 (type ==KMALLOC_RECLAIM ) { flags |=SLAB_RECLAIM_ACCOUNT ; -else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) + }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) { +if (cgroup_memory_nokmem) { + kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL ][idx]; +return ; + } flags |=SLAB_ACCOUNT ; + } kmalloc_caches[type][idx] = create_kmalloc_cache( kmalloc_info[idx].name[type],
Signature · 1 line
2.31.1
Shakeel Butt
Reviewed-byRe: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 56 lines · Vlastimil Babka
Quoted 32 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.Quoted 7 lines
The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>Reviewed-by Vlastimil Babka <[email protected]>I still believe the cgroup.memory=nokmem parameter should be respected, otherwise the caches are not only created, but also used. I offer this followup for squashing into your patch if you and Andrew agree:
----8<----
Fromc87378d437d9a59b8757033485431b4721c74173Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Thu, 6 May 2021 17:53:21 +0200
Subject: [PATCH] mm: memcg/slab: don't create kmalloc-cg caches with
cgroup.memory=nokmem
Quoted 6 lines
The caches should not be created when kmemcg is disabled on boot, otherwise they are also filled by
kmalloc(__GFP_ACCOUNT)allocations. When booted with cgroup.memory=nokmem, link the kmalloc_caches[KMALLOC_CGROUP] entries toKMALLOC_NORMALentries instead.Signed-off-by Vlastimil Babka <[email protected]>
Yes this makes sense:
Roman Gushchin
Acked-byRe: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Vlastimil BabkaQuoted 38 lines · Vlastimil Babka
Quoted 36 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.
Quoted 8 lines
Quoted 3 lines
Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>Reviewed-by Vlastimil Babka <[email protected]>I still believe the cgroup.memory=nokmem parameter should be respected, otherwise the caches are not only created, but also used.
+1
Quoted 10 lines
I offer this followup
for squashing into your patch if you and Andrew agree:----8<----
Fromc87378d437d9a59b8757033485431b4721c74173Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Thu, 6 May 2021 17:53:21 +0200
Subject: [PATCH] mm: memcg/slab: don't create kmalloc-cg caches with
cgroup.memory=nokmem
Quoted 6 lines
The caches should not be created when kmemcg is disabled on boot, otherwise they are also filled by
kmalloc(__GFP_ACCOUNT)allocations. When booted with cgroup.memory=nokmem, link the kmalloc_caches[KMALLOC_CGROUP] entries toKMALLOC_NORMALentries instead.Signed-off-by Vlastimil Babka <[email protected]>
Thanks!
Waiman Long
Acked-byRe: [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Vlastimil BabkaQuoted 106 lines · Vlastimil Babka
Quoted 32 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.Quoted 7 lines
The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.Suggested-by Vlastimil Babka <[email protected]>Signed-off-by Waiman Long <[email protected]>Reviewed-by Shakeel Butt <[email protected]>Reviewed-by Vlastimil Babka <[email protected]>I still believe the cgroup.memory=nokmem parameter should be respected, otherwise the caches are not only created, but also used. I offer this followup for squashing into your patch if you and Andrew agree:
----8<----
Fromc87378d437d9a59b8757033485431b4721c74173Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <[email protected]>
Date: Thu, 6 May 2021 17:53:21 +0200
Subject: [PATCH] mm: memcg/slab: don't create kmalloc-cg caches with
cgroup.memory=nokmemThe caches should not be created when kmemcg is disabled on boot, otherwise they are also filled by
kmalloc(__GFP_ACCOUNT)allocations. When booted with cgroup.memory=nokmem, link the kmalloc_caches[KMALLOC_CGROUP] entries toKMALLOC_NORMALentries instead.Signed-off-by Vlastimil Babka <[email protected]>--- mm/internal.h | 5 +++++ mm/memcontrol.c | 2 +- mm/slab_common.c | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-)mm/internal.h +5
-0@@ -135,6 +135,11 @@ extern void putback_lru_page(struct page *page);*/ extern pmd_t *mm_find_pmd (struct mm_struct *mm,unsigned long address); +/* +* in mm/memcontrol.c: +*/ +extern bool cgroup_memory_nokmem; +/* * in mm/page_alloc.c */ mm/memcontrol.c +1
-1@@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_active_memcg);static bool cgroup_memory_nosocket;/* Kernel memory accounting disabled? */ -static bool cgroup_memory_nokmem; +bool cgroup_memory_nokmem;/* Whether the swap controller is active */ #ifdef CONFIG_MEMCG_SWAP mm/slab_common.c +1
-2@@ -832,10 +832,15 @@ 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 (type ==KMALLOC_RECLAIM ) { flags |=SLAB_RECLAIM_ACCOUNT ; -else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP ))
mm/slab_common.c void __init setup_kmalloc_cache_index_table(void) · line 846
Quoted 10 lines
mm/slab_common.c +6
-0+ }else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) { +if (cgroup_memory_nokmem) { + kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL ][idx]; +return ; + } flags |=SLAB_ACCOUNT ; + } kmalloc_caches[type][idx] = create_kmalloc_cache( kmalloc_info[idx].name[type],
Thanks, the patch looks good to me.
Cheers,
Longman
PATCH v4 3/3 mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
In reply to Waiman LongThe KMALLOC_NORMAL (kmalloc-<n>) caches are for unaccounted objects only when CONFIG_MEMCG_KMEM is enabled. To make sure that this condition remains true, we will have to prevent KMALOC_NORMAL caches to merge with other kmem caches. This is now done by setting its refcount to -1 right after its creation.
--- mm/slab_common.c | 7 +++++++ 1 file changed, 7 insertions(+)
mm/slab_common.c +7 -0
@@ -841,6 +841,13 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) kmalloc_info[idx].name[type], kmalloc_info[idx].size, flags,0 , kmalloc_info[idx].size); + +/* +* If CONFIG_MEMCG_KMEM is enabled, disable cache merging for +* KMALLOC_NORMAL caches. +*/ +if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_NORMAL )) + kmalloc_caches[type][idx]->refcount =-1 ; }/*
Signature · 1 line
2.18.1
Re: [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
Quoted 8 lines · Waiman Long
The
KMALLOC_NORMAL(kmalloc-<n>) caches are for unaccounted objects only whenCONFIG_MEMCG_KMEMis enabled. To make sure that this condition remains true, we will have to preventKMALOC_NORMALcaches to merge with other kmem caches. This is now done by setting its refcount to -1 right after its creation.Suggested-by Roman Gushchin <[email protected]>Signed-off-by Waiman Long <[email protected]>
Re: [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
In reply to Waiman LongQuoted 9 lines · Waiman Long
The
KMALLOC_NORMAL(kmalloc-<n>) caches are for unaccounted objects only whenCONFIG_MEMCG_KMEMis enabled. To make sure that this condition remains true, we will have to preventKMALOC_NORMALcaches to merge with other kmem caches. This is now done by setting its refcount to -1 right after its creation.Suggested-by Roman Gushchin <[email protected]>Signed-off-by Waiman Long <[email protected]>
Re: [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
In reply to Waiman LongQuoted 8 lines · Waiman Long
The
KMALLOC_NORMAL(kmalloc-<n>) caches are for unaccounted objects only whenCONFIG_MEMCG_KMEMis enabled. To make sure that this condition remains true, we will have to preventKMALOC_NORMALcaches to merge with other kmem caches. This is now done by setting its refcount to -1 right after its creation.Suggested-by Roman Gushchin <[email protected]>Signed-off-by Waiman Long <[email protected]>
(outside of scope of this patch/series, we should later replace this refcount ugliness with a proper slab flag)
Quoted 23 lines
--- mm/slab_common.c | 7 +++++++ 1 file changed, 7 insertions(+)mm/slab_common.c +7
-0@@ -841,6 +841,13 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) kmalloc_info[idx].name[type], kmalloc_info[idx].size, flags,0 , kmalloc_info[idx].size); + +/* +* If CONFIG_MEMCG_KMEM is enabled, disable cache merging for +* KMALLOC_NORMAL caches. +*/ +if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_NORMAL )) + kmalloc_caches[type][idx]->refcount =-1 ; }/*
PATCH v5 2/3 mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Waiman LongThere are currently two problems in the way the objcg pointer array (memcg_data) in the page structure is being allocated and freed.
On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the obj_cgroup array) in the slab.
When it is freed, the objcg pointer array object may be the last one in its slab and hence causes kfree() to be called again. With the right workload, the slab cache may be set up in a way that allows the recursive kfree() calling loop to nest deep enough to cause a kernel stack overflow and panic the system.
One way to solve this problem is to split the kmalloc-<n> caches (KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.
With this change, all the objcg pointer array objects will come from KMALLOC_NORMAL caches which won't have their objcg pointer arrays. So both the recursive kfree() problem and non-freeable slab problem are gone.
Since both the KMALLOC_NORMAL and KMALLOC_CGROUP caches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.
The new KMALLOC_CGROUP is added between KMALLOC_NORMAL and KMALLOC_RECLAIM so that the first for loop in create_kmalloc_caches() will include the newly added caches without change.
--- include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 17 deletions(-)
include/linux/slab.h +33 -9
@@ -305,9 +305,21 @@ static inline void __check_heap_object(const void *ptr, unsigned long n,/* * Whenever changing this, take care of that kmalloc_type() and * create_kmalloc_caches() still work as intended. +* +* KMALLOC_NORMAL can contain only unaccounted objects whereas KMALLOC_CGROUP +* is for accounted but unreclaimable and non-dma objects. All the other +* kmem caches can have both accounted and unaccounted objects. */ enum kmalloc_cache_type {KMALLOC_NORMAL =0 , +#ifndef CONFIG_ZONE_DMA +KMALLOC_DMA =KMALLOC_NORMAL , +#endif +#ifndef CONFIG_MEMCG_KMEM +KMALLOC_CGROUP =KMALLOC_NORMAL , +#else +KMALLOC_CGROUP , +#endif KMALLOC_RECLAIM ,#ifdef CONFIG_ZONE_DMA KMALLOC_DMA ,
@@ -319,24 +331,36 @@ enum kmalloc_cache_type {extern struct kmem_cache * kmalloc_caches[NR_KMALLOC_TYPES ][KMALLOC_SHIFT_HIGH +1 ]; +/* +* Define gfp bits that should not be set for KMALLOC_NORMAL. +*/ +#define KMALLOC_NOT_NORMAL_BITS \ + (__GFP_RECLAIMABLE | \ + (IS_ENABLED(CONFIG_ZONE_DMA) ? __GFP_DMA : 0) | \ + (IS_ENABLED(CONFIG_MEMCG_KMEM) ? __GFP_ACCOUNT : 0)) + static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags) { -#ifdef CONFIG_ZONE_DMA /* * The most common case is KMALLOC_NORMAL, so test for it -* with a single branch for both flags. +* with a single branch for all the relevant flags. */ -if (likely ((flags & (__GFP_DMA | __GFP_RECLAIMABLE)) ==0 )) +if (likely ((flags &KMALLOC_NOT_NORMAL_BITS ) ==0 ))return KMALLOC_NORMAL ;/* -* At least one of the flags has to be set. If both are, __GFP_DMA -* is more important. +* At least one of the flags has to be set. Their priorities in +* decreasing order are: +* 1) __GFP_DMA +* 2) __GFP_RECLAIMABLE +* 3) __GFP_ACCOUNT */ -return flags & __GFP_DMA ?KMALLOC_DMA :KMALLOC_RECLAIM ; -#else -return flags & __GFP_RECLAIMABLE ?KMALLOC_RECLAIM :KMALLOC_NORMAL ; -#endif +if (IS_ENABLED (CONFIG_ZONE_DMA ) && (flags & __GFP_DMA)) +return KMALLOC_DMA ; +if (!IS_ENABLED (CONFIG_MEMCG_KMEM ) || (flags & __GFP_RECLAIMABLE)) +return KMALLOC_RECLAIM ; +else +return KMALLOC_CGROUP ; }/*
mm/slab_common.c +17 -8
@@ -727,21 +727,25 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) }#ifdef CONFIG_ZONE_DMA -#define INIT_KMALLOC_INFO (__size, __short_size) \ -{ \ - .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ - .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ - .name[KMALLOC_DMA] = "dma-kmalloc-" #__short_size, \ - .size = __size, \ -} +#define KMALLOC_DMA_NAME (sz) .name[KMALLOC_DMA] = "dma-kmalloc-" #sz, +#else +#define KMALLOC_DMA_NAME (sz) +#endif + +#ifdef CONFIG_MEMCG_KMEM +#define KMALLOC_CGROUP_NAME (sz) .name[KMALLOC_CGROUP] = "kmalloc-cg-" #sz,#else +#define KMALLOC_CGROUP_NAME (sz) +#endif +#define INIT_KMALLOC_INFO (__size, __short_size) \ { \ .name[KMALLOC_NORMAL] = "kmalloc-" #__short_size, \ .name[KMALLOC_RECLAIM] = "kmalloc-rcl-" #__short_size, \ + KMALLOC_CGROUP_NAME(__short_size) \ + KMALLOC_DMA_NAME(__short_size) \ .size = __size, \ } -#endif /* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time.
@@ -830,6 +834,8 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) {if (type ==KMALLOC_RECLAIM ) flags |=SLAB_RECLAIM_ACCOUNT ; +else if (IS_ENABLED (CONFIG_MEMCG_KMEM ) && (type ==KMALLOC_CGROUP )) + flags |=SLAB_ACCOUNT ; kmalloc_caches[type][idx] = create_kmalloc_cache( kmalloc_info[idx].name[type],
@@ -847,6 +853,9 @@ void __init create_kmalloc_caches(slab_flags_t flags)int i;enum kmalloc_cache_type type; +/* +* Including KMALLOC_CGROUP if CONFIG_MEMCG_KMEM defined +*/ for (type =KMALLOC_NORMAL ; type <=KMALLOC_RECLAIM ; type++) {for (i =KMALLOC_SHIFT_LOW ; i <=KMALLOC_SHIFT_HIGH ; i++) {if (!kmalloc_caches[type][i])
Signature · 1 line
2.18.1
Re: [PATCH v5 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 36 lines · Waiman Long
There are currently two problems in the way the objcg pointer array (
memcg_data) in the page structure is being allocated and freed.On its allocation, it is possible that the allocated objcg pointer array comes from the same slab that requires memory accounting. If this happens, the slab will never become empty again as there is at least one object left (the
obj_cgrouparray) in the slab.When it is freed, the objcg pointer array object may be the last one in its slab and hence causes
kfree()to be called again. With the right workload, the slab cache may be set up in a way that allows the recursivekfree()calling loop to nest deep enough to cause a kernel stack overflow and panic the system.One way to solve this problem is to split the kmalloc-<n> caches (
KMALLOC_NORMAL) into two separate sets - a new set of kmalloc-<n> (KMALLOC_NORMAL) caches for unaccounted objects only and a new set of kmalloc-cg-<n> (KMALLOC_CGROUP) caches for accounted objects only. All the other caches can still allow a mix of accounted and unaccounted objects.With this change, all the objcg pointer array objects will come from
KMALLOC_NORMALcaches which won't have their objcg pointer arrays. So both the recursivekfree()problem and non-freeable slab problem are gone.Since both the
KMALLOC_NORMALandKMALLOC_CGROUPcaches no longer have mixed accounted and unaccounted objects, this will slightly reduce the number of objcg pointer arrays that need to be allocated and save a bit of memory. On the other hand, creating a new set of kmalloc caches does have the effect of reducing cache utilization. So it is properly a wash.The new
KMALLOC_CGROUPis added betweenKMALLOC_NORMALandKMALLOC_RECLAIMso that the first for loop increate_kmalloc_caches()will include the newly added caches without change.
Quoted 8 lines
Signed-off-by Waiman Long <[email protected]>Suggested-by Vlastimil Babka <[email protected]>Reviewed-by Shakeel Butt <[email protected]>Acked-by Roman Gushchin <[email protected]>--- include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 17 deletions(-)
The following are the diff's from previous version. It turns out that the previous patch doesn't work if CONFIG_ZONE_DMA isn't defined.
include/linux/slab.h +0 -0
@@ -312,16 +312,17 @@ static inline void __check_heap_object(const void *ptr, un
signed long n,
*/
enum kmalloc_cache_type {
KMALLOC_NORMAL = 0,
-#ifdef CONFIG_MEMCG_KMEM
- KMALLOC_CGROUP,
-#else
+#ifndef CONFIG_ZONE_DMA
+ KMALLOC_DMA = KMALLOC_NORMAL,
+#endif
+#ifndef CONFIG_MEMCG_KMEM
KMALLOC_CGROUP = KMALLOC_NORMAL,
+#else
+ KMALLOC_CGROUP,
#endif
KMALLOC_RECLAIM,
#ifdef CONFIG_ZONE_DMA
KMALLOC_DMA,
-#else
- KMALLOC_DMA = KMALLOC_NORMAL,
#endif
NR_KMALLOC_TYPES
};
Cheers,
Longman
Andrew Morton
maintainerRe: [PATCH v5 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 34 lines · On Wed, 12 May 2021 10:54:19 -0400 Waiman Long…
Quoted 3 lines
include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 17 deletions(-)The following are the diff's from previous version. It turns out that the previous patch doesn't work if
CONFIG_ZONE_DMAisn't defined.include/linux/slab.h +6
-5@@ -312,16 +312,17 @@ static inline void __check_heap_object(const void*ptr, un signed long n, */ enum kmalloc_cache_type { KMALLOC_NORMAL = 0, -#ifdef CONFIG_MEMCG_KMEM - KMALLOC_CGROUP, -#else +#ifndef CONFIG_ZONE_DMA + KMALLOC_DMA = KMALLOC_NORMAL, +#endif +#ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, +#else + KMALLOC_CGROUP, #endif KMALLOC_RECLAIM, #ifdef CONFIG_ZONE_DMA KMALLOC_DMA, -#else - KMALLOC_DMA = KMALLOC_NORMAL, #endif
Quoted 2 lines
NR_KMALLOC_TYPES
};
I assume this fixes
https://lkml.kernel.org/r/[email protected]?
Re: [PATCH v5 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
Quoted 33 lines · Andrew Morton
Quoted 31 lines · On Wed, 12 May 2021 10:54:19 -0400 Waiman Long…
Quoted 3 lines
include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 17 deletions(-)The following are the diff's from previous version. It turns out that the previous patch doesn't work if
CONFIG_ZONE_DMAisn't defined.include/linux/slab.h +6
-3@@ -312,16 +312,17 @@ static inline void __check_heap_object(const void*ptr, un signed long n, */ enum kmalloc_cache_type { KMALLOC_NORMAL = 0, -#ifdef CONFIG_MEMCG_KMEM - KMALLOC_CGROUP, -#else +#ifndef CONFIG_ZONE_DMA + KMALLOC_DMA = KMALLOC_NORMAL, +#endif +#ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, +#else + KMALLOC_CGROUP, #endif KMALLOC_RECLAIM, #ifdef CONFIG_ZONE_DMA KMALLOC_DMA,
Quoted 8 lines
Quoted 5 lines
include/linux/slab.h +0
-2-#else - KMALLOC_DMA = KMALLOC_NORMAL, #endif
NR_KMALLOC_TYPES
};I assume this fixes
https://lkml.kernel.org/r/[email protected]?
Yeah it should.
Re: [PATCH v5 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches
In reply to Andrew MortonQuoted 31 lines · Andrew Morton
Quoted 29 lines · On Wed, 12 May 2021 10:54:19 -0400 Waiman Long…
Quoted 3 lines
include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++--------- mm/slab_common.c | 25 +++++++++++++++++-------- 2 files changed, 50 insertions(+), 17 deletions(-)The following are the diff's from previous version. It turns out that the previous patch doesn't work if
CONFIG_ZONE_DMAisn't defined.include/linux/slab.h +6
-3@@ -312,16 +312,17 @@ static inline void __check_heap_object(const void*ptr, un signed long n, */ enum kmalloc_cache_type { KMALLOC_NORMAL = 0, -#ifdef CONFIG_MEMCG_KMEM - KMALLOC_CGROUP, -#else +#ifndef CONFIG_ZONE_DMA + KMALLOC_DMA = KMALLOC_NORMAL, +#endif +#ifndef CONFIG_MEMCG_KMEM KMALLOC_CGROUP = KMALLOC_NORMAL, +#else + KMALLOC_CGROUP, #endif KMALLOC_RECLAIM, #ifdef CONFIG_ZONE_DMA
Quoted 9 lines
Quoted 6 lines
include/linux/slab.h +0
-2KMALLOC_DMA, -#else - KMALLOC_DMA = KMALLOC_NORMAL, #endifNR_KMALLOC_TYPES };I assume this fixes
https://lkml.kernel.org/r/[email protected]?
Yes.
Cheers,
Longman