X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=7331a59993757cc24ce4cc839d46221a8088d924;hb=4d1d8fadad33de7d3ebce2083d9782048f78b44e;hp=68d476746b60ab670c23357c61a012bb52bea43a;hpb=912f74aae257be698044de894124289ba5356621;p=palacios.git

diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c
index 68d4767..7331a59 100644
--- a/palacios/src/palacios/vmm_msr.c
+++ b/palacios/src/palacios/vmm_msr.c
@@ -27,7 +27,7 @@ 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");
+    PrintDebug(vm, VCORE_NONE, "Initializing MSR map.\n");
 
     INIT_LIST_HEAD(&(msr_map->hook_list));
     msr_map->num_hooks = 0;
@@ -51,23 +51,27 @@ int v3_handle_msr_write(struct guest_info * info) {
     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);
+    PrintDebug(info->vm_info, info, "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;
+    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) {
+	    if (hook->write(info, msr_num, msr_val, hook->priv_data) == -1) {
+		PrintError(info->vm_info, info, "Error in MSR hook Write\n");
+		return -1;
+	    }
+	} else {
+	    PrintError(info->vm_info, info, "No write hook exists for msr 0x%x\n",msr_num);
+	}
     }
 
     info->rip += 2;
@@ -81,20 +85,19 @@ int v3_handle_msr_read(struct guest_info * info) {
     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 0x%x 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;
+    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(info->vm_info, info, "Error in MSR hook Read\n");
+	    return -1;
+	}
     }
-
+    
     info->vm_regs.rax = msr_val.lo;
     info->vm_regs.rdx = msr_val.hi;
 
@@ -102,6 +105,33 @@ int v3_handle_msr_read(struct guest_info * info) {
     return 0;
 }
 
+
+
+int v3_msr_unhandled_read(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data) {
+    V3_Print(core->vm_info, core, "Palacios: Unhandled MSR Read (MSR=0x%x) - returning zero\n", msr);
+
+#ifdef V3_CONFIG_STRICT_MSR_SEMANTICS
+    v3_raise_exception(core,GPF_EXCEPTION);
+#else
+    dst->value = 0;
+#endif
+    
+    return 0;
+}
+
+int v3_msr_unhandled_write(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data) {
+    V3_Print(core->vm_info, core, "Palacios: Unhandled MSR Write (MSR=0x%x) - ignored\n", msr);
+
+#ifdef V3_CONFIG_STRICT_MSR_SEMANTICS
+    v3_raise_exception(core,GPF_EXCEPTION);
+#else
+    // write ignored
+#endif
+
+    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),
@@ -113,7 +143,7 @@ int v3_hook_msr(struct v3_vm_info * vm, uint32_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 0x%x\n", msr);
+        PrintError(vm, VCORE_NONE,"Could not allocate msr hook for MSR 0x%x\n", msr);
 	return -1;
     }
 
@@ -135,6 +165,10 @@ int v3_hook_msr(struct v3_vm_info * vm, uint32_t msr,
     return 0;
 }
 
+
+
+
+
 static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook) {
     list_del(&(hook->link));
 
@@ -152,7 +186,7 @@ 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);
+        PrintError(vm, VCORE_NONE,"Could not find MSR to unhook %u (0x%x)\n", msr, msr);
 	return -1;
     }
 
@@ -182,12 +216,12 @@ void v3_refresh_msr_map(struct v3_vm_info * vm) {
     struct v3_msr_hook * hook = NULL;
 
     if (msr_map->update_map == NULL) {
-	PrintError("Trying to refresh an MSR map with no backend\n");
+        PrintError(vm, VCORE_NONE, "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 0x%x\n", hook->msr);
+	PrintDebug(vm, VCORE_NONE, "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);
@@ -199,7 +233,7 @@ void v3_print_msr_map(struct v3_vm_info * vm) {
     struct v3_msr_hook * hook = NULL;
 
     list_for_each_entry(hook, &(msr_map->hook_list), link) {
-	V3_Print("MSR HOOK (MSR=0x%x) (read=0x%p) (write=0x%p)\n",
+	V3_Print(vm, VCORE_NONE, "MSR HOOK (MSR=0x%x) (read=0x%p) (write=0x%p)\n",
 		   hook->msr, hook->read, hook->write);
     }
 }