1 files changed, 85 insertions, 36 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 71df7acf8643..eeeae0629ad3 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <linux/compiler.h>
 
 #include "../cache.h"
 #include "../util.h"
@@ -63,6 +64,25 @@ enum intel_pt_pkt_state {
         INTEL_PT_STATE_FUP_NO_TIP,
 };
 
+static inline bool intel_pt_sample_time(enum intel_pt_pkt_state pkt_state)
+{
+        switch (pkt_state) {
+        case INTEL_PT_STATE_NO_PSB:
+        case INTEL_PT_STATE_NO_IP:
+        case INTEL_PT_STATE_ERR_RESYNC:
+        case INTEL_PT_STATE_IN_SYNC:
+        case INTEL_PT_STATE_TNT:
+                return true;
+        case INTEL_PT_STATE_TIP:
+        case INTEL_PT_STATE_TIP_PGD:
+        case INTEL_PT_STATE_FUP:
+        case INTEL_PT_STATE_FUP_NO_TIP:
+                return false;
+        default:
+                return true;
+        };
+}
+
 #ifdef INTEL_PT_STRICT
 #define INTEL_PT_STATE_ERR1     INTEL_PT_STATE_NO_PSB
 #define INTEL_PT_STATE_ERR2     INTEL_PT_STATE_NO_PSB
