perf/ftrace: system_wide collection is not effective by default
PATCH 1/1 perf/ftrace: system_wide collection is not effective by default
The ftrace.target.system_wide must be set before invoking evlist__create_maps(), otherwise it has no effect.
--- tools/perf/builtin-ftrace.c | 45 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-)
tools/perf/builtin-ftrace.c +24 -21
@@ -1115,6 +1115,7 @@ enum perf_ftrace_subcommand {int cmd_ftrace (int argc,const char **argv) {int ret; +int (*cmd_func)(struct perf_ftrace *) =NULL ;struct perf_ftrace ftrace = { .tracer =DEFAULT_TRACER , .target = { .uid =UINT_MAX , },
@@ -1221,6 +1222,28 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_filters; } +switch (subcmd) { +case PERF_FTRACE_TRACE : +if (!argc &&target__none (&ftrace.target)) + ftrace.target.system_wide = true; + cmd_func = __cmd_ftrace; +break ; +case PERF_FTRACE_LATENCY : +if (list_empty (&ftrace.filters)) { +pr_err ("Should provide a function to measure\n" ); +parse_options_usage (ftrace_usage, options,"T" ,1 ); + ret = -EINVAL ; + goto out_delete_evlist; + } + cmd_func = __cmd_latency; +break ; +case PERF_FTRACE_NONE : +default : +pr_err ("Invalid subcommand\n" ); + ret = -EINVAL ; + goto out_delete_evlist; + } + ret =target__validate (&ftrace.target);if (ret) {char errbuf[512 ];
@@ -1248,27 +1271,7 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_evlist; } -switch (subcmd) { -case PERF_FTRACE_TRACE : -if (!argc &&target__none (&ftrace.target)) - ftrace.target.system_wide = true; - ret =__cmd_ftrace (&ftrace); -break ; -case PERF_FTRACE_LATENCY : -if (list_empty (&ftrace.filters)) { -pr_err ("Should provide a function to measure\n" ); -parse_options_usage (ftrace_usage, options,"T" ,1 ); - ret = -EINVAL ; - goto out_delete_evlist; - } - ret =__cmd_latency (&ftrace); -break ; -case PERF_FTRACE_NONE : -default : -pr_err ("Invalid subcommand\n" ); - ret = -EINVAL ; -break ; - } + ret =cmd_func (&ftrace); out_delete_evlist:evlist__delete (ftrace.evlist);
Signature · 1 line
2.32.0
Namhyung Kim
maintainerHello,
Quoted 3 lines · Changbin Du
The ftrace.target.system_wide must be set before invoking
evlist__create_maps(), otherwise it has no effect.
Oh, right. Thanks for pointing that out.
Quoted 20 lines
Fixes 53be50282269 ("perf ftrace: Add 'latency' subcommand")Signed-off-by Changbin Du <[email protected]>--- tools/perf/builtin-ftrace.c | 45 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-)tools/perf/builtin-ftrace.c +1
-0@@ -1115,6 +1115,7 @@ enum perf_ftrace_subcommand {int cmd_ftrace (int argc,const char **argv) {int ret; +int (*cmd_func)(struct perf_ftrace *) =NULL ;struct perf_ftrace ftrace = { .tracer =DEFAULT_TRACER , .target = { .uid =UINT_MAX , },
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1228
Quoted 7 lines
tools/perf/builtin-ftrace.c +4
-0@@ -1221,6 +1222,28 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_filters; } +switch (subcmd) { +case PERF_FTRACE_TRACE : +if (!argc &&target__none (&ftrace.target)) + ftrace.target.system_wide = true;
We can move only this part after parse_options().
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1236
Quoted 8 lines
tools/perf/builtin-ftrace.c +8
-0+ cmd_func = __cmd_ftrace; +break ; +case PERF_FTRACE_LATENCY : +if (list_empty (&ftrace.filters)) { +pr_err ("Should provide a function to measure\n" ); +parse_options_usage (ftrace_usage, options,"T" ,1 ); + ret = -EINVAL ; + goto out_delete_evlist;
Otherwise, it should go to the out_delete_filters.
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1244
Quoted 8 lines
tools/perf/builtin-ftrace.c +8
-0+ } + cmd_func = __cmd_latency; +break ; +case PERF_FTRACE_NONE : +default : +pr_err ("Invalid subcommand\n" ); + ret = -EINVAL ; + goto out_delete_evlist;
Ditto.
Thanks,
Namhyung
Quoted 37 lines
tools/perf/builtin-ftrace.c +3
-22+ } + ret =target__validate (&ftrace.target);if (ret) {char errbuf[512 ];@@ -1248,27 +1271,7 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_evlist; } -switch (subcmd) { -case PERF_FTRACE_TRACE : -if (!argc &&target__none (&ftrace.target)) - ftrace.target.system_wide = true; - ret =__cmd_ftrace (&ftrace); -break ; -case PERF_FTRACE_LATENCY : -if (list_empty (&ftrace.filters)) { -pr_err ("Should provide a function to measure\n" ); -parse_options_usage (ftrace_usage, options,"T" ,1 ); - ret = -EINVAL ; - goto out_delete_evlist; - } - ret =__cmd_latency (&ftrace); -break ; -case PERF_FTRACE_NONE : -default : -pr_err ("Invalid subcommand\n" ); - ret = -EINVAL ; -break ; - } + ret =cmd_func (&ftrace); out_delete_evlist:evlist__delete (ftrace.evlist); --2.32.0
Quoted 32 lines · Namhyung Kim
Hello,
Quoted 3 lines · Changbin Du
The ftrace.target.system_wide must be set before invoking
evlist__create_maps(), otherwise it has no effect.Oh, right. Thanks for pointing that out.
Quoted 23 lines
Fixes 53be50282269 ("perf ftrace: Add 'latency' subcommand")Signed-off-by Changbin Du <[email protected]>--- tools/perf/builtin-ftrace.c | 45 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-)tools/perf/builtin-ftrace.c +1
-0@@ -1115,6 +1115,7 @@ enum perf_ftrace_subcommand {int cmd_ftrace (int argc,const char **argv) {int ret; +int (*cmd_func)(struct perf_ftrace *) =NULL ;struct perf_ftrace ftrace = { .tracer =DEFAULT_TRACER , .target = { .uid =UINT_MAX , },@@ -1221,6 +1222,28 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_filters; }
Quoted 7 lines
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1228
Quoted 4 lines
tools/perf/builtin-ftrace.c +4
-0+switch (subcmd) { +case PERF_FTRACE_TRACE : +if (!argc &&target__none (&ftrace.target)) + ftrace.target.system_wide = true;We can move only this part after
parse_options().
I prefer that all parsing works get be done first. :)
Quoted 11 lines
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1236
Quoted 8 lines
tools/perf/builtin-ftrace.c +8
-0+ cmd_func = __cmd_ftrace; +break ; +case PERF_FTRACE_LATENCY : +if (list_empty (&ftrace.filters)) { +pr_err ("Should provide a function to measure\n" ); +parse_options_usage (ftrace_usage, options,"T" ,1 ); + ret = -EINVAL ; + goto out_delete_evlist;Otherwise, it should go to the
out_delete_filters.
yes, will fix it.
Quoted 11 lines
tools/perf/builtin-ftrace.c int cmd_ftrace(int argc, const char **argv) · line 1244
Quoted 8 lines
tools/perf/builtin-ftrace.c +8
-0+ } + cmd_func = __cmd_latency; +break ; +case PERF_FTRACE_NONE : +default : +pr_err ("Invalid subcommand\n" ); + ret = -EINVAL ; + goto out_delete_evlist;Ditto.
okay.
Quoted 41 lines
Thanks,
NamhyungQuoted 37 lines
tools/perf/builtin-ftrace.c +3
-22+ } + ret =target__validate (&ftrace.target);if (ret) {char errbuf[512 ];@@ -1248,27 +1271,7 @@ int cmd_ftrace(int argc, const char **argv) goto out_delete_evlist; } -switch (subcmd) { -case PERF_FTRACE_TRACE : -if (!argc &&target__none (&ftrace.target)) - ftrace.target.system_wide = true; - ret =__cmd_ftrace (&ftrace); -break ; -case PERF_FTRACE_LATENCY : -if (list_empty (&ftrace.filters)) { -pr_err ("Should provide a function to measure\n" ); -parse_options_usage (ftrace_usage, options,"T" ,1 ); - ret = -EINVAL ; - goto out_delete_evlist; - } - ret =__cmd_latency (&ftrace); -break ; -case PERF_FTRACE_NONE : -default : -pr_err ("Invalid subcommand\n" ); - ret = -EINVAL ; -break ; - } + ret =cmd_func (&ftrace); out_delete_evlist:evlist__delete (ftrace.evlist); --2.32.0
Signature · 2 lines
Cheers, Changbin Du