From ec57c389f31fe433bee0e1888e2e158c6fa22a79 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 22 Jul 2021 15:37:50 -0700
Subject: Non-leaf PTEs with D/A/U==1 are reserved

Continuation of 80be4e21c3af7fe2966788ce538d3e3c3b0d60e3
---
 riscv/mmu.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'riscv/mmu.cc')

diff --git a/riscv/mmu.cc b/riscv/mmu.cc
index 1779acd..5b0c31b 100644
--- a/riscv/mmu.cc
+++ b/riscv/mmu.cc
@@ -332,6 +332,8 @@ 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))
+        break;
       base = ppn << PGSHIFT;
     } else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) {
       break;
-- 
cgit v1.1