X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_msr.c;h=ea2037487e4ce6d02aeca8e687dc2b0e632991f7;hb=4d1d8fadad33de7d3ebce2083d9782048f78b44e;hp=0b46b88a00cb724a5c095c1288245b565a4a7100;hpb=52a58bb7bdf06ca22ad6883f8095f8aa5ca4b8a4;p=palacios.git

diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index 0b46b88..ea20374 100644
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -1,42 +1,92 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Andy Gocke <agocke@gmail.com>
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Andy Gocke <agocke@gmail.com>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <palacios/vmm.h>
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_msr.h>
 
-/* Same as SVM */
-static int update_map(struct guest_info * info, uint_t msr, int hook_reads, int hook_writes)
+#define LOW_MSR_START   0x00000000
+#define LOW_MSR_END     0x1fff
+#define HIGH_MSR_START  0xc0000000
+#define HIGH_MSR_END    0xc0001fff
+
+#define LOW_MSR_INDEX   0
+#define HIGH_MSR_INDEX  1024
+
+static int get_bitmap_index(uint_t msr)
 {
+    if( (msr >= LOW_MSR_START) && msr <= LOW_MSR_END) {
+        return LOW_MSR_INDEX + msr;
+    } else if (( msr >= HIGH_MSR_START ) && (msr <= HIGH_MSR_END)) {
+        return (HIGH_MSR_INDEX * 8) + (msr - HIGH_MSR_START);
+    } else {
+        PrintError(VM_NONE, VCORE_NONE,  "MSR out of range: 0x%x\n", msr);
+        return -1;
+    }
+}
 
-#if 0
+/* Same as SVM */
+static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int hook_writes) {
     int index = get_bitmap_index(msr);
-    uint_t major = index / 4;
-    uint_t minor = (index % 4) * 2;
-    uchar_t val = 0;
-    uchar_t mask = 0x3;
-    uint8_t * bitmap = (uint8_t *)(info->msr_map.arch_data);
-
-    if (hook_reads) {
-	val |= 0x1;
-    } 
-    
-    if (hook_writes) {
-	val |= 0x2;
+    uint_t major = index / 8;
+    uint_t minor = (index % 8);
+    uchar_t mask = 0x1;
+    uint8_t read_val = (hook_reads) ? 0x1 : 0x0;
+    uint8_t write_val = (hook_writes) ? 0x1 : 0x0;
+    uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
+
+    if (index == -1) {
+	//	0rintError("Error updating MSR Map failed bitmap index for (0x%x)\n", msr);
+	// MSRs not in the bitmap covered range will always trigger exits, so we don't need to worry about them here.
+	return 0;
     }
 
     *(bitmap + major) &= ~(mask << minor);
-    *(bitmap + major) |= (val << minor);
-#endif
-    
+    *(bitmap + major) |= (read_val << minor);
+
+    *(bitmap + 2048 + major) &= ~(mask << minor);
+    *(bitmap + 2048 + major) |= (write_val << minor);
+
     return 0;
 }
 
-int v3_init_vmx_msr_map(struct guest_info * info)
-{
-   struct v3_msr_map * msr_map = &(info->msr_map);
+int v3_init_vmx_msr_map(struct v3_vm_info * vm) {
+    void *temp;
+
+    struct v3_msr_map * msr_map = &(vm->msr_map);
 
-   msr_map->update_map = update_map;
-   
-   msr_map->arch_data = V3_VAddr(V3_AllocPages(1));
-   memset(msr_map->arch_data, 0, PAGE_SIZE_4KB);
+    msr_map->update_map = update_map;
+    
+    temp = V3_AllocPages(1); // need not be shadow-safe, not exposed to guest
+    if (!temp) { 
+        PrintError(vm, VCORE_NONE, "Cannot allocat MSR bitmap\n");
+	return -1;
+    }
+    msr_map->arch_data = V3_VAddr(temp);
+    memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB);
+    
+    v3_refresh_msr_map(vm);
+    
+    return 0;
+}
 
-   return 0;
+int v3_deinit_vmx_msr_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 1);
+    return 0;
 }