diff options
author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-06-11 13:22:12 -0700 |
---|---|---|
committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-06-11 13:22:12 -0700 |
commit | 621793b43ae825188af584e5789ade2e2527c9f8 (patch) | |
tree | c5c939c2d5ccf6218259c82ec17d685e3a5ac491 | |
parent | 0b66cbb5a9584ae46c0269b0d94456899d775dfd (diff) | |
download | riscv-pk-621793b43ae825188af584e5789ade2e2527c9f8.zip riscv-pk-621793b43ae825188af584e5789ade2e2527c9f8.tar.gz riscv-pk-621793b43ae825188af584e5789ade2e2527c9f8.tar.bz2 |
Fully initialize page tables to zero
Previously, a bug caused only some page tables to be zeroed on RV64.
-rw-r--r-- | pk/vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -419,13 +419,14 @@ void supervisor_vm_init() #ifndef __riscv64 size_t num_middle_pts = 1; pte_t* root_pt = middle_pt; + memset(root_pt, 0, RISCV_PGSIZE); #else size_t num_middle_pts = (-current.first_user_vaddr - 1) / MEGAPAGE_SIZE + 1; pte_t* root_pt = (void*)middle_pt + num_middle_pts * RISCV_PGSIZE; + memset(middle_pt, 0, (num_middle_pts + 1) * RISCV_PGSIZE); for (size_t i = 0; i < num_middle_pts; i++) root_pt[(1<<RISCV_PGLEVEL_BITS)-num_middle_pts+i] = ptd_create(((uintptr_t)middle_pt >> RISCV_PGSHIFT) + i); #endif - memset(middle_pt, 0, root_pt - middle_pt + RISCV_PGSIZE); for (uintptr_t vaddr = current.first_user_vaddr, paddr = vaddr + current.bias, end = current.first_vaddr_after_user; paddr < mem_size; vaddr += SUPERPAGE_SIZE, paddr += SUPERPAGE_SIZE) { |