Skip to content

Commit

Permalink
perf: Add cond_resched() to task_function_call()
Browse files Browse the repository at this point in the history
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]
  • Loading branch information
Barret Rhoden authored and Peter Zijlstra committed Apr 30, 2020
1 parent 3a4ac12 commit 2ed6edd
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions kernel/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down

0 comments on commit 2ed6edd

Please sign in to comment.