mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-06 01:26:56 +01:00
perf: Add cond_resched() to task_function_call()
Under rare circumstances, task_function_call() can repeatedly fail and cause a soft lockup. There is a slight race where the process is no longer running on the cpu we targeted by the time remote_function() runs. The code will simply try again. If we are very unlucky, this will continue to fail, until a watchdog fires. This can happen in a heavily loaded, multi-core virtual machine. Reported-by: [email protected] Signed-off-by: Barret Rhoden <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
This commit is contained in:
1 parent
3a4ac121c2
commit
2ed6edd33a
1 file changed
+14
-9
+14
-9
@@ -95,11 +95,11 @@ static void remote_function(void *data)
|
||||
* @info: the function call argument
|
||||
*
|
||||
* Calls the function @func when the task is currently running. This might
|
||||
* be on the current CPU, which just calls the function directly
|
||||
* be on the current CPU, which just calls the function directly. This will
|
||||
* retry due to any failures in smp_call_function_single(), such as if the
|
||||
* task_cpu() goes offline concurrently.
|
||||
*
|
||||
* returns: @func return value, or
|
||||
* -ESRCH - when the process isn't running
|
||||
* -EAGAIN - when the process moved away
|
||||
* returns @func return value or -ESRCH when the process isn't running
|
||||
*/
|
||||
static int
|
||||
task_function_call(struct task_struct *p, remote_function_f func, void *info)
|
||||
@@ -112,11 +112,16 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)
|
||||
};
|
||||
int ret;
|
||||
|
||||
do {
|
||||
ret = smp_call_function_single(task_cpu(p), remote_function, &data, 1);
|
||||
if (!ret)
|
||||
ret = data.ret;
|
||||
} while (ret == -EAGAIN);
|
||||
for (;;) {
|
||||
ret = smp_call_function_single(task_cpu(p), remote_function,
|
||||
&data, 1);
|
||||
ret = !ret ? data.ret : -EAGAIN;
|
||||
|
||||
if (ret != -EAGAIN)
|
||||
break;
|
||||
|
||||
cond_resched();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user