X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=66a14d4b2936fb4c0807cacd89089757a3ceb51f;hb=13d8e5d4035b90bf1ab8b1da115c7d6310c76526;hp=5fe5ffdcc7106294935e176451242fffd00cef70;hpb=29e825c5f095066bbb5ebbec5a5af1419d883264;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 5fe5ffd..66a14d4 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -23,8 +23,10 @@
 #include <palacios/vm_guest.h>
 
 
-void v3_init_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map  = &(info->msr_map);
+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,13 +35,67 @@ void v3_init_msr_map(struct guest_info * info) {
     msr_map->update_map = NULL;
 }
 
+int v3_handle_msr_write(struct guest_info * info) {
+    uint_t msr_num = info->vm_regs.rcx;
+    struct v3_msr msr_val;
+    struct v3_msr_hook * hook = NULL;
+
+    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(info, msr_num, msr_val, hook->priv_data) == -1) {
+        PrintError("Error in MSR hook Write\n");
+        return -1;
+    }
+
+    info->rip += 2;
+
+    return 0;
+}
+
+
+int v3_handle_msr_read(struct guest_info * info) {
+    uint_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(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;
 
-int v3_hook_msr(struct guest_info * info, 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),
+    info->rip += 2;
+    return 0;
+}
+
+int v3_hook_msr(struct v3_vm_info * vm, uint_t msr, 
+		int (*read)(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data),
+		int (*write)(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data),
 		void * priv_data) {
 
-    struct v3_msr_map * msr_map = &(info->msr_map);
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     hook = (struct v3_msr_hook *)V3_Malloc(sizeof(struct v3_msr_hook));
@@ -58,21 +114,25 @@ int v3_hook_msr(struct guest_info * info, uint_t msr,
 
     list_add(&(hook->link), &(msr_map->hook_list));
 
-    msr_map->update_map(info, msr, 
-			(read == NULL) ? 0 : 1,
-			(write == NULL) ? 0 : 1);
+    if (msr_map->update_map) {
+	msr_map->update_map(vm, msr, 
+			    (read == NULL) ? 0 : 1,
+			    (write == NULL) ? 0 : 1);
+    }
+
     return 0;
 }
 
 
-int v3_unhook_msr(struct guest_info * info, uint_t msr) {
+int v3_unhook_msr(struct v3_vm_info * vm, uint_t msr) {
+    PrintError("Unhooking MSRs currently not supported\n");
     return -1;
 }
 
 
 
-struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint_t msr) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
@@ -85,12 +145,29 @@ struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) {
 }
 
 
-void v3_print_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+void v3_refresh_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
+    struct v3_msr_hook * hook = NULL;
+
+    if (msr_map->update_map == NULL) {
+	PrintError("Trying to refresh an MSR map with no backend\n");
+	return;
+    }
+
+    list_for_each_entry(hook, &(msr_map->hook_list), link) {
+	PrintDebug("updating MSR map for msr %d\n", hook->msr);
+	msr_map->update_map(vm, hook->msr, 	
+			    (hook->read == NULL) ? 0 : 1,
+			    (hook->write == NULL) ? 0 : 1);
+    }
+}
+
+void v3_print_msr_map(struct v3_vm_info * vm) {
+    struct v3_msr_map * msr_map = &(vm->msr_map);
     struct v3_msr_hook * hook = NULL;
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
-	PrintDebug("MSR HOOK (MSR=%d) (read=0x%p) (write=0x%p)\n",
+	V3_Print("MSR HOOK (MSR=0x%x) (read=0x%p) (write=0x%p)\n",
 		   hook->msr, hook->read, hook->write);
     }
 }