Commit 19854e45 authored Feb 18, 2021 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Feb 18, 2021

perf intel-pt: Split VM-Entry and VM-Exit branches



Events record a single cpumode so the tools cannot handle a branch from
the host machine to a virtual machine, or vice versa. Split it in two so
that each branch can have a different cpumode.

  E.g.		host ip -> guest ip

  becomes:	host ip -> 0
		      0 -> guest ip

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210218095801.19576-11-adrian.hunter@intel.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 695fc451

tools/perf/util/intel-pt.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -2171,9 +2171,29 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
		}

		if (pt->sample_branches) {
		if (state->from_nr != state->to_nr &&
		state->from_ip && state->to_ip) {
		struct intel_pt_state st = (struct intel_pt_state )state;
		u64 to_ip = st->to_ip;
		u64 from_ip = st->from_ip;

		/*
		* perf cannot handle having different machines for ip
		* and addr, so create 2 branches.
		*/
		st->to_ip = 0;
		err = intel_pt_synth_branch_sample(ptq);
		if (err)
		return err;
		st->from_ip = 0;
		st->to_ip = to_ip;
		err = intel_pt_synth_branch_sample(ptq);
		st->from_ip = from_ip;
		} else {
		err = intel_pt_synth_branch_sample(ptq);
		}
		if (err)
		return err;
		}

		if (!ptq->sync_switch)