[PATCH 16/34] perf cs-etm: Don't buffer non-timestamped packets
From: James Clark
Date: Wed Nov 18 2026 - 11:30:40 EST
We're going to use the same decode path for timestamped and not
timestamped, but we don't want to buffer non-timestamped trace
unnecessarily. Buffering is only for searching for a timestamp and doing
it when there are no timestamps only results in not generating samples
in trace order.
Let the backend know if timestamps are expected or not so it can decide
to buffer or not.
Rename pending_timestamp_chan_id because now it just means that a packet
is pending, either due to a timestamp being found or the first packet
decoded.
Signed-off-by: James Clark <james.clark@xxxxxxxxxx>
---
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 50 +++++++++++--------------
tools/perf/util/cs-etm.c | 23 ++++--------
tools/perf/util/cs-etm.h | 4 +-
3 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
index d260d89453ef..895e85a1f54b 100644
--- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
+++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
@@ -259,27 +259,16 @@ cs_etm_decoder__init_def_logger_printing(struct cs_etm_decoder_params *d_params,
return 0;
}
-static ocsd_datapath_resp_t
-cs_etm_decoder__do_soft_timestamp(struct cs_etm_queue *etmq,
- struct cs_etm_packet_queue *packet_queue,
- const uint8_t trace_chan_id)
+static void
+cs_etm_decoder__do_soft_timestamp(struct cs_etm_packet_queue *packet_queue)
{
u64 estimated_ts;
- /* No timestamp packet has been received, nothing to do */
- if (!packet_queue->next_cs_timestamp)
- return OCSD_RESP_CONT;
-
estimated_ts = packet_queue->cs_timestamp +
cs_etm_decoder__dec_instr_count_to_ns(&packet_queue->instr_count);
/* Estimated TS can never be higher than the next real one in the trace */
packet_queue->cs_timestamp = min(packet_queue->next_cs_timestamp, estimated_ts);
-
- /* Tell the front end which traceid_queue needs attention */
- cs_etm__etmq_set_traceid_queue_timestamp(etmq, trace_chan_id);
-
- return OCSD_RESP_WAIT;
}
static ocsd_datapath_resp_t
@@ -358,7 +347,7 @@ cs_etm_decoder__do_hard_timestamp(struct cs_etm_queue *etmq,
packet_queue->instr_count = 0;
/* Tell the front end which traceid_queue needs attention */
- cs_etm__etmq_set_traceid_queue_timestamp(etmq, trace_chan_id);
+ cs_etm__etmq_set_traceid_queue_ready(etmq, trace_chan_id);
/* Halt processing until we are being told to proceed */
return OCSD_RESP_WAIT;
@@ -437,10 +426,13 @@ cs_etm_decoder__buffer_packet(struct cs_etm_queue *etmq,
packet_queue->packet_buffer[et].el = ocsd_EL_unknown;
packet_queue->packet_buffer[et].tid = -1;
- if (packet_queue->packet_count == CS_ETM_PACKET_MAX_BUFFER - 1)
- return OCSD_RESP_WAIT;
+ /* Keep decoding until a timestamp is hit or queue fills up */
+ if (cs_etm__has_timestamps(etmq) &&
+ packet_queue->packet_count < CS_ETM_PACKET_MAX_BUFFER - 1)
+ return OCSD_RESP_CONT;
- return OCSD_RESP_CONT;
+ cs_etm__etmq_set_traceid_queue_ready(etmq, trace_chan_id);
+ return OCSD_RESP_WAIT;
}
static ocsd_datapath_resp_t
@@ -475,19 +467,19 @@ cs_etm_decoder__buffer_range(struct cs_etm_queue *etmq,
packet->last_instr_size = elem->last_instr_sz;
- /*
- * The packet queue is full and we haven't seen a timestamp (had we
- * seen one the packet queue wouldn't be full). Let the front end
- * deal with it.
- */
- if (ret == OCSD_RESP_WAIT)
- goto out;
-
packet_queue->instr_count += elem->num_instr_range;
- /* Tell the front end we have a new timestamp to process */
- ret = cs_etm_decoder__do_soft_timestamp(etmq, packet_queue,
- trace_chan_id);
-out:
+
+ if (packet_queue->next_cs_timestamp) {
+ /*
+ * Once a real timestamp has been received, every range can be
+ * handed to the frontend without queueing using an estimated
+ * soft timestamp.
+ */
+ cs_etm_decoder__do_soft_timestamp(packet_queue);
+ cs_etm__etmq_set_traceid_queue_ready(etmq, trace_chan_id);
+ return OCSD_RESP_WAIT;
+ }
+
return ret;
}
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index ca3878a3b74e..b746d1215e0a 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -110,7 +110,7 @@ struct cs_etm_queue {
struct cs_etm_decoder *decoder;
struct auxtrace_buffer *buffer;
unsigned int queue_nr;
- u8 pending_timestamp_chan_id;
+ u8 ready_chan_id;
enum cs_etm_format format;
u64 offset;
const unsigned char *buf;
@@ -568,17 +568,10 @@ static int cs_etm__process_aux_output_hw_id(struct perf_session *session,
return err;
}
-void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq,
- u8 trace_chan_id)
+void cs_etm__etmq_set_traceid_queue_ready(struct cs_etm_queue *etmq,
+ u8 trace_chan_id)
{
- /*
- * When a timestamp packet is encountered the backend code
- * is stopped so that the front end has time to process packets
- * that were accumulated in the traceID queue. Since there can
- * be more than one channel per cs_etm_queue, we need to specify
- * what traceID queue needs servicing.
- */
- etmq->pending_timestamp_chan_id = trace_chan_id;
+ etmq->ready_chan_id = trace_chan_id;
}
/*
@@ -598,19 +591,19 @@ static u64 cs_etm__etmq_get_sort_timestamp(struct cs_etm_queue *etmq,
{
struct cs_etm_packet_queue *packet_queue;
- if (!etmq->pending_timestamp_chan_id)
+ if (!etmq->ready_chan_id)
return 0;
if (trace_chan_id)
- *trace_chan_id = etmq->pending_timestamp_chan_id;
+ *trace_chan_id = etmq->ready_chan_id;
packet_queue = cs_etm__etmq_get_packet_queue(etmq,
- etmq->pending_timestamp_chan_id);
+ etmq->ready_chan_id);
if (!packet_queue)
return 0;
/* Acknowledge pending status */
- etmq->pending_timestamp_chan_id = 0;
+ etmq->ready_chan_id = 0;
/*
* If there are no timestamps, use the TS from the AUX records to sort
diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
index 9e842f1be9fc..71b1ef321625 100644
--- a/tools/perf/util/cs-etm.h
+++ b/tools/perf/util/cs-etm.h
@@ -270,8 +270,8 @@ int cs_etm__etmq_update_decode_context(struct cs_etm_queue *etmq,
u8 trace_chan_id, ocsd_ex_level el,
pid_t tid);
bool cs_etm__has_timestamps(struct cs_etm_queue *etmq);
-void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq,
- u8 trace_chan_id);
+void cs_etm__etmq_set_traceid_queue_ready(struct cs_etm_queue *etmq,
+ u8 trace_chan_id);
struct cs_etm_packet_queue
*cs_etm__etmq_get_packet_queue(struct cs_etm_queue *etmq, u8 trace_chan_id);
int cs_etm__process_auxtrace_info_full(union perf_event *event __maybe_unused,
--
2.43.0