Commit b7ecc2d7 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf intel_pt: Add vmlaunch and vmresume as branches 



In preparation to support Intel PT decoding of virtual machine traces, add
vmlaunch and vmresume as branch instructions.

Note, sample flags will show "VMentry" even if the VM-Entry fails.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarAndi 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-3-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c025d46c

tools/perf/arch/x86/tests/insn-x86.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static int get_op(const char *op_str) 
		{"int",     INTEL_PT_OP_INT},

		{"syscall", INTEL_PT_OP_SYSCALL},

		{"sysret",  INTEL_PT_OP_SYSRET},

		{"vmentry",  INTEL_PT_OP_VMENTRY},

		{NULL, 0},

	};

	struct val_data *val;

tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c

+15 −0
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ static void intel_pt_insn_decoder(struct insn *insn, 
	switch (insn->opcode.bytes[0]) {

	case 0xf:

		switch (insn->opcode.bytes[1]) {

		case 0x01:

			switch (insn->modrm.bytes[0]) {

			case 0xc2: /* vmlaunch */

			case 0xc3: /* vmresume */

				op = INTEL_PT_OP_VMENTRY;

				branch = INTEL_PT_BR_INDIRECT;

				break;

			default:

				break;

			}

			break;

		case 0x05: /* syscall */

		case 0x34: /* sysenter */

			op = INTEL_PT_OP_SYSCALL;
@@ -213,6 +224,7 @@ const char *branch_name[] = { 
	[INTEL_PT_OP_INT]	= "Int",

	[INTEL_PT_OP_SYSCALL]	= "Syscall",

	[INTEL_PT_OP_SYSRET]	= "Sysret",

	[INTEL_PT_OP_VMENTRY]	= "VMentry",

};



const char *intel_pt_insn_name(enum intel_pt_insn_op op)
@@ -267,6 +279,9 @@ int intel_pt_insn_type(enum intel_pt_insn_op op) 
	case INTEL_PT_OP_SYSRET:

		return PERF_IP_FLAG_BRANCH | PERF_IP_FLAG_RETURN |

		       PERF_IP_FLAG_SYSCALLRET;

	case INTEL_PT_OP_VMENTRY:

		return PERF_IP_FLAG_BRANCH | PERF_IP_FLAG_CALL |

		       PERF_IP_FLAG_VMENTRY;

	default:

		return 0;

	}

tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ enum intel_pt_insn_op { 
	INTEL_PT_OP_INT,

	INTEL_PT_OP_SYSCALL,

	INTEL_PT_OP_SYSRET,

	INTEL_PT_OP_VMENTRY,

};



enum intel_pt_insn_branch {