perf intel-pt: Use guest pid/tid etc in guest samples

When decoding with guest sideband information, for VMX non-root (NR)
i.e. guest events, replace the host (hypervisor) pid/tid with guest values,
and provide also the new machine_pid and vcpu values.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: kvm@vger.kernel.org
Link: https://lore.kernel.org/r/20220711093218.10967-35-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 143a096..d5e9fc8 100644 (file)
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1657,6 +1657,17 @@ static void intel_pt_prep_a_sample(struct intel_pt_queue *ptq,
 
        sample->pid = ptq->pid;
        sample->tid = ptq->tid;
+
+       if (ptq->pt->have_guest_sideband) {
+               if ((ptq->state->from_ip && ptq->state->from_nr) ||
+                   (ptq->state->to_ip && ptq->state->to_nr)) {
+                       sample->pid = ptq->guest_pid;
+                       sample->tid = ptq->guest_tid;
+                       sample->machine_pid = ptq->guest_machine_pid;
+                       sample->vcpu = ptq->vcpu;
+               }
+       }
+
        sample->cpu = ptq->cpu;
        sample->insn_len = ptq->insn_len;
        memcpy(sample->insn, ptq->insn, INTEL_PT_INSN_BUF_SZ);