@@ -90,6 +110,7 @@ struct intel_pt_decoder {
         bool have_tma;
         bool have_cyc;
         bool fixup_last_mtc;
+        bool have_last_ip;
         uint64_t pos;
         uint64_t last_ip;
         uint64_t ip;
@@ -97,6 +118,7 @@ struct intel_pt_decoder {
         uint64_t timestamp;
         uint64_t tsc_timestamp;
         uint64_t ref_timestamp;
+        uint64_t sample_timestamp;
         uint64_t ret_addr;
         uint64_t ctc_timestamp;
         uint64_t ctc_delta;
@@ -124,8 +146,6 @@ struct intel_pt_decoder {
         bool have_calc_cyc_to_tsc;
         int exec_mode;
         unsigned int insn_bytes;
-        uint64_t sign_bit;
-        uint64_t sign_bits;
         uint64_t period;
         enum intel_pt_period_type period_type;
         uint64_t tot_insn_cnt;
@@ -139,6 +159,7 @@ struct intel_pt_decoder {
         unsigned int fup_tx_flags;
         unsigned int tx_flags;
         uint64_t timestamp_insn_cnt;
+        uint64_t sample_insn_cnt;
         uint64_t stuck_ip;
         int no_progress;
         int stuck_ip_prd;
@@ -192,9 +213,6 @@ struct intel_pt_decoder *intel_pt_decoder_new(struct intel_pt_params *params)
         decoder->data               = params->data;
         decoder->return_compression = params->return_compression;
 
-        decoder->sign_bit           = (uint64_t)1 << 47;
-        decoder->sign_bits          = ~(((uint64_t)1 << 48) - 1);
-
         decoder->period             = params->period;
         decoder->period_type        = params->period_type;
 
@@ -363,21 +381,30 @@ int intel_pt__strerror(int code, char *buf, size_t buflen)
         return 0;
 }
 
-static uint64_t intel_pt_calc_ip(struct intel_pt_decoder *decoder,
-                                 const struct intel_pt_pkt *packet,
+static uint64_t intel_pt_calc_ip(const struct intel_pt_pkt *packet,
                                  uint64_t last_ip)
 {
         uint64_t ip;
 
         switch (packet->count) {
-        case 2:
+        case 1:
                 ip = (last_ip & (uint64_t)0xffffffffffff0000ULL) |
                      packet->payload;
                 break;
-        case 4:
+        case 2:
                 ip = (last_ip & (uint64_t)0xffffffff00000000ULL) |
                      packet->payload;
                 break;
+        case 3:
+                ip = packet->payload;
+                /* Sign-extend 6-byte ip */
+                if (ip & (uint64_t)0x800000000000ULL)
+                        ip |= (uint64_t)0xffff000000000000ULL;
+                break;
+        case 4:
+                ip = (last_ip & (uint64_t)0xffff000000000000ULL) |
+                     packet->payload;
+                break;
         case 6:
                 ip = packet->payload;
                 break;
@@ -385,16 +412,13 @@ static uint64_t intel_pt_calc_ip(struct intel_pt_decoder *decoder,
                 return 0;
         }
 
-        if (ip & decoder->sign_bit)
-                return ip | decoder->sign_bits;
-
         return ip;
 }
 
 static inline void intel_pt_set_last_ip(struct intel_pt_decoder *decoder)
 {
-        decoder->last_ip = intel_pt_calc_ip(decoder, &decoder->packet,
-                                            decoder->last_ip);
+        decoder->last_ip = intel_pt_calc_ip(&decoder->packet, decoder->last_ip);
+        decoder->have_last_ip = true;
 }
 
 static inline void intel_pt_set_ip(struct intel_pt_decoder *decoder)
@@ -895,6 +919,7 @@ static int intel_pt_walk_insn(struct intel_pt_decoder *decoder,
 
         decoder->tot_insn_cnt += insn_cnt;
         decoder->timestamp_insn_cnt += insn_cnt;
+        decoder->sample_insn_cnt += insn_cnt;
         decoder->period_insn_cnt += insn_cnt;
 
         if (err) {
@@ -1413,7 +1438,8 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
 
                 case INTEL_PT_FUP:
                         decoder->pge = true;
-                        intel_pt_set_last_ip(decoder);
+                        if (decoder->packet.count)
+                                intel_pt_set_last_ip(decoder);
                         break;
 
                 case INTEL_PT_MODE_TSX:
@@ -1617,6 +1643,8 @@ next:
                         break;
 
                 case INTEL_PT_PSB:
+                        decoder->last_ip = 0;
+                        decoder->have_last_ip = true;
                         intel_pt_clear_stack(&decoder->stack);
                         err = intel_pt_walk_psbend(decoder);
                         if (err == -EAGAIN)
@@ -1695,6 +1723,13 @@ next:
         }
 }
 
+static inline bool intel_pt_have_ip(struct intel_pt_decoder *decoder)
+{
+        return decoder->packet.count &&
+               (decoder->have_last_ip || decoder->packet.count == 3 ||
+                decoder->packet.count == 6);
+}
+
 /* Walk PSB+ packets to get in sync. */
 static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
 {
@@ -1708,6 +1743,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                 switch (decoder->packet.type) {
                 case INTEL_PT_TIP_PGD:
                         decoder->continuous_period = false;
+                        __fallthrough;
                 case INTEL_PT_TIP_PGE:
                 case INTEL_PT_TIP:
                         intel_pt_log("ERROR: Unexpected packet\n");
@@ -1715,8 +1751,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
 
                 case INTEL_PT_FUP:
                         decoder->pge = true;
-                        if (decoder->last_ip || decoder->packet.count == 6 ||
-                            decoder->packet.count == 0) {
+                        if (intel_pt_have_ip(decoder)) {
                                 uint64_t current_ip = decoder->ip;
 
                                 intel_pt_set_ip(decoder);
@@ -1762,6 +1797,8 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                         decoder->pge = false;
                         decoder->continuous_period = false;
                         intel_pt_clear_tx_flags(decoder);
+                        __fallthrough;
+
                 case INTEL_PT_TNT:
                         decoder->have_tma = false;
                         intel_pt_log("ERROR: Unexpected packet\n");
@@ -1802,27 +1839,21 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
                 switch (decoder->packet.type) {
                 case INTEL_PT_TIP_PGD:
                         decoder->continuous_period = false;
+                        __fallthrough;
                 case INTEL_PT_TIP_PGE:
                 case INTEL_PT_TIP:
                         decoder->pge = decoder->packet.type != INTEL_PT_TIP_PGD;
-                        if (decoder->last_ip || decoder->packet.count == 6 ||
-                            decoder->packet.count == 0)
+                        if (intel_pt_have_ip(decoder))
                                 intel_pt_set_ip(decoder);
                         if (decoder->ip)
                                 return 0;
                         break;
 
                 case INTEL_PT_FUP:
-                        if (decoder->overflow) {
-                                if (decoder->last_ip ||
-                                    decoder->packet.count == 6 ||
-                                    decoder->packet.count == 0)
-                                        intel_pt_set_ip(decoder);
-                                if (decoder->ip)
-                                        return 0;
-                        }
-                        if (decoder->packet.count)
-                                intel_pt_set_last_ip(decoder);
+                        if (intel_pt_have_ip(decoder))
+                                intel_pt_set_ip(decoder);
+                        if (decoder->ip)
+                                return 0;
                         break;
 
                 case INTEL_PT_MTC:
@@ -1871,6 +1902,9 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
                         break;
 
                 case INTEL_PT_PSB:
+                        decoder->last_ip = 0;
+                        decoder->have_last_ip = true;
+                        intel_pt_clear_stack(&decoder->stack);
                         err = intel_pt_walk_psb(decoder);
                         if (err)
                                 return err;
@@ -1896,6 +1930,8 @@ static int intel_pt_sync_ip(struct intel_pt_decoder *decoder)
 {
         int err;
 
+        decoder->set_fup_tx_flags = false;
+
         intel_pt_log("Scanning for full IP\n");
         err = intel_pt_walk_to_ip(decoder);
         if (err)
@@ -2004,6 +2040,7 @@ static int intel_pt_sync(struct intel_pt_decoder *decoder)
 
         decoder->pge = false;
         decoder->continuous_period = false;
+        decoder->have_last_ip = false;
         decoder->last_ip = 0;
         decoder->ip = 0;
         intel_pt_clear_stack(&decoder->stack);
@@ -2012,6 +2049,7 @@ static int intel_pt_sync(struct intel_pt_decoder *decoder)
         if (err)
                 return err;
 
+        decoder->have_last_ip = true;
         decoder->pkt_state = INTEL_PT_STATE_NO_IP;
 
         err = intel_pt_walk_psb(decoder);
@@ -2030,7 +2068,7 @@ static int intel_pt_sync(struct intel_pt_decoder *decoder)
 
 static uint64_t intel_pt_est_timestamp(struct intel_pt_decoder *decoder)
 {
-        uint64_t est = decoder->timestamp_insn_cnt << 1;
+        uint64_t est = decoder->sample_insn_cnt << 1;
 
         if (!decoder->cbr || !decoder->max_non_turbo_ratio)
                 goto out;
@@ -2038,7 +2076,7 @@ static uint64_t intel_pt_est_timestamp(struct intel_pt_decoder *decoder)
         est *= decoder->max_non_turbo_ratio;
         est /= decoder->cbr;
 out:
-        return decoder->timestamp + est;
+        return decoder->sample_timestamp + est;
 }
 
 const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
@@ -2054,7 +2092,9 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                         err = intel_pt_sync(decoder);
                         break;
                 case INTEL_PT_STATE_NO_IP:
+                        decoder->have_last_ip = false;
                         decoder->last_ip = 0;
+                        decoder->ip = 0;
                         /* Fall through */
                 case INTEL_PT_STATE_ERR_RESYNC:
                         err = intel_pt_sync_ip(decoder);
@@ -2091,15 +2131,24 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                 }
         } while (err == -ENOLINK);
 
-        decoder->state.err = err ? intel_pt_ext_err(err) : 0;
-        decoder->state.timestamp = decoder->timestamp;
+        if (err) {
+                decoder->state.err = intel_pt_ext_err(err);
+                decoder->state.from_ip = decoder->ip;
+                decoder->sample_timestamp = decoder->timestamp;
+                decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+        } else {
+                decoder->state.err = 0;
+                if (intel_pt_sample_time(decoder->pkt_state)) {
+                        decoder->sample_timestamp = decoder->timestamp;
+                        decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+                }
+        }
+
+        decoder->state.timestamp = decoder->sample_timestamp;
         decoder->state.est_timestamp = intel_pt_est_timestamp(decoder);
         decoder->state.cr3 = decoder->cr3;
         decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;
 
-        if (err)
-                decoder->state.from_ip = decoder->ip;
-
         return &decoder->state;
 }