From: Anup Patel <anup@brainfault.org>
To: Atish Patra <atishp@rivosinc.com>
Cc: Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Mayuresh Chitale <mchitale@ventanamicro.com>,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
kvm-riscv@lists.infradead.org
Subject: Re: [PATCH v4 4/9] drivers/perf: riscv: Implement PMU event info function
Date: Tue, 22 Jul 2025 09:25:26 +0530 [thread overview]
Message-ID: <CAAhSdy1KHTW4J+OKVgBof2gQDfFuKq0H9rrmsJ7L2KBRXtzuaw@mail.gmail.com> (raw)
In-Reply-To: <20250721-pmu_event_info-v4-4-ac76758a4269@rivosinc.com>
On Tue, Jul 22, 2025 at 8:45 AM Atish Patra <atishp@rivosinc.com> wrote:
>
> With the new SBI PMU event info function, we can query the availability
> of the all standard SBI PMU events at boot time with a single ecall.
> This improves the bootime by avoiding making an SBI call for each
> standard PMU event. Since this function is defined only in SBI v3.0,
> invoke this only if the underlying SBI implementation is v3.0 or higher.
>
> Signed-off-by: Atish Patra <atishp@rivosinc.com>
LGTM.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
> ---
> arch/riscv/include/asm/sbi.h | 9 ++++++
> drivers/perf/riscv_pmu_sbi.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 78 insertions(+)
>
> diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
> index b0c41ef56968..5ca7cebc13cc 100644
> --- a/arch/riscv/include/asm/sbi.h
> +++ b/arch/riscv/include/asm/sbi.h
> @@ -136,6 +136,7 @@ enum sbi_ext_pmu_fid {
> SBI_EXT_PMU_COUNTER_FW_READ,
> SBI_EXT_PMU_COUNTER_FW_READ_HI,
> SBI_EXT_PMU_SNAPSHOT_SET_SHMEM,
> + SBI_EXT_PMU_EVENT_GET_INFO,
> };
>
> union sbi_pmu_ctr_info {
> @@ -159,6 +160,14 @@ struct riscv_pmu_snapshot_data {
> u64 reserved[447];
> };
>
> +struct riscv_pmu_event_info {
> + u32 event_idx;
> + u32 output;
> + u64 event_data;
> +};
> +
> +#define RISCV_PMU_EVENT_INFO_OUTPUT_MASK 0x01
> +
> #define RISCV_PMU_RAW_EVENT_MASK GENMASK_ULL(47, 0)
> #define RISCV_PMU_PLAT_FW_EVENT_MASK GENMASK_ULL(61, 0)
> /* SBI v3.0 allows extended hpmeventX width value */
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index 7331808b1192..433d122f1f41 100644
> --- a/drivers/perf/riscv_pmu_sbi.c
> +++ b/drivers/perf/riscv_pmu_sbi.c
> @@ -299,6 +299,66 @@ static struct sbi_pmu_event_data pmu_cache_event_map[PERF_COUNT_HW_CACHE_MAX]
> },
> };
>
> +static int pmu_sbi_check_event_info(void)
> +{
> + int num_events = ARRAY_SIZE(pmu_hw_event_map) + PERF_COUNT_HW_CACHE_MAX *
> + PERF_COUNT_HW_CACHE_OP_MAX * PERF_COUNT_HW_CACHE_RESULT_MAX;
> + struct riscv_pmu_event_info *event_info_shmem;
> + phys_addr_t base_addr;
> + int i, j, k, result = 0, count = 0;
> + struct sbiret ret;
> +
> + event_info_shmem = kcalloc(num_events, sizeof(*event_info_shmem), GFP_KERNEL);
> + if (!event_info_shmem)
> + return -ENOMEM;
> +
> + for (i = 0; i < ARRAY_SIZE(pmu_hw_event_map); i++)
> + event_info_shmem[count++].event_idx = pmu_hw_event_map[i].event_idx;
> +
> + for (i = 0; i < ARRAY_SIZE(pmu_cache_event_map); i++) {
> + for (j = 0; j < ARRAY_SIZE(pmu_cache_event_map[i]); j++) {
> + for (k = 0; k < ARRAY_SIZE(pmu_cache_event_map[i][j]); k++)
> + event_info_shmem[count++].event_idx =
> + pmu_cache_event_map[i][j][k].event_idx;
> + }
> + }
> +
> + base_addr = __pa(event_info_shmem);
> + if (IS_ENABLED(CONFIG_32BIT))
> + ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_EVENT_GET_INFO, lower_32_bits(base_addr),
> + upper_32_bits(base_addr), count, 0, 0, 0);
> + else
> + ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_EVENT_GET_INFO, base_addr, 0,
> + count, 0, 0, 0);
> + if (ret.error) {
> + result = -EOPNOTSUPP;
> + goto free_mem;
> + }
> +
> + for (i = 0; i < ARRAY_SIZE(pmu_hw_event_map); i++) {
> + if (!(event_info_shmem[i].output & RISCV_PMU_EVENT_INFO_OUTPUT_MASK))
> + pmu_hw_event_map[i].event_idx = -ENOENT;
> + }
> +
> + count = ARRAY_SIZE(pmu_hw_event_map);
> +
> + for (i = 0; i < ARRAY_SIZE(pmu_cache_event_map); i++) {
> + for (j = 0; j < ARRAY_SIZE(pmu_cache_event_map[i]); j++) {
> + for (k = 0; k < ARRAY_SIZE(pmu_cache_event_map[i][j]); k++) {
> + if (!(event_info_shmem[count].output &
> + RISCV_PMU_EVENT_INFO_OUTPUT_MASK))
> + pmu_cache_event_map[i][j][k].event_idx = -ENOENT;
> + count++;
> + }
> + }
> + }
> +
> +free_mem:
> + kfree(event_info_shmem);
> +
> + return result;
> +}
> +
> static void pmu_sbi_check_event(struct sbi_pmu_event_data *edata)
> {
> struct sbiret ret;
> @@ -316,6 +376,15 @@ static void pmu_sbi_check_event(struct sbi_pmu_event_data *edata)
>
> static void pmu_sbi_check_std_events(struct work_struct *work)
> {
> + int ret;
> +
> + if (sbi_v3_available) {
> + ret = pmu_sbi_check_event_info();
> + if (ret)
> + pr_err("pmu_sbi_check_event_info failed with error %d\n", ret);
> + return;
> + }
> +
> for (int i = 0; i < ARRAY_SIZE(pmu_hw_event_map); i++)
> pmu_sbi_check_event(&pmu_hw_event_map[i]);
>
>
> --
> 2.43.0
>
next prev parent reply other threads:[~2025-07-22 3:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 3:15 [PATCH v4 0/9] Add SBI v3.0 PMU enhancements Atish Patra
2025-07-22 3:15 ` [PATCH v4 1/9] drivers/perf: riscv: Add SBI v3.0 flag Atish Patra
2025-07-22 3:15 ` [PATCH v4 2/9] drivers/perf: riscv: Add raw event v2 support Atish Patra
2025-07-22 3:15 ` [PATCH v4 3/9] RISC-V: KVM: Add support for Raw event v2 Atish Patra
2025-07-22 3:15 ` [PATCH v4 4/9] drivers/perf: riscv: Implement PMU event info function Atish Patra
2025-07-22 3:55 ` Anup Patel [this message]
2025-07-22 3:15 ` [PATCH v4 5/9] drivers/perf: riscv: Export " Atish Patra
2025-07-22 3:15 ` [PATCH v4 6/9] KVM: Add a helper function to validate vcpu gpa range Atish Patra
2025-07-22 17:20 ` Sean Christopherson
2025-07-22 3:15 ` [PATCH v4 7/9] RISC-V: KVM: Use the new gpa range validate helper function Atish Patra
2025-07-22 3:15 ` [PATCH v4 8/9] RISC-V: KVM: Implement get event info function Atish Patra
2025-07-22 3:15 ` [PATCH v4 9/9] RISC-V: KVM: Upgrade the supported SBI version to 3.0 Atish Patra
2025-07-22 3:59 ` [PATCH v4 0/9] Add SBI v3.0 PMU enhancements Anup Patel
2025-07-22 13:17 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAhSdy1KHTW4J+OKVgBof2gQDfFuKq0H9rrmsJ7L2KBRXtzuaw@mail.gmail.com \
--to=anup@brainfault.org \
--cc=atishp@rivosinc.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=mchitale@ventanamicro.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).