From a477155179bb2b7bcda78a755c46a5490a336484 Mon Sep 17 00:00:00 2001 From: Daniel Lustig Date: Fri, 6 Aug 2021 20:19:02 -0400 Subject: Non-leaf PTEs should not have N or PBMT bits set (#764) --- riscv/mmu.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'riscv/mmu.cc') diff --git a/riscv/mmu.cc b/riscv/mmu.cc index 5b0c31b..e57e81c 100644 --- a/riscv/mmu.cc +++ b/riscv/mmu.cc @@ -332,7 +332,7 @@ reg_t mmu_t::s2xlate(reg_t gva, reg_t gpa, access_type type, access_type trap_ty if (pte & PTE_RSVD) { break; } else if (PTE_TABLE(pte)) { // next level of page table - if (pte & (PTE_D | PTE_A | PTE_U)) + if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) break; base = ppn << PGSHIFT; } else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) { @@ -417,7 +417,7 @@ reg_t mmu_t::walk(reg_t addr, access_type type, reg_t mode, bool virt, bool hlvx if (pte & PTE_RSVD) { break; } else if (PTE_TABLE(pte)) { // next level of page table - if (pte & (PTE_D | PTE_A | PTE_U)) + if (pte & (PTE_D | PTE_A | PTE_U | PTE_N | PTE_PBMT)) break; base = ppn << PGSHIFT; } else if ((pte & PTE_U) ? s_mode && (type == FETCH || !sum) : !s_mode) { -- cgit v1.1