Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 16:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

coresight: events: PERF_RECORD_AUX_OUTPUT_HW_ID used for Trace ID

Browse Source 
Use the perf_report_aux_output_id() call to output the CoreSight trace ID
and associated CPU as a PERF_RECORD_AUX_OUTPUT_HW_ID record in the
perf.data file.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230116124928.5440-14-mike.leach@linaro.org
This commit is contained in:
Mike Leach 2023-01-16 12:49:26 +00:00 committed by Suzuki K Poulose
parent 7d30d480a6
commit aa19bb4c35
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hwtracing/coresight/coresight-etm-perf.c
View File

@ -4,6 +4,7 @@
* Author: Mathieu Poirier <mathieu.poirier@linaro.org> * Author: Mathieu Poirier <mathieu.poirier@linaro.org>
*/ */
#include <linux/bitfield.h>
#include <linux/coresight.h> #include <linux/coresight.h>
#include <linux/coresight-pmu.h> #include <linux/coresight-pmu.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
@ -448,6 +449,7 @@ static void etm_event_start(struct perf_event *event, int flags)
struct perf_output_handle *handle = &ctxt->handle; struct perf_output_handle *handle = &ctxt->handle;
struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu); struct coresight_device *sink, *csdev = per_cpu(csdev_src, cpu);
struct list_head *path; struct list_head *path;
u64 hw_id;
if (!csdev) if (!csdev)
goto fail; goto fail;
@ -493,6 +495,11 @@ static void etm_event_start(struct perf_event *event, int flags)
if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF)) if (source_ops(csdev)->enable(csdev, event, CS_MODE_PERF))
goto fail_disable_path; goto fail_disable_path;
/* output cpu / trace ID in perf record */
hw_id = FIELD_PREP(CS_AUX_HW_ID_VERSION_MASK, CS_AUX_HW_ID_CURR_VERSION);
hw_id |= FIELD_PREP(CS_AUX_HW_ID_TRACE_ID_MASK, coresight_trace_id_read_cpu_id(cpu));
perf_report_aux_output_id(event, hw_id);
out: out:
/* Tell the perf core the event is alive */ /* Tell the perf core the event is alive */
event->hw.state = 0; event->hw.state = 0;

14
include/linux/coresight-pmu.h
View File

@ -7,6 +7,8 @@
#ifndef _LINUX_CORESIGHT_PMU_H #ifndef _LINUX_CORESIGHT_PMU_H
#define _LINUX_CORESIGHT_PMU_H #define _LINUX_CORESIGHT_PMU_H
#include <linux/bits.h>
#define CORESIGHT_ETM_PMU_NAME "cs_etm" #define CORESIGHT_ETM_PMU_NAME "cs_etm"
/* /*
@ -43,4 +45,16 @@
#define ETM4_CFG_BIT_RETSTK 12 #define ETM4_CFG_BIT_RETSTK 12
#define ETM4_CFG_BIT_VMID_OPT 15 #define ETM4_CFG_BIT_VMID_OPT 15
/*
* Interpretation of the PERF_RECORD_AUX_OUTPUT_HW_ID payload.
* Used to associate a CPU with the CoreSight Trace ID.
* [07:00] - Trace ID - uses 8 bits to make value easy to read in file.
* [59:08] - Unused (SBZ)
* [63:60] - Version
*/
#define CS_AUX_HW_ID_TRACE_ID_MASK GENMASK_ULL(7, 0)
#define CS_AUX_HW_ID_VERSION_MASK GENMASK_ULL(63, 60)
#define CS_AUX_HW_ID_CURR_VERSION 0
#endif #endif