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

perf intel-pt: pkt-decoder: Add MODE.Exec IFLAG bit 

As of Intel SDM (https://www.intel.com/sdm

) version 076, there is a new
Intel PT feature called Event Trace which adds a bit to the existing
MODE.Exec packet to record the interrupt flag. Amend the packet decoder and
packet decoder test accordingly.

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


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

tools/perf/arch/x86/tests/intel-pt-pkt-decoder-test.c

+5 −2
Original line number Diff line number Diff line
@@ -70,8 +70,11 @@ static struct test_data { 
	{8, {0x02, 0x43, 3, 4, 6, 8, 10, 12}, 0, {INTEL_PT_PIP, 0, 0xC0A08060403}, 0, 0 },

	/* Mode Exec Packet */

	{2, {0x99, 0x00}, 0, {INTEL_PT_MODE_EXEC, 0, 16}, 0, 0 },

	{2, {0x99, 0x01}, 0, {INTEL_PT_MODE_EXEC, 0, 64}, 0, 0 },

	{2, {0x99, 0x02}, 0, {INTEL_PT_MODE_EXEC, 0, 32}, 0, 0 },

	{2, {0x99, 0x01}, 0, {INTEL_PT_MODE_EXEC, 1, 64}, 0, 0 },

	{2, {0x99, 0x02}, 0, {INTEL_PT_MODE_EXEC, 2, 32}, 0, 0 },

	{2, {0x99, 0x04}, 0, {INTEL_PT_MODE_EXEC, 4, 16}, 0, 0 },

	{2, {0x99, 0x05}, 0, {INTEL_PT_MODE_EXEC, 5, 64}, 0, 0 },

	{2, {0x99, 0x06}, 0, {INTEL_PT_MODE_EXEC, 6, 32}, 0, 0 },

	/* Mode TSX Packet */

	{2, {0x99, 0x20}, 0, {INTEL_PT_MODE_TSX, 0, 0}, 0, 0 },

	{2, {0x99, 0x21}, 0, {INTEL_PT_MODE_TSX, 0, 1}, 0, 0 },

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

+3 −1
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ static int intel_pt_get_mode(const unsigned char *buf, size_t len, 
	switch (buf[1] >> 5) {

	case 0:

		packet->type = INTEL_PT_MODE_EXEC;

		packet->count = buf[1];

		switch (buf[1] & 3) {

		case 0:

			packet->payload = 16;
@@ -741,7 +742,8 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf, 
		return snprintf(buf, buf_len, "%s CTC 0x%x FC 0x%x", name,

				(unsigned)payload, packet->count);

	case INTEL_PT_MODE_EXEC:

		return snprintf(buf, buf_len, "%s %lld", name, payload);

		return snprintf(buf, buf_len, "%s IF:%d %lld",

				name, !!(packet->count & 4), payload);

	case INTEL_PT_MODE_TSX:

		return snprintf(buf, buf_len, "%s TXAbort:%u InTX:%u",

				name, (unsigned)(payload >> 1) & 1,