3 files changed, 201 insertions, 17 deletions

diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 56790ea1e88e..4a0e9fb1d173 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -923,6 +923,7 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                 case INTEL_PT_TIP_PGE:
                 case INTEL_PT_TIP:
                 case INTEL_PT_TNT:
+                case INTEL_PT_TRACESTOP:
                 case INTEL_PT_BAD:
                 case INTEL_PT_PSB:
                         intel_pt_log("ERROR: Unexpected packet\n");
@@ -935,6 +936,9 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                         intel_pt_calc_tsc_timestamp(decoder);
                         break;
 
+                case INTEL_PT_TMA:
+                        break;
+
                 case INTEL_PT_CBR:
                         decoder->cbr = decoder->packet.payload;
                         break;
@@ -944,7 +948,7 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                         break;
 
                 case INTEL_PT_PIP:
-                        decoder->cr3 = decoder->packet.payload;
+                        decoder->cr3 = decoder->packet.payload & (BIT63 - 1);
                         break;
 
                 case INTEL_PT_FUP:
@@ -956,6 +960,12 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                         intel_pt_update_in_tx(decoder);
                         break;
 
+                case INTEL_PT_MTC:
+                        break;
+
+                case INTEL_PT_CYC:
+                case INTEL_PT_VMCS:
+                case INTEL_PT_MNT:
                 case INTEL_PT_PAD:
                 default:
                         break;
@@ -983,8 +993,10 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)
                 switch (decoder->packet.type) {
                 case INTEL_PT_TNT:
                 case INTEL_PT_FUP:
+                case INTEL_PT_TRACESTOP:
                 case INTEL_PT_PSB:
                 case INTEL_PT_TSC:
+                case INTEL_PT_TMA:
                 case INTEL_PT_CBR:
                 case INTEL_PT_MODE_TSX:
                 case INTEL_PT_BAD:
@@ -1032,13 +1044,21 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)
                         return 0;
 
                 case INTEL_PT_PIP:
-                        decoder->cr3 = decoder->packet.payload;
+                        decoder->cr3 = decoder->packet.payload & (BIT63 - 1);
+                        break;
+
+                case INTEL_PT_MTC:
+                        break;
+
+                case INTEL_PT_CYC:
                         break;
 
                 case INTEL_PT_MODE_EXEC:
                         decoder->exec_mode = decoder->packet.payload;
                         break;
 
+                case INTEL_PT_VMCS:
+                case INTEL_PT_MNT:
                 case INTEL_PT_PAD:
                         break;
 
@@ -1122,6 +1142,9 @@ next:
                         }
                         return intel_pt_walk_fup_tip(decoder);
 
+                case INTEL_PT_TRACESTOP:
+                        break;
+
                 case INTEL_PT_PSB:
                         intel_pt_clear_stack(&decoder->stack);
                         err = intel_pt_walk_psbend(decoder);
@@ -1132,13 +1155,22 @@ next:
                         break;
 
                 case INTEL_PT_PIP:
-                        decoder->cr3 = decoder->packet.payload;
+                        decoder->cr3 = decoder->packet.payload & (BIT63 - 1);
+                        break;
+
+                case INTEL_PT_MTC:
                         break;
 
                 case INTEL_PT_TSC:
                         intel_pt_calc_tsc_timestamp(decoder);
                         break;
 
+                case INTEL_PT_TMA:
+                        break;
+
+                case INTEL_PT_CYC:
+                        break;
+
                 case INTEL_PT_CBR:
                         decoder->cbr = decoder->packet.payload;
                         break;
@@ -1162,6 +1194,8 @@ next:
                         return intel_pt_bug(decoder);
 
                 case INTEL_PT_PSBEND:
+                case INTEL_PT_VMCS:
+                case INTEL_PT_MNT:
                 case INTEL_PT_PAD:
                         break;
 
@@ -1202,16 +1236,25 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                         }
                         break;
 
+                case INTEL_PT_MTC:
+                        break;
+
                 case INTEL_PT_TSC:
                         intel_pt_calc_tsc_timestamp(decoder);
                         break;
 
+                case INTEL_PT_TMA:
+                        break;
+
+                case INTEL_PT_CYC:
+                        break;
+
                 case INTEL_PT_CBR:
                         decoder->cbr = decoder->packet.payload;
                         break;
 
                 case INTEL_PT_PIP:
-                        decoder->cr3 = decoder->packet.payload;
+                        decoder->cr3 = decoder->packet.payload & (BIT63 - 1);
                         break;
 
                 case INTEL_PT_MODE_EXEC:
