iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lockdep: Improve comments in wait-type checks

Browse Source 
Comments in wait-type checks be improved by mentioning the
PREEPT_RT kernel configure option.

Signed-off-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@kernel.org>
Link: https://lkml.kernel.org/r/20210811025920.20751-1-zhouzhouyi@gmail.com
This commit is contained in:
Zhouyi Zhou 2021-08-11 10:59:20 +08:00 committed by Peter Zijlstra
parent 2507003a1d
commit a2e05ddda1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/lockdep_types.h
View File

@ -21,7 +21,7 @@ enum lockdep_wait_type {
LD_WAIT_SPIN, /* spin loops, raw_spinlock_t etc.. */ LD_WAIT_SPIN, /* spin loops, raw_spinlock_t etc.. */
#ifdef CONFIG_PROVE_RAW_LOCK_NESTING #ifdef CONFIG_PROVE_RAW_LOCK_NESTING
LD_WAIT_CONFIG, /* CONFIG_PREEMPT_LOCK, spinlock_t etc.. */ LD_WAIT_CONFIG, /* preemptible in PREEMPT_RT, spinlock_t etc.. */
#else #else
LD_WAIT_CONFIG = LD_WAIT_SPIN, LD_WAIT_CONFIG = LD_WAIT_SPIN,
#endif #endif

2
kernel/locking/lockdep.c
View File

@ -4671,7 +4671,7 @@ print_lock_invalid_wait_context(struct task_struct *curr,
/* /*
* Verify the wait_type context. * Verify the wait_type context.
* *
* This check validates we takes locks in the right wait-type order; that is it * This check validates we take locks in the right wait-type order; that is it
* ensures that we do not take mutexes inside spinlocks and do not attempt to * ensures that we do not take mutexes inside spinlocks and do not attempt to
* acquire spinlocks inside raw_spinlocks and the sort. * acquire spinlocks inside raw_spinlocks and the sort.
* *

4
kernel/rcu/update.c
View File

@ -247,7 +247,7 @@ struct lockdep_map rcu_lock_map = {
.name = "rcu_read_lock", .name = "rcu_read_lock",
.key = &rcu_lock_key, .key = &rcu_lock_key,
.wait_type_outer = LD_WAIT_FREE, .wait_type_outer = LD_WAIT_FREE,
.wait_type_inner = LD_WAIT_CONFIG, /* XXX PREEMPT_RCU ? */ .wait_type_inner = LD_WAIT_CONFIG, /* PREEMPT_RT implies PREEMPT_RCU */
}; };
EXPORT_SYMBOL_GPL(rcu_lock_map); EXPORT_SYMBOL_GPL(rcu_lock_map);
@ -256,7 +256,7 @@ struct lockdep_map rcu_bh_lock_map = {
.name = "rcu_read_lock_bh", .name = "rcu_read_lock_bh",
.key = &rcu_bh_lock_key, .key = &rcu_bh_lock_key,
.wait_type_outer = LD_WAIT_FREE, .wait_type_outer = LD_WAIT_FREE,
.wait_type_inner = LD_WAIT_CONFIG, /* PREEMPT_LOCK also makes BH preemptible */ .wait_type_inner = LD_WAIT_CONFIG, /* PREEMPT_RT makes BH preemptible. */
}; };
EXPORT_SYMBOL_GPL(rcu_bh_lock_map); EXPORT_SYMBOL_GPL(rcu_bh_lock_map);