Merge branch 'riscv-kstack' into riscv

1 files changed, 32 insertions, 0 deletions

diff --git a/kernel/vm.c b/kernel/vm.c
index 412ec8c..f7ca101 100644
--- a/kernel/vm.c
+++ b/kernel/vm.c
@@ -404,3 +404,35 @@ copyinstr(pagetable_t pagetable, char *dst, uint64 srcva, uint64 max)
     return -1;
   }
 }
+
+char
+*map_kstack(uint64 kstack)
+{
+  char *k = kalloc();
+  if(k == 0) {
+    return 0;
+  }
+  if (mappages(kernel_pagetable, (uint64) kstack, PGSIZE,
+               (uint64) k, PTE_R | PTE_W) == 0) {
+    kvminithart();
+    return (char *) kstack;
+  }
+  kfree(k);
+  return 0;
+}
+
+// assumes va is page aligned
+uint64
+kernelpa(uint64 va) {
+  uint64 off = va % PGSIZE;
+  pte_t *pte;
+  uint64 pa;
+  
+  pte = walk(kernel_pagetable, va, 0);
+  if(pte == 0)
+    panic("kernelpa");
+  if((*pte & PTE_V) == 0)
+    panic("kernelpa");
+  pa = PTE2PA(*pte);
+  return pa+off;
+}