Subject: [to-be-updated] cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline.patch removed from -mm tree To: srivatsa.bhat@xxxxxxxxxxxxxxxxxx,bp@xxxxxxx,ego@xxxxxxxxxxxxxxxxxx,fweisbec@xxxxxxxxx,hch@xxxxxxxxxxxxx,mgalbraith@xxxxxxx,mgorman@xxxxxxx,mingo@xxxxxxxxxx,oleg@xxxxxxxxxx,paulmck@xxxxxxxxxxxxxxxxxx,peterz@xxxxxxxxxxxxx,riel@xxxxxxxxxx,rjw@xxxxxxxxxxxxx,rostedt@xxxxxxxxxxx,rusty@xxxxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 20 May 2014 13:22:36 -0700 The patch titled Subject: CPU hotplug, smp: flush any pending IPI callbacks before CPU offline has been removed from the -mm tree. Its filename was cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: "Srivatsa S. Bhat" <srivatsa.bhat@xxxxxxxxxxxxxxxxxx> Subject: CPU hotplug, smp: flush any pending IPI callbacks before CPU offline During CPU offline, in the stop-machine loop, we use 2 separate stages to disable interrupts, to ensure that the CPU going offline doesn't get any new IPIs from the other CPUs after it has gone offline. However, an IPI sent much earlier might arrive late on the target CPU (possibly _after_ the CPU has gone offline) due to hardware latencies, and due to this, the smp-call-function callbacks queued on the outgoing CPU might not get noticed (and hence not executed) at all. This is somewhat theoretical, but in any case, it makes sense to explicitly loop through the call_single_queue and flush any pending callbacks before the CPU goes completely offline. So, flush the queued smp-call-function callbacks in the MULTI_STOP_DISABLE_IRQ_ACTIVE stage, after disabling interrupts on the active CPU. That way, we would have handled all the queued callbacks before going offline, and also, no new IPIs can be sent by the other CPUs to the outgoing CPU at that point, because they will all be executing the stop-machine code with interrupts disabled. Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@xxxxxxxxxxxxxxxxxx> Suggested-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> Reviewed-by: Tejun Heo <tj@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Mike Galbraith <mgalbraith@xxxxxxx> Cc: Gautham R Shenoy <ego@xxxxxxxxxxxxxxxxxx> Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Rafael J. Wysocki <rjw@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/smp.h | 2 ++ kernel/smp.c | 33 +++++++++++++++++++++++++++++++++ kernel/stop_machine.c | 11 +++++++++++ 3 files changed, 46 insertions(+) diff -puN include/linux/smp.h~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline include/linux/smp.h --- a/include/linux/smp.h~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline +++ a/include/linux/smp.h @@ -52,6 +52,8 @@ void on_each_cpu_cond(bool (*cond_func)( int smp_call_function_single_async(int cpu, struct call_single_data *csd); +void flush_smp_call_function_queue(void); + #ifdef CONFIG_SMP #include <linux/preempt.h> diff -puN kernel/smp.c~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline kernel/smp.c --- a/kernel/smp.c~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline +++ a/kernel/smp.c @@ -212,6 +212,39 @@ void generic_smp_call_function_single_in } } +/** + * flush_smp_call_function_queue - Flush pending smp-call-function callbacks + * + * Flush any pending smp-call-function callbacks queued on this CPU (including + * those for which the source CPU's IPIs might not have been received on this + * CPU yet). This is invoked by a CPU about to go offline, to ensure that all + * pending IPI functions are run before it goes completely offline. + * + * Loop through the call_single_queue and run all the queued functions. + * Must be called with interrupts disabled. + */ +void flush_smp_call_function_queue(void) +{ + struct llist_head *head; + struct llist_node *entry; + struct call_single_data *csd, *csd_next; + + WARN_ON(!irqs_disabled()); + + head = &__get_cpu_var(call_single_queue); + + if (likely(llist_empty(head))) + return; + + entry = llist_del_all(head); + entry = llist_reverse_order(entry); + + llist_for_each_entry_safe(csd, csd_next, entry, llist) { + csd->func(csd->info); + csd_unlock(csd); + } +} + /* * smp_call_function_single - Run a function on a specific CPU * @func: The function to run. This must be fast and non-blocking. diff -puN kernel/stop_machine.c~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline kernel/stop_machine.c --- a/kernel/stop_machine.c~cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline +++ a/kernel/stop_machine.c @@ -21,6 +21,7 @@ #include <linux/smpboot.h> #include <linux/atomic.h> #include <linux/lglock.h> +#include <linux/smp.h> /* * Structure to determine completion condition and record errors. May @@ -224,6 +225,16 @@ static int multi_cpu_stop(void *data) local_irq_disable(); hard_irq_disable(); } + + /* + * IPIs (from the inactive CPUs) might arrive + * late due to hardware latencies. So flush + * out any pending IPI callbacks explicitly, + * to ensure that the outgoing CPU doesn't go + * offline with work still pending (during + * CPU hotplug). + */ + flush_smp_call_function_queue(); break; case MULTI_STOP_RUN: if (is_active) _ Patches currently in -mm which might be from srivatsa.bhat@xxxxxxxxxxxxxxxxxx are smp-print-more-useful-debug-info-upon-receiving-ipi-on-an-offline-cpu.patch smp-print-more-useful-debug-info-upon-receiving-ipi-on-an-offline-cpu-fix.patch smp-print-more-useful-debug-info-upon-receiving-ipi-on-an-offline-cpu-v5.patch cpu-hotplug-stop-machine-plug-race-window-that-leads-to-ipi-to-offline-cpu.patch cpu-hotplug-stop-machine-plug-race-window-that-leads-to-ipi-to-offline-cpu-v3.patch cpu-hotplug-stop-machine-plug-race-window-that-leads-to-ipi-to-offline-cpu-v5.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html