On Mon, Jul 11, 2022 at 2:33 AM Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
>
> Add fields machine_pid and vcpu. These are displayed only if machine_pid is
> non-zero.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> tools/perf/Documentation/perf-script.txt | 7 ++++++-
> tools/perf/builtin-script.c | 11 +++++++++++
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
> index e250ff5566cf..c09cc44e50ee 100644
> --- a/tools/perf/Documentation/perf-script.txt
> +++ b/tools/perf/Documentation/perf-script.txt
> @@ -133,7 +133,8 @@ OPTIONS
> comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff,
> srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output,
> brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth,
> - phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat.
> + phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat,
> + machine_pid, vcpu.
> Field list can be prepended with the type, trace, sw or hw,
> to indicate to which event type the field list applies.
> e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace
> @@ -226,6 +227,10 @@ OPTIONS
> The ipc (instructions per cycle) field is synthesized and may have a value when
> Instruction Trace decoding.
>
> + The machine_pid and vcpu fields are derived from data resulting from using
> + perf insert to insert a perf.data file recorded inside a virtual machine into
Presumably 'perf inject' ?
Thanks,
Ian
> + a perf.data file recorded on the host at the same time.
> +
> Finally, a user may not set fields to none for all event types.
> i.e., -F "" is not allowed.
>
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index 4b00a50faf00..ac19fee62d8e 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -125,6 +125,8 @@ enum perf_output_field {
> PERF_OUTPUT_CODE_PAGE_SIZE = 1ULL << 34,
> PERF_OUTPUT_INS_LAT = 1ULL << 35,
> PERF_OUTPUT_BRSTACKINSNLEN = 1ULL << 36,
> + PERF_OUTPUT_MACHINE_PID = 1ULL << 37,
> + PERF_OUTPUT_VCPU = 1ULL << 38,
> };
>
> struct perf_script {
> @@ -193,6 +195,8 @@ struct output_option {
> {.str = "code_page_size", .field = PERF_OUTPUT_CODE_PAGE_SIZE},
> {.str = "ins_lat", .field = PERF_OUTPUT_INS_LAT},
> {.str = "brstackinsnlen", .field = PERF_OUTPUT_BRSTACKINSNLEN},
> + {.str = "machine_pid", .field = PERF_OUTPUT_MACHINE_PID},
> + {.str = "vcpu", .field = PERF_OUTPUT_VCPU},
> };
>
> enum {
> @@ -746,6 +750,13 @@ static int perf_sample__fprintf_start(struct perf_script *script,
> int printed = 0;
> char tstr[128];
>
> + if (PRINT_FIELD(MACHINE_PID) && sample->machine_pid)
> + printed += fprintf(fp, "VM:%5d ", sample->machine_pid);
> +
> + /* Print VCPU only for guest events i.e. with machine_pid */
> + if (PRINT_FIELD(VCPU) && sample->machine_pid)
> + printed += fprintf(fp, "VCPU:%03d ", sample->vcpu);
> +
> if (PRINT_FIELD(COMM)) {
> const char *comm = thread ? thread__comm_str(thread) : ":-1";
>
> --
> 2.25.1
>
