shmem: fix possible deadlocks on shmlock_user_lock
Subsystems (2)
Hugh Dickins
maintainerPATCH 1/1 shmem: fix possible deadlocks on shmlock_user_lock
Recent commit 71725ed10c40 ("mm: huge tmpfs: try to split_huge_page() when punching hole") has allowed syzkaller to probe deeper, uncovering a long-standing lockdep issue between the irq-unsafe shmlock_user_lock, the irq-safe xa_lock on mapping->i_pages, and shmem inode's info->lock which nests inside xa_lock (or tree_lock) since 4.8's shmem_uncharge().
user_shm_lock(), servicing SysV shmctl(SHM_LOCK), wants shmlock_user_lock while its caller shmem_lock() holds info->lock with interrupts disabled; but hugetlbfs_file_setup() calls user_shm_lock() with interrupts enabled, and might be interrupted by a writeback endio wanting xa_lock on i_pages. This may not risk an actual deadlock, since shmem inodes do not take part in writeback accounting, but there are several easy ways to avoid it.
Requiring interrupts disabled for shmlock_user_lock would be easy, but it's a high-level global lock for which that seems inappropriate. Instead, recall that the use of info->lock to guard info->flags in shmem_lock() dates from pre-3.1 days, when races with SHMEM_PAGEIN and SHMEM_TRUNCATE could occur: nowadays it serves no purpose, the only flag added or removed is VM_LOCKED itself, and calls to shmem_lock() an inode are already serialized by the caller. Take info->lock out of the chain and the possibility of deadlock or lockdep warning goes away.
---
mm/shmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
mm/shmem.c +5 -2
@@ -2179,7 +2179,11 @@ int shmem_lock(struct file *file, int lostruct shmem_inode_info *info =SHMEM_I (inode);int retval = -ENOMEM ; -spin_lock_irq (&info->lock); +/* +* What serializes the accesses to info->flags? +* ipc_lock_object() when called from shmctl_do_lock(), +* no serialization needed when called from shm_destroy(). +*/ if (lock && !(info->flags &VM_LOCKED )) {if (!user_shm_lock (inode->i_size, user)) goto out_nomem;
@@ -2194,7 +2198,6 @@ int shmem_lock(struct file *file, int lo retval =0 ; out_nomem: -spin_unlock_irq (&info->lock);return retval; }
Quoted 29 lines · Hugh Dickins
Recent commit
71725ed10c40("mm: huge tmpfs: try tosplit_huge_page()when punching hole") has allowed syzkaller to probe deeper, uncovering a long-standing lockdep issue between the irq-unsafeshmlock_user_lock, the irq-safexa_lockonmapping->i_pages, and shmem inode'sinfo->lockwhich nests insidexa_lock(ortree_lock) since 4.8'sshmem_uncharge().
user_shm_lock(), servicing SysVshmctl(SHM_LOCK), wantsshmlock_user_lockwhile its callershmem_lock()holdsinfo->lockwith interrupts disabled; buthugetlbfs_file_setup()callsuser_shm_lock()with interrupts enabled, and might be interrupted by a writeback endio wantingxa_lockoni_pages. This may not risk an actual deadlock, since shmem inodes do not take part in writeback accounting, but there are several easy ways to avoid it.Requiring interrupts disabled for
shmlock_user_lockwould be easy, but it's a high-level global lock for which that seems inappropriate. Instead, recall that the use ofinfo->lockto guardinfo->flagsinshmem_lock()dates from pre-3.1 days, when races withSHMEM_PAGEINandSHMEM_TRUNCATEcould occur: nowadays it serves no purpose, the only flag added or removed isVM_LOCKEDitself, and calls toshmem_lock()an inode are already serialized by the caller. Takeinfo->lockout of the chain and the possibility of deadlock or lockdep warning goes away.Reported-by [email protected]Reported-by [email protected]Fixes 4595ef88d136 ("shmem: make shmem_inode_info::lock irq-safe")Signed-off-by Hugh Dickins <[email protected]>Cc Yang Shi <[email protected]>
Quoted 4 lines
---
mm/shmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 24 lines
mm/shmem.c +5
-2@@ -2179,7 +2179,11 @@ int shmem_lock(struct file *file, int lostruct shmem_inode_info *info =SHMEM_I (inode);int retval = -ENOMEM ; -spin_lock_irq (&info->lock); +/* +* What serializes the accesses to info->flags? +* ipc_lock_object() when called from shmctl_do_lock(), +* no serialization needed when called from shm_destroy(). +*/ if (lock && !(info->flags &VM_LOCKED )) {if (!user_shm_lock (inode->i_size, user)) goto out_nomem;@@ -2194,7 +2198,6 @@ int shmem_lock(struct file *file, int lo retval =0 ; out_nomem: -spin_unlock_irq (&info->lock);return retval; }