You need to sign in or sign up before continuing.
提交 3fcf092f 编写于 作者: K Kajol Jain 提交者: Yang Yingliang

perf: Fix task_function_call() error handling

stable inclusion
from linux-4.19.151
commit 80e745b6729ed41248442a687943cc7a48e5e66a

--------------------------------

[ Upstream commit 6d6b8b9f ]

The error handling introduced by commit:

  2ed6edd3 ("perf: Add cond_resched() to task_function_call()")

looses any return value from smp_call_function_single() that is not
{0, -EINVAL}. This is a problem because it will return -EXNIO when the
target CPU is offline. Worse, in that case it'll turn into an infinite
loop.

Fixes: 2ed6edd3 ("perf: Add cond_resched() to task_function_call()")
Reported-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: NKajol Jain <kjain@linux.ibm.com>
Signed-off-by: NPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: NIngo Molnar <mingo@kernel.org>
Reviewed-by: NBarret Rhoden <brho@google.com>
Tested-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: https://lkml.kernel.org/r/20200827064732.20860-1-kjain@linux.ibm.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 7e2f4cee
...@@ -98,7 +98,7 @@ static void remote_function(void *data) ...@@ -98,7 +98,7 @@ static void remote_function(void *data)
* retry due to any failures in smp_call_function_single(), such as if the * retry due to any failures in smp_call_function_single(), such as if the
* task_cpu() goes offline concurrently. * task_cpu() goes offline concurrently.
* *
* returns @func return value or -ESRCH when the process isn't running * returns @func return value or -ESRCH or -ENXIO when the process isn't running
*/ */
static int static int
task_function_call(struct task_struct *p, remote_function_f func, void *info) task_function_call(struct task_struct *p, remote_function_f func, void *info)
...@@ -114,7 +114,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info) ...@@ -114,7 +114,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)
for (;;) { for (;;) {
ret = smp_call_function_single(task_cpu(p), remote_function, ret = smp_call_function_single(task_cpu(p), remote_function,
&data, 1); &data, 1);
ret = !ret ? data.ret : -EAGAIN; if (!ret)
ret = data.ret;
if (ret != -EAGAIN) if (ret != -EAGAIN)
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册