* [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition
@ 2023-06-26 20:16 Jiri Olsa
2023-06-26 20:58 ` Namhyung Kim
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2023-06-26 20:16 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Namhyung Kim
Cc: lkml, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Ian Rogers, Adrian Hunter, linux-perf-users
Namhyung reported segfault in perf daemon start command.
It's caused by extra check on argv[0] which is set to NULL by previous
__cmd_start call. Adding missing else to skip the extra check.
Fixes: 92294b906e6c ("perf daemon: Dynamically allocate path to perf")
Reported-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-daemon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index f5674d824a40..83954af36753 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
if (argc) {
if (!strcmp(argv[0], "start"))
ret = __cmd_start(&__daemon, daemon_options, argc, argv);
- if (!strcmp(argv[0], "signal"))
+ else if (!strcmp(argv[0], "signal"))
ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
else if (!strcmp(argv[0], "stop"))
ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition
2023-06-26 20:16 [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition Jiri Olsa
@ 2023-06-26 20:58 ` Namhyung Kim
2023-06-27 8:35 ` Jiri Olsa
0 siblings, 1 reply; 4+ messages in thread
From: Namhyung Kim @ 2023-06-26 20:58 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, lkml, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Ian Rogers, Adrian Hunter,
linux-perf-users
Hi Jiri,
On Mon, Jun 26, 2023 at 1:16 PM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Namhyung reported segfault in perf daemon start command.
>
> It's caused by extra check on argv[0] which is set to NULL by previous
> __cmd_start call. Adding missing else to skip the extra check.
>
> Fixes: 92294b906e6c ("perf daemon: Dynamically allocate path to perf")
> Reported-by: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Thanks for the fix. Now it runs ok.
Before:
$ sudo ./perf test -v daemon
85: daemon operations :
--- start ---
test child forked, pid 82420
test daemon list
./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
perf daemon start --config ${config}
test daemon reconfig
./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
perf daemon start --config ${config}
test daemon stop
./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
perf daemon start --config ${config}
test daemon signal
./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
perf daemon start --config ${config}
signal 12 sent to session 'test [82676]'
signal 12 sent to session 'test [82676]'
test daemon ping
./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
perf daemon start --config ${config}
test daemon lock
./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
perf daemon start --config ${config}
test child finished with 0
---- end ----
daemon operations: Ok
Maybe we need to investigate more why it was ok..
But at least I don't see segfaults anymore
After:
85: daemon operations :
--- start ---
test child forked, pid 80752
test daemon list
test daemon reconfig
test daemon stop
test daemon signal
signal 12 sent to session 'test [81022]'
signal 12 sent to session 'test [81022]'
test daemon ping
test daemon lock
test child finished with 0
---- end ----
daemon operations: Ok
Tested-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
> ---
> tools/perf/builtin-daemon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
> index f5674d824a40..83954af36753 100644
> --- a/tools/perf/builtin-daemon.c
> +++ b/tools/perf/builtin-daemon.c
> @@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
> if (argc) {
> if (!strcmp(argv[0], "start"))
> ret = __cmd_start(&__daemon, daemon_options, argc, argv);
> - if (!strcmp(argv[0], "signal"))
> + else if (!strcmp(argv[0], "signal"))
> ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
> else if (!strcmp(argv[0], "stop"))
> ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition
2023-06-26 20:58 ` Namhyung Kim
@ 2023-06-27 8:35 ` Jiri Olsa
2023-06-27 19:33 ` Namhyung Kim
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2023-06-27 8:35 UTC (permalink / raw)
To: Namhyung Kim
Cc: Arnaldo Carvalho de Melo, lkml, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Ian Rogers, Adrian Hunter,
linux-perf-users
On Mon, Jun 26, 2023 at 01:58:48PM -0700, Namhyung Kim wrote:
> Hi Jiri,
>
> On Mon, Jun 26, 2023 at 1:16 PM Jiri Olsa <jolsa@kernel.org> wrote:
> >
> > Namhyung reported segfault in perf daemon start command.
> >
> > It's caused by extra check on argv[0] which is set to NULL by previous
> > __cmd_start call. Adding missing else to skip the extra check.
> >
> > Fixes: 92294b906e6c ("perf daemon: Dynamically allocate path to perf")
> > Reported-by: Namhyung Kim <namhyung@kernel.org>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>
> Thanks for the fix. Now it runs ok.
>
> Before:
> $ sudo ./perf test -v daemon
> 85: daemon operations :
> --- start ---
> test child forked, pid 82420
> test daemon list
> ./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
> perf daemon start --config ${config}
> test daemon reconfig
> ./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
> perf daemon start --config ${config}
> test daemon stop
> ./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
> perf daemon start --config ${config}
> test daemon signal
> ./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
> perf daemon start --config ${config}
> signal 12 sent to session 'test [82676]'
> signal 12 sent to session 'test [82676]'
> test daemon ping
> ./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
> perf daemon start --config ${config}
> test daemon lock
> ./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
> perf daemon start --config ${config}
> test child finished with 0
> ---- end ----
> daemon operations: Ok
>
> Maybe we need to investigate more why it was ok..
> But at least I don't see segfaults anymore
yea, for some reason parse_options would put NULL into argv[0]
I'll try to check what changed, in any case the fix makes the
condition alligned with the other legs and fixes the segfault
jirka
>
>
> After:
> 85: daemon operations :
> --- start ---
> test child forked, pid 80752
> test daemon list
> test daemon reconfig
> test daemon stop
> test daemon signal
> signal 12 sent to session 'test [81022]'
> signal 12 sent to session 'test [81022]'
> test daemon ping
> test daemon lock
> test child finished with 0
> ---- end ----
> daemon operations: Ok
>
>
> Tested-by: Namhyung Kim <namhyung@kernel.org>
>
> Thanks,
> Namhyung
>
>
>
> > ---
> > tools/perf/builtin-daemon.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
> > index f5674d824a40..83954af36753 100644
> > --- a/tools/perf/builtin-daemon.c
> > +++ b/tools/perf/builtin-daemon.c
> > @@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
> > if (argc) {
> > if (!strcmp(argv[0], "start"))
> > ret = __cmd_start(&__daemon, daemon_options, argc, argv);
> > - if (!strcmp(argv[0], "signal"))
> > + else if (!strcmp(argv[0], "signal"))
> > ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
> > else if (!strcmp(argv[0], "stop"))
> > ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
> > --
> > 2.41.0
> >
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition
2023-06-27 8:35 ` Jiri Olsa
@ 2023-06-27 19:33 ` Namhyung Kim
0 siblings, 0 replies; 4+ messages in thread
From: Namhyung Kim @ 2023-06-27 19:33 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, lkml, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Ian Rogers, Adrian Hunter,
linux-perf-users
On Tue, Jun 27, 2023 at 1:35 AM Jiri Olsa <olsajiri@gmail.com> wrote:
>
> On Mon, Jun 26, 2023 at 01:58:48PM -0700, Namhyung Kim wrote:
> > Hi Jiri,
> >
> > On Mon, Jun 26, 2023 at 1:16 PM Jiri Olsa <jolsa@kernel.org> wrote:
> > >
> > > Namhyung reported segfault in perf daemon start command.
> > >
> > > It's caused by extra check on argv[0] which is set to NULL by previous
> > > __cmd_start call. Adding missing else to skip the extra check.
> > >
> > > Fixes: 92294b906e6c ("perf daemon: Dynamically allocate path to perf")
> > > Reported-by: Namhyung Kim <namhyung@kernel.org>
> > > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> >
> > Thanks for the fix. Now it runs ok.
> >
> > Before:
> > $ sudo ./perf test -v daemon
> > 85: daemon operations :
> > --- start ---
> > test child forked, pid 82420
> > test daemon list
> > ./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
> > perf daemon start --config ${config}
> > test daemon reconfig
> > ./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
> > perf daemon start --config ${config}
> > test daemon stop
> > ./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
> > perf daemon start --config ${config}
> > test daemon signal
> > ./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
> > perf daemon start --config ${config}
> > signal 12 sent to session 'test [82676]'
> > signal 12 sent to session 'test [82676]'
> > test daemon ping
> > ./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
> > perf daemon start --config ${config}
> > test daemon lock
> > ./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
> > perf daemon start --config ${config}
> > test child finished with 0
> > ---- end ----
> > daemon operations: Ok
> >
> > Maybe we need to investigate more why it was ok..
> > But at least I don't see segfaults anymore
>
> yea, for some reason parse_options would put NULL into argv[0]
>
> I'll try to check what changed, in any case the fix makes the
> condition alligned with the other legs and fixes the segfault
Yep, thanks for checking.
In the meantime, Thomas Richter reported the same problem and
fix. I'll take yours but leave it for the record.
http://lore.kernel.org/r/20230627092633.2135105-1-tmricht@linux.ibm.com
Applied to perf-tools-next, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-27 19:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-26 20:16 [PATCH] perf tools: Add missing else to cmd_daemon subcommand condition Jiri Olsa
2023-06-26 20:58 ` Namhyung Kim
2023-06-27 8:35 ` Jiri Olsa
2023-06-27 19:33 ` Namhyung Kim
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).