lockdep: restrict the use of recursive read_lock with qrwlock
PATCH v3 1/1 lockdep: restrict the use of recursive read_lock with qrwlock
v2->v3:
- Add a new read mode (3) for rwlock (used in lock_acquire_shared_cond_recursive()) to avoid conflict with other use cases of lock_acquire_shared_recursive().
v1->v2:
- Use less conditional & make it easier to read
Unlike the original unfair rwlock implementation, queued rwlock will grant lock according to the chronological sequence of the lock requests except when the lock requester is in the interrupt context. As a result, recursive read_lock calls will hang the process if there is a write_lock call somewhere in between the read_lock calls.
This patch updates the lockdep implementation to look for recursive read_lock calls when queued rwlock is being used.
--- include/linux/lockdep.h | 4 +++- kernel/locking/lockdep.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-)
include/linux/lockdep.h +3 -1
@@ -481,13 +481,15 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 1, n, i)#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i)#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) +#define lock_acquire_shared_cond_recursive (l, s, t, n, i) \ + lock_acquire(l, s, t, 3, 1, n, i)#define spin_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define spin_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define spin_release (l, n, i) lock_release(l, n, i)#define rwlock_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) -#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) +#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_cond_recursive(l, s, t, NULL, i)#define rwlock_release (l, n, i) lock_release(l, n, i)#define seqcount_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
kernel/locking/lockdep.c +16 -0
@@ -67,6 +67,16 @@ module_param(lock_stat, int, 0644);#define lock_stat 0#endif +#ifdef CONFIG_QUEUE_RWLOCK +/* +* Queue rwlock only allows read-after-read recursion of the same lock class +* when the latter read is in an interrupt context. +*/ +#define allow_recursive_read in_interrupt() +#else +#define allow_recursive_read true +#endif +/* * lockdep_lock: protects the lockdep graph, the hashes and the * class/list/hash allocators.
@@ -1774,6 +1784,12 @@ check_deadlock(struct task_struct *curr, struct held_lock *next,return 2 ;/* +* Conditionally recursive read-lock check +*/ +if ((read ==3 ) && prev->read && allow_recursive_read) +return 2 ; + +/* * We're holding the nest_lock, which serializes this lock's * nesting behaviour. */
Signature · 1 line
1.7.1
Peter Zijlstra
maintainerQuoted 14 lines · Waiman Long
v2->v3:
- Add a new read mode (3) for rwlock (used inlock_acquire_shared_cond_recursive()) to avoid conflict with other use cases oflock_acquire_shared_recursive().
v1->v2:
- Use less conditional & make it easier to readUnlike the original unfair rwlock implementation, queued rwlock will grant lock according to the chronological sequence of the lock requests except when the lock requester is in the interrupt context. As a result, recursive
read_lockcalls will hang the process if there is awrite_lockcall somewhere in between theread_lockcalls.
Quoted 4 lines
This patch updates the lockdep implementation to look for recursive
read_lockcalls when queued rwlock is being used.Signed-off-by Waiman Long <[email protected]>
So this Changelog really won't do. This vn->vn+1 nonsense should not be part of the Changelog proper.
Also, you failed to mention what prompted you to write this patch; did you find an offending site that now triggers a lockdep warning?
You also fail to mention that the new read state fits, but exhausts, the storage in held_lock::read.
Quoted 10 lines
---
2 files changed, 19 insertions(+), 1 deletions(-)include/linux/lockdep.h +0
-0@@ -481,13 +481,15 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 1, n, i)#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i)
include/linux/lockdep.h static inline void print_irqtrace_events(struct task_struct *curr) · line 491
Quoted 10 lines
include/linux/lockdep.h +3
-1#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) +#define lock_acquire_shared_cond_recursive (l, s, t, n, i) \ + lock_acquire(l, s, t, 3, 1, n, i)#define spin_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define spin_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define spin_release (l, n, i) lock_release(l, n, i)#define rwlock_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) -#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) +#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_cond_recursive(l, s, t, NULL, i)
Yeah, no. Only the qrwlock has the new cond_recursive thing.
Quoted 10 lines
include/linux/lockdep.h +0
-0#define rwlock_release (l, n, i) lock_release(l, n, i)#define seqcount_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)kernel/locking/lockdep.c +0
-0@@ -67,6 +67,16 @@ module_param(lock_stat, int, 0644);#define lock_stat 0#endif
kernel/locking/lockdep.c module_param(lock_stat, int, 0644); · line 78
Quoted 10 lines
kernel/locking/lockdep.c +9
-0+#ifdef CONFIG_QUEUE_RWLOCK +/* +* Queue rwlock only allows read-after-read recursion of the same lock class +* when the latter read is in an interrupt context. +*/ +#define allow_recursive_read in_interrupt() +#else +#define allow_recursive_read true +#endif
That #ifdef is entirely inappropriate, the lockdep implementation should not depend on this. Furthermore you now added a new read state with variable semantics, that's crap.
Quoted 19 lines
kernel/locking/lockdep.c +6
-0/* * lockdep_lock: protects the lockdep graph, the hashes and the * class/list/hash allocators. @@ -1774,6 +1784,12 @@ check_deadlock(struct task_struct *curr, struct held_lock *next,return 2 ;/* +* Conditionally recursive read-lock check +*/ +if ((read ==3 ) && prev->read && allow_recursive_read) +return 2 ; + +/* * We're holding the nest_lock, which serializes this lock's * nesting behaviour. */ Signature · 1 line
1.7.1
Quoted 15 lines · Peter Zijlstra
Quoted 14 lines · Waiman Long
v2->v3:
- Add a new read mode (3) for rwlock (used inlock_acquire_shared_cond_recursive()) to avoid conflict with other use cases oflock_acquire_shared_recursive().
v1->v2:
- Use less conditional& make it easier to readUnlike the original unfair rwlock implementation, queued rwlock will grant lock according to the chronological sequence of the lock requests except when the lock requester is in the interrupt context. As a result, recursive
read_lockcalls will hang the process if there is awrite_lockcall somewhere in between theread_lockcalls.
Quoted 6 lines
Quoted 4 lines
This patch updates the lockdep implementation to look for recursive
read_lockcalls when queued rwlock is being used.Signed-off-by Waiman Long<[email protected]>So this Changelog really won't do. This vn->vn+1 nonsense should not be part of the Changelog proper.
I occasionally saw change log with history, and so thought that it might be OK. I will take that out in the next patch.
Quoted 2 lines
Also, you failed to mention what prompted you to write this patch; did you find an offending site that now triggers a lockdep warning?
This patch was prompted by a btrfs filesystem hangup problem with qrwlock which is readily reproducible. I was trying to figure out if that hangup was caused by recursive read_lock which looked likely after reading their locking code. It turned out that the cause was more complex and recursive read_lock wasn't the only problem. Chris Mason had sent a fix to Linus which was included in rc2.
With the lockdep change, I also found another recursive read_lock problem in the selinux code.
Quoted 4 lines
You also fail to mention that the new read state fits, but exhausts, the storage in
held_lock::read.
Will look into that issue a bit more.
Quoted 17 lines
Quoted 17 lines
---
2 files changed, 19 insertions(+), 1 deletions(-)include/linux/lockdep.h +2
-0@@ -481,13 +481,15 @@ static inline void print_irqtrace_events(struct task_struct *curr)#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 1, n, i)#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i)#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) +#define lock_acquire_shared_cond_recursive (l, s, t, n, i) \ + lock_acquire(l, s, t, 3, 1, n, i)#define spin_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define spin_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)#define spin_release (l, n, i) lock_release(l, n, i)
Quoted 4 lines
include/linux/lockdep.h static inline void print_irqtrace_events(struct task_struct *curr) · line 492
Quoted 3 lines
include/linux/lockdep.h +1
-1#define rwlock_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i) -#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_recursive(l, s, t, NULL, i) +#define rwlock_acquire_read (l, s, t, i) lock_acquire_shared_cond_recursive(l, s, t, NULL, i)Yeah, no. Only the qrwlock has the new
cond_recursivething.
So you mean put the conditional compilation here around the definition of rwlock_acquire_read. I can do that.
Quoted 11 lines
Quoted 11 lines
include/linux/lockdep.h +0
-0#define rwlock_release (l, n, i) lock_release(l, n, i)#define seqcount_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)kernel/locking/lockdep.c +0
-0@@ -67,6 +67,16 @@ module_param(lock_stat, int, 0644);#define lock_stat 0#endif
Quoted 12 lines
kernel/locking/lockdep.c module_param(lock_stat, int, 0644); · line 78
Quoted 9 lines
kernel/locking/lockdep.c +9
-0+#ifdef CONFIG_QUEUE_RWLOCK +/* +* Queue rwlock only allows read-after-read recursion of the same lock class +* when the latter read is in an interrupt context. +*/ +#define allow_recursive_read in_interrupt() +#else +#define allow_recursive_read true +#endif That #ifdef is entirely inappropriate, the lockdep implementation should not depend on this. Furthermore you now added a new read state with variable semantics, that's crap.
I will modify it to explicitly say allowing recursive read only in interrupt context so that there is no confusion on what it is for.
-Longman