Skip to content

Commit df63d31

Browse files
tehcastergregkh
authored andcommitted
mm/page_alloc: prevent pcp corruption with SMP=n
[ Upstream commit 038a102 ] The kernel test robot has reported: BUG: spinlock trylock failure on UP on CPU#0, kcompactd0/28 lock: 0xffff888807e35ef0, .magic: dead4ead, .owner: kcompactd0/28, .owner_cpu: 0 CPU: 0 UID: 0 PID: 28 Comm: kcompactd0 Not tainted 6.18.0-rc5-00127-ga06157804399 #1 PREEMPT 8cc09ef94dcec767faa911515ce9e609c45db470 Call Trace: <IRQ> __dump_stack (lib/dump_stack.c:95) dump_stack_lvl (lib/dump_stack.c:123) dump_stack (lib/dump_stack.c:130) spin_dump (kernel/locking/spinlock_debug.c:71) do_raw_spin_trylock (kernel/locking/spinlock_debug.c:?) _raw_spin_trylock (include/linux/spinlock_api_smp.h:89 kernel/locking/spinlock.c:138) __free_frozen_pages (mm/page_alloc.c:2973) ___free_pages (mm/page_alloc.c:5295) __free_pages (mm/page_alloc.c:5334) tlb_remove_table_rcu (include/linux/mm.h:? include/linux/mm.h:3122 include/asm-generic/tlb.h:220 mm/mmu_gather.c:227 mm/mmu_gather.c:290) ? __cfi_tlb_remove_table_rcu (mm/mmu_gather.c:289) ? rcu_core (kernel/rcu/tree.c:?) rcu_core (include/linux/rcupdate.h:341 kernel/rcu/tree.c:2607 kernel/rcu/tree.c:2861) rcu_core_si (kernel/rcu/tree.c:2879) handle_softirqs (arch/x86/include/asm/jump_label.h:36 include/trace/events/irq.h:142 kernel/softirq.c:623) __irq_exit_rcu (arch/x86/include/asm/jump_label.h:36 kernel/softirq.c:725) irq_exit_rcu (kernel/softirq.c:741) sysvec_apic_timer_interrupt (arch/x86/kernel/apic/apic.c:1052) </IRQ> <TASK> RIP: 0010:_raw_spin_unlock_irqrestore (arch/x86/include/asm/preempt.h:95 include/linux/spinlock_api_smp.h:152 kernel/locking/spinlock.c:194) free_pcppages_bulk (mm/page_alloc.c:1494) drain_pages_zone (include/linux/spinlock.h:391 mm/page_alloc.c:2632) __drain_all_pages (mm/page_alloc.c:2731) drain_all_pages (mm/page_alloc.c:2747) kcompactd (mm/compaction.c:3115) kthread (kernel/kthread.c:465) ? __cfi_kcompactd (mm/compaction.c:3166) ? __cfi_kthread (kernel/kthread.c:412) ret_from_fork (arch/x86/kernel/process.c:164) ? __cfi_kthread (kernel/kthread.c:412) ret_from_fork_asm (arch/x86/entry/entry_64.S:255) </TASK> Matthew has analyzed the report and identified that in drain_page_zone() we are in a section protected by spin_lock(&pcp->lock) and then get an interrupt that attempts spin_trylock() on the same lock. The code is designed to work this way without disabling IRQs and occasionally fail the trylock with a fallback. However, the SMP=n spinlock implementation assumes spin_trylock() will always succeed, and thus it's normally a no-op. Here the enabled lock debugging catches the problem, but otherwise it could cause a corruption of the pcp structure. The problem has been introduced by commit 5749077 ("mm/page_alloc: leave IRQs enabled for per-cpu page allocations"). The pcp locking scheme recognizes the need for disabling IRQs to prevent nesting spin_trylock() sections on SMP=n, but the need to prevent the nesting in spin_lock() has not been recognized. Fix it by introducing local wrappers that change the spin_lock() to spin_lock_iqsave() with SMP=n and use them in all places that do spin_lock(&pcp->lock). [vbabka@suse.cz: add pcp_ prefix to the spin_lock_irqsave wrappers, per Steven] Link: https://lkml.kernel.org/r/20260105-fix-pcp-up-v1-1-5579662d2071@suse.cz Fixes: 5749077 ("mm/page_alloc: leave IRQs enabled for per-cpu page allocations") Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Reported-by: kernel test robot <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202512101320.e2f2dd6f-lkp@intel.com Analyzed-by: Matthew Wilcox <willy@infradead.org> Link: https://lore.kernel.org/all/aUW05pyc9nZkvY-1@casper.infradead.org/ Acked-by: Mel Gorman <mgorman@techsingularity.net> Cc: Brendan Jackman <jackmanb@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Zi Yan <ziy@nvidia.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2205634 commit df63d31

1 file changed

Lines changed: 39 additions & 8 deletions

File tree

mm/page_alloc.c

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,33 @@ static DEFINE_MUTEX(pcp_batch_high_lock);
163163
#define pcp_spin_unlock(ptr) \
164164
pcpu_spin_unlock(lock, ptr)
165165

