Re: [PATCH v5 4/7] riscv: pmu: Add infrastructure for Control Transfer Record
From: Anup Patel
Date: Thu Nov 19 2026 - 10:27:28 EST
On Wed, Nov 18, 2026 at 3:21 PM Vikram Singh
<vikram.singh3@xxxxxxxxxxxxxxxx> wrote:
>
> To support Control Transfer Records (CTR) extension, we need to extend the
> riscv_pmu framework with some basic infrastructure for branch stack
> sampling. Subsequent patches will use this to add support for CTR in the
> riscv_pmu_dev driver.
>
> With CTR, the branches are stored into a hardware FIFO, which will be
> sampled by software when perf events overflow. A task may be
> context-switched between overflows, and to avoid leaking samples we need
> to clear the last task's records when a task is context-switched in.
> To do this we will be using the pmu::sched_task() callback added in this
> patch.
>
> Co-developed-by: Rajnesh Kanwal <rajnesh.kanwal49@xxxxxxxxx>
> Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal49@xxxxxxxxx>
> Signed-off-by: Vikram Singh <vikram.singh3@xxxxxxxxxxxxxxxx>
> Link: https://lore.kernel.org/r/20261106173942.3175069-5-vikram.singh3@xxxxxxxxxxxxxxxx
> Signed-off-by: Anup Patel <anup@xxxxxxxxxxxxxx>
As mentioned in PATCH1, drop the "Link:" and the subsequent
"Signed-off-by:" lines.
> ---
> drivers/perf/riscv_pmu.c | 19 +++++++++++++++++++
> drivers/perf/riscv_pmu_legacy.c | 2 ++
> drivers/perf/riscv_pmu_sbi.c | 17 +++++++++++++++++
> include/linux/perf/riscv_pmu.h | 23 +++++++++++++++++++++--
> 4 files changed, 59 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/perf/riscv_pmu.c b/drivers/perf/riscv_pmu.c
> index 8e3cd0f35336..d4826eb73b16 100644
> --- a/drivers/perf/riscv_pmu.c
> +++ b/drivers/perf/riscv_pmu.c
> @@ -157,6 +157,19 @@ u64 riscv_pmu_ctr_get_width_mask(struct perf_event *event)
> return GENMASK_ULL(cwidth, 0);
> }
>
> +static void riscv_pmu_sched_task(struct perf_event_pmu_context *pmu_ctx, struct task_struct *task,
> + bool sched_in)
> +{
> + struct riscv_pmu *pmu;
> +
> + if (!pmu_ctx)
> + return;
> +
> + pmu = to_riscv_pmu(pmu_ctx->pmu);
> + if (pmu->sched_task)
> + pmu->sched_task(pmu_ctx, task, sched_in);
> +}
> +
> u64 riscv_pmu_event_update(struct perf_event *event)
> {
> struct riscv_pmu *rvpmu = to_riscv_pmu(event->pmu);
> @@ -269,6 +282,8 @@ static int riscv_pmu_add(struct perf_event *event, int flags)
> cpuc->events[idx] = event;
> cpuc->n_events++;
> hwc->state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
> + if (rvpmu->ctr_add)
> + rvpmu->ctr_add(event, flags);
> if (flags & PERF_EF_START)
> riscv_pmu_start(event, PERF_EF_RELOAD);
>
> @@ -290,6 +305,8 @@ static void riscv_pmu_del(struct perf_event *event, int flags)
> if (rvpmu->ctr_stop)
> rvpmu->ctr_stop(event, RISCV_PMU_STOP_FLAG_RESET);
> cpuc->n_events--;
> + if (rvpmu->ctr_del)
> + rvpmu->ctr_del(event, flags);
> if (rvpmu->ctr_clear_idx)
> rvpmu->ctr_clear_idx(event);
> perf_event_update_userpage(event);
> @@ -402,6 +419,7 @@ struct riscv_pmu *riscv_pmu_alloc(void)
> for_each_possible_cpu(cpuid) {
> cpuc = per_cpu_ptr(pmu->hw_events, cpuid);
> cpuc->n_events = 0;
> + cpuc->ctr_users = 0;
> for (i = 0; i < RISCV_MAX_COUNTERS; i++)
> cpuc->events[i] = NULL;
> cpuc->snapshot_addr = NULL;
> @@ -416,6 +434,7 @@ struct riscv_pmu *riscv_pmu_alloc(void)
> .start = riscv_pmu_start,
> .stop = riscv_pmu_stop,
> .read = riscv_pmu_read,
> + .sched_task = riscv_pmu_sched_task,
> };
>
> return pmu;
> diff --git a/drivers/perf/riscv_pmu_legacy.c b/drivers/perf/riscv_pmu_legacy.c
> index 1b8e4789cb3c..5214e90c61a6 100644
> --- a/drivers/perf/riscv_pmu_legacy.c
> +++ b/drivers/perf/riscv_pmu_legacy.c
> @@ -115,6 +115,8 @@ static void pmu_legacy_init(struct riscv_pmu *pmu)
> set_bit(RISCV_PMU_LEGACY_INSTRET, pmu->cmask);
> pmu->ctr_start = pmu_legacy_ctr_start;
> pmu->ctr_stop = NULL;
> + pmu->ctr_add = NULL;
> + pmu->ctr_del = NULL;
> pmu->event_map = pmu_legacy_event_map;
> pmu->ctr_get_idx = pmu_legacy_ctr_get_idx;
> pmu->ctr_get_width = pmu_legacy_ctr_get_width;
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index 21a2078eab98..b14b3acf7567 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -825,6 +825,14 @@ static void pmu_sbi_reset_scounteren(void *arg)
> csr_read(CSR_SCOUNTEREN) & ~BIT(pmu_sbi_csr_index(event)));
> }
>
> +static void pmu_sbi_ctr_add(struct perf_event *event, int flags)
> +{
> +}
> +
> +static void pmu_sbi_ctr_del(struct perf_event *event, int flags)
> +{
> +}
> +
> static void pmu_sbi_ctr_start(struct perf_event *event, u64 ival)
> {
> struct sbiret ret;
> @@ -885,6 +893,12 @@ static void pmu_sbi_ctr_stop(struct perf_event *event, unsigned long flag)
> }
> }
>
> +static void pmu_sbi_sched_task(struct perf_event_pmu_context *pmu_ctx, struct task_struct *task,
> + bool sched_in)
> +{
> + /* Call CTR specific Sched hook. */
> +}
> +
> static int pmu_sbi_find_num_ctrs(void)
> {
> struct sbiret ret;
> @@ -1506,6 +1520,8 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)
> pmu->pmu.attr_groups = riscv_pmu_attr_groups;
> pmu->pmu.parent = &pdev->dev;
> bitmap_copy(pmu->cmask, cmask, RISCV_MAX_COUNTERS);
> + pmu->ctr_add = pmu_sbi_ctr_add;
> + pmu->ctr_del = pmu_sbi_ctr_del;
> pmu->ctr_start = pmu_sbi_ctr_start;
> pmu->ctr_stop = pmu_sbi_ctr_stop;
> pmu->event_map = pmu_sbi_event_map;
> @@ -1517,6 +1533,7 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)
> pmu->event_mapped = pmu_sbi_event_mapped;
> pmu->event_unmapped = pmu_sbi_event_unmapped;
> pmu->csr_index = pmu_sbi_csr_index;
> + pmu->sched_task = pmu_sbi_sched_task;
>
> ret = riscv_pm_pmu_register(pmu);
> if (ret)
> diff --git a/include/linux/perf/riscv_pmu.h b/include/linux/perf/riscv_pmu.h
> index ecaa40370830..c748a06ad751 100644
> --- a/include/linux/perf/riscv_pmu.h
> +++ b/include/linux/perf/riscv_pmu.h
> @@ -28,6 +28,15 @@
>
> #define RISCV_PMU_CONFIG1_GUEST_EVENTS 0x1
>
> +struct sse_event;
> +
Drop this forward declaration of "struct sse_event" and the
subsequent newline.
> +#define MAX_BRANCH_RECORDS 256
> +
> +struct branch_records {
> + struct perf_branch_stack branch_stack;
> + struct perf_branch_entry branch_entries[MAX_BRANCH_RECORDS];
> +};
> +
> struct cpu_hw_events {
> /* currently enabled events */
> int n_events;
> @@ -47,6 +56,11 @@ struct cpu_hw_events {
> bool snapshot_set_done;
> /* A shadow copy of the counter values to avoid clobbering during multiple SBI calls */
> u64 snapshot_cval_shcopy[RISCV_MAX_COUNTERS];
> + /* Saved branch records. */
> + struct branch_records *branches;
> +
Drop the redundant newline.
> + /* Active events requesting branch records */
> + int ctr_users;
> };
>
> struct riscv_pmu {
> @@ -60,17 +74,22 @@ struct riscv_pmu {
> int (*ctr_get_idx)(struct perf_event *event);
> int (*ctr_get_width)(int idx);
> void (*ctr_clear_idx)(struct perf_event *event);
> + void (*ctr_add)(struct perf_event *event, int flags);
> + void (*ctr_del)(struct perf_event *event, int flags);
> void (*ctr_start)(struct perf_event *event, u64 init_val);
> void (*ctr_stop)(struct perf_event *event, unsigned long flag);
> int (*event_map)(struct perf_event *event, u64 *config);
> - void (*event_init)(struct perf_event *event);
> + int (*event_init)(struct perf_event *event);
> void (*event_mapped)(struct perf_event *event, struct mm_struct *mm);
> void (*event_unmapped)(struct perf_event *event, struct mm_struct *mm);
> uint8_t (*csr_index)(struct perf_event *event);
> -
> + void (*sched_task)(struct perf_event_pmu_context *ctx, struct task_struct *task,
> + bool sched_in);
> struct cpu_hw_events __percpu *hw_events;
> struct hlist_node node;
> struct notifier_block riscv_pm_nb;
> +
> + unsigned int ctr_depth;
> };
>
> #define to_riscv_pmu(p) (container_of(p, struct riscv_pmu, pmu))
> --
> 2.43.0
>
Regards,
Anup