mon_kpfret(): return from a kernel page fault

[akaros.git] / kern / include / pmap.h

diff --git a/kern/include/pmap.h b/kern/include/pmap.h
index 6eea5c3..e7c4710 100644 (file)
--- a/kern/include/pmap.h
+++ b/kern/include/pmap.h
@@ -4,7 +4,6 @@
  * Actual implementation:
  * Copyright (c) 2009 The Regents of the University of California
  * Barret Rhoden <brho@cs.berkeley.edu>
- * Kevin Klues <klueska@cs.berkeley.edu> (multiboot functions)
  * See LICENSE for details.
  *
  * Physical memory mangement, low-level virtual address space initialization and
@@ -22,6 +21,7 @@
 #include <assert.h>
 #include <page_alloc.h>
 #include <multiboot.h>
+#include <arch/pmap.h>
 
 /* This macro takes a kernel virtual address -- an address that points above
  * KERNBASE, where the machine's maximum 256MB of physical memory is mapped --
@@ -40,43 +40,59 @@
        __m_pa; \
 })
 
+#define paddr_low32(p) ((uint32_t)(uintptr_t)PADDR(p))
+#define paddr_high32(p) ((uint32_t)((uint64_t)PADDR(p) >> 32))
+
 /* This macro takes a physical address and returns the corresponding kernel
  * virtual address.  It warns if you pass an invalid physical address. */
 #define KADDR(pa)                                              \
 ({                                                             \
        physaddr_t __m_pa = (pa);                               \
        size_t __m_ppn = LA2PPN(__m_pa);                        \
-       if (__m_ppn >= npages)                                  \
+       if (__m_ppn > max_nr_pages)                                     \
                warn("KADDR called with invalid pa %p", __m_pa);\
        (void*TRUSTED) (__m_pa + KERNBASE);                             \
 })
 
+#define KADDR_NOCHECK(pa) ((void*)(pa + KERNBASE))
+#define KBASEADDR(kla) KADDR(PADDR(kla))
+
 extern char (SNT RO bootstacktop)[], (SNT RO bootstack)[];
 
-// List of physical pages
-extern page_t * RO CT(npages) pages;
+extern physaddr_t max_pmem;            /* Total amount of physical memory */
+extern size_t max_nr_pages;            /* Total number of physical memory pages */
+extern physaddr_t max_paddr;   /* Maximum addressable physical address */
+extern size_t nr_free_pages;
+extern struct multiboot_info *multiboot_kaddr;
+extern uintptr_t boot_freemem;
+extern uintptr_t boot_freelimit;
+
+/* Pages are stored in an array, including for pages that we can never touch
+ * (like reserved memory from the BIOS, fake regions, etc).  Pages are reference
+ * counted, and free pages are kept on a linked list. */
+extern struct page *pages;
 
 extern physaddr_t RO boot_cr3;
 extern pde_t *CT(NPDENTRIES) RO boot_pgdir;
 
-extern char *RO BND(end, maxaddrpa_ptr + IVY_KERNBASE) boot_freemem;
+bool enable_pse(void);
+void vm_init(void);
 
-void   multiboot_detect_memory(multiboot_info_t *COUNT(1) mbi);
-void   multiboot_print_memory_map(multiboot_info_t *COUNT(1) mbi);
-bool   enable_pse(void);
-void   vm_init(void);
+void pmem_init(struct multiboot_info *mbi);
+void *boot_alloc(size_t amt, size_t align);
+void *boot_zalloc(size_t amt, size_t align);
 
-void   page_init(void);
-void   page_check(void);
-int        page_insert(pde_t *pgdir, struct page *page, void *SNT va, int perm);
-void   page_remove(pde_t *COUNT(NPDENTRIES) pgdir, void *SNT va);
+void page_check(void);
+int     page_insert(pde_t *pgdir, struct page *page, void *SNT va, int perm);
+void page_remove(pde_t *COUNT(NPDENTRIES) pgdir, void *SNT va);
 page_t*COUNT(1) page_lookup(pde_t SSOMELOCK*COUNT(NPDENTRIES) pgdir, void *SNT va, pte_t **pte_store);
 error_t        pagetable_remove(pde_t *COUNT(NPDENTRIES) pgdir, void *SNT va);
 void   page_decref(page_t *COUNT(1) pp);
 
-void setup_default_mtrrs(barrier_t* smp_barrier);
 void   tlb_invalidate(pde_t *COUNT(NPDENTRIES) pgdir, void *SNT va);
 void tlb_flush_global(void);
+bool regions_collide_unsafe(uintptr_t start1, uintptr_t end1, 
+                            uintptr_t start2, uintptr_t end2);
 
 /* Arch specific implementations for these */
 pte_t *pgdir_walk(pde_t *COUNT(NPDENTRIES) pgdir, const void *SNT va, int create);
@@ -84,8 +100,8 @@ int get_va_perms(pde_t *COUNT(NPDENTRIES) pgdir, const void *SNT va);
 
 static inline page_t *SAFE ppn2page(size_t ppn)
 {
-       if( ppn >= npages )
-               warn("ppn2page called with ppn (%08lu) larger than npages", ppn);
+       if (ppn >= max_nr_pages)
+               warn("ppn2page called with ppn (%08lu) larger than max_nr_pages", ppn);
        return &(pages[ppn]);
 }
 
@@ -101,8 +117,8 @@ static inline physaddr_t page2pa(page_t *pp)
 
 static inline page_t*COUNT(1) pa2page(physaddr_t pa)
 {
-       if (LA2PPN(pa) >= npages)
-               warn("pa2page called with pa (%p) larger than npages", pa);
+       if (LA2PPN(pa) >= max_nr_pages)
+               warn("pa2page called with pa (%p) larger than max_nr_pages", pa);
        return &pages[LA2PPN(pa)];
 }
 
@@ -131,4 +147,9 @@ static inline ppn_t kva2ppn(void* addr)
        return page2ppn(kva2page(addr));
 }
 
+static inline bool is_kaddr(void *addr)
+{
+       return (uintptr_t)addr >= KERNBASE;
+}
+
 #endif /* !ROS_KERN_PMAP_H */