X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem_hook.c;h=1d49294ba4f188bbb09ecf2a6a5ccd0a52341df3;hb=d3d6d09894dba66f4e2361bb2f903139a2d83684;hp=ee632b0bb09759dc67611a93ddd6e50a118ea0b4;hpb=a8627ddaccf49073eb04286c5ea4767e2903c351;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem_hook.c b/palacios/src/palacios/vmm_mem_hook.c
index ee632b0..1d49294 100644
--- a/palacios/src/palacios/vmm_mem_hook.c
+++ b/palacios/src/palacios/vmm_mem_hook.c
@@ -31,6 +31,8 @@ struct mem_hook {
     int (*read)(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data);
     // Called when data is written to a memory page
     int (*write)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data);
+    // Called when memory page is accessed
+    int (*access)(struct guest_info *core, addr_t guest_va, addr_t guest_pa, struct v3_mem_region *region, pf_error_t access_info, void *priv_data);
 
     void * priv_data;
     struct v3_mem_region * region;
@@ -52,10 +54,28 @@ static int mem_eq_fn(addr_t key1, addr_t key2) {
 }
 
 int v3_init_mem_hooks(struct v3_vm_info * vm) {
+    void *temp;
+
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
-    hooks->hook_hvas_1 = V3_VAddr(V3_AllocPages(vm->num_cores));
-    hooks->hook_hvas_2 = V3_VAddr(V3_AllocPages(vm->num_cores));
+    temp = V3_AllocPages(vm->num_cores);
+
+    if (!temp) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate space for mem hooks\n");
+	return -1;
+    }
+
+    hooks->hook_hvas_1 = V3_VAddr(temp);
+
+    temp = V3_AllocPages(vm->num_cores);
+
+    if (!temp) {
+	PrintError(vm, VCORE_NONE,"Cannot allocate space for mem hooks\n");
+	V3_FreePages(hooks->hook_hvas_1,vm->num_cores);
+	return -1;
+    }
+
+    hooks->hook_hvas_2 = V3_VAddr(temp);
 
     INIT_LIST_HEAD(&(hooks->hook_list));
 
@@ -127,6 +147,16 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
     addr_t dst_mem_op_gpa = 0;
     int dst_req_size = -1;
 
+
+    struct mem_hook *access_hook = NULL;
+
+    // Let access hooks take priority
+    access_hook = (struct mem_hook *) reg->priv_data; 
+    if (access_hook && access_hook->access) { 
+	return access_hook->access(core, guest_va, guest_pa, reg, access_info, access_hook->priv_data);
+    } 
+
+
     /* Find and decode hooked instruction */
     if (core->mem_mode == PHYSICAL_MEM) { 
 	ret = v3_gpa_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), (addr_t *)&instr_ptr);
@@ -135,12 +165,12 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
     }
 
     if (ret == -1) {
-	PrintError("Could not translate Instruction Address (%p)\n", (void *)core->rip);
+      PrintError(core->vm_info, core, "Could not translate Instruction Address (%p)\n", (void *)(addr_t)core->rip);
 	return -1;
     }
 
     if (v3_decode(core, (addr_t)instr_ptr, &instr) == -1) {
-	PrintError("Decoding Error\n");
+	PrintError(core->vm_info, core, "Decoding Error\n");
 	return -1;
     }
 
