From: Jack Lange Date: Tue, 19 Apr 2011 22:06:51 +0000 (-0500) Subject: added cpuid masking X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=1ebf37356d541b20aef0ff6d383861558875a604;p=palacios.git added cpuid masking --- diff --git a/palacios/include/palacios/vmm_cpuid.h b/palacios/include/palacios/vmm_cpuid.h index 30467fd..88d48bd 100644 --- a/palacios/include/palacios/vmm_cpuid.h +++ b/palacios/include/palacios/vmm_cpuid.h @@ -54,6 +54,12 @@ struct v3_cpuid_map { void v3_print_cpuid_map(struct v3_vm_info * vm); +int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid, + uint32_t rax_mask, uint32_t rax, + uint32_t rbx_mask, uint32_t rbx, + uint32_t rcx_mask, uint32_t rcx, + uint32_t rdx_mask, uint32_t rdx); + int v3_hook_cpuid(struct v3_vm_info * vm, uint32_t cpuid, int (*hook_fn)(struct guest_info * info, uint32_t cpuid, \ uint32_t * eax, uint32_t * ebx, \ diff --git a/palacios/src/palacios/vmm_cpuid.c b/palacios/src/palacios/vmm_cpuid.c index a093bf7..ab3e91b 100644 --- a/palacios/src/palacios/vmm_cpuid.c +++ b/palacios/src/palacios/vmm_cpuid.c @@ -7,11 +7,10 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * - * Copyright (c) 2008, Jack Lange - * Copyright (c) 2008, The V3VEE Project + * Copyright (c) 2011, Jack Lange * All rights reserved. * - * Author: Jack Lange + * Author: Jack Lange * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "V3VEE_LICENSE". @@ -22,11 +21,29 @@ #include #include +struct masked_cpuid { + uint32_t rax_mask; + uint32_t rbx_mask; + uint32_t rcx_mask; + uint32_t rdx_mask; + + uint32_t rax; + uint32_t rbx; + uint32_t rcx; + uint32_t rdx; +}; + void v3_init_cpuid_map(struct v3_vm_info * vm) { vm->cpuid_map.map.rb_node = NULL; + + // Setup default cpuid entries + } + + + int v3_deinit_cpuid_map(struct v3_vm_info * vm) { struct rb_node * node = v3_rb_first(&(vm->cpuid_map.map)); struct v3_cpuid_hook * hook = NULL; @@ -104,6 +121,105 @@ static struct v3_cpuid_hook * get_cpuid_hook(struct v3_vm_info * vm, uint32_t cp } + +static int mask_hook(struct guest_info * core, uint32_t cpuid, + uint32_t * eax, uint32_t * ebx, + uint32_t * ecx, uint32_t * edx, + void * priv_data) { + struct masked_cpuid * mask = (struct masked_cpuid *)priv_data; + + v3_cpuid(cpuid, eax, ebx, ecx, edx); + + *eax &= ~(mask->rax_mask); + *eax |= mask->rax; + + *ebx &= ~(mask->rbx_mask); + *ebx |= mask->rbx; + + *ecx &= ~(mask->rcx_mask); + *ecx |= mask->rcx; + + *edx &= ~(mask->rdx_mask); + *edx |= mask->rdx; + + return 0; +} + +int v3_cpuid_add_fields(struct v3_vm_info * vm, uint32_t cpuid, + uint32_t rax_mask, uint32_t rax, + uint32_t rbx_mask, uint32_t rbx, + uint32_t rcx_mask, uint32_t rcx, + uint32_t rdx_mask, uint32_t rdx) { + struct v3_cpuid_hook * hook = get_cpuid_hook(vm, cpuid); + + if (hook == NULL) { + struct masked_cpuid * mask = V3_Malloc(sizeof(struct masked_cpuid)); + memset(mask, 0, sizeof(struct masked_cpuid)); + + mask->rax_mask = rax_mask; + mask->rax = rax; + mask->rbx_mask = rbx_mask; + mask->rbx = rbx; + mask->rcx_mask = rcx_mask; + mask->rcx = rcx; + mask->rdx_mask = rdx_mask; + mask->rdx = rdx; + + if (v3_hook_cpuid(vm, cpuid, mask_hook, mask) == -1) { + PrintError("Error hooking cpuid %d\n", cpuid); + return -1; + } + } else { + struct masked_cpuid * mask = NULL; + uint32_t tmp_val = 0; + + if (hook->hook_fn != mask_hook) { + PrintError("trying to add fields to a fully hooked cpuid (%d)\n", cpuid); + return -1; + } + + mask = (struct masked_cpuid *)(hook->private_data); + + if ((mask->rax_mask & rax_mask) || + (mask->rbx_mask & rbx_mask) || + (mask->rcx_mask & rcx_mask) || + (mask->rdx_mask & rdx_mask)) { + PrintError("Trying to add fields that have already been masked\n"); + return -1; + } + + if ((~rax_mask & rax) || (~rbx_mask & rbx) || + (~rcx_mask & rcx) || (~rdx_mask & rdx)) { + PrintError("Invalid cpuid reg value (mask overrun)\n"); + return -1; + } + + mask->rax_mask |= rax_mask; + mask->rbx_mask |= rbx_mask; + mask->rcx_mask |= rcx_mask; + mask->rdx_mask |= rdx_mask; + + mask->rax |= rax; + tmp_val = (~rax_mask | rax); + mask->rax &= tmp_val; + + mask->rbx |= rbx; + tmp_val = (~rbx_mask | rbx); + mask->rbx &= tmp_val; + + mask->rcx |= rcx; + tmp_val = (~rcx_mask | rcx); + mask->rcx &= tmp_val; + + mask->rdx |= rdx; + tmp_val = (~rdx_mask | rdx); + mask->rdx &= tmp_val; + + } + + return 0; +} + int v3_unhook_cpuid(struct v3_vm_info * vm, uint32_t cpuid) { struct v3_cpuid_hook * hook = get_cpuid_hook(vm, cpuid); @@ -185,3 +301,8 @@ int v3_handle_cpuid(struct guest_info * info) { return 0; } + + + + + diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index eb79fa3..f6a6a0b 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -726,10 +726,15 @@ int v3_vmx_enter(struct guest_info * info) { update_irq_exit_state(info); #endif - // Handle any exits needed still in the atomic section - if (v3_handle_atomic_vmx_exit(info, &exit_info) == -1) { - PrintError("Error in atomic VMX exit handler\n"); - return -1; + if (exit_info.exit_reason == VMEXIT_INTR_WINDOW) { + // This is a special case whose only job is to inject an interrupt + vmcs_read(VMCS_PROC_CTRLS, &(vmx_info->pri_proc_ctrls.value)); + vmx_info->pri_proc_ctrls.int_wndw_exit = 0; + vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); + +#ifdef CONFIG_DEBUG_INTERRUPTS + PrintDebug("Interrupts available again! (RIP=%llx)\n", info->rip); +#endif } // reenable global interrupts after vm exit diff --git a/palacios/src/palacios/vmx_handler.c b/palacios/src/palacios/vmx_handler.c index 4066bf2..e5da762 100644 --- a/palacios/src/palacios/vmx_handler.c +++ b/palacios/src/palacios/vmx_handler.c @@ -42,25 +42,6 @@ #endif /* At this point the GPRs are already copied into the guest_info state */ -int v3_handle_atomic_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info) { - struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); - - switch (exit_info->exit_reason) { - case VMEXIT_INTR_WINDOW: - // This is here because we touch the VMCS - vmcs_read(VMCS_PROC_CTRLS, &(vmx_info->pri_proc_ctrls.value)); - vmx_info->pri_proc_ctrls.int_wndw_exit = 0; - vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); - -#ifdef CONFIG_DEBUG_INTERRUPTS - PrintDebug("Interrupts available again! (RIP=%llx)\n", info->rip); -#endif - break; - } - return 0; -} - -/* At this point the GPRs are already copied into the guest_info state */ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info) { /* PrintError("Handling VMEXIT: %s (%u), %lu (0x%lx)\n",