diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2018-07-31 14:35:32 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-09-10 10:16:38 +0200 |
| commit | cb538267ea1e9e025ec692577c9ae75797261889 (patch) | |
| tree | c64b201dc8a6977b1ac91ef85ca0b828c99ff33a /kernel/jump_label.c | |
| parent | Merge branch 'locking/urgent' into locking/core, to pick up fixes (diff) | |
| download | wireguard-linux-cb538267ea1e9e025ec692577c9ae75797261889.tar.xz wireguard-linux-cb538267ea1e9e025ec692577c9ae75797261889.zip | |
jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations
Weirdly we seem to have forgotten this...
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/jump_label.c')
| -rw-r--r-- | kernel/jump_label.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index de97d8753b62..966a9e9c0f04 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -85,6 +85,7 @@ void static_key_slow_inc_cpuslocked(struct static_key *key) int v, v1; STATIC_KEY_CHECK_USE(key); + lockdep_assert_cpus_held(); /* * Careful if we get concurrent static_key_slow_inc() calls; @@ -130,6 +131,7 @@ EXPORT_SYMBOL_GPL(static_key_slow_inc); void static_key_enable_cpuslocked(struct static_key *key) { STATIC_KEY_CHECK_USE(key); + lockdep_assert_cpus_held(); if (atomic_read(&key->enabled) > 0) { WARN_ON_ONCE(atomic_read(&key->enabled) != 1); @@ -160,6 +162,7 @@ EXPORT_SYMBOL_GPL(static_key_enable); void static_key_disable_cpuslocked(struct static_key *key) { STATIC_KEY_CHECK_USE(key); + lockdep_assert_cpus_held(); if (atomic_read(&key->enabled) != 1) { WARN_ON_ONCE(atomic_read(&key->enabled) != 0); @@ -185,6 +188,8 @@ static void __static_key_slow_dec_cpuslocked(struct static_key *key, unsigned long rate_limit, struct delayed_work *work) { + lockdep_assert_cpus_held(); + /* * The negative count check is valid even when a negative * key->enabled is in use by static_key_slow_inc(); a |