Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / tools / perf / util / cs-etm.c

diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 822ba915d144de828347936bb2c1514943266f36..2ae640257fdbbe897d8c398d1dfeeb406d1c9fb1 100644 (file)
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -494,6 +494,10 @@ static inline void cs_etm__reset_last_branch_rb(struct cs_etm_queue *etmq)
 
 static inline u64 cs_etm__last_executed_instr(struct cs_etm_packet *packet)
 {
+       /* Returns 0 for the CS_ETM_TRACE_ON packet */
+       if (packet->sample_type == CS_ETM_TRACE_ON)
+               return 0;
+
        /*
         * The packet records the execution range with an exclusive end address
         *
@@ -505,6 +509,15 @@ static inline u64 cs_etm__last_executed_instr(struct cs_etm_packet *packet)
        return packet->end_addr - A64_INSTR_SIZE;
 }
 
+static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet)
+{
+       /* Returns 0 for the CS_ETM_TRACE_ON packet */
+       if (packet->sample_type == CS_ETM_TRACE_ON)
+               return 0;
+
+       return packet->start_addr;
+}
+
 static inline u64 cs_etm__instr_count(const struct cs_etm_packet *packet)
 {
        /*
@@ -546,7 +559,7 @@ static void cs_etm__update_last_branch_rb(struct cs_etm_queue *etmq)
 
        be       = &bs->entries[etmq->last_branch_pos];
        be->from = cs_etm__last_executed_instr(etmq->prev_packet);
-       be->to   = etmq->packet->start_addr;
+       be->to   = cs_etm__first_executed_instr(etmq->packet);
        /* No support for mispredict */
        be->flags.mispred = 0;
        be->flags.predicted = 1;
@@ -701,7 +714,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq)
        sample.ip = cs_etm__last_executed_instr(etmq->prev_packet);
        sample.pid = etmq->pid;
        sample.tid = etmq->tid;
-       sample.addr = etmq->packet->start_addr;
+       sample.addr = cs_etm__first_executed_instr(etmq->packet);
        sample.id = etmq->etm->branches_id;
        sample.stream_id = etmq->etm->branches_id;
        sample.period = 1;
@@ -897,13 +910,23 @@ static int cs_etm__sample(struct cs_etm_queue *etmq)
                etmq->period_instructions = instrs_over;
        }
 
-       if (etm->sample_branches &&
-           etmq->prev_packet &&
-           etmq->prev_packet->sample_type == CS_ETM_RANGE &&
-           etmq->prev_packet->last_instr_taken_branch) {
-               ret = cs_etm__synth_branch_sample(etmq);
-               if (ret)
-                       return ret;
+       if (etm->sample_branches && etmq->prev_packet) {
+               bool generate_sample = false;
+
+               /* Generate sample for tracing on packet */
+               if (etmq->prev_packet->sample_type == CS_ETM_TRACE_ON)
+                       generate_sample = true;
+
+               /* Generate sample for branch taken packet */
+               if (etmq->prev_packet->sample_type == CS_ETM_RANGE &&
+                   etmq->prev_packet->last_instr_taken_branch)
+                       generate_sample = true;
+
+               if (generate_sample) {
+                       ret = cs_etm__synth_branch_sample(etmq);
+                       if (ret)
+                               return ret;
+               }
        }
 
        if (etm->sample_branches || etm->synth_opts.last_branch) {
@@ -922,10 +945,17 @@ static int cs_etm__sample(struct cs_etm_queue *etmq)
 static int cs_etm__flush(struct cs_etm_queue *etmq)
 {
        int err = 0;
+       struct cs_etm_auxtrace *etm = etmq->etm;
        struct cs_etm_packet *tmp;
 
+       if (!etmq->prev_packet)
+               return 0;
+
+       /* Handle start tracing packet */
+       if (etmq->prev_packet->sample_type == CS_ETM_EMPTY)
+               goto swap_packet;
+
        if (etmq->etm->synth_opts.last_branch &&
-           etmq->prev_packet &&
            etmq->prev_packet->sample_type == CS_ETM_RANGE) {
                /*
                 * Generate a last branch event for the branches left in the
@@ -939,8 +969,22 @@ static int cs_etm__flush(struct cs_etm_queue *etmq)
                err = cs_etm__synth_instruction_sample(
                        etmq, addr,
                        etmq->period_instructions);
+               if (err)
+                       return err;
+
                etmq->period_instructions = 0;
 
+       }
+
+       if (etm->sample_branches &&
+           etmq->prev_packet->sample_type == CS_ETM_RANGE) {
+               err = cs_etm__synth_branch_sample(etmq);
+               if (err)
+                       return err;
+       }
+
+swap_packet:
+       if (etmq->etm->synth_opts.last_branch) {
                /*
                 * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for
                 * the next incoming packet.
@@ -1020,6 +1064,13 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq)
                                         */
                                        cs_etm__flush(etmq);
                                        break;
+                               case CS_ETM_EMPTY:
+                                       /*
+                                        * Should not receive empty packet,
+                                        * report error.
+                                        */
+                                       pr_err("CS ETM Trace: empty packet\n");
+                                       return -EINVAL;
                                default:
                                        break;
                                }