Messages in this thread Patch in this message | | | From | Frederic Weisbecker <> | Subject | [PATCH 12/32] locking/lockdep: Define per vector softirq lock usage states | Date | Tue, 12 Feb 2019 18:14:03 +0100 |
| |
Now that the code is mostly ready to play at this finegrained level, reuse the macrofied vector list to define the usual 4 lock usage states for each softirq vectors. This way we can perform the validations independently for each of them.
The new usage mask layout becomes:
TIMER_SOFTIRQ LOCK_USED bits HARDIRQ bits \ | | \ | | 0 0000 [...] 0000 0000 0000 | | | | RCU_SOFTIRQ HI_SOFTIRQ bits bits
Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com> Cc: Joel Fernandes <joel@joelfernandes.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Pavan Kondeti <pkondeti@codeaurora.org> Cc: Paul E . McKenney <paulmck@linux.vnet.ibm.com> Cc: David S . Miller <davem@davemloft.net> Cc: Ingo Molnar <mingo@kernel.org> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> --- kernel/locking/lockdep_internals.h | 43 +++++++++++++++++++++++++++--- kernel/locking/lockdep_states.h | 4 ++- 2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h index e714c823f594..4b0c03f0f7ce 100644 --- a/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h @@ -22,9 +22,15 @@ enum lock_usage_bit { LOCK_USAGE_STATES }; -#define LOCK_USAGE_READ_MASK 1 -#define LOCK_USAGE_DIR_MASK 2 -#define LOCK_USAGE_STATE_MASK (~(LOCK_USAGE_READ_MASK | LOCK_USAGE_DIR_MASK)) +#define LOCK_USAGE_READ_MASK 1 +#define LOCK_USAGE_DIR_MASK 2 +#define LOCK_USAGE_STATE_MASK (~(LOCK_USAGE_READ_MASK | LOCK_USAGE_DIR_MASK)) + +/* Base softirq bits that get shifted by the index in stuct lock_usage::vector */ +#define LOCK_USED_IN_SOFTIRQ LOCK_USED_IN_HI_SOFTIRQ +#define LOCK_USED_IN_SOFTIRQ_READ LOCK_USED_IN_HI_SOFTIRQ_READ +#define LOCK_ENABLED_SOFTIRQ LOCK_ENABLED_HI_SOFTIRQ +#define LOCK_ENABLED_SOFTIRQ_READ LOCK_ENABLED_HI_SOFTIRQ_READ struct lock_usage { enum lock_usage_bit bit; @@ -35,7 +41,7 @@ struct lock_usage { /* * Usage-state bitmasks: */ -#define __LOCKF(__STATE) LOCKF_##__STATE = (1 << LOCK_##__STATE), +#define __LOCKF(__STATE) LOCKF_##__STATE = (1ULL << LOCK_##__STATE), enum { #define LOCKDEP_STATE(__STATE) \ @@ -48,11 +54,40 @@ enum { __LOCKF(USED) }; +#define LOCKF_ENABLED_SOFTIRQ \ + (LOCKF_ENABLED_HI_SOFTIRQ | LOCKF_ENABLED_TIMER_SOFTIRQ | \ + LOCKF_ENABLED_NET_TX_SOFTIRQ | LOCKF_ENABLED_NET_RX_SOFTIRQ | \ + LOCKF_ENABLED_BLOCK_SOFTIRQ | LOCKF_ENABLED_IRQ_POLL_SOFTIRQ | \ + LOCKF_ENABLED_TASKLET_SOFTIRQ | LOCKF_ENABLED_SCHED_SOFTIRQ | \ + LOCKF_ENABLED_HRTIMER_SOFTIRQ | LOCKF_ENABLED_RCU_SOFTIRQ) #define LOCKF_ENABLED_IRQ (LOCKF_ENABLED_HARDIRQ | LOCKF_ENABLED_SOFTIRQ) + + +#define LOCKF_USED_IN_SOFTIRQ \ + (LOCKF_USED_IN_HI_SOFTIRQ | LOCKF_USED_IN_TIMER_SOFTIRQ | \ + LOCKF_USED_IN_NET_TX_SOFTIRQ | LOCKF_USED_IN_NET_RX_SOFTIRQ | \ + LOCKF_USED_IN_BLOCK_SOFTIRQ | LOCKF_USED_IN_IRQ_POLL_SOFTIRQ | \ + LOCKF_USED_IN_TASKLET_SOFTIRQ | LOCKF_USED_IN_SCHED_SOFTIRQ | \ + LOCKF_USED_IN_HRTIMER_SOFTIRQ | LOCKF_USED_IN_RCU_SOFTIRQ) #define LOCKF_USED_IN_IRQ (LOCKF_USED_IN_HARDIRQ | LOCKF_USED_IN_SOFTIRQ) + +#define LOCKF_ENABLED_SOFTIRQ_READ \ + (LOCKF_ENABLED_HI_SOFTIRQ_READ | LOCKF_ENABLED_TIMER_SOFTIRQ_READ | \ + LOCKF_ENABLED_NET_TX_SOFTIRQ_READ | LOCKF_ENABLED_NET_RX_SOFTIRQ_READ | \ + LOCKF_ENABLED_BLOCK_SOFTIRQ_READ | LOCKF_ENABLED_IRQ_POLL_SOFTIRQ_READ | \ + LOCKF_ENABLED_TASKLET_SOFTIRQ_READ | LOCKF_ENABLED_SCHED_SOFTIRQ_READ | \ + LOCKF_ENABLED_HRTIMER_SOFTIRQ_READ | LOCKF_ENABLED_RCU_SOFTIRQ_READ) #define LOCKF_ENABLED_IRQ_READ \ (LOCKF_ENABLED_HARDIRQ_READ | LOCKF_ENABLED_SOFTIRQ_READ) + + +#define LOCKF_USED_IN_SOFTIRQ_READ \ + (LOCKF_USED_IN_HI_SOFTIRQ_READ | LOCKF_USED_IN_TIMER_SOFTIRQ_READ | \ + LOCKF_USED_IN_NET_TX_SOFTIRQ_READ | LOCKF_USED_IN_NET_RX_SOFTIRQ_READ | \ + LOCKF_USED_IN_BLOCK_SOFTIRQ_READ | LOCKF_USED_IN_IRQ_POLL_SOFTIRQ_READ | \ + LOCKF_USED_IN_TASKLET_SOFTIRQ_READ | LOCKF_USED_IN_SCHED_SOFTIRQ_READ | \ + LOCKF_USED_IN_HRTIMER_SOFTIRQ_READ | LOCKF_USED_IN_RCU_SOFTIRQ_READ) #define LOCKF_USED_IN_IRQ_READ \ (LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ) diff --git a/kernel/locking/lockdep_states.h b/kernel/locking/lockdep_states.h index 35ca09f2ed0b..34ff569d2024 100644 --- a/kernel/locking/lockdep_states.h +++ b/kernel/locking/lockdep_states.h @@ -5,4 +5,6 @@ * you add one, or come up with a nice dynamic solution. */ LOCKDEP_STATE(HARDIRQ) -LOCKDEP_STATE(SOFTIRQ) +#define SOFTIRQ_VECTOR(__SVEC) LOCKDEP_STATE(__SVEC##_SOFTIRQ) +#include <linux/softirq_vector.h> +#undef SOFTIRQ_VECTOR -- 2.17.1
| |