OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

RISC-V: Check PMP during Page Table Walks

Browse Source 
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.

Suggested-by: Jonathan Behrens <fintelia@gmail.com>
Signed-off-by: Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Hesham Almatary 2019-06-14 05:19:02 -07:00 committed by Palmer Dabbelt
parent cc0fdb2985
commit 1f447aec78
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/riscv/cpu.h
View File

@ -81,6 +81,7 @@ enum {
#define PRIV_VERSION_1_09_1 0x00010901 #define PRIV_VERSION_1_09_1 0x00010901
#define PRIV_VERSION_1_10_0 0x00011000 #define PRIV_VERSION_1_10_0 0x00011000
#define TRANSLATE_PMP_FAIL 2
#define TRANSLATE_FAIL 1 #define TRANSLATE_FAIL 1
#define TRANSLATE_SUCCESS 0 #define TRANSLATE_SUCCESS 0
#define MMU_USER_IDX 3 #define MMU_USER_IDX 3

10
target/riscv/cpu_helper.c
View File

@ -230,6 +230,12 @@ restart:
/* check that physical address of PTE is legal */ /* check that physical address of PTE is legal */
target_ulong pte_addr = base + idx * ptesize; 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) #if defined(TARGET_RISCV32)
target_ulong pte = ldl_phys(cs->as, pte_addr); target_ulong pte = ldl_phys(cs->as, pte_addr);
#elif defined(TARGET_RISCV64) #elif defined(TARGET_RISCV64)
@ -448,8 +454,10 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
(ret == TRANSLATE_SUCCESS) && (ret == TRANSLATE_SUCCESS) &&
!pmp_hart_has_privs(env, pa, TARGET_PAGE_SIZE, 1 << access_type, !pmp_hart_has_privs(env, pa, TARGET_PAGE_SIZE, 1 << access_type,
mode)) { mode)) {
ret = TRANSLATE_PMP_FAIL;
}
if (ret == TRANSLATE_PMP_FAIL) {
pmp_violation = true; pmp_violation = true;
ret = TRANSLATE_FAIL;
} }
if (ret == TRANSLATE_SUCCESS) { if (ret == TRANSLATE_SUCCESS) {
tlb_set_page(cs, address & TARGET_PAGE_MASK, pa & TARGET_PAGE_MASK, tlb_set_page(cs, address & TARGET_PAGE_MASK, pa & TARGET_PAGE_MASK,