lkml.org 
[lkml]   [2020]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[GIT pull] SMP fixes for 5.6-rc1
Linus,

please pull the latest smp/urgent branch from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git smp-urgent-2020-02-09

up to: 1e474b28e788: smp/up: Make smp_call_function_single() match SMP semantics


Two fixes for the SMP related functionality:

- Make the UP version of smp_call_function_single() match SMP semantics
when called for a not available CPU. Instead of emitting a warning and
assuming that the function call target is CPU0, return a proper error
code like the SMP version does.

- Remove a superfluous check in smp_call_function_many_cond()

Thanks,

tglx

------------------>
Paul E. McKenney (1):
smp/up: Make smp_call_function_single() match SMP semantics

Sebastian Andrzej Siewior (1):
smp: Remove superfluous cond_func check in smp_call_function_many_cond()


kernel/smp.c | 2 +-
kernel/up.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/smp.c b/kernel/smp.c
index 3b7bedc97af3..d0ada39eb4d4 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -435,7 +435,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask,

/* Fastpath: do that cpu by itself. */
if (next_cpu >= nr_cpu_ids) {
- if (!cond_func || (cond_func && cond_func(cpu, info)))
+ if (!cond_func || cond_func(cpu, info))
smp_call_function_single(cpu, func, info, wait);
return;
}
diff --git a/kernel/up.c b/kernel/up.c
index 53144d056252..c6f323dcd45b 100644
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -14,7 +14,8 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
{
unsigned long flags;

- WARN_ON(cpu != 0);
+ if (cpu != 0)
+ return -ENXIO;

local_irq_save(flags);
func(info);
\
 
 \ /
  Last update: 2020-02-09 15:07    [W:0.069 / U:1.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site