]> git.karo-electronics.de Git - linux-beck.git/commitdiff
x86/alternatives: Use atomic_xchg() instead atomic_dec_and_test() for stop_machine_te...
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Thu, 7 Jun 2012 13:20:18 +0000 (22:20 +0900)
committerIngo Molnar <mingo@kernel.org>
Wed, 13 Jun 2012 13:08:37 +0000 (15:08 +0200)
stop_machine_text_poke() uses atomic_dec_and_test() to select one of
the CPUs executing that function to actually modify the code.

Since the variable is initialized to 1, subsequent CPUs will make the
variable go negative. Since going negative is uncommon/unexpected in
typical dec_and_test usage change this user to atomic_xchg().

This was found using a patch that warns on dec_and_test going
negative.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
[ Rewrote changelog ]
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/87zk8fgsx9.fsf@devron.myhome.or.jp
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/alternative.c

index 1f84794f0759327c387d602cddccb3d479188f92..53231a045d3d1fc50aabc4859d521736eaae5ba4 100644 (file)
@@ -664,7 +664,7 @@ static int __kprobes stop_machine_text_poke(void *data)
        struct text_poke_param *p;
        int i;
 
-       if (atomic_dec_and_test(&stop_machine_first)) {
+       if (atomic_xchg(&stop_machine_first, 0)) {
                for (i = 0; i < tpp->nparams; i++) {
                        p = &tpp->params[i];
                        text_poke(p->addr, p->opcode, p->len);