Skip to content

Commit aa5c3a2

Browse files
committed
Merge tag 'perf-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Ingo Molnar: "Fix an error handling bug that can cause a lockup if a CPU is offline (doh ...)" * tag 'perf-urgent-2020-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Fix task_function_call() error handling
2 parents da69003 + 6d6b8b9 commit aa5c3a2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

kernel/events/core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static void remote_function(void *data)
9999
* retry due to any failures in smp_call_function_single(), such as if the
100100
* task_cpu() goes offline concurrently.
101101
*
102-
* returns @func return value or -ESRCH when the process isn't running
102+
* returns @func return value or -ESRCH or -ENXIO when the process isn't running
103103
*/
104104
static int
105105
task_function_call(struct task_struct *p, remote_function_f func, void *info)
@@ -115,7 +115,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)
115115
for (;;) {
116116
ret = smp_call_function_single(task_cpu(p), remote_function,
117117
&data, 1);
118-
ret = !ret ? data.ret : -EAGAIN;
118+
if (!ret)
119+
ret = data.ret;
119120

120121
if (ret != -EAGAIN)
121122
break;

0 commit comments

Comments
 (0)