@@ -173,7 +203,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	}
 
 	if (src_reg == NULL) {
-	    PrintError("Error finding Source region (addr=%p)\n", (void *)src_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Error finding Source region (addr=%p)\n", (void *)src_mem_op_gpa);
 	    return -1;
 	}
 
@@ -219,7 +249,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	}
 
 	if (dst_reg == NULL) {
-	    PrintError("Error finding Source region (addr=%p)\n", (void *)dst_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Error finding Source region (addr=%p)\n", (void *)dst_mem_op_gpa);
 	    return -1;
 	}
 	
@@ -240,6 +270,11 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 
     mem_op_size = ((uint_t)src_req_size < (uint_t)dst_req_size) ? src_req_size : dst_req_size;
 
+    if (mem_op_size == -1) {
+	PrintError(core->vm_info, core, "Error: Did not detect any memory operands...\n");
+	return -1;
+    }
+
 
     /* Now handle the hooks if necessary */    
     if ( (src_hook != NULL)  && (src_hook->read != NULL) &&
@@ -248,7 +283,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	// Read in data from hook
 	
 	if (src_hook->read(core, src_mem_op_gpa, (void *)src_mem_op_hva, mem_op_size, src_hook->priv_data) == -1) {
-	    PrintError("Read hook error at src_mem_op_gpa=%p\n", (void *)src_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Read hook error at src_mem_op_gpa=%p\n", (void *)src_mem_op_gpa);
 	    return -1;
 	}
     }
@@ -259,7 +294,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	// Read in data from hook
 	
 	if (dst_hook->read(core, dst_mem_op_gpa, (void *)dst_mem_op_hva, mem_op_size, dst_hook->priv_data) == -1) {
-	    PrintError("Read hook error at dst_mem_op_gpa=%p\n", (void *)dst_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Read hook error at dst_mem_op_gpa=%p\n", (void *)dst_mem_op_gpa);
 	    return -1;
 	}
     }
@@ -267,7 +302,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
     bytes_emulated = v3_emulate(core, &instr, mem_op_size, src_mem_op_hva, dst_mem_op_hva);
 
     if (bytes_emulated == -1) {
-	PrintError("Error emulating instruction\n");
+      PrintError(core->vm_info, core, "Error emulating instruction\n");
 	return -1;
     }
 
@@ -276,7 +311,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	 (instr.src_operand.write == 1) ) {
 
 	if (src_hook->write(core, src_mem_op_gpa, (void *)src_mem_op_hva, bytes_emulated, src_hook->priv_data) == -1) {
-	    PrintError("Write hook error at src_mem_op_gpa=%p\n", (void *)src_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Write hook error at src_mem_op_gpa=%p\n", (void *)src_mem_op_gpa);
 	    return -1;
 	}
 
@@ -287,7 +322,7 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 	 (instr.dst_operand.write == 1) ) {
 
 	if (dst_hook->write(core, dst_mem_op_gpa, (void *)dst_mem_op_hva, bytes_emulated, dst_hook->priv_data) == -1) {
-	    PrintError("Write hook error at dst_mem_op_gpa=%p\n", (void *)dst_mem_op_gpa);
+	    PrintError(core->vm_info, core, "Write hook error at dst_mem_op_gpa=%p\n", (void *)dst_mem_op_gpa);
 	    return -1;
 	}
     }
@@ -303,7 +338,6 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 
 
 
-
 int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
 		      addr_t guest_addr_start, addr_t guest_addr_end, addr_t host_addr,
 		      int (*write)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data),
@@ -312,6 +346,11 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
     struct mem_hook * hook = V3_Malloc(sizeof(struct mem_hook));
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
+    if (!hook) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate in hooking memory for full access\n");
+	return -1;
+    }
+
     memset(hook, 0, sizeof(struct mem_hook));
 
     hook->write = write;
@@ -320,6 +359,12 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
 
     entry = v3_create_mem_region(vm, core_id, guest_addr_start, guest_addr_end);
 
+    if (!entry) { 
+       PrintError(vm, VCORE_NONE, "Cannot allocate a memory region\n");
+       V3_Free(hook);
+       return -1;
+    }
+
     hook->region = entry;
 
     entry->host_addr = host_addr;
