Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi_pmu: Verify the raw events first during event info

Browse Source 
The raw events have same event_idx. Thus, the event info sanity check
only relies on the select mask. The raw event check should be done first
so that regular hardware events can be verified using event idx range
check.

Fixes: e434584216 ("lib: sbi_pmu: Implement SBI PMU event info function")
Signed-off-by: Atish Patra <atishp@rivosinc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Atish Patra
2024-12-04 16:43:47 -08:00
committed by Anup Patel
parent 0928ca21bc
commit 51dbc57fc7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sbi/sbi_pmu.c
View File

@@ -1014,20 +1014,19 @@ int sbi_pmu_event_get_info(unsigned long shmem_phys_lo, unsigned long shmem_phys
} else {
for (j = 0; j < num_hw_events; j++) {
temp = &hw_event_map[j];
if (temp->start_idx <= event_idx && event_idx <= temp->end_idx) {
found = true;
break;
}
/* For raw events, event data is used as the select value */
if (event_idx == SBI_PMU_EVENT_RAW_IDX ||
event_idx == SBI_PMU_EVENT_RAW_V2_IDX) {
uint64_t select_mask = temp->select_mask;
/* just match the selector */
if (temp->select == (einfo[i].event_data & select_mask)) {
if (temp->select == (einfo[i].event_data &
temp->select_mask)) {
found = true;
break;
}
} else if (temp->start_idx <= event_idx &&
event_idx <= temp->end_idx) {
found = true;
break;
}
}
if (found)