mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-23 05:25:11 +00:00
RISC-V: Check PMP during Page Table Walks
The PMP should be checked when doing a page table walk, and report access fault exception if the to-be-read PTE failed the PMP check. Backports commit 1f447aec787bfbbd078afccae44fc4c92acb4fed from qemu
This commit is contained in:
parent
614c2954b0
commit
e0592a9a58
|
@ -84,6 +84,7 @@ enum {
|
|||
#define PRIV_VERSION_1_09_1 0x00010901
|
||||
#define PRIV_VERSION_1_10_0 0x00011000
|
||||
|
||||
#define TRANSLATE_PMP_FAIL 2
|
||||
#define TRANSLATE_FAIL 1
|
||||
#define TRANSLATE_SUCCESS 0
|
||||
#define MMU_USER_IDX 3
|
||||
|
|
|
@ -212,6 +212,12 @@ restart:
|
|||
|
||||
/* check that physical address of PTE is legal */
|
||||
target_ulong pte_addr = base + idx * ptesize;
|
||||
|
||||
if (riscv_feature(env, RISCV_FEATURE_PMP) &&
|
||||
!pmp_hart_has_privs(env, pte_addr, sizeof(target_ulong),
|
||||
1 << MMU_DATA_LOAD, PRV_S)) {
|
||||
return TRANSLATE_PMP_FAIL;
|
||||
}
|
||||
#if defined(TARGET_RISCV32)
|
||||
target_ulong pte = ldl_phys(cs->as, pte_addr);
|
||||
#elif defined(TARGET_RISCV64)
|
||||
|
@ -430,8 +436,10 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
|||
(ret == TRANSLATE_SUCCESS) &&
|
||||
!pmp_hart_has_privs(env, pa, TARGET_PAGE_SIZE, 1 << access_type,
|
||||
mode)) {
|
||||
ret = TRANSLATE_PMP_FAIL;
|
||||
}
|
||||
if (ret == TRANSLATE_PMP_FAIL) {
|
||||
pmp_violation = true;
|
||||
ret = TRANSLATE_FAIL;
|
||||
}
|
||||
if (ret == TRANSLATE_SUCCESS) {
|
||||
tlb_set_page(cs, address & TARGET_PAGE_MASK, pa & TARGET_PAGE_MASK,
|
||||
|
|
Loading…
Reference in a new issue