Re: [PATCH v5 6/7] riscv: pmu: Integrate CTR Ext support in riscv_pmu_dev driver
From: Anup Patel
Date: Thu Nov 19 2026 - 10:36:35 EST
On Wed, Nov 18, 2026 at 3:21 PM Vikram Singh
<vikram.singh3@xxxxxxxxxxxxxxxx> wrote:
>
> This integrates recently added CTR ext support in riscv_pmu_dev driver
> to enable branch stack sampling using PMU events.
>
> This mainly adds CTR enable/disable callbacks in rvpmu_ctr_stop()
> and rvpmu_ctr_start() function to start/stop branch recording along
> with the event.
>
> PMU overflow handler rvpmu_ovf_handler() is also updated to sample
> CTR entries in case of the overflow for the particular event programmed
> to records branches. The recorded entries are fed to core perf for
> further processing.
>
> 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-7-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 | 2 +-
> drivers/perf/riscv_pmu_sbi.c | 72 ++++++++++++++++++++++++++++++++++--
> 2 files changed, 70 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/perf/riscv_pmu.c b/drivers/perf/riscv_pmu.c
> index d4826eb73b16..fa9ae4e659d2 100644
> --- a/drivers/perf/riscv_pmu.c
> +++ b/drivers/perf/riscv_pmu.c
> @@ -327,7 +327,7 @@ static int riscv_pmu_event_init(struct perf_event *event)
> uint64_t cmask;
>
> /* driver does not support branch stack sampling */
> - if (has_branch_stack(event))
> + if (has_branch_stack(event) && !riscv_pmu_ctr_supported(rvpmu))
> return -EOPNOTSUPP;
>
> hwc->flags = 0;
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index b14b3acf7567..637b9d97e20a 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -678,6 +678,9 @@ static int pmu_sbi_event_map(struct perf_event *event, u64 *econfig)
> */
> flush_work(&check_std_events_work);
>
> + if (needs_branch_stack(event) && !riscv_pmu_ctr_valid(event))
> + return -EOPNOTSUPP;
> +
> return riscv_pmu_get_event_info(type, config, econfig);
> }
>
> @@ -827,10 +830,14 @@ static void pmu_sbi_reset_scounteren(void *arg)
>
> static void pmu_sbi_ctr_add(struct perf_event *event, int flags)
> {
> + if (needs_branch_stack(event))
> + riscv_pmu_ctr_add(event);
> }
>
> static void pmu_sbi_ctr_del(struct perf_event *event, int flags)
> {
> + if (needs_branch_stack(event))
> + riscv_pmu_ctr_del(event);
> }
>
> static void pmu_sbi_ctr_start(struct perf_event *event, u64 ival)
> @@ -847,6 +854,10 @@ static void pmu_sbi_ctr_start(struct perf_event *event, u64 ival)
> ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_START, hwc->idx,
> 1, flag, ival);
> #endif
> +
> + if (needs_branch_stack(event))
> + riscv_pmu_ctr_enable(event);
> +
> if (ret.error && (ret.error != SBI_ERR_ALREADY_STARTED))
> pr_err("Starting counter idx %d failed with error %d\n",
> hwc->idx, sbi_err_map_linux_errno(ret.error));
> @@ -864,6 +875,9 @@ static void pmu_sbi_ctr_stop(struct perf_event *event, unsigned long flag)
> struct cpu_hw_events *cpu_hw_evt = this_cpu_ptr(pmu->hw_events);
> struct riscv_pmu_snapshot_data *sdata = cpu_hw_evt->snapshot_addr;
>
> + if (needs_branch_stack(event) && flag != RISCV_PMU_STOP_FLAG_RESET)
> + riscv_pmu_ctr_disable(event);
> +
> if ((hwc->flags & PERF_EVENT_FLAG_USER_ACCESS) &&
> (hwc->flags & PERF_EVENT_FLAG_USER_READ_CNT))
> pmu_sbi_reset_scounteren((void *)event);
> @@ -896,7 +910,7 @@ 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. */
> + riscv_pmu_ctr_sched_task(pmu_ctx, task, sched_in);
> }
>
> static int pmu_sbi_find_num_ctrs(void)
> @@ -1179,6 +1193,12 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev)
> hw_evt->state |= PERF_HES_UPTODATE;
> perf_sample_data_init(&data, 0, hw_evt->last_period);
> if (riscv_pmu_event_set_period(event)) {
> + if (needs_branch_stack(event)) {
> + riscv_pmu_ctr_consume(cpu_hw_evt, event);
> + perf_sample_save_brstack(&data, event,
> + &cpu_hw_evt->branches->branch_stack, NULL);
> + }
> +
> /*
> * Unlike other ISAs, RISC-V don't have to disable interrupts
> * to avoid throttling here. As per the specification, the
> @@ -1222,6 +1242,8 @@ static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node)
> enable_percpu_irq(riscv_pmu_irq, IRQ_TYPE_NONE);
> }
>
> + riscv_pmu_ctr_starting_cpu();
> +
> if (sbi_pmu_snapshot_available())
> return pmu_sbi_snapshot_setup(pmu, cpu);
>
> @@ -1237,6 +1259,8 @@ static int pmu_sbi_dying_cpu(unsigned int cpu, struct hlist_node *node)
> /* Disable all counters access for user mode now */
> csr_write(CSR_SCOUNTEREN, 0x0);
>
> + riscv_pmu_ctr_dying_cpu();
> +
> if (sbi_pmu_snapshot_available())
> return pmu_sbi_snapshot_disable();
>
> @@ -1367,7 +1391,30 @@ static void riscv_pmu_destroy(struct riscv_pmu *pmu)
> cpuhp_state_remove_instance(CPUHP_AP_PERF_RISCV_STARTING, &pmu->node);
> }
>
> -static void pmu_sbi_event_init(struct perf_event *event)
> +static int branch_records_alloc(struct riscv_pmu *pmu)
> +{
> + struct branch_records __percpu *tmp_alloc_ptr;
> + struct branch_records *records;
> + struct cpu_hw_events *events;
> + int cpu;
> +
> + if (!riscv_pmu_ctr_supported(pmu))
> + return 0;
> +
> + tmp_alloc_ptr = alloc_percpu_gfp(struct branch_records, GFP_KERNEL);
> + if (!tmp_alloc_ptr)
> + return -ENOMEM;
> +
> + for_each_possible_cpu(cpu) {
> + events = per_cpu_ptr(pmu->hw_events, cpu);
> + records = per_cpu_ptr(tmp_alloc_ptr, cpu);
> + events->branches = records;
> + }
> +
> + return 0;
> +}
> +
> +static int pmu_sbi_event_init(struct perf_event *event)
> {
> /*
> * The permissions are set at event_init so that we do not depend
> @@ -1379,6 +1426,11 @@ static void pmu_sbi_event_init(struct perf_event *event)
> event->hw.flags |= PERF_EVENT_FLAG_USER_ACCESS;
> else
> event->hw.flags |= PERF_EVENT_FLAG_LEGACY;
> +
> + if (branch_sample_call_stack(event))
> + event->attach_state |= PERF_ATTACH_TASK_DATA;
> +
> + return 0;
> }
>
> static void pmu_sbi_event_mapped(struct perf_event *event, struct mm_struct *mm)
> @@ -1516,9 +1568,16 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)
> pmu->pmu.capabilities |= PERF_PMU_CAP_NO_EXCLUDE;
> }
> irq_requested = (ret == 0);
> -
> pmu->pmu.attr_groups = riscv_pmu_attr_groups;
> pmu->pmu.parent = &pdev->dev;
> + ret = riscv_pmu_ctr_init(pmu);
> + if (ret)
> + goto out_free;
> +
> + ret = branch_records_alloc(pmu);
> + if (ret)
> + goto out_ctr_finish;
> +
> bitmap_copy(pmu->cmask, cmask, RISCV_MAX_COUNTERS);
> pmu->ctr_add = pmu_sbi_ctr_add;
> pmu->ctr_del = pmu_sbi_ctr_del;
> @@ -1535,6 +1594,10 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)
> pmu->csr_index = pmu_sbi_csr_index;
> pmu->sched_task = pmu_sbi_sched_task;
>
> + ret = cpuhp_state_add_instance(CPUHP_AP_PERF_RISCV_STARTING, &pmu->node);
> + if (ret)
> + goto out_ctr_finish;
> +
> ret = riscv_pm_pmu_register(pmu);
> if (ret)
> goto out_destroy;
> @@ -1592,6 +1655,9 @@ static int pmu_sbi_device_probe(struct platform_device *pdev)
> riscv_pmu_irq = 0;
> }
>
> +out_ctr_finish:
> + riscv_pmu_ctr_finish(pmu);
> +
> out_free:
> free_percpu(pmu->hw_events);
> kfree(pmu_ctr_list);
> --
> 2.43.0
>
Regards,
Anup