mm/slab: mark alloc tags empty for sheafs allocated with __GFP_NO_OBJ_EXT
Subsystems (2)
PATCH v2 1/1 mm/slab: mark alloc tags empty for sheafs allocated with __GFP_NO_OBJ_EXT
alloc_empty_sheaf() allocates sheafs from SLAB_KMALLOC caches using __GFP_NO_OBJ_EXT to avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning when CONFIG_MEM_ALLOC_PROFILING_DEBUG is set. Fix this by marking allocation tags for such allocations as empty.
--- mm/slab.h | 4 ++-- mm/slub.c | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-)
mm/slab.h +2 -2
@@ -290,14 +290,14 @@ static inline void *nearest_obj(struct kmem_cache *cache,/* Determine object index from a given position */ static inline unsigned int __obj_to_index (const struct kmem_cache *cache, -void *addr,void *obj) +void *addr,const void *obj) {return reciprocal_divide (kasan_reset_tag (obj) - addr, cache->reciprocal_size); }static inline unsigned int obj_to_index (const struct kmem_cache *cache, -const struct slab *slab,void *obj) +const struct slab *slab,const void *obj) {if (is_kfence_address (obj))return 0 ;
mm/slub.c +15 -8
@@ -2041,18 +2041,18 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) +static inline void mark_objexts_empty (const void *obj) { -struct slab *obj_exts_slab; +struct slab *obj_slab;unsigned long slab_exts; - obj_exts_slab =virt_to_slab (obj_exts); - slab_exts =slab_obj_exts (obj_exts_slab); + obj_slab =virt_to_slab (obj); + slab_exts =slab_obj_exts (obj_slab);if (slab_exts) {get_slab_obj_exts (slab_exts); -unsigned int offs =obj_to_index (obj_exts_slab->slab_cache, - obj_exts_slab, obj_exts); -struct slabobj_ext *ext =slab_obj_ext (obj_exts_slab, +unsigned int offs =obj_to_index (obj_slab->slab_cache, + obj_slab, obj); +struct slabobj_ext *ext =slab_obj_ext (obj_slab, slab_exts, offs);if (unlikely (is_codetag_empty (&ext->ref))) {
@@ -2090,7 +2090,7 @@ static inline void handle_failed_objexts_alloc(unsigned long obj_exts,#else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) {} +static inline void mark_objexts_empty (const void *obj) {}static inline bool mark_failed_objexts_alloc (struct slab *slab) {return false; }static inline void handle_failed_objexts_alloc (unsigned long obj_exts,struct slabobj_ext *vec,unsigned int objects) {}
@@ -2312,6 +2312,10 @@ static void alloc_slab_obj_exts_early(struct kmem_cache *s, struct slab *slab)#else /* CONFIG_SLAB_OBJ_EXT */ +static inline void mark_objexts_empty (const void *obj) +{ +} +static inline void init_slab_obj_exts (struct slab *slab) { }
@@ -2783,6 +2787,9 @@ static inline struct slab_sheaf *alloc_empty_sheaf(struct kmem_cache *s,static void free_empty_sheaf (struct kmem_cache *s,struct slab_sheaf *sheaf) { +if (s->flags &SLAB_KMALLOC ) +mark_objexts_empty (sheaf); +kfree (sheaf);stat (s,SHEAF_FREE );
base-commit: 7dff99b354601dd01829e1511711846e04340a69
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
Quoted 1 line · Suren Baghdasaryan
alloc_empty_sheaf()allocates sheafs fromSLAB_KMALLOCcaches using
nit: the plural form of sheaf is "sheaves" ;)
Quoted 10 lines
__GFP_NO_OBJ_EXTto avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning whenCONFIG_MEM_ALLOC_PROFILING_DEBUGis set. Fix this by marking allocation tags for such allocations as empty.Reported-by David Wang <[email protected]>Analyzed-by Harry Yoo <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
This resolves the issue on my machine.
and the fix looks good to me, so:
and
By the way, perhaps it's worth adding a comment on __GFP_NO_OBJ_EXT saying "you need to call mark_objexts_empty() before freeing the object".
Signature · 2 lines
Cheers, Harry / Hyeonggon
Quoted 5 lines · Harry Yoo
Quoted 1 line · Suren Baghdasaryan
alloc_empty_sheaf()allocates sheafs fromSLAB_KMALLOCcaches usingnit: the plural form of sheaf is "sheaves" ;)
Ack.
Quoted 17 lines
Quoted 11 lines
__GFP_NO_OBJ_EXTto avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning whenCONFIG_MEM_ALLOC_PROFILING_DEBUGis set. Fix this by marking allocation tags for such allocations as empty.Reported-by David Wang <[email protected]>Analyzed-by Harry Yoo <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
This resolves the issue on my machine.
and the fix looks good to me, so:Tested-by Harry Yoo <[email protected]>
Quoted 7 lines
and
Reviewed-by Harry Yoo <[email protected]>By the way, perhaps it's worth adding a comment on
__GFP_NO_OBJ_EXTsaying "you need to callmark_objexts_empty()before freeing the object".
Good idea. I'll post v3 with that comment and spelling fix. Thanks!
Quoted 4 lines
--
Cheers,
Harry / Hyeonggon
Quoted 29 lines · Suren Baghdasaryan
Quoted 5 lines · Harry Yoo
Quoted 1 line · Suren Baghdasaryan
alloc_empty_sheaf()allocates sheafs fromSLAB_KMALLOCcaches usingnit: the plural form of sheaf is "sheaves" ;)
Ack.
Quoted 19 lines
Quoted 11 lines
__GFP_NO_OBJ_EXTto avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning whenCONFIG_MEM_ALLOC_PROFILING_DEBUGis set. Fix this by marking allocation tags for such allocations as empty.Reported-by David Wang <[email protected]>Analyzed-by Harry Yoo <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
This resolves the issue on my machine.
and the fix looks good to me, so:Tested-by Harry Yoo <[email protected]>and
Quoted 7 lines
Quoted 5 lines
Reviewed-by Harry Yoo <[email protected]>By the way, perhaps it's worth adding a comment on
__GFP_NO_OBJ_EXTsaying "you need to callmark_objexts_empty()before freeing the object".Good idea. I'll post v3 with that comment and spelling fix.
I added comments and also renamed mark_objexts_empty() into mark_obj_codetag_empty() to better reflect the functionality since it's now used not only for objexts.
v3 is posted here:
https://lore.kernel.org/all/[email protected]/
Quoted 6 lines
Thanks!
Quoted 4 lines
--
Cheers,
Harry / Hyeonggon
Quoted 97 lines · Suren Baghdasaryan
alloc_empty_sheaf()allocates sheafs fromSLAB_KMALLOCcaches using__GFP_NO_OBJ_EXTto avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning whenCONFIG_MEM_ALLOC_PROFILING_DEBUGis set. Fix this by marking allocation tags for such allocations as empty.Reported-by David Wang <[email protected]>Analyzed-by Harry Yoo <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
mm/slab.h| 4 ++--mm/slub.c| 23 +++++++++++++++--------2 files changed, 17 insertions(+), 10 deletions(-)mm/slab.h +2
-2@@ -290,14 +290,14 @@ static inline void *nearest_obj(struct kmem_cache *cache,/* Determine object index from a given position */ static inline unsigned int __obj_to_index (const struct kmem_cache *cache, -void *addr,void *obj) +void *addr,const void *obj) {return reciprocal_divide (kasan_reset_tag (obj) - addr, cache->reciprocal_size); }static inline unsigned int obj_to_index (const struct kmem_cache *cache, -const struct slab *slab,void *obj) +const struct slab *slab,const void *obj) {if (is_kfence_address (obj))return 0 ;mm/slub.c +15
-8@@ -2041,18 +2041,18 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) +static inline void mark_objexts_empty (const void *obj) { -struct slab *obj_exts_slab; +struct slab *obj_slab;unsigned long slab_exts; - obj_exts_slab =virt_to_slab (obj_exts); - slab_exts =slab_obj_exts (obj_exts_slab); + obj_slab =virt_to_slab (obj); + slab_exts =slab_obj_exts (obj_slab);if (slab_exts) {get_slab_obj_exts (slab_exts); -unsigned int offs =obj_to_index (obj_exts_slab->slab_cache, - obj_exts_slab, obj_exts); -struct slabobj_ext *ext =slab_obj_ext (obj_exts_slab, +unsigned int offs =obj_to_index (obj_slab->slab_cache, + obj_slab, obj); +struct slabobj_ext *ext =slab_obj_ext (obj_slab, slab_exts, offs);if (unlikely (is_codetag_empty (&ext->ref))) {@@ -2090,7 +2090,7 @@ static inline void handle_failed_objexts_alloc(unsigned long obj_exts,#else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) {} +static inline void mark_objexts_empty (const void *obj) {}static inline bool mark_failed_objexts_alloc (struct slab *slab) {return false; }static inline void handle_failed_objexts_alloc (unsigned long obj_exts,struct slabobj_ext *vec,unsigned int objects) {}@@ -2312,6 +2312,10 @@ static void alloc_slab_obj_exts_early(struct kmem_cache *s, struct slab *slab)#else /* CONFIG_SLAB_OBJ_EXT */ +static inline void mark_objexts_empty (const void *obj) +{ +} +static inline void init_slab_obj_exts (struct slab *slab) { }@@ -2783,6 +2787,9 @@ static inline struct slab_sheaf *alloc_empty_sheaf(struct kmem_cache *s,static void free_empty_sheaf (struct kmem_cache *s,struct slab_sheaf *sheaf) { +if (s->flags &SLAB_KMALLOC ) +mark_objexts_empty (sheaf); +kfree (sheaf);stat (s,SHEAF_FREE );
Quoted 3 lines
base-commit:
7dff99b354601dd01829e1511711846e04340a69Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
David
Quoted 97 lines · David Wang
Quoted 95 lines · Suren Baghdasaryan
alloc_empty_sheaf()allocates sheafs fromSLAB_KMALLOCcaches using__GFP_NO_OBJ_EXTto avoid recursion, however it does not mark their allocation tags empty before freeing, which results in a warning whenCONFIG_MEM_ALLOC_PROFILING_DEBUGis set. Fix this by marking allocation tags for such allocations as empty.Reported-by David Wang <[email protected]>Analyzed-by Harry Yoo <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
mm/slab.h| 4 ++--mm/slub.c| 23 +++++++++++++++--------2 files changed, 17 insertions(+), 10 deletions(-)mm/slab.h +2
-2@@ -290,14 +290,14 @@ static inline void *nearest_obj(struct kmem_cache *cache,/* Determine object index from a given position */ static inline unsigned int __obj_to_index (const struct kmem_cache *cache, -void *addr,void *obj) +void *addr,const void *obj) {return reciprocal_divide (kasan_reset_tag (obj) - addr, cache->reciprocal_size); }static inline unsigned int obj_to_index (const struct kmem_cache *cache, -const struct slab *slab,void *obj) +const struct slab *slab,const void *obj) {if (is_kfence_address (obj))return 0 ;mm/slub.c +15
-8@@ -2041,18 +2041,18 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,#ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) +static inline void mark_objexts_empty (const void *obj) { -struct slab *obj_exts_slab; +struct slab *obj_slab;unsigned long slab_exts; - obj_exts_slab =virt_to_slab (obj_exts); - slab_exts =slab_obj_exts (obj_exts_slab); + obj_slab =virt_to_slab (obj); + slab_exts =slab_obj_exts (obj_slab);if (slab_exts) {get_slab_obj_exts (slab_exts); -unsigned int offs =obj_to_index (obj_exts_slab->slab_cache, - obj_exts_slab, obj_exts); -struct slabobj_ext *ext =slab_obj_ext (obj_exts_slab, +unsigned int offs =obj_to_index (obj_slab->slab_cache, + obj_slab, obj); +struct slabobj_ext *ext =slab_obj_ext (obj_slab, slab_exts, offs);if (unlikely (is_codetag_empty (&ext->ref))) {@@ -2090,7 +2090,7 @@ static inline void handle_failed_objexts_alloc(unsigned long obj_exts,#else /* CONFIG_MEM_ALLOC_PROFILING_DEBUG */ -static inline void mark_objexts_empty (struct slabobj_ext *obj_exts) {} +static inline void mark_objexts_empty (const void *obj) {}static inline bool mark_failed_objexts_alloc (struct slab *slab) {return false; }static inline void handle_failed_objexts_alloc (unsigned long obj_exts,struct slabobj_ext *vec,unsigned int objects) {}@@ -2312,6 +2312,10 @@ static void alloc_slab_obj_exts_early(struct kmem_cache *s, struct slab *slab)#else /* CONFIG_SLAB_OBJ_EXT */ +static inline void mark_objexts_empty (const void *obj) +{ +} +static inline void init_slab_obj_exts (struct slab *slab) { }@@ -2783,6 +2787,9 @@ static inline struct slab_sheaf *alloc_empty_sheaf(struct kmem_cache *s,static void free_empty_sheaf (struct kmem_cache *s,struct slab_sheaf *sheaf) { +if (s->flags &SLAB_KMALLOC ) +mark_objexts_empty (sheaf); +kfree (sheaf);
Quoted 7 lines
Quoted 5 lines
mm/slub.c +0
-0stat (s,SHEAF_FREE );base-commit:
7dff99b354601dd01829e1511711846e04340a69--
2.53.0.414.gf7e9f6c205-googTested-by David Wang <[email protected]>
Thanks!
Quoted 3 lines
David