perf record: Preparation for sideband injection
Adrian Hunter
reviewercover perf record: Preparation for sideband injection
Hi
Here are some small patches in preparation for "sideband injection".
I hope to run perf record in a virtual machine to capture sideband events while simulataneously running perf record with Intel PT on the host, and then subsequently inject the sideband events from the guest perf.data file into the host perf.data file, so that decoding can decode the Intel PT trace for the periods when the guest is running user space (kernel space is already decodable).
The patches are changes I have found so far that will be needed.
Adrian Hunter (5):
perf record: Always get text_poke events with --kcore option perf record: Always record id index
perf record: Add new option to sample identifier perf record: Add finished init event
perf script: Add some missing event dumps
tools/lib/perf/include/perf/event.h | 1 + tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 44 +++++++++++++++++++++++++++----- tools/perf/builtin-script.c | 6 +++++ tools/perf/util/event.c | 1 + tools/perf/util/header.c | 3 +++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/session.c | 4 +++ tools/perf/util/synthetic-events.c | 7 +++-- tools/perf/util/tool.h | 3 ++- 12 files changed, 65 insertions(+), 11 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH 1/5 perf record: Always get text_poke events with --kcore option
kcore provides a copy of the running kernel including any modified code. A trace that benefits from that also benefits from text_poke events, so enable them.
--- tools/perf/builtin-record.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-record.c +3 -0
@@ -3805,6 +3805,9 @@ int cmd_record(int argc, const char **argv) goto out_opts; } +if (rec->opts.kcore) + rec->opts.text_poke = true; +if (rec->opts.kcore ||record__threads_enabled (rec)) rec->data.is_dir = true;
Signature · 1 line
2.25.1
Adrian Hunter
reviewerPATCH 2/5 perf record: Always record id index
In reply to Adrian HunterIn preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
Adjust the logic so that if there are IDs then the id index is recorded.
--- tools/perf/builtin-record.c | 12 +++++------- tools/perf/util/synthetic-events.c | 7 +++++-- 2 files changed, 10 insertions(+), 9 deletions(-)
tools/perf/builtin-record.c +5 -7
@@ -1834,13 +1834,11 @@ static int record__synthesize(struct record *rec, bool tail) goto out;/* Synthesize id_index before auxtrace_info */ -if (rec->opts.auxtrace_sample_mode || rec->opts.full_auxtrace) { - err =perf_event__synthesize_id_index (tool, - process_synthesized_event, - session->evlist, machine); -if (err) - goto out; - } + err =perf_event__synthesize_id_index (tool, + process_synthesized_event, + session->evlist, machine); +if (err) + goto out;if (rec->opts.full_auxtrace) { err = perf_event__synthesize_auxtrace_info(rec->itr, tool,
tools/perf/util/synthetic-events.c +5 -2
@@ -1719,14 +1719,17 @@ int perf_event__synthesize_id_index(struct perf_tool *tool, perf_event__handler_size_t nr =0 , i =0 , sz, max_nr, n;int err; -pr_debug2 ("Synthesizing id index\n" ); - max_nr = (UINT16_MAX -sizeof (struct perf_record_id_index )) /sizeof (struct id_index_entry );evlist__for_each_entry (evlist, evsel) nr += evsel->core.ids; +if (!nr) +return 0 ; + +pr_debug2 ("Synthesizing id index\n" ); + n = nr > max_nr ? max_nr : nr; sz =sizeof (struct perf_record_id_index ) + n *sizeof (struct id_index_entry ); ev =zalloc (sz);
Signature · 1 line
2.25.1
Adrian Hunter
reviewerPATCH 3/5 perf record: Add new option to sample identifier
In reply to Adrian HunterIn preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
Add an option to always include sample type PERF_SAMPLE_IDENTIFIER.
--- tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +3 -0
@@ -313,6 +313,9 @@ OPTIONS --sample-cpu:: Record the sample cpu. +--sample-identifier:: + Record the sample identifier. + -n:: --no-samples:: Don't sample.
tools/perf/builtin-record.c +2 -0
@@ -3191,6 +3191,8 @@ static struct option __record_options[] = {OPT_BOOLEAN (0 ,"code-page-size" , &record.opts.sample_code_page_size,"Record the sampled code address (ip) page size" ),OPT_BOOLEAN (0 ,"sample-cpu" , &record.opts.sample_cpu,"Record the sample cpu" ), +OPT_BOOLEAN (0 ,"sample-identifier" , &record.opts.sample_identifier, +"Record the sample identifier" ),OPT_BOOLEAN_SET ('T' ,"timestamp" , &record.opts.sample_time, &record.opts.sample_time_set, "Record the sample timestamps"),
tools/perf/util/record.c +1 -1
@@ -121,7 +121,7 @@ void evlist__config(struct evlist *evlist, struct record_opts *opts, struct callevlist__for_each_entry (evlist, evsel)evsel__config_leader_sampling (evsel, evlist); -if (opts->full_auxtrace) { +if (opts->full_auxtrace || opts->sample_identifier) {/* * Need to be able to synthesize and parse selected events with * arbitrary sample types, which requires always being able to
tools/perf/util/record.h +1 -0
@@ -28,6 +28,7 @@ struct record_opts {bool sample_time;bool sample_time_set;bool sample_cpu; +bool sample_identifier;bool period;bool period_set;bool running_time;
Signature · 1 line
2.25.1
Adrian Hunter
reviewerPATCH 4/5 perf record: Add finished init event
In reply to Adrian HunterIn preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
This is needed to enable injecting events after the initial synthesized user events (that have an all zero id sample) but before regular events.
--- tools/lib/perf/include/perf/event.h | 1 + tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 27 +++++++++++++++++++++++++++ tools/perf/util/event.c | 1 + tools/perf/util/session.c | 4 ++++ tools/perf/util/tool.h | 3 ++- 6 files changed, 36 insertions(+), 1 deletion(-)
tools/lib/perf/include/perf/event.h +1 -0
@@ -389,6 +389,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 ,PERF_RECORD_COMPRESSED =81 , +PERF_RECORD_FINISHED_INIT =82 , PERF_RECORD_HEADER_MAX };
tools/perf/builtin-inject.c +1 -0
@@ -1059,6 +1059,7 @@ int cmd_inject(int argc, const char **argv) .stat = perf_event__repipe_op2_synth, .stat_round = perf_event__repipe_op2_synth, .feature = perf_event__repipe_op2_synth, + .finished_init = perf_event__repipe_op2_synth, .compressed = perf_event__repipe_op4_synth, .auxtrace = perf_event__repipe_auxtrace, },
tools/perf/builtin-record.c +27 -0
@@ -1388,6 +1388,11 @@ static struct perf_event_header finished_round_event = { .type = PERF_RECORD_FINISHED_ROUND, }; +static struct perf_event_header finished_init_event = { + .size =sizeof (struct perf_event_header ), + .type =PERF_RECORD_FINISHED_INIT , +}; +static void record__adjust_affinity (struct record *rec,struct mmap *map) { if (rec->opts.affinity != PERF_AFFINITY_SYS &&
@@ -1696,6 +1701,14 @@ static int record__synthesize_workload(struct record *rec, bool tail)return err; } +static int write_finished_init (struct record *rec,bool tail) +{ +if (rec->opts.tail_synthesize != tail) +return 0 ; + +return record__write (rec,NULL , &finished_init_event,sizeof (finished_init_event)); +} +static int record__synthesize (struct record *rec,bool tail); static int
@@ -1710,6 +1723,8 @@ record__switch_output(struct record *rec, bool at_exit)record__aio_mmap_read_sync (rec); +write_finished_init (rec, true); +record__synthesize (rec, true);if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);
@@ -1764,6 +1779,7 @@ record__switch_output(struct record *rec, bool at_exit)*/ if (target__none (&rec->opts.target))record__synthesize_workload (rec, false); +write_finished_init (rec, false); }return fd; }
@@ -2419,6 +2435,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)trigger_ready (&auxtrace_snapshot_trigger);trigger_ready (&switch_output_trigger);perf_hooks__invoke_record_start (); + +/* +* Must write FINISHED_INIT so it will be seen after all other +* synthesized user events, but before any regular events. +*/ + err =write_finished_init (rec, false); +if (err <0 ) + goto out_child; +for (;;) {unsigned long long hits = thread->samples;
@@ -2563,6 +2588,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)fprintf (stderr,"[ perf record: Woken up %ld times to write data ]\n" ,record__waking (rec)); +write_finished_init (rec, true); +if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);
tools/perf/util/event.c +1 -0
@@ -76,6 +76,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", [PERF_RECORD_COMPRESSED] = "COMPRESSED", + [PERF_RECORD_FINISHED_INIT] = "FINISHED_INIT", };const char *perf_event__name (unsigned int id)
tools/perf/util/session.c +4 -0
@@ -562,6 +562,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->feature = process_event_op2_stub;if (tool->compressed ==NULL ) tool->compressed = perf_session__process_compressed_event; +if (tool->finished_init ==NULL ) + tool->finished_init = process_event_op2_stub; }static void swap_sample_id_all (union perf_event *event,void *data)
@@ -1706,6 +1708,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);return err; +case PERF_RECORD_FINISHED_INIT : +return tool->finished_init (session, event);default :return -EINVAL ; }
tools/perf/util/tool.h +2 -1
@@ -76,7 +76,8 @@ struct perf_tool { stat_config, stat, stat_round, - feature; + feature, + finished_init;event_op4 compressed;event_op3 auxtrace;bool ordered_events;
Signature · 1 line
2.25.1
Adrian Hunter
reviewerPATCH 5/5 perf script: Add some missing event dumps
In reply to Adrian HunterWhen the -D option is used, the details of thread-map, cpu-map and event-update events are not currently dumped. Add prints so that they are.
Example:
# perf record --kcore sleep 0.1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.021 MB perf.data (7 samples) ] # perf script -D | grep 'THREAD\|CPU' 0 0x4950 [0x28]: PERF_RECORD_THREAD_MAP nr: 1 thread: 35116 0 0x4978 [0x20]: PERF_RECORD_CPU_MAP: 0-7 # perf script -D | grep -A4 'UPDATE' 0 0x4920 [0x30]: PERF_RECORD_EVENT_UPDATE ... id: 147 ... 0-7
--- tools/perf/builtin-script.c | 6 ++++++ tools/perf/util/header.c | 3 +++ 2 files changed, 9 insertions(+)
tools/perf/builtin-script.c +6 -0
@@ -3633,6 +3633,9 @@ int process_thread_map_event(struct perf_session *session,struct perf_tool *tool = session->tool; struct perf_script *script = container_of(tool, struct perf_script, tool); +if (dump_trace) +perf_event__fprintf_thread_map (event, stdout); +if (script->threads) {pr_warning ("Extra thread map event, ignoring.\n" );return 0 ;
@@ -3652,6 +3655,9 @@ int process_cpu_map_event(struct perf_session *session,struct perf_tool *tool = session->tool; struct perf_script *script = container_of(tool, struct perf_script, tool); +if (dump_trace) +perf_event__fprintf_cpu_map (event, stdout); +if (script->cpus) {pr_warning ("Extra cpu map event, ignoring.\n" );return 0 ;
tools/perf/util/header.c +3 -0
@@ -4349,6 +4349,9 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,struct evsel *evsel;struct perf_cpu_map *map; +if (dump_trace) +perf_event__fprintf_event_update (event, stdout); +if (!pevlist || *pevlist ==NULL )return -EINVAL ;
Signature · 1 line
2.25.1
Ian Rogers
reviewerRe: [PATCH 3/5] perf record: Add new option to sample identifier
In reply to Adrian HunterQuoted 19 lines · Adrian Hunter
In preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
Add an option to always include sample type
PERF_SAMPLE_IDENTIFIER.Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-)tools/perf/Documentation/perf-record.txt +0
-0
tools/perf/Documentation/perf-record.txt OPTIONS · line 317
Quoted 5 lines
tools/perf/Documentation/perf-record.txt +2
-0@@ -313,6 +313,9 @@ OPTIONS --sample-cpu:: Record the sample cpu. +--sample-identifier:: + Record the sample identifier.
I can see this is following the pattern of --sample-cpu above, but I'm not sure a "sample identifier" is going to be clear to a novice user. The comment adds little beyond the option name. Perhaps expand with an example?
Thanks,
Ian
Quoted 45 lines
tools/perf/Documentation/perf-record.txt +1
-0+ -n:: --no-samples:: Don't sample.tools/perf/builtin-record.c +2
-0@@ -3191,6 +3191,8 @@ static struct option __record_options[] = {OPT_BOOLEAN (0 ,"code-page-size" , &record.opts.sample_code_page_size,"Record the sampled code address (ip) page size" ),OPT_BOOLEAN (0 ,"sample-cpu" , &record.opts.sample_cpu,"Record the sample cpu" ), +OPT_BOOLEAN (0 ,"sample-identifier" , &record.opts.sample_identifier, +"Record the sample identifier" ),OPT_BOOLEAN_SET ('T' ,"timestamp" , &record.opts.sample_time, &record.opts.sample_time_set, "Record the sample timestamps"),tools/perf/util/record.c +1
-1@@ -121,7 +121,7 @@ void evlist__config(struct evlist *evlist, struct record_opts *opts, struct callevlist__for_each_entry (evlist, evsel)evsel__config_leader_sampling (evsel, evlist); -if (opts->full_auxtrace) { +if (opts->full_auxtrace || opts->sample_identifier) {/* * Need to be able to synthesize and parse selected events with * arbitrary sample types, which requires always being able to tools/perf/util/record.h +1
-1@@ -28,6 +28,7 @@ struct record_opts {bool sample_time;bool sample_time_set;bool sample_cpu; +bool sample_identifier;bool period;bool period_set;bool running_time; --2.25.1
Quoted 5 lines · Adrian Hunter
Hi
Here are some small patches in preparation for "sideband injection".
Quoted 9 lines
I hope to run perf record in a virtual machine to capture sideband events while simulataneously running perf record with Intel PT on the host, and then subsequently inject the sideband events from the guest perf.data file into the host perf.data file, so that decoding can decode the Intel PT trace for the periods when the guest is running user space (kernel space is already decodable).
The patches are changes I have found so far that will be needed.
Except for a nit on the perf-record man page, everything looks good to me.
Thanks,
Ian
Quoted 24 lines
Adrian Hunter (5):
perf record: Always gettext_pokeevents with --kcore option perf record: Always record id index
perf record: Add new option to sample identifier perf record: Add finished init event
perf script: Add some missing event dumpstools/lib/perf/include/perf/event.h | 1 + tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 44 +++++++++++++++++++++++++++----- tools/perf/builtin-script.c | 6 +++++ tools/perf/util/event.c | 1 + tools/perf/util/header.c | 3 +++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/session.c | 4 +++ tools/perf/util/synthetic-events.c | 7 +++-- tools/perf/util/tool.h | 3 ++- 12 files changed, 65 insertions(+), 11 deletions(-)Regards
Adrian
Adrian Hunter
reviewerPATCH v2 3/5 perf record: Add new option to sample identifier
In reply to Ian RogersIn preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
Add an option to always include sample type PERF_SAMPLE_IDENTIFIER.
---
Changes in V2:
Extend documntation for --sample-identifier
tools/perf/Documentation/perf-record.txt | 5 +++++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +5 -0
@@ -313,6 +313,11 @@ OPTIONS --sample-cpu:: Record the sample cpu. +--sample-identifier:: + Record the sample identifier i.e. PERF_SAMPLE_IDENTIFIER bit set in + the sample_type member of the struct perf_event_attr argument to the + perf_event_open system call. + -n:: --no-samples:: Don't sample.
tools/perf/builtin-record.c +2 -0
@@ -3191,6 +3191,8 @@ static struct option __record_options[] = {OPT_BOOLEAN (0 ,"code-page-size" , &record.opts.sample_code_page_size,"Record the sampled code address (ip) page size" ),OPT_BOOLEAN (0 ,"sample-cpu" , &record.opts.sample_cpu,"Record the sample cpu" ), +OPT_BOOLEAN (0 ,"sample-identifier" , &record.opts.sample_identifier, +"Record the sample identifier" ),OPT_BOOLEAN_SET ('T' ,"timestamp" , &record.opts.sample_time, &record.opts.sample_time_set, "Record the sample timestamps"),
tools/perf/util/record.c +1 -1
@@ -121,7 +121,7 @@ void evlist__config(struct evlist *evlist, struct record_opts *opts, struct callevlist__for_each_entry (evlist, evsel)evsel__config_leader_sampling (evsel, evlist); -if (opts->full_auxtrace) { +if (opts->full_auxtrace || opts->sample_identifier) {/* * Need to be able to synthesize and parse selected events with * arbitrary sample types, which requires always being able to
tools/perf/util/record.h +1 -0
@@ -28,6 +28,7 @@ struct record_opts {bool sample_time;bool sample_time_set;bool sample_cpu; +bool sample_identifier;bool period;bool period_set;bool running_time;
Signature · 1 line
2.25.1
Adrian Hunter
reviewerQuoted 4 lines · Adrian Hunter
Hi
Here are some small patches in preparation for "sideband injection".
Quoted 8 lines
I hope to run perf record in a virtual machine to capture sideband events while simulataneously running perf record with Intel PT on the host, and then subsequently inject the sideband events from the guest perf.data file into the host perf.data file, so that decoding can decode the Intel PT trace for the periods when the guest is running user space (kernel space is already decodable).
The patches are changes I have found so far that will be needed.
Are there OK?
Quoted 26 lines
Adrian Hunter (5):
perf record: Always gettext_pokeevents with --kcore option perf record: Always record id index
perf record: Add new option to sample identifier perf record: Add finished init event
perf script: Add some missing event dumpstools/lib/perf/include/perf/event.h | 1 + tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 44 +++++++++++++++++++++++++++----- tools/perf/builtin-script.c | 6 +++++ tools/perf/util/event.c | 1 + tools/perf/util/header.c | 3 +++ tools/perf/util/record.c | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/session.c | 4 +++ tools/perf/util/synthetic-events.c | 7 +++-- tools/perf/util/tool.h | 3 ++- 12 files changed, 65 insertions(+), 11 deletions(-)Regards
Adrian
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 4/5] perf record: Add finished init event
In reply to Adrian HunterEm Fri, Jun 10, 2022 at 02:33:15PM +0300, Adrian Hunter escreveu:
Quoted 5 lines
In preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
This is needed to enable injecting events after the initial synthesized user events (that have an all zero id sample) but before regular events.
Humm, can't we consider the first FINISHED_ROUND as a good enough marker for this?
0 0x4fc8 [0x48]: PERF_RECORD_KSYMBOL addr ffffffffc10d0650 len 255 type 1 flags 0x0 name bpf_prog_ee0e253c78993a24
[email protected] [0x28]: event: 18
.
. ... raw event: size 40 bytes
. 0000: 12 00 00 00 00 00 28 00 01 00 00 00 28 00 00 00 ......(.....(... . 0010: ee 0e 25 3c 78 99 3a 24 00 00 00 00 00 00 00 00 ..%<x.:$........ . 0020: 00 00 00 00 00 00 00 00 ........
0 0x5010 [0x28]: PERF_RECORD_BPF_EVENT type 1, flags 0, id 40
[email protected] [0x30]: event: 3
.
. ... raw event: size 48 bytes
. 0000: 03 00 00 00 00 00 30 00 3a 5d 00 00 3a 5d 00 00 ......0.:]..:].. . 0010: 70 65 72 66 2d 65 78 65 63 00 00 00 00 00 00 00 perf-exec....... . 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
0 0x5038 [0x30]: PERF_RECORD_COMM: perf-exec:23866/23866
[email protected] [0x8]: event: 82
.
. ... raw event: size 8 bytes
. 0000: 52 00 00 00 00 00 08 00 R.......
0 0x5068 [0x8]: PERF_RECORD_FINISHED_INIT: unhandled!
[email protected] [0x8]: event: 68
.
. ... raw event: size 8 bytes
. 0000: 44 00 00 00 00 00 08 00 D.......
0 0x5390 [0x8]: PERF_RECORD_FINISHED_ROUND
[email protected] [0x28]: event: 9
.
. ... raw event: size 40 bytes
. 0000: 09 00 00 00 01 00 28 00 50 b5 16 a7 ff ff ff ff ......(.P....... . 0010: 3a 5d 00 00 3a 5d 00 00 54 90 f5 bf 52 01 00 00 :]..:]..T...R... . 0020: 01 00 00 00 00 00 00 00 ........
1454919487572 0x5070 [0x28]: PERF_RECORD_SAMPLE(IP, 0x1): 23866/23866: 0xffffffffa716b550 period: 1 addr: 0
Quoted 157 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/lib/perf/include/perf/event.h | 1 + tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 27 +++++++++++++++++++++++++++ tools/perf/util/event.c | 1 + tools/perf/util/session.c | 4 ++++ tools/perf/util/tool.h | 3 ++- 6 files changed, 36 insertions(+), 1 deletion(-)tools/lib/perf/include/perf/event.h +1
-0@@ -389,6 +389,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 ,PERF_RECORD_COMPRESSED =81 , +PERF_RECORD_FINISHED_INIT =82 , PERF_RECORD_HEADER_MAX };tools/perf/builtin-inject.c +1
-0@@ -1059,6 +1059,7 @@ int cmd_inject(int argc, const char **argv) .stat = perf_event__repipe_op2_synth, .stat_round = perf_event__repipe_op2_synth, .feature = perf_event__repipe_op2_synth, + .finished_init = perf_event__repipe_op2_synth, .compressed = perf_event__repipe_op4_synth, .auxtrace = perf_event__repipe_auxtrace, },tools/perf/builtin-record.c +27
-0@@ -1388,6 +1388,11 @@ static struct perf_event_header finished_round_event = { .type = PERF_RECORD_FINISHED_ROUND, }; +static struct perf_event_header finished_init_event = { + .size =sizeof (struct perf_event_header ), + .type =PERF_RECORD_FINISHED_INIT , +}; +static void record__adjust_affinity (struct record *rec,struct mmap *map) { if (rec->opts.affinity != PERF_AFFINITY_SYS &&@@ -1696,6 +1701,14 @@ static int record__synthesize_workload(struct record *rec, bool tail)return err; } +static int write_finished_init (struct record *rec,bool tail) +{ +if (rec->opts.tail_synthesize != tail) +return 0 ; + +return record__write (rec,NULL , &finished_init_event,sizeof (finished_init_event)); +} +static int record__synthesize (struct record *rec,bool tail); static int@@ -1710,6 +1723,8 @@ record__switch_output(struct record *rec, bool at_exit)record__aio_mmap_read_sync (rec); +write_finished_init (rec, true); +record__synthesize (rec, true);if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);@@ -1764,6 +1779,7 @@ record__switch_output(struct record *rec, bool at_exit)*/ if (target__none (&rec->opts.target))record__synthesize_workload (rec, false); +write_finished_init (rec, false); }return fd; }@@ -2419,6 +2435,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)trigger_ready (&auxtrace_snapshot_trigger);trigger_ready (&switch_output_trigger);perf_hooks__invoke_record_start (); + +/* +* Must write FINISHED_INIT so it will be seen after all other +* synthesized user events, but before any regular events. +*/ + err =write_finished_init (rec, false); +if (err <0 ) + goto out_child; +for (;;) {unsigned long long hits = thread->samples;@@ -2563,6 +2588,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)fprintf (stderr,"[ perf record: Woken up %ld times to write data ]\n" ,record__waking (rec)); +write_finished_init (rec, true); +if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);tools/perf/util/event.c +1
-0@@ -76,6 +76,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", [PERF_RECORD_COMPRESSED] = "COMPRESSED", + [PERF_RECORD_FINISHED_INIT] = "FINISHED_INIT", };const char *perf_event__name (unsigned int id)tools/perf/util/session.c +4
-0@@ -562,6 +562,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->feature = process_event_op2_stub;if (tool->compressed ==NULL ) tool->compressed = perf_session__process_compressed_event; +if (tool->finished_init ==NULL ) + tool->finished_init = process_event_op2_stub; }static void swap_sample_id_all (union perf_event *event,void *data)@@ -1706,6 +1708,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);return err; +case PERF_RECORD_FINISHED_INIT : +return tool->finished_init (session, event);default :return -EINVAL ; }tools/perf/util/tool.h +2
-1@@ -76,7 +76,8 @@ struct perf_tool { stat_config, stat, stat_round, - feature; + feature, + finished_init;event_op4 compressed;event_op3 auxtrace;bool ordered_events;Signature · 1 line
2.25.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 4/5] perf record: Add finished init event
Em Thu, Jun 23, 2022 at 10:41:31AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Fri, Jun 10, 2022 at 02:33:15PM +0300, Adrian Hunter escreveu:
Quoted 5 lines
In preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
This is needed to enable injecting events after the initial synthesized user events (that have an all zero id sample) but before regular events.
Humm, can't we consider the first
FINISHED_ROUNDas a good enough marker for this?
Nope, synthesize_flush() may be called multiple times during the initialization (the synthesizing of PERF_RECORD_ events for pre-existing threads)...
I'm reapplying this patch.
- Arnaldo
Quoted 205 lines
0
0x4fc8[0x48]:PERF_RECORD_KSYMBOLaddrffffffffc10d0650len 255 type 1 flags0x0namebpf_prog_ee0e253c78993a24[email protected] [
0x28]: event: 18
.
. ... raw event: size 40 bytes. 0000: 12 00 00 00 00 00 28 00 01 00 00 00 28 00 00 00 ......(.....(... . 0010: ee 0e 25 3c 78 99 3a 24 00 00 00 00 00 00 00 00 ..%<x.:$........ . 0020: 00 00 00 00 00 00 00 00 ........0
0x5010[0x28]:PERF_RECORD_BPF_EVENTtype 1, flags 0, id 40[email protected] [
0x30]: event: 3
.
. ... raw event: size 48 bytes. 0000: 03 00 00 00 00 00 30 00 3a 5d 00 00 3a 5d 00 00 ......0.:]..:].. . 0010: 70 65 72 66 2d 65 78 65 63 00 00 00 00 00 00 00 perf-exec....... . 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................0
0x5038[0x30]:PERF_RECORD_COMM: perf-exec:23866/23866[email protected] [
0x8]: event: 82
.
. ... raw event: size 8 bytes
. 0000: 52 00 00 00 00 00 08 00 R.......0
0x5068[0x8]:PERF_RECORD_FINISHED_INIT: unhandled![email protected] [
0x8]: event: 68
.
. ... raw event: size 8 bytes
. 0000: 44 00 00 00 00 00 08 00 D.......0
0x5390[0x8]:PERF_RECORD_FINISHED_ROUND[email protected] [
0x28]: event: 9
.
. ... raw event: size 40 bytes. 0000: 09 00 00 00 01 00 28 00 50 b5 16 a7 ff ff ff ff ......(.P....... . 0010: 3a 5d 00 00 3a 5d 00 00 54 90 f5 bf 52 01 00 00 :]..:]..T...R... . 0020: 01 00 00 00 00 00 00 00 ........1454919487572
0x5070[0x28]:PERF_RECORD_SAMPLE(IP, 0x1): 23866/23866:0xffffffffa716b550period: 1 addr: 0Quoted 157 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/lib/perf/include/perf/event.h | 1 + tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 27 +++++++++++++++++++++++++++ tools/perf/util/event.c | 1 + tools/perf/util/session.c | 4 ++++ tools/perf/util/tool.h | 3 ++- 6 files changed, 36 insertions(+), 1 deletion(-)tools/lib/perf/include/perf/event.h +1
-0@@ -389,6 +389,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 ,PERF_RECORD_COMPRESSED =81 , +PERF_RECORD_FINISHED_INIT =82 , PERF_RECORD_HEADER_MAX };tools/perf/builtin-inject.c +1
-0@@ -1059,6 +1059,7 @@ int cmd_inject(int argc, const char **argv) .stat = perf_event__repipe_op2_synth, .stat_round = perf_event__repipe_op2_synth, .feature = perf_event__repipe_op2_synth, + .finished_init = perf_event__repipe_op2_synth, .compressed = perf_event__repipe_op4_synth, .auxtrace = perf_event__repipe_auxtrace, },tools/perf/builtin-record.c +27
-0@@ -1388,6 +1388,11 @@ static struct perf_event_header finished_round_event = { .type = PERF_RECORD_FINISHED_ROUND, }; +static struct perf_event_header finished_init_event = { + .size =sizeof (struct perf_event_header ), + .type =PERF_RECORD_FINISHED_INIT , +}; +static void record__adjust_affinity (struct record *rec,struct mmap *map) { if (rec->opts.affinity != PERF_AFFINITY_SYS &&@@ -1696,6 +1701,14 @@ static int record__synthesize_workload(struct record *rec, bool tail)return err; } +static int write_finished_init (struct record *rec,bool tail) +{ +if (rec->opts.tail_synthesize != tail) +return 0 ; + +return record__write (rec,NULL , &finished_init_event,sizeof (finished_init_event)); +} +static int record__synthesize (struct record *rec,bool tail); static int@@ -1710,6 +1723,8 @@ record__switch_output(struct record *rec, bool at_exit)record__aio_mmap_read_sync (rec); +write_finished_init (rec, true); +record__synthesize (rec, true);if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);@@ -1764,6 +1779,7 @@ record__switch_output(struct record *rec, bool at_exit)*/ if (target__none (&rec->opts.target))record__synthesize_workload (rec, false); +write_finished_init (rec, false); }return fd; }@@ -2419,6 +2435,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)trigger_ready (&auxtrace_snapshot_trigger);trigger_ready (&switch_output_trigger);perf_hooks__invoke_record_start (); + +/* +* Must write FINISHED_INIT so it will be seen after all other +* synthesized user events, but before any regular events. +*/ + err =write_finished_init (rec, false); +if (err <0 ) + goto out_child; +for (;;) {unsigned long long hits = thread->samples;@@ -2563,6 +2588,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)fprintf (stderr,"[ perf record: Woken up %ld times to write data ]\n" ,record__waking (rec)); +write_finished_init (rec, true); +if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);tools/perf/util/event.c +1
-0@@ -76,6 +76,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", [PERF_RECORD_COMPRESSED] = "COMPRESSED", + [PERF_RECORD_FINISHED_INIT] = "FINISHED_INIT", };const char *perf_event__name (unsigned int id)tools/perf/util/session.c +4
-0@@ -562,6 +562,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->feature = process_event_op2_stub;if (tool->compressed ==NULL ) tool->compressed = perf_session__process_compressed_event; +if (tool->finished_init ==NULL ) + tool->finished_init = process_event_op2_stub; }static void swap_sample_id_all (union perf_event *event,void *data)@@ -1706,6 +1708,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);return err; +case PERF_RECORD_FINISHED_INIT : +return tool->finished_init (session, event);default :return -EINVAL ; }tools/perf/util/tool.h +2
-1@@ -76,7 +76,8 @@ struct perf_tool { stat_config, stat, stat_round, - feature; + feature, + finished_init;event_op4 compressed;event_op3 auxtrace;bool ordered_events;Signature · 1 line
2.25.1Signature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 4/5] perf record: Add finished init event
Em Thu, Jun 23, 2022 at 10:46:18AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 8 lines
Em Thu, Jun 23, 2022 at 10:41:31AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Fri, Jun 10, 2022 at 02:33:15PM +0300, Adrian Hunter escreveu:
Quoted 5 lines
In preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
This is needed to enable injecting events after the initial synthesized user events (that have an all zero id sample) but before regular events.
Quoted 8 lines
Quoted 2 lines
Humm, can't we consider the first
FINISHED_ROUNDas a good enough marker for this?Nope,
synthesize_flush()may be called multiple times during the initialization (the synthesizing ofPERF_RECORD_events for pre-existing threads)...I'm reapplying this patch.
And add this, please check:
tools/perf/Documentation/perf.data-file-format.txt +10 -0
@@ -607,6 +607,16 @@ struct compressed_event { char data[]; }; + PERF_RECORD_FINISHED_INIT = 82, + +Marks the end of records for the system, pre-existing threads in system wide +sessions, etc. Those are the ones prefixed PERF_RECORD_USER_*. + +This is used, for instance, to 'perf inject' events after init and before +regular events, those emitted by the kernel, to support combining guest and +host records. + + The header is followed by compressed data frame that can be decompressed into array of perf trace records. The size of the entire compressed event record including the header is limited by the max value of header.size.
⬢[acme@toolbox perf]$
- Arnaldo
Quoted 211 lines
- Arnaldo
Quoted 205 lines
0
0x4fc8[0x48]:PERF_RECORD_KSYMBOLaddrffffffffc10d0650len 255 type 1 flags0x0namebpf_prog_ee0e253c78993a24[email protected] [
0x28]: event: 18
.
. ... raw event: size 40 bytes. 0000: 12 00 00 00 00 00 28 00 01 00 00 00 28 00 00 00 ......(.....(... . 0010: ee 0e 25 3c 78 99 3a 24 00 00 00 00 00 00 00 00 ..%<x.:$........ . 0020: 00 00 00 00 00 00 00 00 ........0
0x5010[0x28]:PERF_RECORD_BPF_EVENTtype 1, flags 0, id 40[email protected] [
0x30]: event: 3
.
. ... raw event: size 48 bytes. 0000: 03 00 00 00 00 00 30 00 3a 5d 00 00 3a 5d 00 00 ......0.:]..:].. . 0010: 70 65 72 66 2d 65 78 65 63 00 00 00 00 00 00 00 perf-exec....... . 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................0
0x5038[0x30]:PERF_RECORD_COMM: perf-exec:23866/23866[email protected] [
0x8]: event: 82
.
. ... raw event: size 8 bytes
. 0000: 52 00 00 00 00 00 08 00 R.......0
0x5068[0x8]:PERF_RECORD_FINISHED_INIT: unhandled![email protected] [
0x8]: event: 68
.
. ... raw event: size 8 bytes
. 0000: 44 00 00 00 00 00 08 00 D.......0
0x5390[0x8]:PERF_RECORD_FINISHED_ROUND[email protected] [
0x28]: event: 9
.
. ... raw event: size 40 bytes. 0000: 09 00 00 00 01 00 28 00 50 b5 16 a7 ff ff ff ff ......(.P....... . 0010: 3a 5d 00 00 3a 5d 00 00 54 90 f5 bf 52 01 00 00 :]..:]..T...R... . 0020: 01 00 00 00 00 00 00 00 ........1454919487572
0x5070[0x28]:PERF_RECORD_SAMPLE(IP, 0x1): 23866/23866:0xffffffffa716b550period: 1 addr: 0Quoted 157 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/lib/perf/include/perf/event.h | 1 + tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 27 +++++++++++++++++++++++++++ tools/perf/util/event.c | 1 + tools/perf/util/session.c | 4 ++++ tools/perf/util/tool.h | 3 ++- 6 files changed, 36 insertions(+), 1 deletion(-)tools/lib/perf/include/perf/event.h +1
-0@@ -389,6 +389,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 ,PERF_RECORD_COMPRESSED =81 , +PERF_RECORD_FINISHED_INIT =82 , PERF_RECORD_HEADER_MAX };tools/perf/builtin-inject.c +1
-0@@ -1059,6 +1059,7 @@ int cmd_inject(int argc, const char **argv) .stat = perf_event__repipe_op2_synth, .stat_round = perf_event__repipe_op2_synth, .feature = perf_event__repipe_op2_synth, + .finished_init = perf_event__repipe_op2_synth, .compressed = perf_event__repipe_op4_synth, .auxtrace = perf_event__repipe_auxtrace, },tools/perf/builtin-record.c +27
-0@@ -1388,6 +1388,11 @@ static struct perf_event_header finished_round_event = { .type = PERF_RECORD_FINISHED_ROUND, }; +static struct perf_event_header finished_init_event = { + .size =sizeof (struct perf_event_header ), + .type =PERF_RECORD_FINISHED_INIT , +}; +static void record__adjust_affinity (struct record *rec,struct mmap *map) { if (rec->opts.affinity != PERF_AFFINITY_SYS &&@@ -1696,6 +1701,14 @@ static int record__synthesize_workload(struct record *rec, bool tail)return err; } +static int write_finished_init (struct record *rec,bool tail) +{ +if (rec->opts.tail_synthesize != tail) +return 0 ; + +return record__write (rec,NULL , &finished_init_event,sizeof (finished_init_event)); +} +static int record__synthesize (struct record *rec,bool tail); static int@@ -1710,6 +1723,8 @@ record__switch_output(struct record *rec, bool at_exit)record__aio_mmap_read_sync (rec); +write_finished_init (rec, true); +record__synthesize (rec, true);if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);@@ -1764,6 +1779,7 @@ record__switch_output(struct record *rec, bool at_exit)*/ if (target__none (&rec->opts.target))record__synthesize_workload (rec, false); +write_finished_init (rec, false); }return fd; }@@ -2419,6 +2435,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)trigger_ready (&auxtrace_snapshot_trigger);trigger_ready (&switch_output_trigger);perf_hooks__invoke_record_start (); + +/* +* Must write FINISHED_INIT so it will be seen after all other +* synthesized user events, but before any regular events. +*/ + err =write_finished_init (rec, false); +if (err <0 ) + goto out_child; +for (;;) {unsigned long long hits = thread->samples;@@ -2563,6 +2588,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)fprintf (stderr,"[ perf record: Woken up %ld times to write data ]\n" ,record__waking (rec)); +write_finished_init (rec, true); +if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);tools/perf/util/event.c +1
-0@@ -76,6 +76,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", [PERF_RECORD_COMPRESSED] = "COMPRESSED", + [PERF_RECORD_FINISHED_INIT] = "FINISHED_INIT", };const char *perf_event__name (unsigned int id)tools/perf/util/session.c +4
-0@@ -562,6 +562,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->feature = process_event_op2_stub;if (tool->compressed ==NULL ) tool->compressed = perf_session__process_compressed_event; +if (tool->finished_init ==NULL ) + tool->finished_init = process_event_op2_stub; }static void swap_sample_id_all (union perf_event *event,void *data)@@ -1706,6 +1708,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);return err; +case PERF_RECORD_FINISHED_INIT : +return tool->finished_init (session, event);default :return -EINVAL ; }tools/perf/util/tool.h +2
-1@@ -76,7 +76,8 @@ struct perf_tool { stat_config, stat, stat_round, - feature; + feature, + finished_init;event_op4 compressed;event_op3 auxtrace;bool ordered_events;Signature · 1 line
2.25.1Signature · 1 line
- ArnaldoSignature · 1 line
- Arnaldo
Signature · 1 line
- Arnaldo
Adrian Hunter
reviewerRe: [PATCH 4/5] perf record: Add finished init event
Quoted 41 lines · Arnaldo Carvalho de Melo
Em Thu, Jun 23, 2022 at 10:46:18AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 8 lines
Em Thu, Jun 23, 2022 at 10:41:31AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Fri, Jun 10, 2022 at 02:33:15PM +0300, Adrian Hunter escreveu:
Quoted 5 lines
In preparation for recording sideband events in a virtual machine guest so that they can be injected into a host perf.data file.
This is needed to enable injecting events after the initial synthesized user events (that have an all zero id sample) but before regular events.
Quoted 8 lines
Quoted 2 lines
Humm, can't we consider the first
FINISHED_ROUNDas a good enough marker for this?Nope,
synthesize_flush()may be called multiple times during the initialization (the synthesizing ofPERF_RECORD_events for pre-existing threads)...I'm reapplying this patch.
And add this, please check:
tools/perf/Documentation/perf.data-file-format.txt +10
-0@@ -607,6 +607,16 @@ struct compressed_event { char data[]; }; + PERF_RECORD_FINISHED_INIT = 82, + +Marks the end of records for the system, pre-existing threads in system wide +sessions, etc. Those are the ones prefixed PERF_RECORD_USER_*. + +This is used, for instance, to 'perf inject' events after init and before +regular events, those emitted by the kernel, to support combining guest and +host records. + + The header is followed by compressed data frame that can be decompressed into array of perf trace records. The size of the entire compressed event record including the header is limited by the max value of header.size.
Quoted 1 line
⬢[acme@toolbox perf]$
That's great! Thank you!
Quoted 216 lines
- Arnaldo
Quoted 211 lines
- Arnaldo
Quoted 205 lines
0
0x4fc8[0x48]:PERF_RECORD_KSYMBOLaddrffffffffc10d0650len 255 type 1 flags0x0namebpf_prog_ee0e253c78993a24[email protected] [
0x28]: event: 18
.
. ... raw event: size 40 bytes. 0000: 12 00 00 00 00 00 28 00 01 00 00 00 28 00 00 00 ......(.....(... . 0010: ee 0e 25 3c 78 99 3a 24 00 00 00 00 00 00 00 00 ..%<x.:$........ . 0020: 00 00 00 00 00 00 00 00 ........0
0x5010[0x28]:PERF_RECORD_BPF_EVENTtype 1, flags 0, id 40[email protected] [
0x30]: event: 3
.
. ... raw event: size 48 bytes. 0000: 03 00 00 00 00 00 30 00 3a 5d 00 00 3a 5d 00 00 ......0.:]..:].. . 0010: 70 65 72 66 2d 65 78 65 63 00 00 00 00 00 00 00 perf-exec....... . 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................0
0x5038[0x30]:PERF_RECORD_COMM: perf-exec:23866/23866[email protected] [
0x8]: event: 82
.
. ... raw event: size 8 bytes
. 0000: 52 00 00 00 00 00 08 00 R.......0
0x5068[0x8]:PERF_RECORD_FINISHED_INIT: unhandled![email protected] [
0x8]: event: 68
.
. ... raw event: size 8 bytes
. 0000: 44 00 00 00 00 00 08 00 D.......0
0x5390[0x8]:PERF_RECORD_FINISHED_ROUND[email protected] [
0x28]: event: 9
.
. ... raw event: size 40 bytes. 0000: 09 00 00 00 01 00 28 00 50 b5 16 a7 ff ff ff ff ......(.P....... . 0010: 3a 5d 00 00 3a 5d 00 00 54 90 f5 bf 52 01 00 00 :]..:]..T...R... . 0020: 01 00 00 00 00 00 00 00 ........1454919487572
0x5070[0x28]:PERF_RECORD_SAMPLE(IP, 0x1): 23866/23866:0xffffffffa716b550period: 1 addr: 0Quoted 157 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/lib/perf/include/perf/event.h | 1 + tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 27 +++++++++++++++++++++++++++ tools/perf/util/event.c | 1 + tools/perf/util/session.c | 4 ++++ tools/perf/util/tool.h | 3 ++- 6 files changed, 36 insertions(+), 1 deletion(-)tools/lib/perf/include/perf/event.h +1
-0@@ -389,6 +389,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 ,PERF_RECORD_COMPRESSED =81 , +PERF_RECORD_FINISHED_INIT =82 , PERF_RECORD_HEADER_MAX };tools/perf/builtin-inject.c +1
-0@@ -1059,6 +1059,7 @@ int cmd_inject(int argc, const char **argv) .stat = perf_event__repipe_op2_synth, .stat_round = perf_event__repipe_op2_synth, .feature = perf_event__repipe_op2_synth, + .finished_init = perf_event__repipe_op2_synth, .compressed = perf_event__repipe_op4_synth, .auxtrace = perf_event__repipe_auxtrace, },tools/perf/builtin-record.c +27
-0@@ -1388,6 +1388,11 @@ static struct perf_event_header finished_round_event = { .type = PERF_RECORD_FINISHED_ROUND, }; +static struct perf_event_header finished_init_event = { + .size =sizeof (struct perf_event_header ), + .type =PERF_RECORD_FINISHED_INIT , +}; +static void record__adjust_affinity (struct record *rec,struct mmap *map) { if (rec->opts.affinity != PERF_AFFINITY_SYS &&@@ -1696,6 +1701,14 @@ static int record__synthesize_workload(struct record *rec, bool tail)return err; } +static int write_finished_init (struct record *rec,bool tail) +{ +if (rec->opts.tail_synthesize != tail) +return 0 ; + +return record__write (rec,NULL , &finished_init_event,sizeof (finished_init_event)); +} +static int record__synthesize (struct record *rec,bool tail); static int@@ -1710,6 +1723,8 @@ record__switch_output(struct record *rec, bool at_exit)record__aio_mmap_read_sync (rec); +write_finished_init (rec, true); +record__synthesize (rec, true);if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);@@ -1764,6 +1779,7 @@ record__switch_output(struct record *rec, bool at_exit)*/ if (target__none (&rec->opts.target))record__synthesize_workload (rec, false); +write_finished_init (rec, false); }return fd; }@@ -2419,6 +2435,15 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)trigger_ready (&auxtrace_snapshot_trigger);trigger_ready (&switch_output_trigger);perf_hooks__invoke_record_start (); + +/* +* Must write FINISHED_INIT so it will be seen after all other +* synthesized user events, but before any regular events. +*/ + err =write_finished_init (rec, false); +if (err <0 ) + goto out_child; +for (;;) {unsigned long long hits = thread->samples;@@ -2563,6 +2588,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)fprintf (stderr,"[ perf record: Woken up %ld times to write data ]\n" ,record__waking (rec)); +write_finished_init (rec, true); +if (target__none (&rec->opts.target))record__synthesize_workload (rec, true);tools/perf/util/event.c +1
-0@@ -76,6 +76,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", [PERF_RECORD_COMPRESSED] = "COMPRESSED", + [PERF_RECORD_FINISHED_INIT] = "FINISHED_INIT", };const char *perf_event__name (unsigned int id)tools/perf/util/session.c +4
-0@@ -562,6 +562,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->feature = process_event_op2_stub;if (tool->compressed ==NULL ) tool->compressed = perf_session__process_compressed_event; +if (tool->finished_init ==NULL ) + tool->finished_init = process_event_op2_stub; }static void swap_sample_id_all (union perf_event *event,void *data)@@ -1706,6 +1708,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,if (err)dump_event (session->evlist, event, file_offset, &sample, file_path);return err; +case PERF_RECORD_FINISHED_INIT : +return tool->finished_init (session, event);default :return -EINVAL ; }tools/perf/util/tool.h +2
-1@@ -76,7 +76,8 @@ struct perf_tool { stat_config, stat, stat_round, - feature; + feature, + finished_init;event_op4 compressed;event_op3 auxtrace;bool ordered_events;Signature · 1 line
2.25.1Signature · 1 line
- ArnaldoSignature · 1 line
- Arnaldo