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 f4c3c84b090f6674655e6414a4551fb0fd96ca96..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
@@ -116,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;
@@ -160,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;
@@ -167,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;
@@ -479,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, };
@@ -1317,10 +1327,10 @@ 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) {
-                               decoder->sample_timestamp = decoder->timestamp;
-                               decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+                               intel_pt_update_sample_time(decoder);
                                return -EAGAIN;
                        }
                        decoder->tnt.payload <<= 1;
@@ -1510,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;
@@ -1537,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:
@@ -1562,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);
@@ -1611,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)
@@ -1984,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:
@@ -2003,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;
@@ -2062,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:
@@ -2081,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)
@@ -2413,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) {
@@ -2423,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;
                }
        }
 
@@ -2432,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;
 }