perf intel-pt: Record when decoding PSB+ packets

[linux.git] / tools / perf / util / intel-pt-decoder / intel-pt-decoder.c

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 872fab163585ac9dcf6b42ab7d95e8cae651714b..a2384a3149904bbf07c1406251785a9913a3132c 100644 (file)
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -58,6 +58,7 @@ enum intel_pt_pkt_state {
        INTEL_PT_STATE_NO_IP,
        INTEL_PT_STATE_ERR_RESYNC,
        INTEL_PT_STATE_IN_SYNC,
+       INTEL_PT_STATE_TNT_CONT,
        INTEL_PT_STATE_TNT,
        INTEL_PT_STATE_TIP,
        INTEL_PT_STATE_TIP_PGD,
@@ -72,8 +73,9 @@ static inline bool intel_pt_sample_time(enum intel_pt_pkt_state pkt_state)
        case INTEL_PT_STATE_NO_IP:
        case INTEL_PT_STATE_ERR_RESYNC:
        case INTEL_PT_STATE_IN_SYNC:
-       case INTEL_PT_STATE_TNT:
+       case INTEL_PT_STATE_TNT_CONT:
                return true;
+       case INTEL_PT_STATE_TNT:
        case INTEL_PT_STATE_TIP:
        case INTEL_PT_STATE_TIP_PGD:
        case INTEL_PT_STATE_FUP:
@@ -114,6 +116,7 @@ struct intel_pt_decoder {
        bool have_cyc;
        bool fixup_last_mtc;
        bool have_last_ip;
+       bool in_psb;
        enum intel_pt_param_flags flags;
        uint64_t pos;
        uint64_t last_ip;
@@ -158,6 +161,8 @@ struct intel_pt_decoder {
        uint64_t period_mask;
        uint64_t period_ticks;
        uint64_t last_masked_timestamp;
+       uint64_t tot_cyc_cnt;
+       uint64_t sample_tot_cyc_cnt;
        bool continuous_period;
        bool overflow;
        bool set_fup_tx_flags;
@@ -165,6 +170,7 @@ struct intel_pt_decoder {
        bool set_fup_mwait;
        bool set_fup_pwre;
        bool set_fup_exstop;
+       bool sample_cyc;
        unsigned int fup_tx_flags;
        unsigned int tx_flags;
        uint64_t fup_ptw_payload;
@@ -477,6 +483,12 @@ static int intel_pt_bad_packet(struct intel_pt_decoder *decoder)
        return -EBADMSG;
 }
 
+static inline void intel_pt_update_sample_time(struct intel_pt_decoder *decoder)
+{
+       decoder->sample_timestamp = decoder->timestamp;
+       decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+}
+
 static int intel_pt_get_data(struct intel_pt_decoder *decoder)
 {
        struct intel_pt_buffer buffer = { .buf = 0, };
@@ -888,16 +900,20 @@ static uint64_t intel_pt_next_period(struct intel_pt_decoder *decoder)
        timestamp = decoder->timestamp + decoder->timestamp_insn_cnt;
        masked_timestamp = timestamp & decoder->period_mask;
        if (decoder->continuous_period) {
-               if (masked_timestamp != decoder->last_masked_timestamp)
+               if (masked_timestamp > decoder->last_masked_timestamp)
                        return 1;
        } else {
                timestamp += 1;
                masked_timestamp = timestamp & decoder->period_mask;
-               if (masked_timestamp != decoder->last_masked_timestamp) {
+               if (masked_timestamp > decoder->last_masked_timestamp) {
                        decoder->last_masked_timestamp = masked_timestamp;
                        decoder->continuous_period = true;
                }
        }
+
+       if (masked_timestamp < decoder->last_masked_timestamp)
+               return decoder->period_ticks;
+
        return decoder->period_ticks - (timestamp - masked_timestamp);
 }
 
@@ -926,7 +942,10 @@ static void intel_pt_sample_insn(struct intel_pt_decoder *decoder)
        case INTEL_PT_PERIOD_TICKS:
                timestamp = decoder->timestamp + decoder->timestamp_insn_cnt;
                masked_timestamp = timestamp & decoder->period_mask;
-               decoder->last_masked_timestamp = masked_timestamp;
+               if (masked_timestamp > decoder->last_masked_timestamp)
+                       decoder->last_masked_timestamp = masked_timestamp;
+               else
+                       decoder->last_masked_timestamp += decoder->period_ticks;
                break;
        case INTEL_PT_PERIOD_NONE:
        case INTEL_PT_PERIOD_MTC:
@@ -1254,7 +1273,9 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder)
                                return -ENOENT;
                        }
                        decoder->tnt.count -= 1;
-                       if (!decoder->tnt.count)
+                       if (decoder->tnt.count)
+                               decoder->pkt_state = INTEL_PT_STATE_TNT_CONT;
+                       else
                                decoder->pkt_state = INTEL_PT_STATE_IN_SYNC;
                        decoder->tnt.payload <<= 1;
                        decoder->state.from_ip = decoder->ip;
@@ -1285,7 +1306,9 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder)
 
                if (intel_pt_insn.branch == INTEL_PT_BR_CONDITIONAL) {
                        decoder->tnt.count -= 1;
-                       if (!decoder->tnt.count)
+                       if (decoder->tnt.count)
+                               decoder->pkt_state = INTEL_PT_STATE_TNT_CONT;
+                       else
                                decoder->pkt_state = INTEL_PT_STATE_IN_SYNC;
                        if (decoder->tnt.payload & BIT63) {
                                decoder->tnt.payload <<= 1;
@@ -1304,9 +1327,12 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder)
                                decoder->ip += intel_pt_insn.length;
                                return 0;
                        }
+                       decoder->sample_cyc = false;
                        decoder->ip += intel_pt_insn.length;
-                       if (!decoder->tnt.count)
+                       if (!decoder->tnt.count) {
+                               intel_pt_update_sample_time(decoder);
                                return -EAGAIN;
+                       }
                        decoder->tnt.payload <<= 1;
                        continue;
                }
