CoreSight

coresight@lists.linaro.org

7 participants
2771 discussions

[RFC PATCH 00/12] Add Linux RISC-V trace support via CoreSight

by Zane Leung

From: liangzhen <zhen.liang(a)spacemit.com> This series adds Linux RISC-V trace support via CoreSight, implementing RISC-V trace drivers within the CoreSight framework and integrating them with perf tools. The K3 SoC contains RISC-V Encoder, Funnel, ATB, CoreSight Funnel, and CoreSight TMC components, which can be directly leveraged through the existing CoreSight infrastructure. Linux RISC-V trace support form Anup Patel: (https://patchwork.kernel.org/project/linux-riscv/cover/20260225062448.40279…) which currently lacks ATB component support and guidance on reusing CoreSight components. The series includes: - RISC-V trace driver implementation within the CoreSight framework - RISC-V Trace Encoder, Funnel, and ATB Bridge drivers as CoreSight devices - RISC-V trace PMU record capabilities and parsing events in perf. - RISC-V Nexus Trace decoder for perf tools Any comments or suggestions are welcome. Verification on K3 SoC: To verify this patch series on K3 hardware, the following device tree are required: 1. RISC-V Trace Encoder node (8) 2. RISC-V ATB Bridge node (8) 3. RISC-V Trace Funnel node (2) 3. CoreSight Funnel configuration for RISC-V (1) 4. CoreSight TMC configuration for trace buffer (1) /{ dummy_clk: apb-pclk { compatible = "fixed-clock"; #clock-cells = <0x0>; clock-output-names = "clk14mhz"; clock-frequency = <14000000>; }; soc: soc { #address-cells = <2>; #size-cells = <2>; encoder0: encoder@d9002000 { compatible = "riscv,trace-encoder"; reg = <0x0 0xd9002000 0x0 0x1000>; cpus = <&cpu_0>; out-ports { port { cluster0_encoder0_out_port: endpoint { remote-endpoint = <&cluster0_bridge0_in_port>; }; }; }; }; bridge0: bridge@d9003000 { compatible = "riscv,trace-atbbridge"; reg = <0x0 0xd9003000 0x0 0x1000>; cpus = <&cpu_0>; out-ports { port { cluster0_bridge0_out_port: endpoint { remote-endpoint = <&cluster0_funnel_in_port0>; }; }; }; in-ports { port { cluster0_bridge0_in_port: endpoint { remote-endpoint = <&cluster0_encoder0_out_port>; }; }; }; }; ... cluster0_funnel: funnel@d9000000 { compatible = "riscv,trace-funnel"; reg = <0x0 0xd9000000 0x0 0x1000>; cpus = <&cpu_0>, <&cpu_1>, <&cpu_2>, <&cpu_3>; riscv,timestamp-present; out-ports { port { cluster0_funnel_out_port: endpoint { remote-endpoint = <&main_funnel_in_port0>; }; }; }; in-ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; cluster0_funnel_in_port0: endpoint { remote-endpoint = <&cluster0_bridge0_out_port>; }; }; port@1 { reg = <1>; cluster0_funnel_in_port1: endpoint { remote-endpoint = <&cluster0_bridge1_out_port>; }; }; port@2 { reg = <2>; cluster0_funnel_in_port2: endpoint { remote-endpoint = <&cluster0_bridge2_out_port>; }; }; port@3 { reg = <3>; cluster0_funnel_in_port3: endpoint { remote-endpoint = <&cluster0_bridge3_out_port>; }; }; }; }; cluster1_funnel: funnel@d9010000 { compatible = "riscv,trace-funnel"; reg = <0x0 0xd9010000 0x0 0x1000>; cpus = <&cpu_4>, <&cpu_5>, <&cpu_6>, <&cpu_7>; riscv,timestamp-present; out-ports { port { cluster1_funnel_out_port: endpoint { remote-endpoint = <&main_funnel_in_port1>; }; }; }; in-ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; cluster1_funnel_in_port0: endpoint { remote-endpoint = <&cluster1_bridge0_out_port>; }; }; port@1 { reg = <1>; cluster1_funnel_in_port1: endpoint { remote-endpoint = <&cluster1_bridge1_out_port>; }; }; port@2 { reg = <2>; cluster1_funnel_in_port2: endpoint { remote-endpoint = <&cluster1_bridge2_out_port>; }; }; port@3 { reg = <3>; cluster1_funnel_in_port3: endpoint { remote-endpoint = <&cluster1_bridge3_out_port>; }; }; }; }; main_funnel: funnel@d9042000 { compatible = "arm,coresight-dynamic-funnel", "arm,primecell"; reg = <0x0 0xd9042000 0x0 0x1000>; clocks = <&dummy_clk>; clock-names = "apb_pclk"; out-ports { port { main_funnel_out_port: endpoint { remote-endpoint = <&etf_in_port>; }; }; }; in-ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; main_funnel_in_port0: endpoint { remote-endpoint = <&cluster0_funnel_out_port>; }; }; port@1 { reg = <1>; main_funnel_in_port1: endpoint { remote-endpoint = <&cluster1_funnel_out_port>; }; }; }; }; etf: etf@d9043000 { compatible = "arm,coresight-tmc", "arm,primecell"; reg = <0x0 0xd9043000 0x0 0x1000>; clocks = <&dummy_clk>; clock-names = "apb_pclk"; out-ports { port { etf_out_port: endpoint { remote-endpoint = <&etr_in_port>; }; }; }; in-ports { port { etf_in_port: endpoint { remote-endpoint = <&main_funnel_out_port>; }; }; }; }; etr: etr@d9044000 { compatible = "arm,coresight-tmc", "arm,primecell"; reg = <0x0 0xd9044000 0x0 0x1000>; clocks = <&dummy_clk>; clock-names = "apb_pclk"; arm,scatter-gather; in-ports { port { etr_in_port: endpoint { remote-endpoint = <&etf_out_port>; }; }; }; }; }; }; Verification case: ~ # perf list pmu rvtrace// [Kernel PMU event] ~ # perf record -e rvtrace/@tmc_etr0/ --per-thread uname Linux [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.191 MB perf.data ] ~ # perf script uname 137 [003] 1 branches: ffffffff80931470 rvtrace_poll_bit+0x38 ([kernel.kallsyms]) => ffffffff80931492 rvtrace_poll_bit+0x5a ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff809328a6 encoder_enable_hw+0x252 ([kernel.kallsyms]) => ffffffff809328ba encoder_enable_hw+0x266 ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff80932c4a encoder_enable+0x82 ([kernel.kallsyms]) => ffffffff80932c36 encoder_enable+0x6e ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff80928198 etm_event_start+0xf0 ([kernel.kallsyms]) => ffffffff809281aa etm_event_start+0x102 ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff809281e6 etm_event_start+0x13e ([kernel.kallsyms]) => ffffffff8092755e coresight_get_sink_id+0x16 ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff8092820e etm_event_start+0x166 ([kernel.kallsyms]) => ffffffff80928226 etm_event_start+0x17e ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff801c3bb4 perf_report_aux_output_id+0x0 ([kernel.kallsyms]) => ffffffff801c3bd6 perf_report_aux_output_id+0x22 ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff801c3c5a perf_report_aux_output_id+0xa6 ([kernel.kallsyms]) => ffffffff801c3bf0 perf_report_aux_output_id+0x3c ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff801c3c40 perf_report_aux_output_id+0x8c ([kernel.kallsyms]) => ffffffff801c3aea __perf_event_header__init_id+0x2a ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff801c3b42 __perf_event_header__init_id+0x82 ([kernel.kallsyms]) => ffffffff801c3b4a __perf_event_header__init_id+0x8a ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff801c3bb0 __perf_event_header__init_id+0xf0 ([kernel.kallsyms]) => ffffffff801c3b58 __perf_event_header__init_id+0x98 ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff8004c658 __task_pid_nr_ns+0x0 ([kernel.kallsyms]) => ffffffff8004c696 __task_pid_nr_ns+0x3e ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff8004c71e __task_pid_nr_ns+0xc6 ([kernel.kallsyms]) => ffffffff8004c6a4 __task_pid_nr_ns+0x4c ([kernel.kallsyms]) uname 137 [003] 1 branches: ffffffff8004c6e4 __task_pid_nr_ns+0x8c ([kernel.kallsyms]) => ffffffff8004c6e4 __task_pid_nr_ns+0x8c ([kernel.kallsyms]) ... liangzhen (12): coresight: Add RISC-V support to CoreSight tracing coresight: Initial implementation of RISC-V trace driver coresight: Add RISC-V Trace Encoder driver coresight: Add RISC-V Trace Funnel driver coresight: Add RISC-V Trace ATB Bridge driver coresight rvtrace: Add timestamp component support for encoder and funnel coresight: Add RISC-V PMU name support perf tools: riscv: making rvtrace PMU listable perf tools: Add RISC-V trace PMU record capabilities perf tools: Add Nexus RISC-V Trace decoder perf symbols: Add RISC-V PLT entry sizes perf tools: Integrate RISC-V trace decoder into auxtrace drivers/hwtracing/Kconfig | 2 + drivers/hwtracing/coresight/Kconfig | 46 +- drivers/hwtracing/coresight/Makefile | 6 + drivers/hwtracing/coresight/coresight-core.c | 8 + .../hwtracing/coresight/coresight-etm-perf.c | 1 - .../hwtracing/coresight/coresight-etm-perf.h | 21 + .../hwtracing/coresight/coresight-platform.c | 1 - .../hwtracing/coresight/coresight-tmc-etf.c | 4 + .../hwtracing/coresight/coresight-tmc-etr.c | 4 + .../hwtracing/coresight/rvtrace-atbbridge.c | 239 +++ drivers/hwtracing/coresight/rvtrace-core.c | 135 ++ .../coresight/rvtrace-encoder-core.c | 562 +++++++ .../coresight/rvtrace-encoder-sysfs.c | 363 +++++ drivers/hwtracing/coresight/rvtrace-encoder.h | 151 ++ drivers/hwtracing/coresight/rvtrace-funnel.c | 337 ++++ drivers/hwtracing/coresight/rvtrace-funnel.h | 39 + .../hwtracing/coresight/rvtrace-timestamp.c | 278 ++++ .../hwtracing/coresight/rvtrace-timestamp.h | 64 + include/linux/coresight-pmu.h | 4 + include/linux/rvtrace.h | 116 ++ tools/arch/riscv/include/asm/insn.h | 645 ++++++++ tools/perf/arch/riscv/util/Build | 2 + tools/perf/arch/riscv/util/auxtrace.c | 490 ++++++ tools/perf/arch/riscv/util/pmu.c | 20 + tools/perf/util/Build | 3 + tools/perf/util/auxtrace.c | 4 + tools/perf/util/auxtrace.h | 1 + tools/perf/util/nexus-rv-decoder/Build | 1 + .../util/nexus-rv-decoder/nexus-rv-decoder.c | 1364 +++++++++++++++++ .../util/nexus-rv-decoder/nexus-rv-decoder.h | 139 ++ .../perf/util/nexus-rv-decoder/nexus-rv-msg.h | 190 +++ tools/perf/util/rvtrace-decoder.c | 1039 +++++++++++++ tools/perf/util/rvtrace.h | 40 + tools/perf/util/symbol-elf.c | 4 + 34 files changed, 6320 insertions(+), 3 deletions(-) create mode 100644 drivers/hwtracing/coresight/rvtrace-atbbridge.c create mode 100644 drivers/hwtracing/coresight/rvtrace-core.c create mode 100644 drivers/hwtracing/coresight/rvtrace-encoder-core.c create mode 100644 drivers/hwtracing/coresight/rvtrace-encoder-sysfs.c create mode 100644 drivers/hwtracing/coresight/rvtrace-encoder.h create mode 100644 drivers/hwtracing/coresight/rvtrace-funnel.c create mode 100644 drivers/hwtracing/coresight/rvtrace-funnel.h create mode 100644 drivers/hwtracing/coresight/rvtrace-timestamp.c create mode 100644 drivers/hwtracing/coresight/rvtrace-timestamp.h create mode 100644 include/linux/rvtrace.h create mode 100644 tools/arch/riscv/include/asm/insn.h create mode 100644 tools/perf/arch/riscv/util/auxtrace.c create mode 100644 tools/perf/arch/riscv/util/pmu.c create mode 100644 tools/perf/util/nexus-rv-decoder/Build create mode 100644 tools/perf/util/nexus-rv-decoder/nexus-rv-decoder.c create mode 100644 tools/perf/util/nexus-rv-decoder/nexus-rv-decoder.h create mode 100644 tools/perf/util/nexus-rv-decoder/nexus-rv-msg.h create mode 100644 tools/perf/util/rvtrace-decoder.c create mode 100644 tools/perf/util/rvtrace.h -- 2.34.1

1 week, 4 days

[PATCH v2 00/18] perf cs-etm: Queue context packets for frontend

by James Clark

Fix thread tracking when decoding Coresight trace and add a new test for it. The new test is added as a Perf test workload instead of a custom binary with its own build system, but this requires a new feature in Perf test to pass in control pipes which can enable and disable events. This scopes the recording to just the workload and helps to reduce the amount of data recorded in tracing tests. With this new feature we can re-write all of the Coresight tests to make use of it and remove the remaining binaries which fixes the following issues: * They didn't work in out of source builds * A lot of the tests unnecessarily required root and didn't skip without it * They were mainly qualitative tests which didn't look for specific behavior Most importantly, the long build and runtime has been reduced. On a Radxa Orion O6, unroll_loop_thread.c took 37s to compile which is longer than the entire Perf build. Now the build time is negligible and the before and after test runtimes for all the Coresight tests are: | N1SDP | Orion O6 ----------------------------------- Before | 4m 0s | 14m 49s After | 26s | 56s ----------------------------------- Signed-off-by: James Clark <james.clark(a)linaro.org> --- Changes in v2: - Add --workload-ctl option to Perf test - Re-write all the Coresight tests and speed them up - Pass packet to memory access function so frontend can use either the previous or current packet's EL - Link to v1: https://lore.kernel.org/r/20260526-james-cs-context-tracking-fix-v1-0-ebd60… --- James Clark (18): perf cs-etm: Queue context packets for frontend perf test: Add workload-ctl option perf test: Add a workload that forces context switches perf test cs-etm: Test process attribution perf test: Add deterministic workload perf test cs-etm: Replace unroll loop thread with deterministic decode test perf test cs-etm: Remove asm_pure_loop test perf test cs-etm: Replace memcpy test with raw dump stress test perf test: Add named_threads workload perf test cs-etm: Test decoding for concurrent threads test perf test cs-etm: Remove duplicate branch tests perf test cs-etm: Reduce snapshot size perf test cs-etm: Speed up basic test perf test cs-etm: Remove unused Coresight workloads perf test cs-etm: Make disassembly test use kcore perf test cs-etm: Add all branch instructions to test perf test cs-etm: Speed up disassembly test perf test cs-etm: Move existing tests to coresight folder Documentation/trace/coresight/coresight-perf.rst | 78 +------ MAINTAINERS | 2 - tools/perf/Documentation/perf-test.txt | 18 +- tools/perf/Makefile.perf | 14 +- tools/perf/scripts/python/arm-cs-trace-disasm.py | 20 +- tools/perf/tests/builtin-test.c | 187 ++++++++++++++++- tools/perf/tests/shell/coresight/Makefile | 29 --- .../perf/tests/shell/coresight/Makefile.miniconfig | 14 -- tools/perf/tests/shell/coresight/asm_pure_loop.sh | 22 -- .../tests/shell/coresight/asm_pure_loop/.gitignore | 1 - .../tests/shell/coresight/asm_pure_loop/Makefile | 34 --- .../shell/coresight/asm_pure_loop/asm_pure_loop.S | 30 --- .../tests/shell/coresight/concurrent_threads.sh | 45 ++++ .../tests/shell/coresight/context_switch_thread.sh | 69 ++++++ tools/perf/tests/shell/coresight/deterministic.sh | 71 +++++++ .../tests/shell/coresight/memcpy_thread/.gitignore | 1 - .../tests/shell/coresight/memcpy_thread/Makefile | 33 --- .../shell/coresight/memcpy_thread/memcpy_thread.c | 80 ------- .../tests/shell/coresight/memcpy_thread_16k_10.sh | 22 -- .../perf/tests/shell/coresight/raw_dump_stress.sh | 54 +++++ .../shell/{ => coresight}/test_arm_coresight.sh | 43 ++-- .../{ => coresight}/test_arm_coresight_disasm.sh | 17 +- .../tests/shell/coresight/thread_loop/.gitignore | 1 - .../tests/shell/coresight/thread_loop/Makefile | 33 --- .../shell/coresight/thread_loop/thread_loop.c | 85 -------- .../shell/coresight/thread_loop_check_tid_10.sh | 23 -- .../shell/coresight/thread_loop_check_tid_2.sh | 23 -- .../shell/coresight/unroll_loop_thread/.gitignore | 1 - .../shell/coresight/unroll_loop_thread/Makefile | 33 --- .../unroll_loop_thread/unroll_loop_thread.c | 75 ------- .../tests/shell/coresight/unroll_loop_thread_10.sh | 22 -- tools/perf/tests/shell/lib/coresight.sh | 134 ------------ tools/perf/tests/tests.h | 3 + tools/perf/tests/workloads/Build | 4 + tools/perf/tests/workloads/context_switch_loop.c | 95 +++++++++ tools/perf/tests/workloads/deterministic.c | 39 ++++ tools/perf/tests/workloads/named_threads.c | 109 ++++++++++ tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 21 +- tools/perf/util/cs-etm.c | 233 +++++++++++++-------- tools/perf/util/cs-etm.h | 8 +- 40 files changed, 892 insertions(+), 934 deletions(-) --- base-commit: 5f0ca6b80b12bab1ce06839cdffb6148bb650ff4 change-id: 20260515-james-cs-context-tracking-fix-754998bae7ed Best regards, -- James Clark <james.clark(a)linaro.org>

2 weeks, 1 day

Re: [PATCH v3 01/19] perf cs-etm: Queue context packets for frontend

by James Clark

On 03/06/2026 9:14 pm, Amir Ayupov wrote: > Hi James, > > I tested the v2 patch series and it looks good. Compared to my > stamping pid/tid on each packet, there was a minor difference in 2/39 > tested perf data files: the number of brstack samples differs by one, > however, there was no loss of binary profile. The resulting BOLT > profile converted from the perf script output was identical, so I'm OK > with v2 patch as-is. > > -Amir > Thanks for testing. Seems like Leo might have an explanation for the branch stack difference on the other thread. If you want to share the files I can look into it, otherwise I'm ok with ignoring it too. James > > > On Wed, Jun 3, 2026 at 3:17 AM James Clark <james.clark(a)linaro.org> wrote: >> >>> >> PE_CONTEXT elements update the context ID and exception level, but the >> decoder may still have prior packets cached for frontend processing. >> Updating the context immediately in the decoder backend can make those >> cached packets get consumed with the wrong thread or EL state. >> >> Add a CS_ETM_CONTEXT packet carrying the TID and EL to the frontend, >> this keeps context changes ordered with the rest of the packet stream >> and avoids mismatches when synthesizing samples from cached packets. >> >> Separate the memory access function into one for the frontend and one >> for decoding. The frontend also needs memory access to attach the >> instruction to samples. Because the frontend does memory access for >> both previous and current packets, change all the frontend memory access >> function signatures to take both a tidq and packet. But backend always >> uses the current backend EL and thread from the tidq. >> >> Treat context packets as a boundary for branch sample generation and >> remove tidq->prev_packet_thread because it's not possible to branch to a >> different thread, so only tracking the current thread is required for >> sample generation. >> >> Fixes: e573e978fb12 ("perf cs-etm: Inject capabilitity for CoreSight traces") >> Reported-by: Amir Ayupov <aaupov(a)meta.com> >> Closes: https://lore.kernel.org/linux-perf-users/20260515021135.1729028-1-aaupov@me… >> Co-authored-by: James Clark <james.clark(a)linaro.org> >> Signed-off-by: Leo Yan <leo.yan(a)arm.com> >> Signed-off-by: James Clark <james.clark(a)linaro.org> >> --- >> tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 21 ++- >> tools/perf/util/cs-etm.c | 234 ++++++++++++++---------- >> tools/perf/util/cs-etm.h | 8 +- >> 3 files changed, 162 insertions(+), 101 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 dee3020ceaa9..26940f1f1b0b 100644 >> --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c >> @@ -402,6 +402,8 @@ cs_etm_decoder__buffer_packet(struct cs_etm_queue *etmq, >> packet_queue->packet_buffer[et].flags = 0; >> packet_queue->packet_buffer[et].exception_number = UINT32_MAX; >> packet_queue->packet_buffer[et].trace_chan_id = trace_chan_id; >> + 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; >> @@ -449,6 +451,7 @@ cs_etm_decoder__buffer_range(struct cs_etm_queue *etmq, >> packet->last_instr_type = elem->last_i_type; >> packet->last_instr_subtype = elem->last_i_subtype; >> packet->last_instr_cond = elem->last_instr_cond; >> + packet->el = elem->context.exception_level; >> >> if (elem->last_i_type == OCSD_INSTR_BR || elem->last_i_type == OCSD_INSTR_BR_INDIRECT) >> packet->last_instr_taken_branch = elem->last_instr_exec; >> @@ -525,7 +528,9 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, >> const ocsd_generic_trace_elem *elem, >> const uint8_t trace_chan_id) >> { >> + struct cs_etm_packet *packet; >> pid_t tid = -1; >> + int ret; >> >> /* >> * Process the PE_CONTEXT packets if we have a valid contextID or VMID. >> @@ -546,12 +551,18 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, >> break; >> } >> >> - if (cs_etm__etmq_set_tid_el(etmq, tid, trace_chan_id, >> - elem->context.exception_level)) >> + if (cs_etm__etmq_update_decode_context(etmq, trace_chan_id, >> + elem->context.exception_level, tid)) >> return OCSD_RESP_FATAL_SYS_ERR; >> >> - if (tid == -1) >> - return OCSD_RESP_CONT; >> + ret = cs_etm_decoder__buffer_packet(etmq, packet_queue, trace_chan_id, >> + CS_ETM_CONTEXT); >> + if (ret != OCSD_RESP_CONT && ret != OCSD_RESP_WAIT) >> + return ret; >> + >> + packet = &packet_queue->packet_buffer[packet_queue->tail]; >> + packet->tid = tid; >> + packet->el = elem->context.exception_level; >> >> /* >> * A timestamp is generated after a PE_CONTEXT element so make sure >> @@ -559,7 +570,7 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, >> */ >> cs_etm_decoder__reset_timestamp(packet_queue); >> >> - return OCSD_RESP_CONT; >> + return ret; >> } >> >> static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( >> diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c >> index 40c6ddfa8c8d..ce570913669c 100644 >> --- a/tools/perf/util/cs-etm.c >> +++ b/tools/perf/util/cs-etm.c >> @@ -85,15 +85,22 @@ struct cs_etm_traceid_queue { >> u64 period_instructions; >> size_t last_branch_pos; >> union perf_event *event_buf; >> - struct thread *thread; >> - struct thread *prev_packet_thread; >> - ocsd_ex_level prev_packet_el; >> - ocsd_ex_level el; >> struct branch_stack *last_branch; >> struct branch_stack *last_branch_rb; >> struct cs_etm_packet *prev_packet; >> struct cs_etm_packet *packet; >> struct cs_etm_packet_queue packet_queue; >> + >> + struct thread *decode_thread; >> + ocsd_ex_level decode_el; >> + >> + /* >> + * The frontend accesses the EL from '[prev_]packet' because it needs >> + * previous EL for branch and current EL for instruction samples. It's >> + * not possible to change thread in a single branch sample so no need to >> + * store or access the thread through the packet. >> + */ >> + struct thread *frontend_thread; >> }; >> >> enum cs_etm_format { >> @@ -614,10 +621,11 @@ static int cs_etm__init_traceid_queue(struct cs_etm_queue *etmq, >> >> queue = &etmq->etm->queues.queue_array[etmq->queue_nr]; >> tidq->trace_chan_id = trace_chan_id; >> - tidq->el = tidq->prev_packet_el = ocsd_EL_unknown; >> - tidq->thread = machine__findnew_thread(&etm->session->machines.host, -1, >> + tidq->decode_el = ocsd_EL_unknown; >> + tidq->frontend_thread = machine__findnew_thread(&etm->session->machines.host, -1, >> + queue->tid); >> + tidq->decode_thread = machine__findnew_thread(&etm->session->machines.host, -1, >> queue->tid); >> - tidq->prev_packet_thread = machine__idle_thread(&etm->session->machines.host); >> >> tidq->packet = zalloc(sizeof(struct cs_etm_packet)); >> if (!tidq->packet) >> @@ -750,21 +758,10 @@ static void cs_etm__packet_swap(struct cs_etm_auxtrace *etm, >> /* >> * Swap PACKET with PREV_PACKET: PACKET becomes PREV_PACKET for >> * the next incoming packet. >> - * >> - * Threads and exception levels are also tracked for both the >> - * previous and current packets. This is because the previous >> - * packet is used for the 'from' IP for branch samples, so the >> - * thread at that time must also be assigned to that sample. >> - * Across discontinuity packets the thread can change, so by >> - * tracking the thread for the previous packet the branch sample >> - * will have the correct info. >> */ >> tmp = tidq->packet; >> tidq->packet = tidq->prev_packet; >> tidq->prev_packet = tmp; >> - tidq->prev_packet_el = tidq->el; >> - thread__put(tidq->prev_packet_thread); >> - tidq->prev_packet_thread = thread__get(tidq->thread); >> } >> } >> >> @@ -937,8 +934,8 @@ static void cs_etm__free_traceid_queues(struct cs_etm_queue *etmq) >> >> /* Free this traceid_queue from the array */ >> tidq = etmq->traceid_queues[idx]; >> - thread__zput(tidq->thread); >> - thread__zput(tidq->prev_packet_thread); >> + thread__zput(tidq->frontend_thread); >> + thread__zput(tidq->decode_thread); >> zfree(&tidq->event_buf); >> zfree(&tidq->last_branch); >> zfree(&tidq->last_branch_rb); >> @@ -1083,47 +1080,43 @@ static u8 cs_etm__cpu_mode(struct cs_etm_queue *etmq, u64 address, >> } >> } >> >> -static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, >> - u64 address, size_t size, u8 *buffer, >> - const ocsd_mem_space_acc_t mem_space) >> +static u32 __cs_etm__mem_access(struct cs_etm_queue *etmq, >> + u64 address, size_t size, u8 *buffer, >> + const ocsd_mem_space_acc_t mem_space, >> + ocsd_ex_level el, struct thread *thread) >> { >> u8 cpumode; >> u64 offset; >> int len; >> struct addr_location al; >> struct dso *dso; >> - struct cs_etm_traceid_queue *tidq; >> int ret = 0; >> >> if (!etmq) >> return 0; >> >> addr_location__init(&al); >> - tidq = cs_etm__etmq_get_traceid_queue(etmq, trace_chan_id); >> - if (!tidq) >> - goto out; >> >> /* >> - * We've already tracked EL along side the PID in cs_etm__set_thread() >> - * so double check that it matches what OpenCSD thinks as well. It >> - * doesn't distinguish between EL0 and EL1 for this mem access callback >> - * so we had to do the extra tracking. Skip validation if it's any of >> - * the 'any' values. >> + * We track EL for the frontend and the backend when receiving context >> + * and range packets. OpenCSD doesn't distinguish between EL0 and EL1 >> + * for this mem access callback so we had to do the extra tracking. Skip >> + * validation if it's any of the 'any' values. >> */ >> if (!(mem_space == OCSD_MEM_SPACE_ANY || >> mem_space == OCSD_MEM_SPACE_N || mem_space == OCSD_MEM_SPACE_S)) { >> if (mem_space & OCSD_MEM_SPACE_EL1N) { >> /* Includes both non secure EL1 and EL0 */ >> - assert(tidq->el == ocsd_EL1 || tidq->el == ocsd_EL0); >> + assert(el == ocsd_EL1 || el == ocsd_EL0); >> } else if (mem_space & OCSD_MEM_SPACE_EL2) >> - assert(tidq->el == ocsd_EL2); >> + assert(el == ocsd_EL2); >> else if (mem_space & OCSD_MEM_SPACE_EL3) >> - assert(tidq->el == ocsd_EL3); >> + assert(el == ocsd_EL3); >> } >> >> - cpumode = cs_etm__cpu_mode(etmq, address, tidq->el); >> + cpumode = cs_etm__cpu_mode(etmq, address, el); >> >> - if (!thread__find_map(tidq->thread, cpumode, address, &al)) >> + if (!thread__find_map(thread, cpumode, address, &al)) >> goto out; >> >> dso = map__dso(al.map); >> @@ -1138,7 +1131,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, >> >> map__load(al.map); >> >> - len = dso__data_read_offset(dso, maps__machine(thread__maps(tidq->thread)), >> + len = dso__data_read_offset(dso, maps__machine(thread__maps(thread)), >> offset, buffer, size); >> >> if (len <= 0) { >> @@ -1158,6 +1151,30 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, >> return ret; >> } >> >> +static u32 cs_etm__frontend_mem_access(struct cs_etm_queue *etmq, >> + struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, >> + u64 address, size_t size, u8 *buffer) >> +{ >> + return __cs_etm__mem_access(etmq, address, size, buffer, 0, packet->el, >> + tidq->frontend_thread); >> +} >> + >> +static u32 cs_etm__decoder_mem_access(struct cs_etm_queue *etmq, u8 trace_chan_id, >> + u64 address, size_t size, u8 *buffer, >> + const ocsd_mem_space_acc_t mem_space) >> +{ >> + struct cs_etm_traceid_queue *tidq; >> + >> + tidq = cs_etm__etmq_get_traceid_queue(etmq, trace_chan_id); >> + if (!tidq) >> + return 0; >> + >> + return __cs_etm__mem_access(etmq, address, size, buffer, >> + mem_space, tidq->decode_el, >> + tidq->decode_thread); >> +} >> + >> static struct cs_etm_queue *cs_etm__alloc_queue(void) >> { >> struct cs_etm_queue *etmq = zalloc(sizeof(*etmq)); >> @@ -1333,12 +1350,13 @@ void cs_etm__reset_last_branch_rb(struct cs_etm_traceid_queue *tidq) >> } >> >> static inline int cs_etm__t32_instr_size(struct cs_etm_queue *etmq, >> - u8 trace_chan_id, u64 addr) >> + struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, u64 addr) >> { >> u8 instrBytes[2]; >> >> - cs_etm__mem_access(etmq, trace_chan_id, addr, ARRAY_SIZE(instrBytes), >> - instrBytes, 0); >> + cs_etm__frontend_mem_access(etmq, tidq, packet, addr, >> + ARRAY_SIZE(instrBytes), instrBytes); >> /* >> * T32 instruction size is indicated by bits[15:11] of the first >> * 16-bit word of the instruction: 0b11101, 0b11110 and 0b11111 >> @@ -1371,16 +1389,16 @@ u64 cs_etm__last_executed_instr(const struct cs_etm_packet *packet) >> } >> >> static inline u64 cs_etm__instr_addr(struct cs_etm_queue *etmq, >> - u64 trace_chan_id, >> - const struct cs_etm_packet *packet, >> + struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, >> u64 offset) >> { >> if (packet->isa == CS_ETM_ISA_T32) { >> u64 addr = packet->start_addr; >> >> while (offset) { >> - addr += cs_etm__t32_instr_size(etmq, >> - trace_chan_id, addr); >> + addr += cs_etm__t32_instr_size(etmq, tidq, packet, >> + addr); >> offset--; >> } >> return addr; >> @@ -1490,34 +1508,51 @@ cs_etm__get_trace(struct cs_etm_queue *etmq) >> return etmq->buf_len; >> } >> >> -static void cs_etm__set_thread(struct cs_etm_queue *etmq, >> - struct cs_etm_traceid_queue *tidq, pid_t tid, >> - ocsd_ex_level el) >> +/* >> + * Convert a raw thread number to a thread struct and assign it to **thread. >> + */ >> +static int cs_etm__etmq_update_thread(struct cs_etm_queue *etmq, >> + ocsd_ex_level el, pid_t tid, >> + struct thread **thread) >> { >> struct machine *machine = cs_etm__get_machine(etmq, el); >> >> + if (!machine || !*thread) >> + return -EINVAL; >> + >> if (tid != -1) { >> - thread__zput(tidq->thread); >> - tidq->thread = machine__find_thread(machine, -1, tid); >> + thread__zput(*thread); >> + *thread = machine__find_thread(machine, -1, tid); >> } >> >> /* Couldn't find a known thread */ >> - if (!tidq->thread) >> - tidq->thread = machine__idle_thread(machine); >> + if (!*thread) >> + *thread = machine__idle_thread(machine); >> >> - tidq->el = el; >> + return 0; >> } >> >> -int cs_etm__etmq_set_tid_el(struct cs_etm_queue *etmq, pid_t tid, >> - u8 trace_chan_id, ocsd_ex_level el) >> +/* >> + * Set the thread and EL of the decode context which is ahead in time of the >> + * frontend context. >> + */ >> +int cs_etm__etmq_update_decode_context(struct cs_etm_queue *etmq, >> + u8 trace_chan_id, >> + ocsd_ex_level el, pid_t tid) >> { >> struct cs_etm_traceid_queue *tidq; >> + int ret; >> >> tidq = cs_etm__etmq_get_traceid_queue(etmq, trace_chan_id); >> if (!tidq) >> return -EINVAL; >> >> - cs_etm__set_thread(etmq, tidq, tid, el); >> + ret = cs_etm__etmq_update_thread(etmq, el, tid, >> + &tidq->decode_thread); >> + if (ret) >> + return ret; >> + >> + tidq->decode_el = el; >> return 0; >> } >> >> @@ -1527,8 +1562,8 @@ bool cs_etm__etmq_is_timeless(struct cs_etm_queue *etmq) >> } >> >> static void cs_etm__copy_insn(struct cs_etm_queue *etmq, >> - u64 trace_chan_id, >> - const struct cs_etm_packet *packet, >> + struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, >> struct perf_sample *sample) >> { >> /* >> @@ -1545,14 +1580,14 @@ static void cs_etm__copy_insn(struct cs_etm_queue *etmq, >> * cs_etm__t32_instr_size(). >> */ >> if (packet->isa == CS_ETM_ISA_T32) >> - sample->insn_len = cs_etm__t32_instr_size(etmq, trace_chan_id, >> + sample->insn_len = cs_etm__t32_instr_size(etmq, tidq, packet, >> sample->ip); >> /* Otherwise, A64 and A32 instruction size are always 32-bit. */ >> else >> sample->insn_len = 4; >> >> - cs_etm__mem_access(etmq, trace_chan_id, sample->ip, sample->insn_len, >> - (void *)sample->insn, 0); >> + cs_etm__frontend_mem_access(etmq, tidq, packet, sample->ip, >> + sample->insn_len, (void *)sample->insn); >> } >> >> u64 cs_etm__convert_sample_time(struct cs_etm_queue *etmq, u64 cs_timestamp) >> @@ -1579,6 +1614,7 @@ static inline u64 cs_etm__resolve_sample_time(struct cs_etm_queue *etmq, >> >> static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, >> struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, >> u64 addr, u64 period) >> { >> int ret = 0; >> @@ -1588,15 +1624,15 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, >> >> perf_sample__init(&sample, /*all=*/true); >> event->sample.header.type = PERF_RECORD_SAMPLE; >> - event->sample.header.misc = cs_etm__cpu_mode(etmq, addr, tidq->el); >> + event->sample.header.misc = cs_etm__cpu_mode(etmq, addr, packet->el); >> event->sample.header.size = sizeof(struct perf_event_header); >> >> /* Set time field based on etm auxtrace config. */ >> sample.time = cs_etm__resolve_sample_time(etmq, tidq); >> >> sample.ip = addr; >> - sample.pid = thread__pid(tidq->thread); >> - sample.tid = thread__tid(tidq->thread); >> + sample.pid = thread__pid(tidq->frontend_thread); >> + sample.tid = thread__tid(tidq->frontend_thread); >> sample.id = etmq->etm->instructions_id; >> sample.stream_id = etmq->etm->instructions_id; >> sample.period = period; >> @@ -1604,7 +1640,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, >> sample.flags = tidq->prev_packet->flags; >> sample.cpumode = event->sample.header.misc; >> >> - cs_etm__copy_insn(etmq, tidq->trace_chan_id, tidq->packet, &sample); >> + cs_etm__copy_insn(etmq, tidq, tidq->packet, &sample); >> >> if (etm->synth_opts.last_branch) >> sample.branch_stack = tidq->last_branch; >> @@ -1649,15 +1685,15 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq, >> >> event->sample.header.type = PERF_RECORD_SAMPLE; >> event->sample.header.misc = cs_etm__cpu_mode(etmq, ip, >> - tidq->prev_packet_el); >> + tidq->prev_packet->el); >> event->sample.header.size = sizeof(struct perf_event_header); >> >> /* Set time field based on etm auxtrace config. */ >> sample.time = cs_etm__resolve_sample_time(etmq, tidq); >> >> sample.ip = ip; >> - sample.pid = thread__pid(tidq->prev_packet_thread); >> - sample.tid = thread__tid(tidq->prev_packet_thread); >> + sample.pid = thread__pid(tidq->frontend_thread); >> + sample.tid = thread__tid(tidq->frontend_thread); >> sample.addr = cs_etm__first_executed_instr(tidq->packet); >> sample.id = etmq->etm->branches_id; >> sample.stream_id = etmq->etm->branches_id; >> @@ -1666,8 +1702,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq, >> sample.flags = tidq->prev_packet->flags; >> sample.cpumode = event->sample.header.misc; >> >> - cs_etm__copy_insn(etmq, tidq->trace_chan_id, tidq->prev_packet, >> - &sample); >> + cs_etm__copy_insn(etmq, tidq, tidq->prev_packet, &sample); >> >> /* >> * perf report cannot handle events without a branch stack >> @@ -1788,7 +1823,6 @@ static int cs_etm__sample(struct cs_etm_queue *etmq, >> { >> struct cs_etm_auxtrace *etm = etmq->etm; >> int ret; >> - u8 trace_chan_id = tidq->trace_chan_id; >> u64 instrs_prev; >> >> /* Get instructions remainder from previous packet */ >> @@ -1874,10 +1908,10 @@ static int cs_etm__sample(struct cs_etm_queue *etmq, >> * been executed, but PC has not advanced to next >> * instruction) >> */ >> - addr = cs_etm__instr_addr(etmq, trace_chan_id, >> - tidq->packet, offset - 1); >> + addr = cs_etm__instr_addr(etmq, tidq, tidq->packet, >> + offset - 1); >> ret = cs_etm__synth_instruction_sample( >> - etmq, tidq, addr, >> + etmq, tidq, tidq->packet, addr, >> etm->instructions_sample_period); >> if (ret) >> return ret; >> @@ -1959,7 +1993,7 @@ static int cs_etm__flush(struct cs_etm_queue *etmq, >> addr = cs_etm__last_executed_instr(tidq->prev_packet); >> >> err = cs_etm__synth_instruction_sample( >> - etmq, tidq, addr, >> + etmq, tidq, tidq->prev_packet, addr, >> tidq->period_instructions); >> if (err) >> return err; >> @@ -2014,7 +2048,7 @@ static int cs_etm__end_block(struct cs_etm_queue *etmq, >> addr = cs_etm__last_executed_instr(tidq->prev_packet); >> >> err = cs_etm__synth_instruction_sample( >> - etmq, tidq, addr, >> + etmq, tidq, tidq->prev_packet, addr, >> tidq->period_instructions); >> if (err) >> return err; >> @@ -2051,9 +2085,9 @@ static int cs_etm__get_data_block(struct cs_etm_queue *etmq) >> return etmq->buf_len; >> } >> >> -static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, u8 trace_chan_id, >> - struct cs_etm_packet *packet, >> - u64 end_addr) >> +static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, >> + struct cs_etm_traceid_queue *tidq, >> + struct cs_etm_packet *packet, u64 end_addr) >> { >> /* Initialise to keep compiler happy */ >> u16 instr16 = 0; >> @@ -2075,8 +2109,8 @@ static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, u8 trace_chan_id, >> * so below only read 2 bytes as instruction size for T32. >> */ >> addr = end_addr - 2; >> - cs_etm__mem_access(etmq, trace_chan_id, addr, sizeof(instr16), >> - (u8 *)&instr16, 0); >> + cs_etm__frontend_mem_access(etmq, tidq, packet, addr, >> + sizeof(instr16), (u8 *)&instr16); >> if ((instr16 & 0xFF00) == 0xDF00) >> return true; >> >> @@ -2091,8 +2125,8 @@ static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, u8 trace_chan_id, >> * +---------+---------+-------------------------+ >> */ >> addr = end_addr - 4; >> - cs_etm__mem_access(etmq, trace_chan_id, addr, sizeof(instr32), >> - (u8 *)&instr32, 0); >> + cs_etm__frontend_mem_access(etmq, tidq, packet, addr, >> + sizeof(instr32), (u8 *)&instr32); >> if ((instr32 & 0x0F000000) == 0x0F000000 && >> (instr32 & 0xF0000000) != 0xF0000000) >> return true; >> @@ -2108,8 +2142,8 @@ static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, u8 trace_chan_id, >> * +-----------------------+---------+-----------+ >> */ >> addr = end_addr - 4; >> - cs_etm__mem_access(etmq, trace_chan_id, addr, sizeof(instr32), >> - (u8 *)&instr32, 0); >> + cs_etm__frontend_mem_access(etmq, tidq, packet, addr, >> + sizeof(instr32), (u8 *)&instr32); >> if ((instr32 & 0xFFE0001F) == 0xd4000001) >> return true; >> >> @@ -2125,7 +2159,6 @@ static bool cs_etm__is_svc_instr(struct cs_etm_queue *etmq, u8 trace_chan_id, >> static bool cs_etm__is_syscall(struct cs_etm_queue *etmq, >> struct cs_etm_traceid_queue *tidq, u64 magic) >> { >> - u8 trace_chan_id = tidq->trace_chan_id; >> struct cs_etm_packet *packet = tidq->packet; >> struct cs_etm_packet *prev_packet = tidq->prev_packet; >> >> @@ -2140,7 +2173,7 @@ static bool cs_etm__is_syscall(struct cs_etm_queue *etmq, >> */ >> if (magic == __perf_cs_etmv4_magic) { >> if (packet->exception_number == CS_ETMV4_EXC_CALL && >> - cs_etm__is_svc_instr(etmq, trace_chan_id, prev_packet, >> + cs_etm__is_svc_instr(etmq, tidq, prev_packet, >> prev_packet->end_addr)) >> return true; >> } >> @@ -2178,7 +2211,6 @@ static bool cs_etm__is_sync_exception(struct cs_etm_queue *etmq, >> struct cs_etm_traceid_queue *tidq, >> u64 magic) >> { >> - u8 trace_chan_id = tidq->trace_chan_id; >> struct cs_etm_packet *packet = tidq->packet; >> struct cs_etm_packet *prev_packet = tidq->prev_packet; >> >> @@ -2204,7 +2236,7 @@ static bool cs_etm__is_sync_exception(struct cs_etm_queue *etmq, >> * (SMC, HVC) are taken as sync exceptions. >> */ >> if (packet->exception_number == CS_ETMV4_EXC_CALL && >> - !cs_etm__is_svc_instr(etmq, trace_chan_id, prev_packet, >> + !cs_etm__is_svc_instr(etmq, tidq, prev_packet, >> prev_packet->end_addr)) >> return true; >> >> @@ -2228,7 +2260,6 @@ static int cs_etm__set_sample_flags(struct cs_etm_queue *etmq, >> { >> struct cs_etm_packet *packet = tidq->packet; >> struct cs_etm_packet *prev_packet = tidq->prev_packet; >> - u8 trace_chan_id = tidq->trace_chan_id; >> u64 magic; >> int ret; >> >> @@ -2309,11 +2340,11 @@ static int cs_etm__set_sample_flags(struct cs_etm_queue *etmq, >> if (prev_packet->flags == (PERF_IP_FLAG_BRANCH | >> PERF_IP_FLAG_RETURN | >> PERF_IP_FLAG_INTERRUPT) && >> - cs_etm__is_svc_instr(etmq, trace_chan_id, >> - packet, packet->start_addr)) >> + cs_etm__is_svc_instr(etmq, tidq, packet, packet->start_addr)) { >> prev_packet->flags = PERF_IP_FLAG_BRANCH | >> PERF_IP_FLAG_RETURN | >> PERF_IP_FLAG_SYSCALLRET; >> + } >> break; >> case CS_ETM_DISCONTINUITY: >> /* >> @@ -2394,6 +2425,7 @@ static int cs_etm__set_sample_flags(struct cs_etm_queue *etmq, >> PERF_IP_FLAG_RETURN | >> PERF_IP_FLAG_INTERRUPT; >> break; >> + case CS_ETM_CONTEXT: >> case CS_ETM_EMPTY: >> default: >> break; >> @@ -2469,6 +2501,19 @@ static int cs_etm__process_traceid_queue(struct cs_etm_queue *etmq, >> */ >> cs_etm__sample(etmq, tidq); >> break; >> + case CS_ETM_CONTEXT: >> + /* >> + * Update context but don't swap packet. Keep the >> + * previous one for branch source address info, if >> + * tracing the kernel the context packet will be emitted >> + * between two ranges. >> + */ >> + ret = cs_etm__etmq_update_thread(etmq, tidq->packet->el, >> + tidq->packet->tid, >> + &tidq->frontend_thread); >> + if (ret) >> + goto out; >> + break; >> case CS_ETM_EXCEPTION: >> case CS_ETM_EXCEPTION_RET: >> /* >> @@ -2497,6 +2542,7 @@ static int cs_etm__process_traceid_queue(struct cs_etm_queue *etmq, >> } >> } >> >> +out: >> return ret; >> } >> >> @@ -2620,7 +2666,7 @@ static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, >> if (!tidq) >> continue; >> >> - if (tid == -1 || thread__tid(tidq->thread) == tid) >> + if (tid == -1 || thread__tid(tidq->frontend_thread) == tid) >> cs_etm__run_per_thread_timeless_decoder(etmq); >> } else >> cs_etm__run_per_cpu_timeless_decoder(etmq); >> @@ -3328,7 +3374,7 @@ static int cs_etm__create_queue_decoders(struct cs_etm_queue *etmq) >> */ >> if (cs_etm_decoder__add_mem_access_cb(etmq->decoder, >> 0x0L, ((u64) -1L), >> - cs_etm__mem_access)) >> + cs_etm__decoder_mem_access)) >> goto out_free_decoder; >> >> zfree(&t_params); >> diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h >> index aa9bb4a32eca..b81099c2b301 100644 >> --- a/tools/perf/util/cs-etm.h >> +++ b/tools/perf/util/cs-etm.h >> @@ -158,6 +158,7 @@ enum cs_etm_sample_type { >> CS_ETM_DISCONTINUITY, >> CS_ETM_EXCEPTION, >> CS_ETM_EXCEPTION_RET, >> + CS_ETM_CONTEXT, >> }; >> >> enum cs_etm_isa { >> @@ -184,6 +185,8 @@ struct cs_etm_packet { >> u8 last_instr_size; >> u8 trace_chan_id; >> int cpu; >> + int el; >> + pid_t tid; >> }; >> >> #define CS_ETM_PACKET_MAX_BUFFER 1024 >> @@ -259,8 +262,9 @@ enum cs_etm_pid_fmt { >> #include <opencsd/ocsd_if_types.h> >> int cs_etm__get_cpu(struct cs_etm_queue *etmq, u8 trace_chan_id, int *cpu); >> enum cs_etm_pid_fmt cs_etm__get_pid_fmt(struct cs_etm_queue *etmq); >> -int cs_etm__etmq_set_tid_el(struct cs_etm_queue *etmq, pid_t tid, >> - u8 trace_chan_id, ocsd_ex_level el); >> +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__etmq_is_timeless(struct cs_etm_queue *etmq); >> void cs_etm__etmq_set_traceid_queue_timestamp(struct cs_etm_queue *etmq, >> u8 trace_chan_id); >> >> -- >> 2.34.1 >>

2 weeks, 1 day

Re: [PATCH] coresight: ultrasoc-smb: Fix OOB write in smb_sync_perf_buffer()

by Suzuki K Poulose

On Thu, 04 Jun 2026 15:34:25 +0800, Junrui Luo wrote: > When the SMB sink is used as a perf AUX sink, smb_update_buffer() calls > smb_sync_perf_buffer() to copy hardware trace data into the perf AUX ring > buffer pages. It derives pg_idx = head >> PAGE_SHIFT from @head, which is > handle->head, and indexes dst_pages[pg_idx]. The pg_idx %= nr_pages > normalization is only applied after the first loop iteration. > > This leaves the initial page index underived from the buffer size, which > can result in an out-of-bounds write past dst_pages[] when head exceeds > the AUX buffer size. > > [...] Applied, thanks! [1/1] coresight: ultrasoc-smb: Fix OOB write in smb_sync_perf_buffer() https://git.kernel.org/coresight/c/98495b5a4d77 Best regards, -- Suzuki K Poulose <suzuki.poulose(a)arm.com>

2 weeks, 1 day

Re: [PATCH v7 05/13] coresight: etm4x: exclude ss_status from drvdata->config

by Suzuki K Poulose

Hi Levi, On 19/05/2026 16:48, Yeoreum Yun wrote: > The purpose of TRCSSCSRn register is to show status of > the corresponding Single-shot Comparator Control and input supports. > That means writable field's purpose for reset or restore from idle status > not for configuration. > > Therefore, exclude ss_status from drvdata->config and move it to drvdata. TRCSSCSRn has two different types of fields. 1. Capability 2. Status Moving the entire register from "config" to a common dangling place looks like shifting the problem to me. Could we do something like : 1. Split the fields to two. a. Store only the capability information in etmv4_caps. Bits[4:0] b. Store the Status bit in drvdata->config , as it is really matters to the session ? Bits[31:30] Add a helper to write/read the TRCSSSRn which would apply/mask the bits from drvdata->etmv4_caps->fields to the Status/Pending Suzuki > > Signed-off-by: Yeoreum Yun <yeoreum.yun(a)arm.com> > --- > .../hwtracing/coresight/coresight-etm4x-cfg.c | 1 - > .../hwtracing/coresight/coresight-etm4x-core.c | 16 +++++++++------- > .../hwtracing/coresight/coresight-etm4x-sysfs.c | 10 +++++----- > drivers/hwtracing/coresight/coresight-etm4x.h | 7 ++++++- > 4 files changed, 20 insertions(+), 14 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > index e1a59b434505..9b4947d75fde 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > @@ -86,7 +86,6 @@ static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata, > off_mask = (offset & GENMASK(11, 5)); > do { > CHECKREGIDX(TRCSSCCRn(0), ss_ctrl, idx, off_mask); > - CHECKREGIDX(TRCSSCSRn(0), ss_status, idx, off_mask); > CHECKREGIDX(TRCSSPCICRn(0), ss_pe_cmp, idx, off_mask); > } while (0); > } else if ((offset >= TRCCIDCVRn(0)) && (offset <= TRCVMIDCVRn(7))) { > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 53fbc4826628..7783c97b53e8 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -95,7 +95,7 @@ static bool etm4x_sspcicrn_present(struct etmv4_drvdata *drvdata, int n) > const struct etmv4_caps *caps = &drvdata->caps; > > return (n < caps->nr_ss_cmp) && caps->nr_pe_cmp && > - (drvdata->config.ss_status[n] & TRCSSCSRn_PC); > + (drvdata->ss_status[n] & TRCSSCSRn_PC); > } > > u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit) > @@ -571,11 +571,11 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > etm4x_relaxed_write32(csa, config->res_ctrl[i], TRCRSCTLRn(i)); > > for (i = 0; i < caps->nr_ss_cmp; i++) { > - /* always clear status bit on restart if using single-shot */ > + /* always clear status and pending bits on restart if using single-shot */ > if (config->ss_ctrl[i] || config->ss_pe_cmp[i]) > - config->ss_status[i] &= ~TRCSSCSRn_STATUS; > + drvdata->ss_status[i] &= ~(TRCSSCSRn_STATUS | TRCSSCSRn_PENDING); > etm4x_relaxed_write32(csa, config->ss_ctrl[i], TRCSSCCRn(i)); > - etm4x_relaxed_write32(csa, config->ss_status[i], TRCSSCSRn(i)); > + etm4x_relaxed_write32(csa, drvdata->ss_status[i], TRCSSCSRn(i)); > if (etm4x_sspcicrn_present(drvdata, i)) > etm4x_relaxed_write32(csa, config->ss_pe_cmp[i], TRCSSPCICRn(i)); > } > @@ -772,6 +772,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev, > /* Clear configuration from previous run */ > memset(config, 0, sizeof(struct etmv4_config)); > > + > if (attr->exclude_kernel) > config->mode = ETM_MODE_EXCL_KERN; > > @@ -1064,7 +1065,7 @@ static void etm4_disable_hw(struct etmv4_drvdata *drvdata) > > /* read the status of the single shot comparators */ > for (i = 0; i < caps->nr_ss_cmp; i++) { > - config->ss_status[i] = > + drvdata->ss_status[i] = > etm4x_relaxed_read32(csa, TRCSSCSRn(i)); > } > > @@ -1497,8 +1498,9 @@ static void etm4_init_arch_data(void *info) > */ > caps->nr_ss_cmp = FIELD_GET(TRCIDR4_NUMSSCC_MASK, etmidr4); > for (i = 0; i < caps->nr_ss_cmp; i++) { > - drvdata->config.ss_status[i] = > - etm4x_relaxed_read32(csa, TRCSSCSRn(i)); > + drvdata->ss_status[i] = etm4x_relaxed_read32(csa, TRCSSCSRn(i)); > + drvdata->ss_status[i] &= (TRCSSCSRn_PC | TRCSSCSRn_DV | > + TRCSSCSRn_DA | TRCSSCSRn_INST); > } > /* NUMCIDC, bits[27:24] number of Context ID comparators for tracing */ > caps->numcidc = FIELD_GET(TRCIDR4_NUMCIDC_MASK, etmidr4); > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > index 7de3c58a47b4..71e95d152ee6 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c > @@ -1829,8 +1829,8 @@ static ssize_t sshot_ctrl_store(struct device *dev, > raw_spin_lock(&drvdata->spinlock); > idx = config->ss_idx; > config->ss_ctrl[idx] = FIELD_PREP(TRCSSCCRn_SAC_ARC_RST_MASK, val); > - /* must clear bit 31 in related status register on programming */ > - config->ss_status[idx] &= ~TRCSSCSRn_STATUS; > + /* must clear bit 31 and 30 in related status register on programming */ > + drvdata->ss_status[idx] &= ~(TRCSSCSRn_STATUS | TRCSSCSRn_PENDING); > raw_spin_unlock(&drvdata->spinlock); > return size; > } > @@ -1844,7 +1844,7 @@ static ssize_t sshot_status_show(struct device *dev, > struct etmv4_config *config = &drvdata->config; > > raw_spin_lock(&drvdata->spinlock); > - val = config->ss_status[config->ss_idx]; > + val = drvdata->ss_status[config->ss_idx]; > raw_spin_unlock(&drvdata->spinlock); > return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); > } > @@ -1879,8 +1879,8 @@ static ssize_t sshot_pe_ctrl_store(struct device *dev, > raw_spin_lock(&drvdata->spinlock); > idx = config->ss_idx; > config->ss_pe_cmp[idx] = FIELD_PREP(TRCSSPCICRn_PC_MASK, val); > - /* must clear bit 31 in related status register on programming */ > - config->ss_status[idx] &= ~TRCSSCSRn_STATUS; > + /* must clear bit 31 and 30 in related status register on programming */ > + drvdata->ss_status[idx] &= ~(TRCSSCSRn_STATUS | TRCSSCSRn_PENDING); > raw_spin_unlock(&drvdata->spinlock); > return size; > } > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 6d4fbae78448..43db1eb6f8cd 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -213,6 +213,7 @@ > #define TRCACATRn_EXLEVEL_MASK GENMASK(14, 8) > > #define TRCSSCSRn_STATUS BIT(31) > +#define TRCSSCSRn_PENDING BIT(30) > #define TRCSSCCRn_SAC_ARC_RST_MASK GENMASK(24, 0) > > #define TRCSSPCICRn_PC_MASK GENMASK(7, 0) > @@ -730,6 +731,9 @@ static inline u32 etm4_res_sel_pair(u8 res_sel_idx) > #define ETM_DEFAULT_ADDR_COMP 0 > > #define TRCSSCSRn_PC BIT(3) > +#define TRCSSCSRn_DV BIT(2) > +#define TRCSSCSRn_DA BIT(1) > +#define TRCSSCSRn_INST BIT(0) > > /* PowerDown Control Register bits */ > #define TRCPDCR_PU BIT(3) > @@ -978,7 +982,6 @@ struct etmv4_config { > u32 res_ctrl[ETM_MAX_RES_SEL]; /* TRCRSCTLRn */ > u8 ss_idx; > u32 ss_ctrl[ETM_MAX_SS_CMP]; > - u32 ss_status[ETM_MAX_SS_CMP]; > u32 ss_pe_cmp[ETM_MAX_SS_CMP]; > u8 addr_idx; > u64 addr_val[ETM_MAX_SINGLE_ADDR_CMP]; > @@ -1073,6 +1076,7 @@ struct etmv4_save_state { > * @config: structure holding configuration parameters. > * @save_state: State to be preserved across power loss > * @paused: Indicates if the trace unit is paused. > + * @ss_status: The status of the corresponding single-shot comparator. > * @arch_features: Bitmap of arch features of etmv4 devices. > */ > struct etmv4_drvdata { > @@ -1092,6 +1096,7 @@ struct etmv4_drvdata { > u64 trfcr; > struct etmv4_config config; > struct etmv4_save_state *save_state; > + u32 ss_status[ETM_MAX_SS_CMP]; > DECLARE_BITMAP(arch_features, ETM4_IMPDEF_FEATURE_MAX); > }; >

2 weeks, 1 day

Re: [PATCH] perf cs-etm: stamp pid/tid/EL on each buffered packet to fix cross-pid attribution

by Leo Yan

Hi Amir, On Wed, Jun 03, 2026 at 01:10:17PM -0700, Amir Ayupov wrote: > Hi James, > > Thank you for picking it up. > > I tested the v2 patch series and it looks good. There was a minor > difference in 2/39 tested perf data files: the number of brstack samples > differs by one, however, there was no loss of binary profile. The resulting > BOLT profile converted from the perf script output was identical, so I'm OK > with v2 patch as-is. Sorry jumping in as brstack is mentioned. Now branch stack is maintained per-CPU wise, it mixes up branch stack cross threads. The patch 03 in the series [1] refactors branch stack per-thread by using common code. Hope this can benefit a bit the profiling data quality and in case you are interested in. Thanks, Leo [1] https://lore.kernel.org/linux-perf-users/20260526-b4-arm_cs_callchain_suppo…

2 weeks, 1 day

[PATCH v3 00/19] perf cs-etm: Queue context packets for frontend

by James Clark

Fix thread tracking when decoding Coresight trace and add a new test for it. The new test is added as a Perf test workload instead of a custom binary with its own build system, but this requires a new feature in Perf test to pass in control pipes which can enable and disable events. This scopes the recording to just the workload and helps to reduce the amount of data recorded in tracing tests. With this new feature we can re-write all of the Coresight tests to make use of it and remove the remaining binaries which fixes the following issues: * They didn't work in out of source builds * A lot of the tests unnecessarily required root and didn't skip without it * They were mainly qualitative tests which didn't look for specific behavior Most importantly, the long build and runtime has been reduced. On a Radxa Orion O6, unroll_loop_thread.c took 37s to compile which is longer than the entire Perf build. Now the build time is negligible and the before and after test runtimes for all the Coresight tests are: | N1SDP | Orion O6 ----------------------------------- Before | 4m 0s | 14m 49s After | 26s | 56s ----------------------------------- Signed-off-by: James Clark <james.clark(a)linaro.org> --- Changes in v3: - Minor sashiko comments - Close some more pipes - Fix warning messages - Error handling improvements - Pass packet into cs_etm__synth_instruction_sample() - Fixup stale comment (Leo) - Link to v2: https://lore.kernel.org/r/20260602-james-cs-context-tracking-fix-v2-0-85b5c… Changes in v2: - Add --workload-ctl option to Perf test - Re-write all the Coresight tests and speed them up - Pass packet to memory access function so frontend can use either the previous or current packet's EL - Link to v1: https://lore.kernel.org/r/20260526-james-cs-context-tracking-fix-v1-0-ebd60… --- James Clark (19): perf cs-etm: Queue context packets for frontend perf test: Add workload-ctl option perf test: Add a workload that forces context switches perf test cs-etm: Test process attribution perf test: Add deterministic workload perf test cs-etm: Replace unroll loop thread with deterministic decode test perf test cs-etm: Remove asm_pure_loop test perf test cs-etm: Replace memcpy test with raw dump stress test perf test: Add named_threads workload perf test cs-etm: Test decoding for concurrent threads test perf test cs-etm: Remove duplicate branch tests perf test cs-etm: Skip if not root perf test cs-etm: Reduce snapshot size perf test cs-etm: Speed up basic test perf test cs-etm: Remove unused Coresight workloads perf test cs-etm: Make disassembly test use kcore perf test cs-etm: Add all branch instructions to test perf test cs-etm: Speed up disassembly test perf test cs-etm: Move existing tests to coresight folder Documentation/trace/coresight/coresight-perf.rst | 78 +------ MAINTAINERS | 2 - tools/perf/Documentation/perf-test.txt | 18 +- tools/perf/Makefile.perf | 14 +- tools/perf/scripts/python/arm-cs-trace-disasm.py | 20 +- tools/perf/tests/builtin-test.c | 187 +++++++++++++++- tools/perf/tests/shell/coresight/Makefile | 29 --- .../perf/tests/shell/coresight/Makefile.miniconfig | 14 -- tools/perf/tests/shell/coresight/asm_pure_loop.sh | 22 -- .../tests/shell/coresight/asm_pure_loop/.gitignore | 1 - .../tests/shell/coresight/asm_pure_loop/Makefile | 34 --- .../shell/coresight/asm_pure_loop/asm_pure_loop.S | 30 --- .../tests/shell/coresight/concurrent_threads.sh | 45 ++++ .../tests/shell/coresight/context_switch_thread.sh | 69 ++++++ tools/perf/tests/shell/coresight/deterministic.sh | 71 +++++++ .../tests/shell/coresight/memcpy_thread/.gitignore | 1 - .../tests/shell/coresight/memcpy_thread/Makefile | 33 --- .../shell/coresight/memcpy_thread/memcpy_thread.c | 80 ------- .../tests/shell/coresight/memcpy_thread_16k_10.sh | 22 -- .../perf/tests/shell/coresight/raw_dump_stress.sh | 48 +++++ .../shell/{ => coresight}/test_arm_coresight.sh | 43 ++-- .../{ => coresight}/test_arm_coresight_disasm.sh | 17 +- .../tests/shell/coresight/thread_loop/.gitignore | 1 - .../tests/shell/coresight/thread_loop/Makefile | 33 --- .../shell/coresight/thread_loop/thread_loop.c | 85 -------- .../shell/coresight/thread_loop_check_tid_10.sh | 23 -- .../shell/coresight/thread_loop_check_tid_2.sh | 23 -- .../shell/coresight/unroll_loop_thread/.gitignore | 1 - .../shell/coresight/unroll_loop_thread/Makefile | 33 --- .../unroll_loop_thread/unroll_loop_thread.c | 75 ------- .../tests/shell/coresight/unroll_loop_thread_10.sh | 22 -- tools/perf/tests/shell/lib/coresight.sh | 134 ------------ tools/perf/tests/tests.h | 3 + tools/perf/tests/workloads/Build | 4 + tools/perf/tests/workloads/context_switch_loop.c | 101 +++++++++ tools/perf/tests/workloads/deterministic.c | 39 ++++ tools/perf/tests/workloads/named_threads.c | 109 ++++++++++ tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 21 +- tools/perf/util/cs-etm.c | 234 ++++++++++++--------- tools/perf/util/cs-etm.h | 8 +- 40 files changed, 889 insertions(+), 938 deletions(-) --- base-commit: 5f0ca6b80b12bab1ce06839cdffb6148bb650ff4 change-id: 20260515-james-cs-context-tracking-fix-754998bae7ed Best regards, -- James Clark <james.clark(a)linaro.org>

2 weeks, 2 days

Re: [PATCH v7 09/13] coresight: etm4x: missing cscfg_csdev_disable_active_config() in perf enable

by Leo Yan

On Tue, May 19, 2026 at 04:48:08PM +0100, Yeoreum Yun wrote: > In the perf enable path, there are missing cases where > cscfg_csdev_disable_active_config() is not called: > > - Branch broadcast is selected but not supported by the hardware > - etm4_enable_hw() fails > > This can lead to a leak of config_desc->active_cnt. > Fix this by properly calling cscfg_csdev_disable_active_config() > in these error paths. > > Fixes: 810ac401db1f ("coresight: etm4x: Add complex configuration handlers to etmv4") > Signed-off-by: Yeoreum Yun <yeoreum.yun(a)arm.com> > --- > .../hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index f0a9f2ef4b27..0889937811cb 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -899,6 +899,8 @@ static int etm4_parse_event_config(struct coresight_device *csdev, > * Missing BB support could cause silent decode errors > * so fail to open if it's not supported. > */ > + if (cfg_hash) > + cscfg_csdev_disable_active_config(csdev); > ret = -EINVAL; > goto out; > } else { > @@ -915,6 +917,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, > struct coresight_path *path) > { > struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > + struct perf_event_attr *attr = &event->attr; > int ret; > > if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) > @@ -926,7 +929,7 @@ static int etm4_enable_perf(struct coresight_device *csdev, > /* Configure the tracer based on the session's specifics */ > ret = etm4_parse_event_config(csdev, event); > if (ret) > - goto out; > + goto err; > > drvdata->trcid = path->trace_id; > > @@ -935,16 +938,19 @@ static int etm4_enable_perf(struct coresight_device *csdev, > > /* And enable it */ > ret = etm4_enable_hw(drvdata); > - > -out: > - /* Failed to start tracer; roll back to DISABLED mode */ > if (ret) { > - coresight_set_mode(csdev, CS_MODE_DISABLED); > - return ret; > + if (ATTR_CFG_GET_FLD(attr, configid)) > + cscfg_csdev_disable_active_config(csdev); > + goto err; > } > > csdev->path = path; > return 0; > + > +err: > + /* Failed to start tracer; roll back to DISABLED mode */ > + coresight_set_mode(csdev, CS_MODE_DISABLED); > + return ret; > } Seems to me, it is not readable if spread error handling into both child and parent functions. I would like we can stick to use the same function for resource allocation and rollback for failures. How about below change (I did not verify it yet): diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 0889937811cb..8347efb2069b 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -794,8 +794,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev, .ATTR_CFG_FLD_timestamp_CFG = U64_MAX, }; struct perf_event_attr *attr = &event->attr; - unsigned long cfg_hash; - int preset, cc_threshold; + int cc_threshold; u8 ts_level; /* Clear configuration from previous run */ @@ -882,16 +881,6 @@ static int etm4_parse_event_config(struct coresight_device *csdev, /* bit[12], Return stack enable bit */ config->cfg |= TRCCONFIGR_RS; - /* - * Set any selected configuration and preset. A zero configid means no - * configuration active, preset = 0 means no preset selected. - */ - cfg_hash = ATTR_CFG_GET_FLD(attr, configid); - if (cfg_hash) { - preset = ATTR_CFG_GET_FLD(attr, preset); - ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset); - } - /* branch broadcast - enable if selected and supported */ if (ATTR_CFG_GET_FLD(attr, branch_broadcast)) { if (!caps->trcbb) { @@ -899,8 +888,6 @@ static int etm4_parse_event_config(struct coresight_device *csdev, * Missing BB support could cause silent decode errors * so fail to open if it's not supported. */ - if (cfg_hash) - cscfg_csdev_disable_active_config(csdev); ret = -EINVAL; goto out; } else { @@ -918,7 +905,8 @@ static int etm4_enable_perf(struct coresight_device *csdev, { struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct perf_event_attr *attr = &event->attr; - int ret; + unsigned long cfg_hash; + int preset, ret; if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) return -EINVAL; @@ -931,6 +919,18 @@ static int etm4_enable_perf(struct coresight_device *csdev, if (ret) goto err; + /* + * Set any selected configuration and preset. A zero configid means no + * configuration active, preset = 0 means no preset selected. + */ + cfg_hash = ATTR_CFG_GET_FLD(attr, configid); + if (cfg_hash) { + preset = ATTR_CFG_GET_FLD(attr, preset); + ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset); + if (ret) + goto err; + } + drvdata->trcid = path->trace_id; /* Populate pause state */ @@ -938,15 +938,15 @@ static int etm4_enable_perf(struct coresight_device *csdev, /* And enable it */ ret = etm4_enable_hw(drvdata); - if (ret) { - if (ATTR_CFG_GET_FLD(attr, configid)) - cscfg_csdev_disable_active_config(csdev); - goto err; - } + if (ret) + goto err_enable_hw; csdev->path = path; return 0; +err_enable_hw: + if (cfg_hash) + cscfg_csdev_disable_active_config(csdev); err: /* Failed to start tracer; roll back to DISABLED mode */ coresight_set_mode(csdev, CS_MODE_DISABLED);

2 weeks, 4 days

Re: [PATCH v7 08/13] coresight: etm4x: fix inconsistencies with sysfs configuration

by Leo Yan

On Thu, May 28, 2026 at 03:26:57PM +0100, Yeoreum Yun wrote: [...] > > > @@ -47,7 +47,7 @@ static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata, > > > struct cscfg_regval_csdev *reg_csdev, u32 offset) > > > { > > > int err = -EINVAL, idx; > > > - struct etmv4_config *drvcfg = &drvdata->config; > > > + struct etmv4_config *drvcfg = &drvdata->active_config; > > > > Wouldn't it make more sense to keep using drvdata->config for cfgfs? > > This would avoid cfgfs updating the active configuration while a session > > is enabled. > > > > My understanding is after refactoring cfgfs, we will never expose > > active_config or config anymore so this should not an issue. Before > > that, maybe we just keep to use config so can avoid mess. > > I don't think so. since the cfgfs's config is updated right before > enable and in this patchset, It's applied after "take the mode". > > If we do it into drvdta->config, then contention would be increased > with the access of sysfs and that nullifies almost this patch purpose > and because of we use "one config" this makes a corruption with perf > and sysfs. Here have two different contention: the contention between sysfs and cfgfs, and the contention between cfgfs and a runtime config (active config). My suggestion is to avoid the later contention, which is the main idea in this series that avoid the runtime config is modified in the middle of a session. That said, I have no strong opinion. > > > static void etm4_enable_sysfs_smp_call(void *info) > > > { > > > struct etm4_enable_arg *arg = info; > > > + struct etmv4_drvdata *drvdata; > > > struct coresight_device *csdev; > > > + unsigned long cfg_hash; > > > + int preset; > > > > > > if (WARN_ON(!arg)) > > > return; > > > > > > - csdev = arg->drvdata->csdev; > > > + drvdata = arg->drvdata; > > > + csdev = drvdata->csdev; > > > if (!coresight_take_mode(csdev, CS_MODE_SYSFS)) { > > > /* Someone is already using the tracer */ > > > arg->rc = -EBUSY; > > > return; > > > } > > > > > > - arg->rc = etm4_enable_hw(arg->drvdata); > > > + /* enable any config activated by configfs */ > > > + cscfg_config_sysfs_get_active_cfg(&cfg_hash, &preset); > > > > > > - /* The tracer didn't start */ > > > + drvdata->active_config = arg->config; > > > > Can move this down to just before drvdata->trcid assignment so cscfg > > operations can be put together? > > No. Copy the arg->config must be before cscfg_csdev_enable_active_config(). > If that's after, it overrides the "preset" and this is different from > the former behavior. Please copy config first, then do cscfg stuffs. > > > + arg->rc = etm4_enable_hw(drvdata); > > > if (arg->rc) { > > > - coresight_set_mode(csdev, CS_MODE_DISABLED); > > > - return; > > > + cscfg_csdev_disable_active_config(csdev); > > > + goto err; > > > > Add a new goto tag (like err_enable_hw) for the disable_active_config > > rollback? > > This is only place where cscfg_csdev_disable_active_config(). > Why do we need to goto for cleanup where there is no duplication? It is about to use a central place for handling errors. > > > @@ -1449,7 +1458,7 @@ static void etm4_init_arch_data(void *info) > > > > > > /* EXLEVEL_S, bits[19:16] Secure state instruction tracing */ > > > caps->s_ex_level = FIELD_GET(TRCIDR3_EXLEVEL_S_MASK, etmidr3); > > > - drvdata->config.s_ex_level = caps->s_ex_level; > > > + config->s_ex_level = caps->s_ex_level; > > > > config->s_ex_level is redundant and not really a configuration item. > > We should use caps->s_ex_level instead of config->s_ex_level wherever > > it is used. > > Agree, but this includes it should change the omse function > declations to pass "caps" argument: > - etm4_set_comparator_filter() > - etm4_set_start_stop_filter() > > If that's okay, I'll respin with it. This is fine for me. Thanks, Leo

2 weeks, 4 days

Re: [PATCH v7 03/13] coresight: etm4x: introduce ETM_MAX_SEQ_TRANSITIONS

by Suzuki K Poulose

On 19/05/2026 16:48, Yeoreum Yun wrote: > According to IHI006H Embedded Trace Macrocell Architecture > Specification [0], n could be 0-2 for TCRSEQEVR<n> when > TCRIDR5.NUMSEQSTATE is 0b100. > > Therefore, introduce ETM_MAX_SEQ_TRANSITIONS macro and apply this > in TCRSEQEVR<n> relevant fields. > > Link: https://developer.arm.com/documentation/ihi0064/latest/ [0] > Suggestedby: Leo Yan <leo.yan(a)arm.com> > Signed-off-by: Yeoreum Yun <yeoreum.yun(a)arm.com> > --- > drivers/hwtracing/coresight/coresight-etm4x-cfg.c | 2 +- > drivers/hwtracing/coresight/coresight-etm4x.h | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > index c302072b293a..e1a59b434505 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-cfg.c > @@ -76,7 +76,7 @@ static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata, > } else if ((offset & GENMASK(11, 4)) == TRCSEQEVRn(0)) { > /* sequencer state control registers */ > idx = (offset & GENMASK(3, 0)) / 4; > - if (idx < ETM_MAX_SEQ_STATES) { > + if (idx < ETM_MAX_SEQ_TRANSITIONS) { > reg_csdev->driver_regval = &drvcfg->seq_ctrl[idx]; > err = 0; > } > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 89d81ce4e04e..60e08ab085c5 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -614,6 +614,7 @@ static inline u32 etm4_res_sel_pair(u8 res_sel_idx) > #define ETM_MAX_NR_PE 8 > #define ETMv4_MAX_CNTR 4 > #define ETM_MAX_SEQ_STATES 4 > +#define ETM_MAX_SEQ_TRANSITIONS (ETM_MAX_SEQ_STATES - 1) Similar to the other comment on the patch, please don't tie this to SEQ_STATES. Simpl define. #define ETM_MAX_SEQ_CTRLS 3 Suzuki > #define ETM_MAX_EXT_INP_SEL 4 > #define ETM_MAX_EXT_INP 256 > #define ETM_MAX_EXT_OUT 4 > @@ -877,7 +878,7 @@ struct etmv4_config { > u32 vipcssctlr; > u8 seq_idx; > u8 syncfreq; > - u32 seq_ctrl[ETM_MAX_SEQ_STATES]; > + u32 seq_ctrl[ETM_MAX_SEQ_TRANSITIONS]; > u32 seq_rst; > u32 seq_state; > u8 cntr_idx; > @@ -928,7 +929,7 @@ struct etmv4_save_state { > u32 trcvissctlr; > u32 trcvipcssctlr; > > - u32 trcseqevr[ETM_MAX_SEQ_STATES]; > + u32 trcseqevr[ETM_MAX_SEQ_TRANSITIONS]; > u32 trcseqrstevr; > u32 trcseqstr; > u32 trcextinselr;

2 weeks, 4 days

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

CoreSight