mm-shmem-disable-interrupt-when-acquiring-info-lock-in-userfaultfd_copy-path.patch removed from -mm tree
The patch titled
Subject: mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
has been removed from the -mm tree. Its filename was
mm-shmem-disable-interrupt-when-acquiring-info-lock-in-userfaultfd_copy-path.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yang Shi <[email protected]>
Subject: mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
Syzbot reported the below lockdep splat:
WARNING: possible irq lock inversion dependency detected 5.6.0-rc7-syzkaller #0 Not tainted
--------------------------------------------------------
syz-executor.0/10317 just changed the state of lock:ffff888021d16568 (&(&info->lock)->rlock){+.+.}, at: spin_lock include/linux/spinlock.h:338 [inline]ffff888021d16568 (&(&info->lock)->rlock){+.+.}, at:shmem_mfill_atomic_pte+0x1012/0x21c0 mm/shmem.c:2407 but this lock was taken by another, SOFTIRQ-safe lock in the past:
(&(&xa->xa_lock)->rlock#5){..-.}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&(&info->lock)->rlock);
local_irq_disable();
lock(&(&xa->xa_lock)->rlock#5);
lock(&(&info->lock)->rlock);
<Interrupt>
lock(&(&xa->xa_lock)->rlock#5);*** DEADLOCK ***
The full report is quite lengthy, please see:
https://lore.kernel.org/linux-mm/[email protected]/T/#m813b412c5f78e25ca8c6c7734886ed4de43f241d
It is because CPU 0 held info->lock with IRQ enabled in userfaultfd_copy path, then CPU 1 is splitting a THP which held xa_lock and info->lock in IRQ disabled context at the same time. If softirq comes in to acquire xa_lock, the deadlock would be triggered.
The fix is to acquire/release info->lock with *_irq version instead of plain spin_{lock,unlock} to make it softirq safe.
---
mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/shmem.c renamed from mm/shmem.c~mm-shmem-disable-interrupt-when-acquiring-info-lock-in-userfaultfd_copy-path +2 -2
@@ -2402,11 +2402,11 @@ static int shmem_mfill_atomic_pte(structlru_cache_add_anon (page); -spin_lock (&info->lock); +spin_lock_irq (&info->lock); info->alloced++; inode->i_blocks +=BLOCKS_PER_PAGE ;shmem_recalc_inode (inode); -spin_unlock (&info->lock); +spin_unlock_irq (&info->lock);inc_mm_counter (dst_mm,mm_counter_file (page));page_add_file_rmap (page, false);
_
Patches currently in -mm which might be from [email protected] are
mm-thp-dont-need-drain-lru-cache-when-splitting-and-mlocking-thp.patch