* [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug
@ 2020-08-26 14:54 Kajol Jain
2020-08-26 15:14 ` Barret Rhoden
2020-08-27 5:47 ` Srikar Dronamraju
0 siblings, 2 replies; 3+ messages in thread
From: Kajol Jain @ 2020-08-26 14:54 UTC (permalink / raw)
To: acme, peterz
Cc: jolsa, linux-kernel, linux-perf-users, maddy, mingo,
mark.rutland, alexander.shishkin, namhyung, daniel, brho, srikar,
kjain
Commit 2ed6edd33a21 ("perf: Add cond_resched() to task_function_call()")
added assignment of ret value as -EAGAIN in case function
call to 'smp_call_function_single' fails.
For non-zero ret value, it did
'ret = !ret ? data.ret : -EAGAIN;', which always
assign -EAGAIN to ret and make second if condition useless.
In scenarios like when executing a perf stat with --per-thread option, and
if any of the monitoring cpu goes offline, the 'smp_call_function_single'
function could return -ENXIO, and with the above check,
task_function_call hung and increases CPU
usage (because of repeated 'smp_call_function_single()')
Recration scenario:
# perf stat -a --per-thread && (offline a CPU )
Patch here removes the tertiary condition added as part of that
commit and added a check for NULL and -EAGAIN.
Fixes: 2ed6edd33a21("perf: Add cond_resched() to task_function_call()")
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
Reported-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---
kernel/events/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changelog:
- Remove addition of else in the first patch for
if(ret != -EAGAIN) condition.
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 856d98c36f56..fe104fee097a 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -115,8 +115,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)
for (;;) {
ret = smp_call_function_single(task_cpu(p), remote_function,
&data, 1);
- ret = !ret ? data.ret : -EAGAIN;
-
+ if(!ret)
+ ret = data.ret;
if (ret != -EAGAIN)
break;
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug
2020-08-26 14:54 [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug Kajol Jain
@ 2020-08-26 15:14 ` Barret Rhoden
2020-08-27 5:47 ` Srikar Dronamraju
1 sibling, 0 replies; 3+ messages in thread
From: Barret Rhoden @ 2020-08-26 15:14 UTC (permalink / raw)
To: Kajol Jain, acme, peterz
Cc: jolsa, linux-kernel, linux-perf-users, maddy, mingo,
mark.rutland, alexander.shishkin, namhyung, daniel, srikar
Hi -
On 8/26/20 10:54 AM, Kajol Jain wrote:
> Commit 2ed6edd33a21 ("perf: Add cond_resched() to task_function_call()")
> added assignment of ret value as -EAGAIN in case function
> call to 'smp_call_function_single' fails.
> For non-zero ret value, it did
> 'ret = !ret ? data.ret : -EAGAIN;', which always
> assign -EAGAIN to ret and make second if condition useless.
>
> In scenarios like when executing a perf stat with --per-thread option, and
> if any of the monitoring cpu goes offline, the 'smp_call_function_single'
> function could return -ENXIO, and with the above check,
> task_function_call hung and increases CPU
> usage (because of repeated 'smp_call_function_single()')
>
> Recration scenario:
> # perf stat -a --per-thread && (offline a CPU )
>
> Patch here removes the tertiary condition added as part of that
> commit and added a check for NULL and -EAGAIN.
>
> Fixes: 2ed6edd33a21("perf: Add cond_resched() to task_function_call()")
> Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
> Reported-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
> ---
> kernel/events/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Changelog:
> - Remove addition of else in the first patch for
> if(ret != -EAGAIN) condition.
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 856d98c36f56..fe104fee097a 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -115,8 +115,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)
> for (;;) {
> ret = smp_call_function_single(task_cpu(p), remote_function,
> &data, 1);
> - ret = !ret ? data.ret : -EAGAIN;
> -
> + if(!ret)
^
Minor nit, you need a space after the if.
Also, the comment for the function says it returns @func's return val or
-ESRCH. You could also add -ENXIO to that.
Thanks for the fix.
Reviewed-by: Barret Rhoden <brho@google.com>
> + ret = data.ret;
> if (ret != -EAGAIN)
> break;
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug
2020-08-26 14:54 [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug Kajol Jain
2020-08-26 15:14 ` Barret Rhoden
@ 2020-08-27 5:47 ` Srikar Dronamraju
1 sibling, 0 replies; 3+ messages in thread
From: Srikar Dronamraju @ 2020-08-27 5:47 UTC (permalink / raw)
To: Kajol Jain
Cc: acme, peterz, jolsa, linux-kernel, linux-perf-users, maddy,
mingo, mark.rutland, alexander.shishkin, namhyung, daniel, brho
* Kajol Jain <kjain@linux.ibm.com> [2020-08-26 20:24:11]:
> Commit 2ed6edd33a21 ("perf: Add cond_resched() to task_function_call()")
> added assignment of ret value as -EAGAIN in case function
> call to 'smp_call_function_single' fails.
> For non-zero ret value, it did
> 'ret = !ret ? data.ret : -EAGAIN;', which always
> assign -EAGAIN to ret and make second if condition useless.
>
> In scenarios like when executing a perf stat with --per-thread option, and
> if any of the monitoring cpu goes offline, the 'smp_call_function_single'
> function could return -ENXIO, and with the above check,
> task_function_call hung and increases CPU
> usage (because of repeated 'smp_call_function_single()')
>
> Recration scenario:
> # perf stat -a --per-thread && (offline a CPU )
>
> Patch here removes the tertiary condition added as part of that
> commit and added a check for NULL and -EAGAIN.
>
> Fixes: 2ed6edd33a21("perf: Add cond_resched() to task_function_call()")
> Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
> Reported-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Tested-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
--
Thanks and Regards
Srikar Dronamraju
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-27 5:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-26 14:54 [RFC v2] perf/core: Fixes hung issue on perf stat command during cpu hotplug Kajol Jain
2020-08-26 15:14 ` Barret Rhoden
2020-08-27 5:47 ` Srikar Dronamraju
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).