X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=3a9b16d4a182c9f60778ab1308e7d372472a4ab3;hb=afb634a80f946634454a5d067a92aa600227bd93;hp=d37b3dae3514bbd861348297491b90f35678a4d6;hpb=058a3adde5893927ae056a1d8fbccd5191d2446f;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index d37b3da..3a9b16d 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -22,9 +22,11 @@
 #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
 
+#define MEM_OFFSET_HCALL 0x1000
 
 
 static inline
@@ -67,6 +69,9 @@ void v3_delete_shadow_map(struct guest_info * info) {
 
 	v3_delete_shadow_region(info, reg);
     }
+
+    V3_FreePage((void *)(info->mem_map.base_region.host_addr));
+    V3_FreePage(V3_PAddr((void *)(info->mem_map.hook_hva)));
 }
 
 
@@ -145,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 
@@ -184,6 +205,36 @@ 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;
 }
 						 
@@ -216,7 +267,8 @@ int v3_handle_mem_wr_hook(struct guest_info * info, addr_t guest_va, addr_t gues
 
     addr_t dst_addr = (addr_t)V3_VAddr((void *)v3_get_shadow_addr(reg, guest_pa));
 
-    if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, reg->write_hook, reg->priv_data) == -1) {
+    if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, 
+			    reg->write_hook, reg->priv_data) == -1) {
 	PrintError("Write hook emulation failed\n");
 	return -1;
     }
@@ -230,12 +282,15 @@ int v3_handle_mem_full_hook(struct guest_info * info, addr_t guest_va, addr_t gu
     addr_t op_addr = info->mem_map.hook_hva;
 
     if (access_info.write == 1) {
-	if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, reg->write_hook, reg->priv_data) == -1) {
+	if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, 
+				reg->write_hook, reg->priv_data) == -1) {
 	    PrintError("Write Full Hook emulation failed\n");
 	    return -1;
 	}
     } else {
-	if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, reg->read_hook, reg->write_hook, reg->priv_data) == -1) {
+	if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, 
+			       reg->read_hook, reg->write_hook, 
+			       reg->priv_data) == -1) {
 	    PrintError("Read Full Hook emulation failed\n");
 	    return -1;
 	}
@@ -276,11 +331,46 @@ 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);
+	}
+
+    } else if (info->shdw_pg_mode == NESTED_PAGING) {
+	addr_t cur_addr;
 
-	V3_Free(reg);
+	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
+
 }