From: "Vlastimil Babka (SUSE)" <vbabka@kernel.org>
To: "Harry Yoo (Meta)" <harry@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeel.butt@linux.dev>,
Muchun Song <muchun.song@linux.dev>,
Andrew Morton <akpm@linux-foundation.org>,
Alexei Starovoitov <ast@kernel.org>, Hao Li <hao.li@linux.dev>,
Christoph Lameter <cl@gentwo.org>,
David Rientjes <rientjes@google.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Clark Williams <clrkwllms@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>
Cc: kernel-team@meta.com, cgroups@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
linux-rt-devel@lists.linux.dev, Sashiko <sashiko-bot@kernel.org>
Subject: Re: [PATCH for-next v3 4/7] mm/slab: fix a deadlock in memcg_alloc_abort_single()
Date: Wed, 18 Nov 2026 17:24:19 +0100 [thread overview]
Message-ID: <02c600ac-c968-4143-9e70-ccd2da858e09@kernel.org> (raw)
In-Reply-To: <20261115-kmalloc-nolock-fixes-v3-4-9034dd4ecaab@kernel.org>
On 11/15/26 16:09, Harry Yoo (Meta) wrote:
> When kmalloc_nolock() successfully grabs a slab object but memcg aborts
> the allocation, the object is freed via __slab_free(). Calling
> __slab_free() in unknown context is not allowed and can lead to a
> deadlock.
>
> Free the object via defer_free() when spinning is not allowed.
>
> While at it, try freeing the object to the percpu sheaves first in both
> contexts, as kmem_cache_free_bulk() already does for bulk allocations.
> This also avoids queueing an irq_work for every failed charge when
> spinning is not allowed.
>
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://sashiko.dev/#/patchset/20260610-slab_alloc_flags-v2-0-7190909db118%40kernel.org?part=9
> Fixes: af92793e52c3 ("slab: Introduce kmalloc_nolock() and kfree_nolock().")
> Signed-off-by: Harry Yoo (Meta) <harry@kernel.org>
Reviewed-by: Vlastimil Babka (SUSE) <vbabka@kernel.org>
nit (not worth respinning just for that)
> ---
> mm/slab.h | 8 ++++++++
> mm/slub.c | 22 +++++++++++++++++-----
> 2 files changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/mm/slab.h b/mm/slab.h
> index 15b0d98ae1d4..fb80a72ad952 100644
> --- a/mm/slab.h
> +++ b/mm/slab.h
> @@ -37,6 +37,14 @@ static inline unsigned int to_alloc_flags(unsigned int free_flags)
> return SLAB_ALLOC_DEFAULT;
> }
>
> +static inline unsigned int to_free_flags(unsigned int alloc_flags)
> +{
> + if (alloc_flags & SLAB_ALLOC_NOLOCK)
> + return SLAB_FREE_NOLOCK;
> + else
> + return SLAB_FREE_DEFAULT;
> +}
> +
> static inline bool alloc_flags_allow_spinning(const unsigned int alloc_flags)
> {
> return !(alloc_flags & SLAB_ALLOC_NOLOCK);
> diff --git a/mm/slub.c b/mm/slub.c
> index 7c0adc104988..8252c0b681cc 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -2531,7 +2531,8 @@ static inline void slab_obj_ext_has_codetag_init(void)
>
> #ifdef CONFIG_MEMCG
>
> -static void memcg_alloc_abort_single(struct kmem_cache *s, void *object);
> +static void memcg_alloc_abort_single(struct kmem_cache *s, void *object,
> + unsigned int alloc_flags);
>
> static __fastpath_inline
> bool memcg_slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
> @@ -2549,7 +2550,7 @@ bool memcg_slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
> return true;
>
> if (likely(size == 1)) {
> - memcg_alloc_abort_single(s, *p);
> + memcg_alloc_abort_single(s, *p, ac->alloc_flags);
> *p = NULL;
> } else {
> kmem_cache_free_bulk(s, size, p);
> @@ -6647,18 +6648,29 @@ void slab_free(struct kmem_cache *s, struct slab *slab, void *object,
> #ifdef CONFIG_MEMCG
> /* Do not inline the rare memcg charging failed path into the allocation path */
> static noinline
> -void memcg_alloc_abort_single(struct kmem_cache *s, void *object)
> +void memcg_alloc_abort_single(struct kmem_cache *s, void *object,
> + unsigned int alloc_flags)
> {
> struct slab *slab = virt_to_slab(object);
> - unsigned int free_flags = SLAB_FREE_DEFAULT;
> + bool allow_spin = alloc_flags_allow_spinning(alloc_flags);
> + unsigned int free_flags = to_free_flags(alloc_flags);
>
> if (slab_want_init_on_free(s))
> free_flags |= SLAB_FREE_INIT;
>
> alloc_tagging_slab_free_hook(s, slab, &object, 1);
>
> - if (likely(slab_free_hook(s, object, free_flags)))
> + if (unlikely(!slab_free_hook(s, object, free_flags)))
> + return;
> +
> + if (likely(can_free_to_pcs(slab)) &&
> + likely(free_to_pcs(s, object, allow_spin)))
I think it could be a single likely(x && y)
> + return;
> +
> + if (likely(allow_spin))
> __slab_free(s, slab, object, object, 1, _RET_IP_);
> + else
> + defer_free(s, object);
> }
> #endif
>
>
next prev parent reply other threads:[~2026-11-18 16:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 15:09 [PATCH for-next v3 0/7] memcg,slab: kmalloc_nolock() fixes Harry Yoo (Meta)
2026-11-15 15:09 ` [PATCH for-next v3 1/7] mm/memcontrol: defer obj_cgroup_release() to irq_work Harry Yoo (Meta)
2026-11-15 15:09 ` [PATCH for-next v3 2/7] mm/slab: pass free_flags to slab_free_hook() Harry Yoo (Meta)
2026-11-18 15:21 ` Vlastimil Babka (SUSE)
2026-11-15 15:09 ` [PATCH for-next v3 3/7] mm/slab: handle SLAB_FREE_NOLOCK in slab_free_hook() instead of open coding Harry Yoo (Meta)
2026-11-16 8:26 ` sashiko-bot
2026-11-18 15:54 ` Vlastimil Babka (SUSE)
2026-11-15 15:09 ` [PATCH for-next v3 4/7] mm/slab: fix a deadlock in memcg_alloc_abort_single() Harry Yoo (Meta)
2026-11-18 16:24 ` Vlastimil Babka (SUSE) [this message]
2026-11-15 15:09 ` [PATCH for-next v3 5/7] mm/slab: serialize deferred_work_barrier() Harry Yoo (Meta)
2026-11-15 15:09 ` [PATCH for-next v3 6/7] mm/slab: refactor free_to_pcs() Harry Yoo (Meta)
2026-11-18 16:32 ` Vlastimil Babka (SUSE)
2026-11-15 15:09 ` [PATCH for-next v3 7/7] mm/slab: call debug_locks and KCSAN checks in kfree_nolock() Harry Yoo (Meta)
2026-11-18 16:58 ` Vlastimil Babka (SUSE)
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=02c600ac-c968-4143-9e70-ccd2da858e09@kernel.org \
--to=vbabka@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=cgroups@vger.kernel.org \
--cc=cl@gentwo.org \
--cc=clrkwllms@kernel.org \
--cc=hannes@cmpxchg.org \
--cc=hao.li@linux.dev \
--cc=harry@kernel.org \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-rt-devel@lists.linux.dev \
--cc=mhocko@kernel.org \
--cc=muchun.song@linux.dev \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=rostedt@goodmis.org \
--cc=sashiko-bot@kernel.org \
--cc=shakeel.butt@linux.dev \
/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
all inboxes | Powered by JetHome®