fix leakage on mid-level page table when freeing vms

[lunaix-os.git] / lunaix-os / includes / lunaix / mm / region.h

diff --git a/lunaix-os/includes/lunaix/mm/region.h b/lunaix-os/includes/lunaix/mm/region.h
index d030f6d2fb6adfad5e6a7ff5a16f3098b4bb66a5..34e517ea41fbeb747aeb0eabd5c1b13a00945289 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/region.h
+++ b/lunaix-os/includes/lunaix/mm/region.h
@@ -2,7 +2,6 @@
 #define __LUNAIX_REGION_H
 
 #include <lunaix/mm/mm.h>
 #define __LUNAIX_REGION_H
 
 #include <lunaix/mm/mm.h>

-#include <lunaix/mm/page.h>

 #include <lunaix/mm/procvm.h>
 
 #define prev_region(vmr) list_prev(vmr, struct mm_region, head)
 #include <lunaix/mm/procvm.h>
 
 #define prev_region(vmr) list_prev(vmr, struct mm_region, head)


@@ -31,6 +30,31 @@ region_size(struct mm_region* mm) {
     return mm->end - mm->start;
 }
 
     return mm->end - mm->start;
 }
 

+static inline bool
+anon_region(struct mm_region* mm) {
+    return (mm->attr & REGION_ANON);
+}
+
+static inline bool
+writable_region(struct mm_region* mm) {
+    return !!(mm->attr & (REGION_RSHARED | REGION_WRITE));
+}
+
+static inline bool
+readable_region(struct mm_region* mm) {
+    return !!(mm->attr & (REGION_RSHARED | REGION_READ));
+}
+
+static inline bool
+executable_region(struct mm_region* mm) {
+    return !!(mm->attr & REGION_EXEC);
+}
+
+static inline bool
+shared_writable_region(struct mm_region* mm) {
+    return !!(mm->attr & REGION_WSHARED);
+}
+

 
 struct mm_region*
 region_create(ptr_t start, ptr_t end, u32_t attr);
 
 struct mm_region*
 region_create(ptr_t start, ptr_t end, u32_t attr);


@@ -56,17 +80,10 @@ region_copy_mm(struct proc_mm* src, struct proc_mm* dest);
 struct mm_region*
 region_dup(struct mm_region* origin);
 
 struct mm_region*
 region_dup(struct mm_region* origin);
 

-static u32_t
-region_ptattr(struct mm_region* vmr)
+static inline pte_t
+region_tweakpte(struct mm_region* vmr, pte_t pte)

 {
 {

-    u32_t vmr_attr = vmr->attr;
-    u32_t ptattr = PG_PRESENT | PG_ALLOW_USER;
-
-    if ((vmr_attr & PROT_WRITE)) {
-        ptattr |= PG_WRITE;
-    }
-
-    return ptattr & 0xfff;
+    return translate_vmr_prot(vmr->attr, pte);

 }
 
 #endif /* __LUNAIX_REGION_H */
 }
 
 #endif /* __LUNAIX_REGION_H */