mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations

Browse source 
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>
This commit is contained in:
Peter Zijlstra 2018-07-31 14:35:32 +02:00 committed by Ingo Molnar
parent ce991095cc
commit cb538267ea
1 changed files with 5 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/jump_label.c
View file

@ -85,6 +85,7 @@ void static_key_slow_inc_cpuslocked(struct static_key *key)
int v, v1; int v, v1;
STATIC_KEY_CHECK_USE(key); STATIC_KEY_CHECK_USE(key);
lockdep_assert_cpus_held();
/* /*
* Careful if we get concurrent static_key_slow_inc() calls; * 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) void static_key_enable_cpuslocked(struct static_key *key)
{ {
STATIC_KEY_CHECK_USE(key); STATIC_KEY_CHECK_USE(key);
lockdep_assert_cpus_held();
if (atomic_read(&key->enabled) > 0) { if (atomic_read(&key->enabled) > 0) {
WARN_ON_ONCE(atomic_read(&key->enabled) != 1); 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) void static_key_disable_cpuslocked(struct static_key *key)
{ {
STATIC_KEY_CHECK_USE(key); STATIC_KEY_CHECK_USE(key);
lockdep_assert_cpus_held();
if (atomic_read(&key->enabled) != 1) { if (atomic_read(&key->enabled) != 1) {
WARN_ON_ONCE(atomic_read(&key->enabled) != 0); 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, unsigned long rate_limit,
struct delayed_work *work) struct delayed_work *work)
{ {
lockdep_assert_cpus_held();
/* /*
* The negative count check is valid even when a negative * The negative count check is valid even when a negative
* key->enabled is in use by static_key_slow_inc(); a * key->enabled is in use by static_key_slow_inc(); a