#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)
(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);
+ 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_map->arch_data = V3_VAddr(temp);
- v3_refresh_msr_map(info);
+ memset(msr_map->arch_data, 0xff, PAGE_SIZE_4KB * 2);
+
+ v3_refresh_msr_map(vm);
return 0;
}
-
+int v3_deinit_svm_msr_map(struct v3_vm_info * vm) {
+ if (vm->msr_map.arch_data) {
+ V3_FreePages(V3_PAddr(vm->msr_map.arch_data), 2);
+ }
+ return 0;
+}