From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, surenb@google.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.12.y] mm, slab: clean up slab->obj_exts always
Date: Thu, 8 May 2025 12:18:17 -0400 [thread overview]
Message-ID: <20250507082538-05e988860e87f40a@stable.kernel.org> (raw)
In-Reply-To: <20250505232601.3160940-1-surenb@google.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: be8250786ca94952a19ce87f98ad9906448bc9ef
WARNING: Author mismatch between patch and found commit:
Backport author: Suren Baghdasaryan<surenb@google.com>
Commit author: Zhenhua Huang<quic_zhenhuah@quicinc.com>
Status in newer kernel trees:
6.14.y | Present (different SHA1: 94107e5aed93)
Note: The patch differs from the upstream commit:
---
1: be8250786ca94 ! 1: 86ffacf03afed mm, slab: clean up slab->obj_exts always
@@ Commit message
Acked-by: Suren Baghdasaryan <surenb@google.com>
Link: https://patch.msgid.link/20250421075232.2165527-1-quic_zhenhuah@quicinc.com
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
+ (cherry picked from commit be8250786ca94952a19ce87f98ad9906448bc9ef)
+ [surenb: fixed trivial merge conflict in alloc_tagging_slab_alloc_hook(),
+ skipped inlining free_slab_obj_exts() as it's already inline in 6.12]
+ Signed-off-by: Suren Baghdasaryan <surenb@google.com>
## mm/slub.c ##
-@@ mm/slub.c: 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;
-
-@@ mm/slub.c: static noinline void free_slab_obj_exts(struct slab *slab)
+@@ mm/slub.c: static inline void free_slab_obj_exts(struct slab *slab)
slab->obj_exts = 0;
}
@@ mm/slub.c: static inline void free_slab_obj_exts(struct slab *slab)
#endif /* CONFIG_SLAB_OBJ_EXT */
#ifdef CONFIG_MEM_ALLOC_PROFILING
-@@ mm/slub.c: __alloc_tagging_slab_alloc_hook(struct kmem_cache *s, void *object, gfp_t flags)
+@@ mm/slub.c: prepare_slab_obj_exts_hook(struct kmem_cache *s, gfp_t flags, void *p)
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);
- }
+- if (need_slab_obj_ext()) {
++ if (mem_alloc_profiling_enabled()) {
+ struct slabobj_ext *obj_exts;
+ obj_exts = prepare_slab_obj_exts_hook(s, flags, object);
@@ mm/slub.c: 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)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
next prev parent reply other threads:[~2025-05-08 16:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 7:55 FAILED: patch "[PATCH] mm, slab: clean up slab->obj_exts always" failed to apply to 6.12-stable tree gregkh
2025-05-05 23:26 ` [PATCH 6.12.y] mm, slab: clean up slab->obj_exts always Suren Baghdasaryan
2025-05-08 16:18 ` Sasha Levin [this message]
2025-05-08 17:04 ` Suren Baghdasaryan
2025-05-08 17:15 ` Sasha Levin
2025-05-08 18:14 ` Suren Baghdasaryan
2025-05-09 6:23 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250507082538-05e988860e87f40a@stable.kernel.org \
--to=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=surenb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox