Mirrors/opensbi
3
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2026-09-08 18:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi_pmu: Return invalid param error for reserved event_idx bits

Browse Source 
As per section 11.14 of the SBI specification (Function: Get PMU Event
Info, FID #8), Table 47, the event_idx word of an event info entry
only uses BIT[0:19]; BIT[20:31] are reserved for the future purpose
and must be zero. Table 48 further requires the SBI implementation to
return SBI_ERR_INVALID_PARAM if any reserved bit in an event_idx word
is set.

sbi_pmu_event_get_info() does not check the reserved bits, so a
malformed event_idx is silently passed on to pmu_event_validate()
instead of failing the call. Add SBI_PMU_EVENT_IDX_MBZ_MASK covering
the must-be-zero bits and return SBI_ERR_INVALID_PARAM when any of
them are set.

Fixes: e434584216 ("lib: sbi_pmu: Implement SBI PMU event info function")
Signed-off-by: David E. Garcia Porras <david.garcia@aheadcomputing.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260818210023.466462-2-david.garcia@aheadcomputing.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
David E. Garcia Porras
2026-09-03 13:27:45 +05:30
committed by Anup Patel
parent 35511bc6ee
commit d97cfb33ae
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sbi/sbi_ecall_interface.h
+2
View File
@@ -271,6 +271,8 @@ struct sbi_pmu_event_info {
#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 #define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16
#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET) #define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)
#define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF #define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF
#define SBI_PMU_EVENT_IDX_MBZ_OFFSET 20
#define SBI_PMU_EVENT_IDX_MBZ_MASK (0xFFF << SBI_PMU_EVENT_IDX_MBZ_OFFSET)
#define SBI_PMU_EVENT_RAW_IDX 0x20000 #define SBI_PMU_EVENT_RAW_IDX 0x20000
#define SBI_PMU_EVENT_RAW_V2_IDX 0x30000 #define SBI_PMU_EVENT_RAW_V2_IDX 0x30000
lib/sbi/sbi_pmu.c
+3
View File
@@ -1098,6 +1098,9 @@ int sbi_pmu_event_get_info(unsigned long shmem_phys_lo, unsigned long shmem_phys
einfo = (struct sbi_pmu_event_info *)(shmem_phys_lo); einfo = (struct sbi_pmu_event_info *)(shmem_phys_lo);
for (i = 0; i < num_events; i++) { for (i = 0; i < num_events; i++) {
event_idx = einfo[i].event_idx; event_idx = einfo[i].event_idx;
/* Any must-be-zero event_idx bits set should return INVALID_PARAM per-spec */
if (event_idx & SBI_PMU_EVENT_IDX_MBZ_MASK)
return SBI_ERR_INVALID_PARAM;
event_type = pmu_event_validate(phs, event_idx, einfo[i].event_data); event_type = pmu_event_validate(phs, event_idx, einfo[i].event_data);
if (event_type < 0) { if (event_type < 0) {
einfo[i].output = 0; einfo[i].output = 0;