@@ -331,6 +376,7 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
     entry->flags.alloced = 1;
 
     if (v3_insert_mem_region(vm, entry) == -1) {
+        PrintError(vm, VCORE_NONE, "Cannot insert memory region\n");
 	V3_Free(entry);
 	V3_Free(hook);
 	return -1;
@@ -354,6 +400,11 @@ int v3_hook_full_mem(struct v3_vm_info * vm, uint16_t core_id,
     struct mem_hook * hook = V3_Malloc(sizeof(struct mem_hook));
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
+    if (!hook) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate in hooking memory for writing\n");
+	return -1;
+    }
+
     memset(hook, 0, sizeof(struct mem_hook));
 
     hook->write = write;
@@ -361,12 +412,20 @@ int v3_hook_full_mem(struct v3_vm_info * vm, uint16_t core_id,
     hook->priv_data = priv_data;
 
     entry = v3_create_mem_region(vm, core_id, guest_addr_start, guest_addr_end);
+
+    if (!entry) {
+	PrintError(vm, VCORE_NONE, "Cannot create memory region\n");
+	V3_Free(hook);
+	return -1;
+    }
+
     hook->region = entry;
 
     entry->unhandled = handle_mem_hook;
     entry->priv_data = hook;
 
     if (v3_insert_mem_region(vm, entry)) {
+	PrintError(vm, VCORE_NONE, "Cannot insert memory region\n");
 	V3_Free(entry);
 	V3_Free(hook);
 	return -1;
@@ -380,6 +439,58 @@ int v3_hook_full_mem(struct v3_vm_info * vm, uint16_t core_id,
 }
 
 
+int v3_hook_access_mem(struct v3_vm_info * vm, uint16_t core_id, 
+		       addr_t guest_addr_start, addr_t guest_addr_end,
+		       int (*access)(struct guest_info * core, 
+				     addr_t guest_va, 
+				     addr_t guest_pa, 
+				     struct v3_mem_region *reg, 
+				     pf_error_t access_info, 
+				     void *priv_data),
+		       void * priv_data) 
+{
+  
+    struct v3_mem_region * entry = NULL;
+    struct mem_hook * hook = V3_Malloc(sizeof(struct mem_hook));
+    struct v3_mem_hooks * hooks = &(vm->mem_hooks);
+
+    if (!hook) {
+	PrintError(vm, VCORE_NONE,"Cannot allocate in hooking memory for access\n");
+	return -1;
+    }
+
+    memset(hook, 0, sizeof(struct mem_hook));
+
+    hook->access = access;
+    hook->priv_data = priv_data;
+
+    entry = v3_create_mem_region(vm, core_id, guest_addr_start, guest_addr_end);
+
+    if (!entry) {
+	PrintError(vm, VCORE_NONE, "Cannot create memory region\n");
+	V3_Free(hook);
+	return -1;
+    }
+
+    hook->region = entry;
+
+    entry->unhandled = handle_mem_hook;
+    entry->priv_data = hook;
+
+    if (v3_insert_mem_region(vm, entry)) {
+	PrintError(vm, VCORE_NONE, "Cannot insert memory region\n");
+	V3_Free(entry);
+	V3_Free(hook);
+	return -1;
+    }
+
+    list_add(&(hook->hook_node), &(hooks->hook_list));
+    v3_htable_insert(hooks->reg_table, (addr_t)entry, (addr_t)hook);
+
+    return 0;
+}
+
+
 static int free_hook(struct v3_vm_info * vm, struct mem_hook * hook) {  
     v3_delete_mem_region(vm, hook->region);
     list_del(&(hook->hook_node));
@@ -394,10 +505,26 @@ static int free_hook(struct v3_vm_info * vm, struct mem_hook * hook) {
 // We do not support unhooking subregions
 int v3_unhook_mem(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr_start) {
     struct v3_mem_region * reg = v3_get_mem_region(vm, core_id, guest_addr_start);
-    struct mem_hook * hook = reg->priv_data;
+    struct v3_mem_hooks * hooks = &(vm->mem_hooks);
+    struct mem_hook * hook = NULL;
 
+    if (reg == NULL) {
+	PrintError(vm, VCORE_NONE, "Could not find region at %p\n", (void *)guest_addr_start);
+	return -1;
+    }
+
+    hook = reg->priv_data;
+
+    if (hook == NULL) {
+	PrintError(vm, VCORE_NONE, "Trying to unhook region that is not a hook at %p\n", (void *)guest_addr_start);
+	return -1;
+    }
+    
+    
     free_hook(vm, hook);
 
+    v3_htable_remove(hooks->reg_table, (addr_t)reg, 0);
+
     return 0;
 }