166+
/*
167+
* With the UP spinlock implementation, when we spin_lock(&pcp->lock) (for i.e.
168+
* a potentially remote cpu drain) and get interrupted by an operation that
169+
* attempts pcp_spin_trylock(), we can't rely on the trylock failure due to UP
170+
* spinlock assumptions making the trylock a no-op. So we have to turn that
171+
* spin_lock() to a spin_lock_irqsave(). This works because on UP there are no
172+
* remote cpu's so we can only be locking the only existing local one.
173+
*/
174+
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT)
175+
static inline void __flags_noop(unsigned long *flags) { }
176+
#define pcp_spin_lock_maybe_irqsave(ptr, flags) \
177+
({ \
178+
__flags_noop(&(flags)); \
179+
spin_lock(&(ptr)->lock); \
180+
})
181+
#define pcp_spin_unlock_maybe_irqrestore(ptr, flags) \
182+
({ \
183+
spin_unlock(&(ptr)->lock); \
184+
__flags_noop(&(flags)); \
185+
})
186+
#else
187+
#define pcp_spin_lock_maybe_irqsave(ptr, flags) \
188+
spin_lock_irqsave(&(ptr)->lock, flags)
189+
#define pcp_spin_unlock_maybe_irqrestore(ptr, flags) \
190+
spin_unlock_irqrestore(&(ptr)->lock, flags)
191+
#endif
192+
166193
#ifdef CONFIG_USE_PERCPU_NUMA_NODE_ID
167194
DEFINE_PER_CPU(int, numa_node);
168195
EXPORT_PER_CPU_SYMBOL(numa_node);
@@ -2366,6 +2393,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
23662393
bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp)
23672394
{
23682395
int high_min, to_drain, to_drain_batched, batch;
2396+
unsigned long UP_flags;
23692397
bool todo = false;
23702398

23712399
high_min = READ_ONCE(pcp->high_min);
@@ -2385,9 +2413,9 @@ bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp)
23852413
to_drain = pcp->count - pcp->high;
23862414
while (to_drain > 0) {
23872415
to_drain_batched = min(to_drain, batch);
2388-
spin_lock(&pcp->lock);
2416+
pcp_spin_lock_maybe_irqsave(pcp, UP_flags);
23892417
free_pcppages_bulk(zone, to_drain_batched, pcp, 0);
2390-
spin_unlock(&pcp->lock);
2418+
pcp_spin_unlock_maybe_irqrestore(pcp, UP_flags);
23912419
todo = true;
23922420

23932421
to_drain -= to_drain_batched;
@@ -2404,14 +2432,15 @@ bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp)
24042432
*/
24052433
void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
24062434
{
2435+
unsigned long UP_flags;
24072436
int to_drain, batch;
24082437

24092438
batch = READ_ONCE(pcp->batch);
24102439
to_drain = min(pcp->count, batch);
24112440
if (to_drain > 0) {
2412-
spin_lock(&pcp->lock);
2441+
pcp_spin_lock_maybe_irqsave(pcp, UP_flags);
24132442
free_pcppages_bulk(zone, to_drain, pcp, 0);
2414-
spin_unlock(&pcp->lock);
2443+
pcp_spin_unlock_maybe_irqrestore(pcp, UP_flags);
24152444
}
24162445
}
24172446
#endif
@@ -2422,10 +2451,11 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
24222451
static void drain_pages_zone(unsigned int cpu, struct zone *zone)
24232452
{
24242453
struct per_cpu_pages *pcp = per_cpu_ptr(zone->per_cpu_pageset, cpu);
2454+
unsigned long UP_flags;
24252455
int count;
24262456

24272457
do {
2428-
spin_lock(&pcp->lock);
2458+
pcp_spin_lock_maybe_irqsave(pcp, UP_flags);
24292459
count = pcp->count;
24302460
if (count) {
24312461
int to_drain = min(count,
@@ -2434,7 +2464,7 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
24342464
free_pcppages_bulk(zone, to_drain, pcp, 0);
24352465
count -= to_drain;
24362466
}
2437-
spin_unlock(&pcp->lock);
2467+
pcp_spin_unlock_maybe_irqrestore(pcp, UP_flags);
24382468
} while (count);
24392469
}
24402470

@@ -5795,6 +5825,7 @@ static void zone_pcp_update_cacheinfo(struct zone *zone, unsigned int cpu)
57955825
{
57965826
struct per_cpu_pages *pcp;
57975827
struct cpu_cacheinfo *cci;
5828+
unsigned long UP_flags;
57985829

57995830
pcp = per_cpu_ptr(zone->per_cpu_pageset, cpu);
58005831
cci = get_cpu_cacheinfo(cpu);
@@ -5805,12 +5836,12 @@ static void zone_pcp_update_cacheinfo(struct zone *zone, unsigned int cpu)
58055836
* This can reduce zone lock contention without hurting
58065837
* cache-hot pages sharing.
58075838
*/
5808-
spin_lock(&pcp->lock);
5839+
pcp_spin_lock_maybe_irqsave(pcp, UP_flags);
58095840
if ((cci->per_cpu_data_slice_size >> PAGE_SHIFT) > 3 * pcp->batch)
58105841
pcp->flags |= PCPF_FREE_HIGH_BATCH;
58115842
else
58125843
pcp->flags &= ~PCPF_FREE_HIGH_BATCH;
5813-
spin_unlock(&pcp->lock);
5844+
pcp_spin_unlock_maybe_irqrestore(pcp, UP_flags);
58145845
}
58155846

58165847
void setup_pcp_cacheinfo(unsigned int cpu)

0 commit comments

Comments
 (0)