Commit bbbf7af4 authored by Gleb Natapov's avatar Gleb Natapov Committed by Steven Rostedt

jump_label: jump_label_inc may return before the code is patched

If cpu A calls jump_label_inc() just after atomic_add_return() is
called by cpu B, atomic_inc_not_zero() will return value greater then
zero and jump_label_inc() will return to a caller before jump_label_update()
finishes its job on cpu B.

Link: http://lkml.kernel.org/r/20111018175551.GH17571@redhat.com

Cc: stable@vger.kernel.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c7c6ec8b
...@@ -66,8 +66,9 @@ void jump_label_inc(struct jump_label_key *key) ...@@ -66,8 +66,9 @@ void jump_label_inc(struct jump_label_key *key)
return; return;
jump_label_lock(); jump_label_lock();
if (atomic_add_return(1, &key->enabled) == 1) if (atomic_read(&key->enabled) == 0)
jump_label_update(key, JUMP_LABEL_ENABLE); jump_label_update(key, JUMP_LABEL_ENABLE);
atomic_inc(&key->enabled);
jump_label_unlock(); jump_label_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment