X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_msr.c;h=08b1569cca59c5cf04f125eb3d622ac273b8e605;hb=fd8ffc465479e68f4938f85b718a9fb35d05bee0;hp=dcc653e9961511e6fe6acc5a5ae6534f96400bea;hpb=29e825c5f095066bbb5ebbec5a5af1419d883264;p=palacios.git

diff --git a/palacios/src/palacios/svm_msr.c b/palacios/src/palacios/svm_msr.c
index dcc653e..08b1569 100644
--- a/palacios/src/palacios/svm_msr.c
+++ b/palacios/src/palacios/svm_msr.c
@@ -19,9 +19,9 @@
 
 #include <palacios/svm_msr.h>
 #include <palacios/vmm_msr.h>
-
+#include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_list.h>
-
+#include <palacios/vm_guest.h>
 
 #define PENTIUM_MSRS_START            0x00000000
 #define PENTIUM_MSRS_END              0x00001fff
@@ -30,9 +30,9 @@
 #define AMD_7_8_GEN_MSRS_START        0xc0010000
 #define AMD_7_8_GEN_MSRS_END          0xc0011fff
 
-#define PENTIUM_MSRS_INDEX            (0x0 * 4)
-#define AMD_6_GEN_MSRS_INDEX          (0x800 * 4)
-#define AMD_7_8_GEN_MSRS_INDEX        (0x1000 * 4)
+#define PENTIUM_MSRS_INDEX            (0)
+#define AMD_6_GEN_MSRS_INDEX          (0x2000)
+#define AMD_7_8_GEN_MSRS_INDEX        (0x4000)
 
 
 
@@ -47,95 +47,63 @@ static int get_bitmap_index(uint_t msr) {
 	       (msr <= AMD_7_8_GEN_MSRS_END)) {
 	return (AMD_7_8_GEN_MSRS_INDEX + (msr - AMD_7_8_GEN_MSRS_START));
     } else {
-	PrintError("MSR out of range (MSR=0x%x)\n", msr);
+	PrintError(VM_NONE, VCORE_NONE,  "MSR out of range (MSR=0x%x)\n", msr);
 	return -1;
     }
 }
 
 
-static int update_map(struct guest_info * info, uint_t msr, int hook_reads, int hook_writes) {
+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);
+    uint8_t val = 0;
+    uint8_t mask = 0x3;
+    uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
+
+    if (index == -1) {
+	PrintError(vm, VCORE_NONE,  "MSR (0x%x) out of bitmap range\n", msr);
+	return 0;
+    }
 
-    if (hook_reads) {
+    if (hook_reads != 0) {
 	val |= 0x1;
     } 
     
-    if (hook_writes) {
+    if (hook_writes != 0) {
 	val |= 0x2;
     }
 
     *(bitmap + major) &= ~(mask << minor);
     *(bitmap + major) |= (val << minor);
-    
+
     return 0;
 }
 
 
-int v3_init_svm_msr_map(struct guest_info * info) {
-    struct v3_msr_map * msr_map = &(info->msr_map);
+int v3_init_svm_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(2));  
-    memset(msr_map->arch_data, 0, PAGE_SIZE_4KB * 2);
-
-    return 0;
-}
-
-
-
-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;
-
-    hook = v3_get_msr_hook(info, msr_num);
-
-    if (!hook) {
-	PrintError("Hook for MSR write %d not found\n", msr_num);
+    temp = V3_AllocPages(2); // need not be shadow-safe, not exposed to guest
+    
+    if (!temp) { 
+	PrintError(vm, VCORE_NONE,  "Cannot allocate msr bitmap\n");
 	return -1;
     }
 
-    msr_val.value = 0;
-    msr_val.lo = info->vm_regs.rax;
-    msr_val.hi = info->vm_regs.rdx;
+    msr_map->arch_data = V3_VAddr(temp);
 
-    if (hook->write(msr_num, msr_val, hook->priv_data) == -1) {
-	PrintError("Error in MSR hook Write\n");
-	return -1;
-    }
+    memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB * 2);
+
+    v3_refresh_msr_map(vm);
 
     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, 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;
-    }
-
-    info->vm_regs.rax = msr_val.lo;
-    info->vm_regs.rdx = msr_val.hi;
-  
+int v3_deinit_svm_msr_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 2);
     return 0;
 }