perf sched: Prefer sched_waking event when it exists
PATCH 1/2 perf sched: Prefer sched_waking event when it exists
Commit fbd705a0c618 ("sched: Introduce the 'trace_sched_waking' tracepoint") added sched_waking tracepoint which should be preferred over sched_wakeup when analyzing scheduling delays.
Update 'perf sched record' to collect sched_waking events if it exists and fallback to sched_wakeup if it does not. Similarly, update timehist command to skip sched_wakeup events if the session includes sched_waking (ie., sched_waking is preferred over sched_wakeup).
--- tools/perf/builtin-sched.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)
tools/perf/builtin-sched.c +29 -3
@@ -2398,6 +2398,15 @@ static void timehist_print_wakeup_event(struct perf_sched *sched,printf ("\n" ); } +static int timehist_sched_wakeup_ignore (struct perf_tool *tool__maybe_unused , +union perf_event *event__maybe_unused , +struct evsel *evsel__maybe_unused , +struct perf_sample *sample__maybe_unused , +struct machine *machine__maybe_unused ) +{ +return 0 ; +} + static int timehist_sched_wakeup_event(struct perf_tool *tool, union perf_event *event __maybe_unused, struct evsel *evsel,
@@ -2958,9 +2967,10 @@ static int timehist_check_attr(struct perf_sched *sched,static int perf_sched__timehist (struct perf_sched *sched) { -const struct evsel_str_handler handlers[] = { +struct evsel_str_handler handlers[] = { {"sched:sched_switch" , timehist_sched_switch_event, }, {"sched:sched_wakeup" , timehist_sched_wakeup_event, }, + {"sched:sched_waking" , timehist_sched_wakeup_event, }, {"sched:sched_wakeup_new" , timehist_sched_wakeup_event, }, };const struct evsel_str_handler migrate_handlers[] = {
@@ -3018,6 +3028,11 @@ static int perf_sched__timehist(struct perf_sched *sched)setup_pager (); +/* prefer sched_waking if it is captured */ +if (perf_evlist__find_tracepoint_by_name (session->evlist, +"sched:sched_waking" )) + handlers[1 ].handler = timehist_sched_wakeup_ignore; +/* setup per-evsel handlers */ if (perf_session__set_tracepoints_handlers (session, handlers)) goto out;
@@ -3330,12 +3345,16 @@ static int __cmd_record(int argc, const char **argv)"-e" ,"sched:sched_stat_iowait" ,"-e" ,"sched:sched_stat_runtime" ,"-e" ,"sched:sched_process_fork" , -"-e" ,"sched:sched_wakeup" ,"-e" ,"sched:sched_wakeup_new" , "-e", "sched:sched_migrate_task", }; +struct tep_event *waking_event; - rec_argc =ARRAY_SIZE (record_args) + argc -1 ; +/* +* +2 for either "-e", "sched:sched_wakeup" or +* "-e", "sched:sched_waking" +*/ + rec_argc =ARRAY_SIZE (record_args) +2 + argc -1 ; rec_argv =calloc (rec_argc +1 ,sizeof (char *));if (rec_argv ==NULL )
@@ -3344,6 +3363,13 @@ static int __cmd_record(int argc, const char **argv)for (i =0 ; i <ARRAY_SIZE (record_args); i++) rec_argv[i] =strdup (record_args[i]); + rec_argv[i++] ="-e" ; + waking_event =trace_event__tp_format ("sched" ,"sched_waking" ); +if (!IS_ERR (waking_event)) + rec_argv[i++] =strdup ("sched:sched_waking" ); +else + rec_argv[i++] =strdup ("sched:sched_wakeup" ); +for (j =1 ; j < (unsigned int )argc; j++, i++) rec_argv[i] = argv[j];
Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerEm Fri, Aug 07, 2020 at 10:48:44AM -0600, David Ahern escreveu:
Quoted 47 lines
Commit
fbd705a0c618("sched: Introduce the 'trace_sched_waking' tracepoint") addedsched_wakingtracepoint which should be preferred oversched_wakeupwhen analyzing scheduling delays.Update 'perf sched record' to collect
sched_wakingevents if it exists and fallback tosched_wakeupif it does not. Similarly, update timehist command to skipsched_wakeupevents if the session includessched_waking(ie.,sched_wakingis preferred oversched_wakeup).Signed-off-by David Ahern <[email protected]>--- tools/perf/builtin-sched.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)tools/perf/builtin-sched.c +11
-1@@ -2398,6 +2398,15 @@ static void timehist_print_wakeup_event(struct perf_sched *sched,printf ("\n" ); } +static int timehist_sched_wakeup_ignore (struct perf_tool *tool__maybe_unused , +union perf_event *event__maybe_unused , +struct evsel *evsel__maybe_unused , +struct perf_sample *sample__maybe_unused , +struct machine *machine__maybe_unused ) +{ +return 0 ; +} + static int timehist_sched_wakeup_event(struct perf_tool *tool, union perf_event *event __maybe_unused, struct evsel *evsel,@@ -2958,9 +2967,10 @@ static int timehist_check_attr(struct perf_sched *sched,static int perf_sched__timehist (struct perf_sched *sched) { -const struct evsel_str_handler handlers[] = { +struct evsel_str_handler handlers[] = { {"sched:sched_switch" , timehist_sched_switch_event, }, {"sched:sched_wakeup" , timehist_sched_wakeup_event, }, + {"sched:sched_waking" , timehist_sched_wakeup_event, }, {"sched:sched_wakeup_new" , timehist_sched_wakeup_event, }, };const struct evsel_str_handler migrate_handlers[] = {
tools/perf/builtin-sched.c static int perf_sched__timehist(struct perf_sched *sched) · line 3035
Quoted 8 lines
tools/perf/builtin-sched.c +5
-0@@ -3018,6 +3028,11 @@ static int perf_sched__timehist(struct perf_sched *sched)setup_pager (); +/* prefer sched_waking if it is captured */ +if (perf_evlist__find_tracepoint_by_name (session->evlist, +"sched:sched_waking" )) + handlers[1 ].handler = timehist_sched_wakeup_ignore; +
ouch, can't we figure out if its present and then don't ask for the wakeup one to be recorded?
- Arnaldo
Quoted 39 lines
tools/perf/builtin-sched.c +13
-2/* setup per-evsel handlers */ if (perf_session__set_tracepoints_handlers (session, handlers)) goto out;@@ -3330,12 +3345,16 @@ static int __cmd_record(int argc, const char **argv)"-e" ,"sched:sched_stat_iowait" ,"-e" ,"sched:sched_stat_runtime" ,"-e" ,"sched:sched_process_fork" , -"-e" ,"sched:sched_wakeup" ,"-e" ,"sched:sched_wakeup_new" , "-e", "sched:sched_migrate_task", }; +struct tep_event *waking_event; - rec_argc =ARRAY_SIZE (record_args) + argc -1 ; +/* +* +2 for either "-e", "sched:sched_wakeup" or +* "-e", "sched:sched_waking" +*/ + rec_argc =ARRAY_SIZE (record_args) +2 + argc -1 ; rec_argv =calloc (rec_argc +1 ,sizeof (char *));if (rec_argv ==NULL )@@ -3344,6 +3363,13 @@ static int __cmd_record(int argc, const char **argv)for (i =0 ; i <ARRAY_SIZE (record_args); i++) rec_argv[i] =strdup (record_args[i]); + rec_argv[i++] ="-e" ; + waking_event =trace_event__tp_format ("sched" ,"sched_waking" ); +if (!IS_ERR (waking_event)) + rec_argv[i++] =strdup ("sched:sched_waking" ); +else + rec_argv[i++] =strdup ("sched:sched_wakeup" ); +for (j =1 ; j < (unsigned int )argc; j++, i++) rec_argv[i] = argv[j];Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
Quoted 16 lines · Arnaldo Carvalho de Melo
Quoted 16 lines
tools/perf/builtin-sched.c +2
-1@@ -2958,9 +2967,10 @@ static int timehist_check_attr(struct perf_sched *sched,static int perf_sched__timehist (struct perf_sched *sched) { -const struct evsel_str_handler handlers[] = { +struct evsel_str_handler handlers[] = { {"sched:sched_switch" , timehist_sched_switch_event, }, {"sched:sched_wakeup" , timehist_sched_wakeup_event, }, + {"sched:sched_waking" , timehist_sched_wakeup_event, }, {"sched:sched_wakeup_new" , timehist_sched_wakeup_event, }, };const struct evsel_str_handler migrate_handlers[] = {@@ -3018,6 +3028,11 @@ static int perf_sched__timehist(struct perf_sched *sched)setup_pager ();
Quoted 10 lines
tools/perf/builtin-sched.c static int perf_sched__timehist(struct perf_sched *sched) · line 3035
Quoted 5 lines
tools/perf/builtin-sched.c +5
-0+/* prefer sched_waking if it is captured */ +if (perf_evlist__find_tracepoint_by_name (session->evlist, +"sched:sched_waking" )) + handlers[1 ].handler = timehist_sched_wakeup_ignore; +ouch, can't we figure out if its present and then don't ask for the wakeup one to be recorded?
This is the analysis side. If someone recorded with sched:* we do not want to analyze both sched_wakeup and sched_waking. Rather, it should prefer the latter and ignore the former.
Arnaldo Carvalho de Melo
maintainerEm Fri, Aug 07, 2020 at 01:50:47PM -0600, David Ahern escreveu:
Quoted 28 lines · Arnaldo Carvalho de Melo
Quoted 16 lines
Quoted 16 lines
tools/perf/builtin-sched.c +2
-1@@ -2958,9 +2967,10 @@ static int timehist_check_attr(struct perf_sched *sched,static int perf_sched__timehist (struct perf_sched *sched) { -const struct evsel_str_handler handlers[] = { +struct evsel_str_handler handlers[] = { {"sched:sched_switch" , timehist_sched_switch_event, }, {"sched:sched_wakeup" , timehist_sched_wakeup_event, }, + {"sched:sched_waking" , timehist_sched_wakeup_event, }, {"sched:sched_wakeup_new" , timehist_sched_wakeup_event, }, };const struct evsel_str_handler migrate_handlers[] = {@@ -3018,6 +3028,11 @@ static int perf_sched__timehist(struct perf_sched *sched)setup_pager ();Quoted 10 lines
tools/perf/builtin-sched.c static int perf_sched__timehist(struct perf_sched *sched) · line 3035
Quoted 5 lines
tools/perf/builtin-sched.c +5
-0+/* prefer sched_waking if it is captured */ +if (perf_evlist__find_tracepoint_by_name (session->evlist, +"sched:sched_waking" )) + handlers[1 ].handler = timehist_sched_wakeup_ignore; +ouch, can't we figure out if its present and then don't ask for the wakeup one to be recorded?
Quoted 3 lines
This is the analysis side. If someone recorded with sched:* we do not want to analyze both
sched_wakeupandsched_waking. Rather, it should prefer the latter and ignore the former.
Right you are, thans for the explanation, I should've noticed that :)
- Arnaldoi
Hi David,
Quoted 11 lines · David Ahern
Commit
fbd705a0c618("sched: Introduce the 'trace_sched_waking' tracepoint") addedsched_wakingtracepoint which should be preferred oversched_wakeupwhen analyzing scheduling delays.Update 'perf sched record' to collect
sched_wakingevents if it exists and fallback tosched_wakeupif it does not. Similarly, update timehist command to skipsched_wakeupevents if the session includessched_waking(ie.,sched_wakingis preferred oversched_wakeup).Signed-off-by David Ahern <[email protected]>
Thanks
Namhyung
Em Tue, Aug 11, 2020 at 03:42:45PM +0900, Namhyung Kim escreveu:
Quoted 8 lines
Hi David,
Quoted 5 lines · David Ahern
Commit
fbd705a0c618("sched: Introduce the 'trace_sched_waking' tracepoint") addedsched_wakingtracepoint which should be preferred oversched_wakeupwhen analyzing scheduling delays.
Quoted 8 lines
Quoted 6 lines
Update 'perf sched record' to collect
sched_wakingevents if it exists and fallback tosched_wakeupif it does not. Similarly, update timehist command to skipsched_wakeupevents if the session includessched_waking(ie.,sched_wakingis preferred oversched_wakeup).Signed-off-by David Ahern <[email protected]>Acked-by Namhyung Kim <[email protected]>
Thanks, applied.
- Arnaldo