[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-177c53d943368fc97644ebc0a250dc8e2d124250@git.kernel.org>
Date: Tue, 11 Mar 2014 05:36:47 -0700
From: tip-bot for Peter Zijlstra <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
peterz@...radead.org, hch@...radead.org, riel@...hat.com,
akpm@...ux-foundation.org, mgorman@...e.de, tglx@...utronix.de,
prarit@...hat.com
Subject: [tip:sched/core] stop_machine: Fix^2 race between stop_two_cpus()
and stop_cpus()
Commit-ID: 177c53d943368fc97644ebc0a250dc8e2d124250
Gitweb: http://git.kernel.org/tip/177c53d943368fc97644ebc0a250dc8e2d124250
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Fri, 28 Feb 2014 13:39:05 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 11 Mar 2014 11:33:47 +0100
stop_machine: Fix^2 race between stop_two_cpus() and stop_cpus()
We must use smp_call_function_single(.wait=1) for the
irq_cpu_stop_queue_work() to ensure the queueing is actually done under
stop_cpus_lock. Without this we could have dropped the lock by the time
we do the queueing and get the race we tried to fix.
Fixes: 7053ea1a34fa ("stop_machine: Fix race between stop_two_cpus() and stop_cpus()")
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Rik van Riel <riel@...hat.com>
Cc: Mel Gorman <mgorman@...e.de>
Cc: Christoph Hellwig <hch@...radead.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Link: http://lkml.kernel.org/r/20140228123905.GK3104@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/stop_machine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 84571e0..01fbae5 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -293,7 +293,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void *
*/
smp_call_function_single(min(cpu1, cpu2),
&irq_cpu_stop_queue_work,
- &call_args, 0);
+ &call_args, 1);
lg_local_unlock(&stop_cpus_lock);
preempt_enable();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists