#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
#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)
}
-
-addr_t v3_init_svm_msr_map(struct guest_info * info) {
- uchar_t * msr_bitmap = (uchar_t*)V3_VAddr(V3_AllocPages(2));
- struct v3_msr_map * msr_map = &(info->msr_map);
- struct v3_msr_hook * hook = NULL;
-
-
- memset(msr_bitmap, 0, PAGE_SIZE * 2);
-
- list_for_each_entry(hook, &(msr_map->hook_list), link) {
- int index = get_bitmap_index(hook->msr);
- uint_t byte_offset = index / 4;
- uint_t bit_offset = (index % 4) * 2;
- uchar_t val = 0;
- uchar_t mask = ~0x3;
-
- if (hook->read) {
- val |= 0x1;
- }
-
- if (hook->write) {
- val |= 0x2;
- }
-
- val = val << bit_offset;
- mask = mask << bit_offset;
-
- *(msr_bitmap + byte_offset) &= mask;
- *(msr_bitmap + byte_offset) |= val;
+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 *)(vm->msr_map.arch_data);
+
+ if (hook_reads) {
+ val |= 0x1;
+ }
+
+ if (hook_writes) {
+ val |= 0x2;
}
- return (addr_t)V3_PAddr(msr_bitmap);
-}
-
-
-
-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);
- 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;
- }
+ *(bitmap + major) &= ~(mask << minor);
+ *(bitmap + major) |= (val << minor);
return 0;
}
+int v3_init_svm_msr_map(struct v3_vm_info * vm) {
+ struct v3_msr_map * msr_map = &(vm->msr_map);
+
+ msr_map->update_map = update_map;
-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_map->arch_data = V3_VAddr(V3_AllocPages(2));
+ memset(msr_map->arch_data, 0, PAGE_SIZE_4KB * 2);
- msr_val.value = 0;
-
- if (hook->read(msr_num, &msr_val, hook->priv_data) == -1) {
- PrintError("Error in MSR hook Read\n");
- return -1;
- }
+ v3_refresh_msr_map(vm);
- info->vm_regs.rax = msr_val.lo;
- info->vm_regs.rdx = msr_val.hi;
-
return 0;
}
+
+