X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_msr.c;h=290398ecbbe2366afe1d60b973f36e7570dc11d3;hb=5e5c8ee949fa45116d58b904fc11aab082f61607;hp=8b70dd270ee62ee6e8b2ca7c727a28c5241bdf63;hpb=c3714b74821dffe63b2fdcf10d8fe614c5ac9bb1;p=palacios.git diff --git a/palacios/src/palacios/vmm_msr.c b/palacios/src/palacios/vmm_msr.c index 8b70dd2..290398e 100644 --- a/palacios/src/palacios/vmm_msr.c +++ b/palacios/src/palacios/vmm_msr.c @@ -22,9 +22,12 @@ #include #include +static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook); -void v3_init_msr_map(struct guest_info * info) { - struct v3_msr_map * msr_map = &(info->msr_map); +void v3_init_msr_map(struct v3_vm_info * vm) { + struct v3_msr_map * msr_map = &(vm->msr_map); + + PrintDebug("Initializing MSR map.\n"); INIT_LIST_HEAD(&(msr_map->hook_list)); msr_map->num_hooks = 0; @@ -33,25 +36,38 @@ void v3_init_msr_map(struct guest_info * info) { msr_map->update_map = NULL; } -int v3_handle_msr_write(struct guest_info * info) { - uint_t msr_num = info->vm_regs.rcx; - struct v3_msr msr_val; +int v3_deinit_msr_map(struct v3_vm_info * vm) { struct v3_msr_hook * hook = NULL; + struct v3_msr_hook * tmp = NULL; - hook = v3_get_msr_hook(info, msr_num); - - if (!hook) { - PrintError("Hook for MSR write %d not found\n", msr_num); - return -1; + list_for_each_entry_safe(hook, tmp, &(vm->msr_map.hook_list), link) { + free_hook(vm, hook); } + return 0; +} + +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; - 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; + PrintDebug("MSR write for msr 0x%x\n", msr_num); + + hook = v3_get_msr_hook(info->vm_info, msr_num); + + if (hook == NULL) { + PrintError("Write to unhooked MSR 0x%x\n", msr_num); + } else { + 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; + } } info->rip += 2; @@ -61,24 +77,23 @@ int v3_handle_msr_write(struct guest_info * info) { int v3_handle_msr_read(struct guest_info * info) { - uint_t msr_num = info->vm_regs.rcx; + uint32_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; + hook = v3_get_msr_hook(info->vm_info, msr_num); + + if (hook == NULL) { + PrintError("Read from unhooked MSR 0x%x\n", msr_num); + } else { + if (hook->read(info, 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; @@ -86,18 +101,18 @@ int v3_handle_msr_read(struct guest_info * info) { return 0; } -int v3_hook_msr(struct guest_info * info, uint_t msr, - int (*read)(uint_t msr, struct v3_msr * dst, void * priv_data), - int (*write)(uint_t msr, struct v3_msr src, void * priv_data), +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), void * priv_data) { - struct v3_msr_map * msr_map = &(info->msr_map); + struct v3_msr_map * msr_map = &(vm->msr_map); struct v3_msr_hook * hook = NULL; hook = (struct v3_msr_hook *)V3_Malloc(sizeof(struct v3_msr_hook)); if (hook == NULL) { - PrintError("Could not allocate msr hook for MSR %d\n", msr); + PrintError("Could not allocate msr hook for MSR 0x%x\n", msr); return -1; } @@ -111,7 +126,7 @@ int v3_hook_msr(struct guest_info * info, uint_t msr, list_add(&(hook->link), &(msr_map->hook_list)); if (msr_map->update_map) { - msr_map->update_map(info, msr, + msr_map->update_map(vm, msr, (read == NULL) ? 0 : 1, (write == NULL) ? 0 : 1); } @@ -119,16 +134,36 @@ int v3_hook_msr(struct guest_info * info, uint_t msr, return 0; } +static int free_hook(struct v3_vm_info * vm, struct v3_msr_hook * hook) { + list_del(&(hook->link)); + + if (vm->msr_map.update_map) { + vm->msr_map.update_map(vm, hook->msr, 0, 0); + } + + V3_Free(hook); + + return 0; +} -int v3_unhook_msr(struct guest_info * info, uint_t msr) { - PrintError("Unhooking MSRs currently not supported\n"); - return -1; + +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); + return -1; + } + + free_hook(vm, hook); + + return 0; } -struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) { - struct v3_msr_map * msr_map = &(info->msr_map); +struct v3_msr_hook * v3_get_msr_hook(struct v3_vm_info * vm, uint32_t msr) { + struct v3_msr_map * msr_map = &(vm->msr_map); struct v3_msr_hook * hook = NULL; list_for_each_entry(hook, &(msr_map->hook_list), link) { @@ -141,8 +176,8 @@ struct v3_msr_hook * v3_get_msr_hook(struct guest_info * info, uint_t msr) { } -void v3_refresh_msr_map(struct guest_info * info) { - struct v3_msr_map * msr_map = &(info->msr_map); +void v3_refresh_msr_map(struct v3_vm_info * vm) { + struct v3_msr_map * msr_map = &(vm->msr_map); struct v3_msr_hook * hook = NULL; if (msr_map->update_map == NULL) { @@ -151,18 +186,19 @@ void v3_refresh_msr_map(struct guest_info * info) { } list_for_each_entry(hook, &(msr_map->hook_list), link) { - msr_map->update_map(info, hook->msr, + PrintDebug("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); } } -void v3_print_msr_map(struct guest_info * info) { - struct v3_msr_map * msr_map = &(info->msr_map); +void v3_print_msr_map(struct v3_vm_info * vm) { + struct v3_msr_map * msr_map = &(vm->msr_map); struct v3_msr_hook * hook = NULL; list_for_each_entry(hook, &(msr_map->hook_list), link) { - PrintDebug("MSR HOOK (MSR=%d) (read=0x%p) (write=0x%p)\n", + V3_Print("MSR HOOK (MSR=0x%x) (read=0x%p) (write=0x%p)\n", hook->msr, hook->read, hook->write); } }