@@ -594,14 +594,48 @@ static void etm_event_start(struct perf_event *event, int flags)
return;
}
-static void etm_event_pause(struct coresight_device *csdev,
+static void etm_event_pause(struct perf_event *event,
+ struct coresight_device *csdev,
struct etm_ctxt *ctxt)
{
+ int cpu = smp_processor_id();
+ struct coresight_device *sink;
+ struct perf_output_handle *handle = &ctxt->handle;
+ struct list_head *path;
+ unsigned long size;
+
if (!ctxt->event_data)
return;
/* Stop tracer */
coresight_pause_source(csdev);
+
+ /* Bail out if no need update buffer */
+ if (!ctxt->event_data->update_buf_on_pause)
+ return;
+
+ if (WARN_ON_ONCE(handle->event != event))
+ return;
+
+ path = etm_event_cpu_path(ctxt->event_data, cpu);
+ sink = coresight_get_sink(path);
+ if (WARN_ON_ONCE(!sink))
+ return;
+
+ if (!sink_ops(sink)->update_buffer)
+ return;
+
+ size = sink_ops(sink)->update_buffer(sink, handle,
+ ctxt->event_data->snk_config);
+ if (READ_ONCE(handle->event)) {
+ if (!size)
+ return;
+
+ perf_aux_output_end(handle, size);
+ perf_aux_output_begin(handle, event);
+ } else {
+ WARN_ON_ONCE(size);
+ }
}
static void etm_event_stop(struct perf_event *event, int mode)
@@ -615,7 +649,7 @@ static void etm_event_stop(struct perf_event *event, int mode)
struct list_head *path;
if (mode & PERF_EF_PAUSE)
- return etm_event_pause(csdev, ctxt);
+ return etm_event_pause(event, csdev, ctxt);
/*
* If we still have access to the event_data via handle,
Due to sinks like ETR and ETB don't support interrupt handling, the hardware trace data might be lost for continuous running tasks. This commit takes advantage of the AUX pause for updating trace buffer to mitigate the trace data losing issue. Signed-off-by: Leo Yan <leo.yan@arm.com> --- .../hwtracing/coresight/coresight-etm-perf.c | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-)