mm-factor-out-can_spin_trylock.patch removed from -mm tree
The quilt patch titled
Subject: mm: factor out can_spin_trylock()
has been removed from the -mm tree. Its filename was
mm-factor-out-can_spin_trylock.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Brendan Jackman <[email protected]>
Subject: mm: factor out can_spin_trylock()
Date: Fri, 03 Jul 2026 12:31:58 +0000
Deduplicate checks for whether the current context is safe for spin_trylock().
Does this function really belong in mm/internal.h or is it generic? Not sure. If someone ends up duplicating this logic elsewhere in the kernel, that would be a shame. But if it goes in some generic header, someone treats it as documentation about where it's guaranteed safe to spin_trylock(), and then it emerges that there are other subtle preconditions that didn't affect the mm usecase, that would be worse. So, just be conservative and keep it local.
---
mm/internal.h | 23 +++++++++++++++++++++++ mm/page_alloc.c | 17 +---------------- mm/slub.c | 10 +--------- 3 files changed, 25 insertions(+), 25 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-factor-out-can_spin_trylock +23 -0
@@ -1713,4 +1713,27 @@ static inline void mm_prepare_for_swap_e } } +static inline bool can_spin_trylock (void ) +{ +/* +* In PREEMPT_RT spin_trylock() will call raw_spin_lock() which is +* unsafe in NMI. If spin_trylock() is called from hard IRQ the current +* task may be waiting for one rt_spin_lock, but rt_spin_trylock() will +* mark the task as the owner of another rt_spin_lock which will +* confuse PI logic, so return immediately if called from hard IRQ or +* NMI. +* +* Note, irqs_disabled() case is ok. spin_trylock() can be called +* from raw_spin_lock_irqsave region. +*/ +if (IS_ENABLED (CONFIG_PREEMPT_RT ) && (in_nmi () ||in_hardirq ())) +return false; + +/* On UP, spin_trylock() always succeeds even when it is locked */ +if (!IS_ENABLED (CONFIG_SMP ) &&in_nmi ()) +return false; + +return true; +} +#endif /* __MM_INTERNAL_H */
mm/page_alloc.c renamed from mm/page_alloc.c~mm-factor-out-can_spin_trylock +1 -16
@@ -5291,22 +5291,7 @@ static inline bool alloc_order_allowed(gstatic inline bool alloc_nolock_allowed (void ) { -/* -* In PREEMPT_RT spin_trylock() will call raw_spin_lock() which is -* unsafe in NMI. If spin_trylock() is called from hard IRQ the current -* task may be waiting for one rt_spin_lock, but rt_spin_trylock() will -* mark the task as the owner of another rt_spin_lock which will -* confuse PI logic, so return immediately if called from hard IRQ or -* NMI. -* -* Note, irqs_disabled() case is ok. This function can be called -* from raw_spin_lock_irqsave region. -*/ -if (IS_ENABLED (CONFIG_PREEMPT_RT ) && (in_nmi () ||in_hardirq ())) -return false; - -/* On UP, spin_trylock() always succeeds even when it is locked */ -if (!IS_ENABLED (CONFIG_SMP ) &&in_nmi ()) +if (!can_spin_trylock ())return false;/* Bailout, since _deferred_grow_zone() needs to take a lock */
mm/slub.c renamed from mm/slub.c~mm-factor-out-can_spin_trylock +1 -9
@@ -5380,15 +5380,7 @@ static void *__kmalloc_nolock_noprof(DECif (unlikely (!size))return ZERO_SIZE_PTR ; -/* -* See the comment for the same check in -* alloc_frozen_pages_nolock_noprof() -*/ -if (IS_ENABLED (CONFIG_PREEMPT_RT ) && (in_nmi () ||in_hardirq ())) -return NULL ; - -/* On UP, spin_trylock() always succeeds even when it is locked */ -if (!IS_ENABLED (CONFIG_SMP ) &&in_nmi ()) +if (!can_spin_trylock ())return NULL ; retry:
_
Patches currently in -mm which might be from [email protected] are
mm-secretmem-dont-allow-highmem-folios.patch mm-page_alloc-dont-spin_trylock-in-nmi-on-up.patch mm-page_alloc-dont-spin_trylock-when-disallowed-in-free_one_page.patch mm-page_alloc-rename-fpi_trylock-fpi_nolock.patch cgroup-cpuset-update-some-comments-about-the-page-allocator.patch mm-page_alloc-fixup-alloc_pages_nolock_noprof-comment.patch mm-page_alloc-remove-a-couple-of-vm_bug_onst.patch