proc-use-a-dedicated-lock-in-struct-pid.patch removed from -mm tree
The patch titled
Subject: proc: Use a dedicated lock in struct pid
has been removed from the -mm tree. Its filename was
proc-use-a-dedicated-lock-in-struct-pid.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: [email protected] (Eric W. Biederman)
Subject: proc: Use a dedicated lock in struct pid
Quoted 25 lines · syzbot
========================================================
WARNING: possible irq lock inversion dependency detected
5.6.0-syzkaller #0 Not tainted
--------------------------------------------------------
swapper/1/0 just changed the state of lock:ffffffff898090d8(tasklist_lock){.+.?}-{2:2}, at:send_sigurg+0x9f/0x320fs/fcntl.c:840but this lock took another, SOFTIRQ-unsafe lock in the past:
(&pid->wait_pidfd){+.+.}-{2:2}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(&pid->wait_pidfd); local_irq_disable(); lock(tasklist_lock); lock(&pid->wait_pidfd); <Interrupt> lock(tasklist_lock);
Quoted 3 lines
*** DEADLOCK ***
4 locks held by swapper/1/0:
The problem is that because wait_pidfd.lock is taken under the tasklist lock. It must always be taken with irqs disabled as tasklist_lock can be taken from interrupt context and if wait_pidfd.lock was already taken this would create a lock order inversion.
Oleg suggested just disabling irqs where I have added extra calls to wait_pidfd.lock. That should be safe and I think the code will eventually do that. It was rightly pointed out by Christian that sharing the wait_pidfd.lock was a premature optimization.
It is also true that my pre-merge window testing was insufficient. So remove the premature optimization and give struct pid a dedicated lock of it's own for struct pid things. I have verified that lockdep sees all 3 paths where we take the new pid->lock and lockdep does not complain.
It is my current day dream that one day pid->lock can be used to guard the task lists as well and then the tasklist_lock won't need to be held to deliver signals. That will require taking pid->lock with irqs disabled.
---
fs/proc/base.c | 10 +++++----- include/linux/pid.h | 1 + kernel/pid.c | 1 + 3 files changed, 7 insertions(+), 5 deletions(-)
fs/proc/base.c renamed from fs/proc/base.c~proc-use-a-dedicated-lock-in-struct-pid +5 -5
@@ -1839,9 +1839,9 @@ void proc_pid_evict_inode(struct proc_instruct pid *pid = ei->pid;if (S_ISDIR (ei->vfs_inode.i_mode)) { -spin_lock (&pid->wait_pidfd.lock); +spin_lock (&pid->lock);hlist_del_init_rcu (&ei->sibling_inodes); -spin_unlock (&pid->wait_pidfd.lock); +spin_unlock (&pid->lock); }put_pid (pid);
@@ -1877,9 +1877,9 @@ struct inode *proc_pid_make_inode(struct/* Let the pid remember us for quick removal */ ei->pid = pid;if (S_ISDIR (mode)) { -spin_lock (&pid->wait_pidfd.lock); +spin_lock (&pid->lock);hlist_add_head_rcu (&ei->sibling_inodes, &pid->inodes); -spin_unlock (&pid->wait_pidfd.lock); +spin_unlock (&pid->lock); }task_dump_owner (task,0 , &inode->i_uid, &inode->i_gid);
@@ -3273,7 +3273,7 @@ static const struct inode_operations provoid proc_flush_pid (struct pid *pid) { -proc_invalidate_siblings_dcache (&pid->inodes, &pid->wait_pidfd.lock); +proc_invalidate_siblings_dcache (&pid->inodes, &pid->lock);put_pid (pid); }
include/linux/pid.h renamed from include/linux/pid.h~proc-use-a-dedicated-lock-in-struct-pid +1 -0
@@ -60,6 +60,7 @@ struct pid {refcount_t count;unsigned int level; +spinlock_t lock;/* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX ];struct hlist_head inodes;
kernel/pid.c renamed from kernel/pid.c~proc-use-a-dedicated-lock-in-struct-pid +1 -0
@@ -256,6 +256,7 @@ struct pid *alloc_pid(struct pid_namespaget_pid_ns (ns);refcount_set (&pid->count,1 ); +spin_lock_init (&pid->lock);for (type =0 ; type <PIDTYPE_MAX ; ++type)INIT_HLIST_HEAD (&pid->tasks[type]);
_
Patches currently in -mm which might be from [email protected] are