[folded-merged] mm-slab-move-memcg-charging-to-post-alloc-hook-fix.patch removed from -mm tree

[folded-merged] mm-slab-move-memcg-charging-to-post-alloc-hook-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: fixup! mm, slab: move memcg charging to post-alloc hook
has been removed from the -mm tree.  Its filename was
     mm-slab-move-memcg-charging-to-post-alloc-hook-fix.patch

This patch was dropped because it was folded into mm-slab-move-memcg-charging-to-post-alloc-hook.patch

------------------------------------------------------
From: Vlastimil Babka <vbabka@suse.cz>
Subject: fixup! mm, slab: move memcg charging to post-alloc hook
Date: Wed, 3 Apr 2024 17:45:15 +0200

The call to memcg_alloc_abort_single() is wrong, it expects a pointer to
single object, not an array.

Link: https://lkml.kernel.org/r/4af50be2-4109-45e5-8a36-2136252a635e@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reported-by: Aishwarya TCV <aishwarya.tcv@arm.com>
Tested-by: Aishwarya TCV <aishwarya.tcv@arm.com>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Kees Cook <kees@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/slub.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/slub.c~mm-slab-move-memcg-charging-to-post-alloc-hook-fix
+++ a/mm/slub.c
@@ -2172,7 +2172,7 @@ bool memcg_slab_post_alloc_hook(struct k
 		return true;
 
 	if (likely(size == 1)) {
-		memcg_alloc_abort_single(s, p);
+		memcg_alloc_abort_single(s, *p);
 		*p = NULL;
 	} else {
 		kmem_cache_free_bulk(s, size, p);
_

Patches currently in -mm which might be from vbabka@suse.cz are

mm-page_alloc-change-move_freepages-to-__move_freepages_block.patch
mm-slab-move-memcg-charging-to-post-alloc-hook.patch
mm-slab-move-slab_memcg-hooks-to-mm-memcontrolc.patch