diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-05-26 18:11:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-28 10:54:15 +0200 |
| commit | afaa653c564da38c0b34c4baba31e88c46a8764c (patch) | |
| tree | b85811d7edf87ad2c844f4057cac655b5d82f94b /kernel/smp.c | |
| parent | 52103be07d8b08311955f8c30e535c2dda290cf4 (diff) | |
| download | linux-stable-afaa653c564da38c0b34c4baba31e88c46a8764c.tar.gz linux-stable-afaa653c564da38c0b34c4baba31e88c46a8764c.tar.bz2 linux-stable-afaa653c564da38c0b34c4baba31e88c46a8764c.zip | |
smp: Move irq_work_run() out of flush_smp_call_function_queue()
This ensures flush_smp_call_function_queue() is strictly about
call_single_queue.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200526161907.895109676@infradead.org
Diffstat (limited to 'kernel/smp.c')
| -rw-r--r-- | kernel/smp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index db2f73808db5..f720e38e880d 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -84,6 +84,7 @@ int smpcfd_dying_cpu(unsigned int cpu) * still pending. */ flush_smp_call_function_queue(false); + irq_work_run(); return 0; } @@ -191,6 +192,14 @@ static int generic_exec_single(int cpu, call_single_data_t *csd, void generic_smp_call_function_single_interrupt(void) { flush_smp_call_function_queue(true); + + /* + * Handle irq works queued remotely by irq_work_queue_on(). + * Smp functions above are typically synchronous so they + * better run first since some other CPUs may be busy waiting + * for them. + */ + irq_work_run(); } /** @@ -267,14 +276,6 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline) csd_unlock(csd); func(info); } - - /* - * Handle irq works queued remotely by irq_work_queue_on(). - * Smp functions above are typically synchronous so they - * better run first since some other CPUs may be busy waiting - * for them. - */ - irq_work_run(); } /* |