@@ -1222,6 +1265,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                         intel_pt_update_in_tx(decoder);
                         break;
 
+                case INTEL_PT_TRACESTOP:
                 case INTEL_PT_TNT:
                         intel_pt_log("ERROR: Unexpected packet\n");
                         if (decoder->ip)
@@ -1240,6 +1284,8 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                         return 0;
 
                 case INTEL_PT_PSB:
+                case INTEL_PT_VMCS:
+                case INTEL_PT_MNT:
                 case INTEL_PT_PAD:
                 default:
                         break;
@@ -1282,16 +1328,25 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
                                 intel_pt_set_last_ip(decoder);
                         break;
 
+                case INTEL_PT_MTC:
+                        break;
+
                 case INTEL_PT_TSC:
                         intel_pt_calc_tsc_timestamp(decoder);
                         break;
 
+                case INTEL_PT_TMA:
+                        break;
+
+                case INTEL_PT_CYC:
+                        break;
+
                 case INTEL_PT_CBR:
                         decoder->cbr = decoder->packet.payload;
                         break;
 
                 case INTEL_PT_PIP:
-                        decoder->cr3 = decoder->packet.payload;
+                        decoder->cr3 = decoder->packet.payload & (BIT63 - 1);
                         break;
 
                 case INTEL_PT_MODE_EXEC:
@@ -1308,6 +1363,9 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
                 case INTEL_PT_BAD: /* Does not happen */
                         return intel_pt_bug(decoder);
 
+                case INTEL_PT_TRACESTOP:
+                        break;
+
                 case INTEL_PT_PSB:
                         err = intel_pt_walk_psb(decoder);
                         if (err)
@@ -1321,6 +1379,8 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
 
                 case INTEL_PT_TNT:
                 case INTEL_PT_PSBEND:
+                case INTEL_PT_VMCS:
+                case INTEL_PT_MNT:
                 case INTEL_PT_PAD:
                 default:
                         break;
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
index 988c82c6652d..b1257c816310 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
@@ -24,6 +24,8 @@
 
 #define BIT63           ((uint64_t)1 << 63)
 
+#define NR_FLAG         BIT63
+
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define le16_to_cpu bswap_16
 #define le32_to_cpu bswap_32
@@ -46,15 +48,21 @@ static const char * const packet_name[] = {
         [INTEL_PT_TIP_PGD]      = "TIP.PGD",
         [INTEL_PT_TIP_PGE]      = "TIP.PGE",
         [INTEL_PT_TSC]          = "TSC",
+        [INTEL_PT_TMA]          = "TMA",
         [INTEL_PT_MODE_EXEC]    = "MODE.Exec",
         [INTEL_PT_MODE_TSX]     = "MODE.TSX",
+        [INTEL_PT_MTC]          = "MTC",
         [INTEL_PT_TIP]          = "TIP",
         [INTEL_PT_FUP]          = "FUP",
+        [INTEL_PT_CYC]          = "CYC",
+        [INTEL_PT_VMCS]         = "VMCS",
         [INTEL_PT_PSB]          = "PSB",
         [INTEL_PT_PSBEND]       = "PSBEND",
         [INTEL_PT_CBR]          = "CBR",
+        [INTEL_PT_TRACESTOP]    = "TraceSTOP",
         [INTEL_PT_PIP]          = "PIP",
         [INTEL_PT_OVF]          = "OVF",
+        [INTEL_PT_MNT]          = "MNT",
 };
 
 const char *intel_pt_pkt_name(enum intel_pt_pkt_type type)
@@ -96,10 +104,18 @@ static int intel_pt_get_pip(const unsigned char *buf, size_t len,
         packet->type = INTEL_PT_PIP;
         memcpy_le64(&payload, buf + 2, 6);
         packet->payload = payload >> 1;
+        if (payload & 1)
+                packet->payload |= NR_FLAG;
 
         return 8;
 }
 
