Update to new privileged spec

1 files changed, 11 insertions, 0 deletions

diff --git a/pk/vm.h b/pk/vm.h
index d46abec..273d71c 100644
--- a/pk/vm.h
+++ b/pk/vm.h
@@ -7,6 +7,8 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+#define SUPERPAGE_SIZE ((uintptr_t)(RISCV_PGSIZE << RISCV_PGLEVEL_BITS))
+
 #define PROT_READ 1
 #define PROT_WRITE 2
 #define PROT_EXEC 4
@@ -17,9 +19,18 @@
 #define MAP_POPULATE 0x8000
 #define MREMAP_FIXED 0x2
 
+#define supervisor_paddr_valid(start, length) \
+  ((uintptr_t)(start) >= current.first_user_vaddr + current.bias \
+   && (uintptr_t)(start) + (length) < mem_size \
+   && (uintptr_t)(start) + (length) >= (uintptr_t)(start))
+
 void vm_init();
+void supervisor_vm_init();
+void pk_vm_init();
 int handle_page_fault(uintptr_t vaddr, int prot);
 void populate_mapping(const void* start, size_t size, int prot);
+void __map_kernel_range(uintptr_t va, uintptr_t pa, size_t len, int prot);
+int __valid_user_range(uintptr_t vaddr, size_t len);
 uintptr_t __do_mmap(uintptr_t addr, size_t length, int prot, int flags, file_t* file, off_t offset);
 uintptr_t do_mmap(uintptr_t addr, size_t length, int prot, int flags, int fd, off_t offset);
 int do_munmap(uintptr_t addr, size_t length);