trbe_get_fault_act() currently handles only a small set of TRBE stop reasons: external aborts, trigger events and stage 1 and 2 aborts. Other TRBSR_EL1 EC/BSC values are reported as spurious events, which hides useful failure information and makes the status handling hard to extend.
Decode the EC and BSC fields explicitly. Keep the normal fill-mode handling unchanged, but treat unsupported or unexpected status values as fatal and report them with a ratelimited diagnostic containing TRBSR_EL1, TRBPTR_EL1 and TRBLIMITR_EL1. Use %p for the buffer pointers so the printk diagnostic hashes their address values by default.
Stop using is_trbe_trg(), instead, use TRBSR_EL1_BSC_TRIGGER_EVENT as the unsupported trigger case. This keeps the stop-reason handling in the EC/BSC decode path, the driver can validate the status fields safely.
Move the TRBSR_EL1 BSC definitions to the arm64 sysreg header, and use the common TRBSR_EL1 EC/BSC names in the TRBE driver.
Signed-off-by: Leo Yan leo.yan@arm.com --- arch/arm64/include/asm/sysreg.h | 6 +++ drivers/hwtracing/coresight/coresight-trbe.c | 57 +++++++++++++++++++++++++--- drivers/hwtracing/coresight/coresight-trbe.h | 8 ---- 3 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 7aa08d59d49448cfa3bb61f5cb42e0a6f1aa8a89..0e602f07625b3c4fe6cd3fd71a658ebae768d8fd 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -357,6 +357,12 @@ #define TRBSR_EL1_BSC_MASK GENMASK(5, 0) #define TRBSR_EL1_BSC_SHIFT 0
+#define TRBSR_EL1_BSC_NOT_STOPPED UL(0) +#define TRBSR_EL1_BSC_FILLED UL(1) +#define TRBSR_EL1_BSC_TRIGGER_EVENT UL(2) +#define TRBSR_EL1_BSC_MANUAL_STOP UL(3) +#define TRBSR_EL1_BSC_BUF_SIZE UL(4) + #define SYS_PMINTENSET_EL1 sys_reg(3, 0, 9, 14, 1) #define SYS_PMINTENCLR_EL1 sys_reg(3, 0, 9, 14, 2)
diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c index 1f51c33de83638479436683fd96e31d69c3b860f..a851f09d806a6b6a6386d6f7547b01a17f61b88e 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -658,29 +658,76 @@ static void trbe_enable_hw(struct trbe_buf *buf) static enum trbe_fault_action trbe_get_fault_act(struct perf_output_handle *handle, u64 trbsr) { + const char *err_str; int ec = get_trbe_ec(trbsr); int bsc = get_trbe_bsc(trbsr); struct trbe_buf *buf = etm_perf_sink_config(handle); struct trbe_cpudata *cpudata = buf->cpudata;
WARN_ON(is_trbe_running(trbsr)); - if (is_trbe_trg(trbsr) || is_trbe_abort(trbsr)) - return TRBE_FAULT_ACT_FATAL;
- if ((ec == TRBE_EC_STAGE1_ABORT) || (ec == TRBE_EC_STAGE2_ABORT)) - return TRBE_FAULT_ACT_FATAL; + if (is_trbe_abort(trbsr)) { + err_str = "External abort"; + goto out_fatal; + } + + switch (ec) { + case TRBSR_EL1_EC_OTHER: + break; + case TRBSR_EL1_EC_IMP_DEF: + err_str = "Unexpected IMPDEF buffer management event"; + goto out_fatal; + case TRBSR_EL1_EC_FAULT_GPC: + err_str = "Granule Protection Check fault"; + goto out_fatal; + case TRBSR_EL1_EC_FAULT_WRITE_S1: + err_str = "Stage 1 data abort"; + goto out_fatal; + case TRBSR_EL1_EC_FAULT_WRITE_S2: + err_str = "Stage 2 data abort"; + goto out_fatal; + default: + err_str = "Unknown error code"; + goto out_fatal; + } + + switch (bsc) { + case TRBSR_EL1_BSC_NOT_STOPPED: + break; + case TRBSR_EL1_BSC_FILLED: + break; + case TRBSR_EL1_BSC_TRIGGER_EVENT: + err_str = "Unsupported trigger event"; + goto out_fatal; + case TRBSR_EL1_BSC_MANUAL_STOP: + err_str = "Unsupported manual stop"; + goto out_fatal; + case TRBSR_EL1_BSC_BUF_SIZE: + err_str = "Buffer size was too large"; + goto out_fatal; + default: + err_str = "Unexpected buffer status code"; + goto out_fatal; + }
/* * If the trbe is affected by TRBE_WORKAROUND_OVERWRITE_FILL_MODE, * it might write data after a WRAP event in the fill mode. * Thus the check TRBPTR == TRBBASER will not be honored. */ - if ((is_trbe_wrap(trbsr) && (ec == TRBE_EC_OTHERS) && (bsc == TRBE_BSC_FILLED)) && + if ((is_trbe_wrap(trbsr) && (ec == TRBSR_EL1_EC_OTHER) && (bsc == TRBSR_EL1_BSC_FILLED)) && (trbe_may_overwrite_in_fill_mode(cpudata) || get_trbe_write_pointer() == get_trbe_base_pointer())) return TRBE_FAULT_ACT_WRAP;
return TRBE_FAULT_ACT_SPURIOUS; + +out_fatal: + pr_err_ratelimited("%s on CPU %d [TRBSR=0x%016llx, TRBPTR=%p, TRBLIMITR=%p]\n", + err_str, smp_processor_id(), trbsr, + (void *)read_sysreg_s(SYS_TRBPTR_EL1), + (void *)read_sysreg_s(SYS_TRBLIMITR_EL1)); + return TRBE_FAULT_ACT_FATAL; }
static unsigned long trbe_get_trace_size(struct perf_output_handle *handle, diff --git a/drivers/hwtracing/coresight/coresight-trbe.h b/drivers/hwtracing/coresight/coresight-trbe.h index 45202c48accec7c86ba56130e2737bc2d1830fae..8ba9ef4056e4dc3968816c6a7cbf2859f2bbed36 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.h +++ b/drivers/hwtracing/coresight/coresight-trbe.h @@ -35,19 +35,11 @@ static inline bool is_trbe_enabled(void) return trblimitr & TRBLIMITR_EL1_E; }
-#define TRBE_EC_OTHERS 0 -#define TRBE_EC_STAGE1_ABORT 36 -#define TRBE_EC_STAGE2_ABORT 37 - static inline int get_trbe_ec(u64 trbsr) { return (trbsr & TRBSR_EL1_EC_MASK) >> TRBSR_EL1_EC_SHIFT; }
-#define TRBE_BSC_NOT_STOPPED 0 -#define TRBE_BSC_FILLED 1 -#define TRBE_BSC_TRIGGERED 2 - static inline int get_trbe_bsc(u64 trbsr) { return (trbsr & TRBSR_EL1_BSC_MASK) >> TRBSR_EL1_BSC_SHIFT;