@@ -1494,6 +1520,9 @@ static void intel_pt_calc_cyc_timestamp(struct intel_pt_decoder *decoder)
        decoder->have_cyc = true;
 
        decoder->cycle_cnt += decoder->packet.payload;
+       if (decoder->pge)
+               decoder->tot_cyc_cnt += decoder->packet.payload;
+       decoder->sample_cyc = true;
 
        if (!decoder->cyc_ref_timestamp)
                return;
@@ -1521,14 +1550,17 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
 {
        int err;
 
+       decoder->in_psb = true;
+
        while (1) {
                err = intel_pt_get_next_packet(decoder);
                if (err)
-                       return err;
+                       goto out;
 
                switch (decoder->packet.type) {
                case INTEL_PT_PSBEND:
-                       return 0;
+                       err = 0;
+                       goto out;
 
                case INTEL_PT_TIP_PGD:
                case INTEL_PT_TIP_PGE:
@@ -1546,10 +1578,12 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                case INTEL_PT_PWRX:
                        decoder->have_tma = false;
                        intel_pt_log("ERROR: Unexpected packet\n");
-                       return -EAGAIN;
+                       err = -EAGAIN;
+                       goto out;
 
                case INTEL_PT_OVF:
-                       return intel_pt_overflow(decoder);
+                       err = intel_pt_overflow(decoder);
+                       goto out;
 
                case INTEL_PT_TSC:
                        intel_pt_calc_tsc_timestamp(decoder);
@@ -1595,6 +1629,10 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
                        break;
                }
        }
+out:
+       decoder->in_psb = false;
+
+       return err;
 }
 
 static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)
@@ -1968,10 +2006,12 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
 {
        int err;
 
+       decoder->in_psb = true;
+
        while (1) {
                err = intel_pt_get_next_packet(decoder);
                if (err)
-                       return err;
+                       goto out;
 
                switch (decoder->packet.type) {
                case INTEL_PT_TIP_PGD:
@@ -1987,7 +2027,8 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                case INTEL_PT_PWRE:
                case INTEL_PT_PWRX:
                        intel_pt_log("ERROR: Unexpected packet\n");
-                       return -ENOENT;
+                       err = -ENOENT;
+                       goto out;
 
                case INTEL_PT_FUP:
                        decoder->pge = true;
@@ -2046,16 +2087,20 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                                decoder->pkt_state = INTEL_PT_STATE_ERR4;
                        else
                                decoder->pkt_state = INTEL_PT_STATE_ERR3;
-                       return -ENOENT;
+                       err = -ENOENT;
+                       goto out;
 
                case INTEL_PT_BAD: /* Does not happen */
-                       return intel_pt_bug(decoder);
+                       err = intel_pt_bug(decoder);
+                       goto out;
 
                case INTEL_PT_OVF:
-                       return intel_pt_overflow(decoder);
+                       err = intel_pt_overflow(decoder);
+                       goto out;
 
                case INTEL_PT_PSBEND:
-                       return 0;
+                       err = 0;
+                       goto out;
 
                case INTEL_PT_PSB:
                case INTEL_PT_VMCS:
@@ -2065,6 +2110,10 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
                        break;
                }
        }
+out:
+       decoder->in_psb = false;
+
+       return err;
 }
 
 static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
@@ -2365,6 +2414,7 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                        err = intel_pt_walk_trace(decoder);
                        break;
                case INTEL_PT_STATE_TNT:
+               case INTEL_PT_STATE_TNT_CONT:
                        err = intel_pt_walk_tnt(decoder);
                        if (err == -EAGAIN)
                                err = intel_pt_walk_trace(decoder);
@@ -2396,8 +2446,8 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
        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;
+               intel_pt_update_sample_time(decoder);
+               decoder->sample_tot_cyc_cnt = decoder->tot_cyc_cnt;
        } else {
                decoder->state.err = 0;
                if (decoder->cbr != decoder->cbr_seen && decoder->state.type) {
@@ -2406,8 +2456,9 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                        decoder->state.cbr_payload = decoder->cbr_payload;
                }
                if (intel_pt_sample_time(decoder->pkt_state)) {
-                       decoder->sample_timestamp = decoder->timestamp;
-                       decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+                       intel_pt_update_sample_time(decoder);
+                       if (decoder->sample_cyc)
+                               decoder->sample_tot_cyc_cnt = decoder->tot_cyc_cnt;
                }
        }
 
@@ -2415,6 +2466,7 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
        decoder->state.est_timestamp = intel_pt_est_timestamp(decoder);
        decoder->state.cr3 = decoder->cr3;
        decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;
+       decoder->state.tot_cyc_cnt = decoder->sample_tot_cyc_cnt;
 
        return &decoder->state;
 }