X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=bb1b06234de231caa1e766a71ea42da4a5231b50;hb=a9e204d157a33976ca454b2ce8b161c2a5501b14;hp=85bc3f37b722bac90221ed993af0b8e34259b126;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 85bc3f3..bb1b062 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -22,10 +22,13 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest.h>
 
+static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook);
 
 void v3_init_msr_map(struct v3_vm_info * vm) {
     struct v3_msr_map * msr_map  = &(vm->msr_map);
 
+    PrintDebug("Initializing MSR map.\n");
+
     INIT_LIST_HEAD(&(msr_map->hook_list));
     msr_map->num_hooks = 0;
 
@@ -33,27 +36,38 @@ void v3_init_msr_map(struct v3_vm_info * vm) {
     msr_map->update_map = NULL;
 }
 
+int v3_deinit_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_hook * hook = NULL;
+    struct v3_msr_hook * tmp = NULL;
+
+    list_for_each_entry_safe(hook, tmp, &(vm->msr_map.hook_list), link) {
+	free_hook(vm, hook);
+    }
+
+    return 0;
+}
+
 int v3_handle_msr_write(struct guest_info * info) {
-    uint_t msr_num = info->vm_regs.rcx;
+    uint32_t msr_num = info->vm_regs.rcx;
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
+    
+    msr_val.value = 0;
 
     PrintDebug("MSR write for msr 0x%x\n", msr_num);
 
     hook = v3_get_msr_hook(info->vm_info, msr_num);
 
-    if (!hook) {
-        PrintError("Hook for MSR write %d not found\n", msr_num);
-        return -1;
-    }
-
-    msr_val.value = 0;
-    msr_val.lo = info->vm_regs.rax;
-    msr_val.hi = info->vm_regs.rdx;
-
-    if (hook->write(msr_num, msr_val, hook->priv_data) == -1) {
-        PrintError("Error in MSR hook Write\n");
-        return -1;
+    if (hook == NULL) {
+	v3_msr_unhandled_write(info, msr_num, msr_val, NULL);
+    } else {
+	msr_val.lo = info->vm_regs.rax;
+	msr_val.hi = info->vm_regs.rdx;
+	
+	if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
+	    PrintError("Error in MSR hook Write\n");
+	    return -1;
+	}
     }
 
     info->rip += 2;
@@ -63,24 +77,23 @@ int v3_handle_msr_write(struct guest_info * info) {
 
 
 int v3_handle_msr_read(struct guest_info * info) {
-    uint_t msr_num = info->vm_regs.rcx;
+    uint32_t msr_num = info->vm_regs.rcx;
     struct v3_msr msr_val;
     struct v3_msr_hook * hook = NULL;
 
-    hook = v3_get_msr_hook(info->vm_info, msr_num);
-
-    if (!hook) {
-        PrintError("Hook for MSR read %d not found\n", msr_num);
-        return -1;
-    }
-
     msr_val.value = 0;
 
-    if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
-        PrintError("Error in MSR hook Read\n");
-        return -1;
+    hook = v3_get_msr_hook(info->vm_info, msr_num);
+    
+    if (hook == NULL) {
+	v3_msr_unhandled_read(info, msr_num, &msr_val, NULL);
+    } else {
+	if (hook->read(info, msr_num, &msr_val, hook->priv_data) == -1) {
+	    PrintError("Error in MSR hook Read\n");
+	    return -1;
+	}
     }
-
+    
     info->vm_regs.rax = msr_val.lo;
     info->vm_regs.rdx = msr_val.hi;
 
@@ -88,9 +101,22 @@ int v3_handle_msr_read(struct guest_info * info) {
     return 0;
 }
 
-int v3_hook_msr(struct v3_vm_info * vm, uint_t msr, 
-		int (*read)(uint_t msr, struct v3_msr * dst, void * priv_data),
-		int (*write)(uint_t msr, struct v3_msr src, void * priv_data),
+
+
+int v3_msr_unhandled_read(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data) {
+    V3_Print("Palacios: Unhandled MSR Read (MSR=0x%x)\n", msr);
+    return 0;
+}
+
+int v3_msr_unhandled_write(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data) {
+    V3_Print("Palacios: Unhandled MSR Write (MSR=0x%x)\n", msr);
+    return 0;
+}
+
+
+int v3_hook_msr(struct v3_vm_info * vm, uint32_t msr, 
+		int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data),
+		int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data),
 		void * priv_data) {
 
     struct v3_msr_map * msr_map = &(vm->msr_map);
@@ -99,7 +125,7 @@ int v3_hook_msr(struct v3_vm_info * vm, uint_t msr,
     hook = (struct v3_msr_hook *)V3_Malloc(sizeof(struct v3_msr_hook));
 
     if (hook == NULL) {
-	PrintError("Could not allocate msr hook for MSR %d\n", msr);
+	PrintError("Could not allocate msr hook for MSR 0x%x\n", msr);
 	return -1;
     }
 
@@ -122,14 +148,38 @@ int v3_hook_msr(struct v3_vm_info * vm, uint_t msr,
 }
 
 
-int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr) {
-    PrintError("Unhooking MSRs currently not supported\n");
-    return -1;
+
+
+
+static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook) {
+    list_del(&(hook->link));
+
+    if (vm->msr_map.update_map) {
+	vm->msr_map.update_map(vm, hook->msr, 0, 0);
+    }
+
+    V3_Free(hook);
+
+    return 0;
+}
+
+
+int v3_unhook_msr(struct v3_vm_info * vm, uint32_t msr) {
+    struct v3_msr_hook * hook = v3_get_msr_hook(vm, msr);
+
+    if (hook == NULL) {
+	PrintError("Could not find MSR to unhook %u (0x%x)\n", msr, msr);
+	return -1;
+    }
+
+    free_hook(vm, hook);
+
+    return 0;
 }
 
 
 
-struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint_t msr) {
+struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint32_t msr) {
     struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
@@ -153,7 +203,7 @@ void v3_refresh_msr_map(struct v3_vm_info * vm) {
     }
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
-	PrintDebug("updating MSR map for msr %d\n", hook->msr);
+	PrintDebug("updating MSR map for msr 0x%x\n", hook->msr);
 	msr_map->update_map(vm, hook->msr, 	
 			    (hook->read == NULL) ? 0 : 1,
 			    (hook->write == NULL) ? 0 : 1);