Commit 9910affe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'slab-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab 

Pull slab fix from Vlastimil Babka:

 - Stable fix to avoid bugs due to leftover obj_ext after allocation
   profiling is disabled at runtime (Zhenhua Huang)

* tag 'slab-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
  mm, slab: clean up slab->obj_exts always
parents ebd297a2 be825078

mm/slub.c

+8 −22
Original line number Diff line number Diff line
@@ -2028,8 +2028,7 @@ int alloc_slab_obj_exts(struct slab *slab, struct kmem_cache *s, 
	return 0;

}



/* Should be called only if mem_alloc_profiling_enabled() */

static noinline void free_slab_obj_exts(struct slab *slab)

static inline void free_slab_obj_exts(struct slab *slab)

{

	struct slabobj_ext *obj_exts;
@@ -2049,18 +2048,6 @@ static noinline void free_slab_obj_exts(struct slab *slab) 
	slab->obj_exts = 0;

}



static inline bool need_slab_obj_ext(void)

{

	if (mem_alloc_profiling_enabled())

		return true;



	/*

	 * CONFIG_MEMCG creates vector of obj_cgroup objects conditionally

	 * inside memcg_slab_post_alloc_hook. No other users for now.

	 */

	return false;

}



#else /* CONFIG_SLAB_OBJ_EXT */



static inline void init_slab_obj_exts(struct slab *slab)
@@ -2077,11 +2064,6 @@ static inline void free_slab_obj_exts(struct slab *slab) 
{

}



static inline bool need_slab_obj_ext(void)

{

	return false;

}



#endif /* CONFIG_SLAB_OBJ_EXT */



#ifdef CONFIG_MEM_ALLOC_PROFILING
@@ -2129,7 +2111,7 @@ __alloc_tagging_slab_alloc_hook(struct kmem_cache *s, void *object, gfp_t flags) 
static inline void

alloc_tagging_slab_alloc_hook(struct kmem_cache *s, void *object, gfp_t flags)

{

	if (need_slab_obj_ext())

	if (mem_alloc_profiling_enabled())

		__alloc_tagging_slab_alloc_hook(s, object, flags);

}
@@ -2601,7 +2583,11 @@ static __always_inline void account_slab(struct slab *slab, int order, 
static __always_inline void unaccount_slab(struct slab *slab, int order,

					   struct kmem_cache *s)

{

	if (memcg_kmem_online() || need_slab_obj_ext())

	/*

	 * The slab object extensions should now be freed regardless of

	 * whether mem_alloc_profiling_enabled() or not because profiling

	 * might have been disabled after slab->obj_exts got allocated.

	 */

	free_slab_obj_exts(slab);



	mod_node_page_state(slab_pgdat(slab), cache_vmstat_idx(s),