+static int intel_pt_get_tracestop(struct intel_pt_pkt *packet)
+{
+        packet->type = INTEL_PT_TRACESTOP;
+        return 2;
+}
+
 static int intel_pt_get_cbr(const unsigned char *buf, size_t len,
                             struct intel_pt_pkt *packet)
 {
@@ -110,6 +126,24 @@ static int intel_pt_get_cbr(const unsigned char *buf, size_t len,
         return 4;
 }
 
+static int intel_pt_get_vmcs(const unsigned char *buf, size_t len,
+                             struct intel_pt_pkt *packet)
+{
+        unsigned int count = (52 - 5) >> 3;
+
+        if (count < 1 || count > 7)
+                return INTEL_PT_BAD_PACKET;
+
+        if (len < count + 2)
+                return INTEL_PT_NEED_MORE_BYTES;
+
+        packet->type = INTEL_PT_VMCS;
+        packet->count = count;
+        memcpy_le64(&packet->payload, buf + 2, count);
+
+        return count + 2;
+}
+
 static int intel_pt_get_ovf(struct intel_pt_pkt *packet)
 {
         packet->type = INTEL_PT_OVF;
@@ -139,12 +173,49 @@ static int intel_pt_get_psbend(struct intel_pt_pkt *packet)
         return 2;
 }
 
+static int intel_pt_get_tma(const unsigned char *buf, size_t len,
+                            struct intel_pt_pkt *packet)
+{
+        if (len < 7)
+                return INTEL_PT_NEED_MORE_BYTES;
+
+        packet->type = INTEL_PT_TMA;
+        packet->payload = buf[2] | (buf[3] << 8);
+        packet->count = buf[5] | ((buf[6] & BIT(0)) << 8);
+        return 7;
+}
+
 static int intel_pt_get_pad(struct intel_pt_pkt *packet)
 {
         packet->type = INTEL_PT_PAD;
         return 1;
 }
 
+static int intel_pt_get_mnt(const unsigned char *buf, size_t len,
+                            struct intel_pt_pkt *packet)
+{
+        if (len < 11)
+                return INTEL_PT_NEED_MORE_BYTES;
+        packet->type = INTEL_PT_MNT;
+        memcpy_le64(&packet->payload, buf + 3, 8);
+        return 11
+;
+}
+
+static int intel_pt_get_3byte(const unsigned char *buf, size_t len,
+                              struct intel_pt_pkt *packet)
+{
+        if (len < 3)
+                return INTEL_PT_NEED_MORE_BYTES;
+
+        switch (buf[2]) {
+        case 0x88: /* MNT */
+                return intel_pt_get_mnt(buf, len, packet);
+        default:
+                return INTEL_PT_BAD_PACKET;
+        }
+}
+
 static int intel_pt_get_ext(const unsigned char *buf, size_t len,
                             struct intel_pt_pkt *packet)
 {
@@ -156,14 +227,22 @@ static int intel_pt_get_ext(const unsigned char *buf, size_t len,
                 return intel_pt_get_long_tnt(buf, len, packet);
         case 0x43: /* PIP */
                 return intel_pt_get_pip(buf, len, packet);
+        case 0x83: /* TraceStop */
+                return intel_pt_get_tracestop(packet);
         case 0x03: /* CBR */
                 return intel_pt_get_cbr(buf, len, packet);
+        case 0xc8: /* VMCS */
+                return intel_pt_get_vmcs(buf, len, packet);
         case 0xf3: /* OVF */
                 return intel_pt_get_ovf(packet);
         case 0x82: /* PSB */
                 return intel_pt_get_psb(buf, len, packet);
         case 0x23: /* PSBEND */
                 return intel_pt_get_psbend(packet);
+        case 0x73: /* TMA */
+                return intel_pt_get_tma(buf, len, packet);
+        case 0xC3: /* 3-byte header */
+                return intel_pt_get_3byte(buf, len, packet);
         default:
                 return INTEL_PT_BAD_PACKET;
         }
@@ -187,6 +266,28 @@ static int intel_pt_get_short_tnt(unsigned int byte,
         return 1;
 }
 
+static int intel_pt_get_cyc(unsigned int byte, const unsigned char *buf,
+                            size_t len, struct intel_pt_pkt *packet)
+{
+        unsigned int offs = 1, shift;
+        uint64_t payload = byte >> 3;
+
+        byte >>= 2;
+        len -= 1;
+        for (shift = 5; byte & 1; shift += 7) {
+                if (offs > 9)
+                        return INTEL_PT_BAD_PACKET;
+                if (len < offs)
+                        return INTEL_PT_NEED_MORE_BYTES;
+                byte = buf[offs++];
+                payload |= (byte >> 1) << shift;
+        }
+
+        packet->type = INTEL_PT_CYC;
+        packet->payload = payload;
+        return offs;
+}
+
 static int intel_pt_get_ip(enum intel_pt_pkt_type type, unsigned int byte,
                            const unsigned char *buf, size_t len,
                            struct intel_pt_pkt *packet)
@@ -269,6 +370,16 @@ static int intel_pt_get_tsc(const unsigned char *buf, size_t len,
         return 8;
 }
 
+static int intel_pt_get_mtc(const unsigned char *buf, size_t len,
+                            struct intel_pt_pkt *packet)
+{
+        if (len < 2)
+                return INTEL_PT_NEED_MORE_BYTES;
+        packet->type = INTEL_PT_MTC;
+        packet->payload = buf[1];
+        return 2;
+}
+
 static int intel_pt_do_get_packet(const unsigned char *buf, size_t len,
                                   struct intel_pt_pkt *packet)
 {
@@ -288,6 +399,9 @@ static int intel_pt_do_get_packet(const unsigned char *buf, size_t len,
                 return intel_pt_get_short_tnt(byte, packet);
         }
 
+        if ((byte & 2))
+                return intel_pt_get_cyc(byte, buf, len, packet);
+
         switch (byte & 0x1f) {
         case 0x0D:
                 return intel_pt_get_ip(INTEL_PT_TIP, byte, buf, len, packet);
@@ -305,6 +419,8 @@ static int intel_pt_do_get_packet(const unsigned char *buf, size_t len,
                         return intel_pt_get_mode(buf, len, packet);
                 case 0x19:
                         return intel_pt_get_tsc(buf, len, packet);
+                case 0x59:
+                        return intel_pt_get_mtc(buf, len, packet);
                 default:
                         return INTEL_PT_BAD_PACKET;
                 }
@@ -329,7 +445,7 @@ int intel_pt_get_packet(const unsigned char *buf, size_t len,
 int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf,
                       size_t buf_len)
 {
-        int ret, i;
+        int ret, i, nr;
         unsigned long long payload = packet->payload;
         const char *name = intel_pt_pkt_name(packet->type);
 
@@ -338,6 +454,7 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf,
         case INTEL_PT_PAD:
         case INTEL_PT_PSB:
         case INTEL_PT_PSBEND:
+        case INTEL_PT_TRACESTOP:
         case INTEL_PT_OVF:
                 return snprintf(buf, buf_len, "%s", name);
         case INTEL_PT_TNT: {
@@ -371,17 +488,16 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf,
         case INTEL_PT_FUP:
                 if (!(packet->count))
                         return snprintf(buf, buf_len, "%s no ip", name);
+        case INTEL_PT_CYC:
+        case INTEL_PT_VMCS:
+        case INTEL_PT_MTC:
+        case INTEL_PT_MNT:
         case INTEL_PT_CBR:
-                return snprintf(buf, buf_len, "%s 0x%llx", name, payload);
         case INTEL_PT_TSC:
-                if (packet->count)
-                        return snprintf(buf, buf_len,
-                                        "%s 0x%llx CTC 0x%x FC 0x%x",
-                                        name, payload, packet->count & 0xffff,
-                                        (packet->count >> 16) & 0x1ff);
-                else
-                        return snprintf(buf, buf_len, "%s 0x%llx",
-                                        name, payload);
+                return snprintf(buf, buf_len, "%s 0x%llx", name, payload);
+        case INTEL_PT_TMA:
+                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);
         case INTEL_PT_MODE_TSX:
@@ -389,8 +505,10 @@ int intel_pt_pkt_desc(const struct intel_pt_pkt *packet, char *buf,
                                 name, (unsigned)(payload >> 1) & 1,
                                 (unsigned)payload & 1);
         case INTEL_PT_PIP:
-                ret = snprintf(buf, buf_len, "%s 0x%llx",
-                               name, payload);
+                nr = packet->payload & NR_FLAG ? 1 : 0;
+                payload &= ~NR_FLAG;
+                ret = snprintf(buf, buf_len, "%s 0x%llx (NR=%d)",
+                               name, payload, nr);
                 return ret;
         default:
                 break;
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h
index 53404fa942b3..781bb79883bd 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h
@@ -37,15 +37,21 @@ enum intel_pt_pkt_type {
         INTEL_PT_TIP_PGD,
         INTEL_PT_TIP_PGE,
         INTEL_PT_TSC,
+        INTEL_PT_TMA,
         INTEL_PT_MODE_EXEC,
         INTEL_PT_MODE_TSX,
+        INTEL_PT_MTC,
         INTEL_PT_TIP,
         INTEL_PT_FUP,
+        INTEL_PT_CYC,
+        INTEL_PT_VMCS,
         INTEL_PT_PSB,
         INTEL_PT_PSBEND,
         INTEL_PT_CBR,
+        INTEL_PT_TRACESTOP,
         INTEL_PT_PIP,
         INTEL_PT_OVF,
+        INTEL_PT_MNT,
 };
 
 struct intel_pt_pkt {