compilation fix

[palacios.git] / palacios / src / palacios / vmm_mem.c

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 92b6c63..3a9b16d 100644 (file)
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -22,6 +22,9 @@
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_emulator.h>
 
+#include <palacios/vmm_shadow_paging.h>
+#include <palacios/vmm_direct_paging.h>
+
 
 #define MEM_OFFSET_HCALL 0x1000
 
@@ -147,6 +150,22 @@ int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t g
 }
 
 
+// This will unhook the memory hook registered at start address
+// We do not support unhooking subregions
+int v3_unhook_mem(struct guest_info * info, addr_t guest_addr_start) {
+    struct v3_shadow_region * reg = v3_get_shadow_region(info, guest_addr_start);
+
+    if ((reg->host_type != SHDW_REGION_FULL_HOOK) || 
+       (reg->host_type != SHDW_REGION_WRITE_HOOK)) {
+       PrintError("Trying to unhook a non hooked memory region (addr=%p)\n", (void *)guest_addr_start);
+       return -1;
+    }
+
+    v3_delete_shadow_region(info, reg);
+
+    return 0;
+}
+
 
 
 static inline 
@@ -187,8 +206,34 @@ struct v3_shadow_region * insert_shadow_region(struct guest_info * info,
     v3_rb_insert_color(&(region->tree_node), &(info->mem_map.shdw_regions));
 
 
+
     // flush virtual page tables 
     // 3 cases shadow, shadow passthrough, and nested
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+       v3_vm_mem_mode_t mem_mode = v3_get_mem_mode(info);
+
+       if (mem_mode == PHYSICAL_MEM) {
+           addr_t cur_addr;
+
+           for (cur_addr = region->guest_start;
+                cur_addr < region->guest_end;
+                cur_addr += PAGE_SIZE_4KB) {
+               v3_invalidate_passthrough_addr(info, cur_addr);
+           }
+       } else {
+           v3_invalidate_shadow_pts(info);
+       }
+
+    } else if (info->shdw_pg_mode == NESTED_PAGING) {
+       addr_t cur_addr;
+
+       for (cur_addr = region->guest_start;
+            cur_addr < region->guest_end;
+            cur_addr += PAGE_SIZE_4KB) {
+           
+           v3_invalidate_nested_addr(info, cur_addr);
+       }
+    }
 
     return NULL;
 }
@@ -286,12 +331,43 @@ struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t
 
 
 void v3_delete_shadow_region(struct guest_info * info, struct v3_shadow_region * reg) {
-    if (reg != NULL) {
-       v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions));
+    if (reg == NULL) {
+       return;
+    }
+
+    // flush virtual page tables 
+    // 3 cases shadow, shadow passthrough, and nested
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+       v3_vm_mem_mode_t mem_mode = v3_get_mem_mode(info);
+           
+       if (mem_mode == PHYSICAL_MEM) {
+           addr_t cur_addr;
+               
+           for (cur_addr = reg->guest_start;
+                cur_addr < reg->guest_end;
+                cur_addr += PAGE_SIZE_4KB) {
+               v3_invalidate_passthrough_addr(info, cur_addr);
+           }
+       } else {
+           v3_invalidate_shadow_pts(info);
+       }
 
-       V3_Free(reg);
+    } else if (info->shdw_pg_mode == NESTED_PAGING) {
+       addr_t cur_addr;
+
+       for (cur_addr = reg->guest_start;
+            cur_addr < reg->guest_end;
+            cur_addr += PAGE_SIZE_4KB) {
+           
+           v3_invalidate_nested_addr(info, cur_addr);
+       }
     }
 
+
+    v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions));
+
+    V3_Free(reg);
+
     // flush virtual page tables 
     // 3 cases shadow, shadow passthrough, and nested