X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=f0823b4cfe5c6d099fd8950fe8351985aefc4487;hp=d6dfafccfa94f359fe3993f747431913bd333971;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hpb=65301e679dd7e1e8ab4ab4746e6b650c9e24d901 diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index d6dfafc..f0823b4 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -33,6 +33,8 @@ #include #include #include +#include +#include #ifdef V3_CONFIG_CHECKPOINT #include @@ -42,6 +44,10 @@ #include #include +#ifdef V3_CONFIG_MEM_TRACK +#include +#endif + #ifndef V3_CONFIG_DEBUG_VMX #undef PrintDebug #define PrintDebug(fmt, args...) @@ -51,7 +57,7 @@ /* These fields contain the hardware feature sets supported by the local CPU */ static struct vmx_hw_info hw_info; -extern v3_cpu_arch_t v3_cpu_types[]; +extern v3_cpu_arch_t v3_mach_type; static addr_t host_vmcs_ptrs[V3_CONFIG_MAX_CPUS] = { [0 ... V3_CONFIG_MAX_CPUS - 1] = 0}; @@ -64,10 +70,13 @@ static int inline check_vmcs_write(vmcs_field_t field, addr_t val) { ret = vmcs_write(field, val); if (ret != VMX_SUCCESS) { - PrintError("VMWRITE error on %s!: %d\n", v3_vmcs_field_to_str(field), ret); + PrintError(VM_NONE, VCORE_NONE, "VMWRITE error on %s!: %d\n", v3_vmcs_field_to_str(field), ret); return 1; } + + + return 0; } @@ -77,7 +86,7 @@ static int inline check_vmcs_read(vmcs_field_t field, void * val) { ret = vmcs_read(field, val); if (ret != VMX_SUCCESS) { - PrintError("VMREAD error on %s!: %d\n", v3_vmcs_field_to_str(field), ret); + PrintError(VM_NONE, VCORE_NONE, "VMREAD error on %s!: %d\n", v3_vmcs_field_to_str(field), ret); } return ret; @@ -87,34 +96,71 @@ static int inline check_vmcs_read(vmcs_field_t field, void * val) { static addr_t allocate_vmcs() { + void *temp; struct vmcs_data * vmcs_page = NULL; - PrintDebug("Allocating page\n"); + PrintDebug(VM_NONE, VCORE_NONE, "Allocating page\n"); - vmcs_page = (struct vmcs_data *)V3_VAddr(V3_AllocPages(1)); + temp = V3_AllocPages(1); // need not be shadow-safe, not exposed to guest + if (!temp) { + PrintError(VM_NONE, VCORE_NONE, "Cannot allocate VMCS\n"); + return -1; + } + vmcs_page = (struct vmcs_data *)V3_VAddr(temp); memset(vmcs_page, 0, 4096); vmcs_page->revision = hw_info.basic_info.revision; - PrintDebug("VMX Revision: 0x%x\n", vmcs_page->revision); + PrintDebug(VM_NONE, VCORE_NONE, "VMX Revision: 0x%x\n", vmcs_page->revision); return (addr_t)V3_PAddr((void *)vmcs_page); } +#if 0 +static int debug_efer_read(struct guest_info * core, uint_t msr, struct v3_msr * src, void * priv_data) { + struct v3_msr * efer = (struct v3_msr *)&(core->ctrl_regs.efer); + V3_Print(core->vm_info, core, "\n\nEFER READ (val = %p)\n", (void *)efer->value); + + v3_print_guest_state(core); + v3_print_vmcs(); + + + src->value = efer->value; + return 0; +} + +static int debug_efer_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) { + struct v3_msr * efer = (struct v3_msr *)&(core->ctrl_regs.efer); + V3_Print(core->vm_info, core, "\n\nEFER WRITE (old_val = %p) (new_val = %p)\n", (void *)efer->value, (void *)src.value); + + v3_print_guest_state(core); + v3_print_vmcs(); + + efer->value = src.value; + + return 0; +} +#endif static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) { int vmx_ret = 0; + /* Get Available features */ + struct vmx_pin_ctrls avail_pin_ctrls; + avail_pin_ctrls.value = v3_vmx_get_ctrl_features(&(hw_info.pin_ctrls)); + /* ** */ + + // disable global interrupts for vm state initialization v3_disable_ints(); - PrintDebug("Loading VMCS\n"); + PrintDebug(core->vm_info, core, "Loading VMCS\n"); vmx_ret = vmcs_load(vmx_state->vmcs_ptr_phys); vmx_state->state = VMX_UNLAUNCHED; if (vmx_ret != VMX_SUCCESS) { - PrintError("VMPTRLD failed\n"); + PrintError(core->vm_info, core, "VMPTRLD failed\n"); return -1; } @@ -128,8 +174,8 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) vmx_state->sec_proc_ctrls.value = hw_info.sec_proc_ctrls.def_val; /* Print Control MSRs */ - PrintDebug("CR0 MSR: %p\n", (void *)(addr_t)hw_info.cr0.value); - PrintDebug("CR4 MSR: %p\n", (void *)(addr_t)hw_info.cr4.value); + V3_Print(core->vm_info, core, "CR0 MSR: req_val=%p, req_mask=%p\n", (void *)(addr_t)hw_info.cr0.req_val, (void *)(addr_t)hw_info.cr0.req_mask); + V3_Print(core->vm_info, core, "CR4 MSR: req_val=%p, req_mask=%p\n", (void *)(addr_t)hw_info.cr4.req_val, (void *)(addr_t)hw_info.cr4.req_mask); @@ -142,13 +188,29 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) /* Add external interrupts, NMI exiting, and virtual NMI */ vmx_state->pin_ctrls.nmi_exit = 1; + vmx_state->pin_ctrls.virt_nmi = 1; vmx_state->pin_ctrls.ext_int_exit = 1; + + /* We enable the preemption timer by default to measure accurate guest time */ + if (avail_pin_ctrls.active_preempt_timer) { + V3_Print(core->vm_info, core, "VMX Preemption Timer is available\n"); + vmx_state->pin_ctrls.active_preempt_timer = 1; + vmx_state->exit_ctrls.save_preempt_timer = 1; + } + + // we want it to use this when halting vmx_state->pri_proc_ctrls.hlt_exit = 1; + // cpuid tells it that it does not have these instructions + vmx_state->pri_proc_ctrls.monitor_exit = 1; + vmx_state->pri_proc_ctrls.mwait_exit = 1; + // we don't need to handle a pause, although this is where + // we could pull out of a spin lock acquire or schedule to find its partner vmx_state->pri_proc_ctrls.pause_exit = 0; + vmx_state->pri_proc_ctrls.tsc_offset = 1; #ifdef V3_CONFIG_TIME_VIRTUALIZE_TSC vmx_state->pri_proc_ctrls.rdtsc_exit = 1; @@ -171,11 +233,7 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) vmx_state->exit_ctrls.host_64_on = 1; #endif - // Hook all accesses to EFER register - v3_hook_msr(core->vm_info, EFER_MSR, - &v3_handle_efer_read, - &v3_handle_efer_write, - core); + // Restore host's EFER register on each VM EXIT vmx_state->exit_ctrls.ld_efer = 1; @@ -184,35 +242,51 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) vmx_state->exit_ctrls.save_efer = 1; vmx_state->entry_ctrls.ld_efer = 1; - // Cause VM_EXIT whenever CR4.VMXE or CR4.PAE bits are written - vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE | CR4_PAE); + vmx_state->exit_ctrls.save_pat = 1; + vmx_state->exit_ctrls.ld_pat = 1; + vmx_state->entry_ctrls.ld_pat = 1; + /* Temporary GPF trap */ + // vmx_state->excp_bmap.gp = 1; // Setup Guests initial PAT field vmx_ret |= check_vmcs_write(VMCS_GUEST_PAT, 0x0007040600070406LL); + // Capture CR8 mods so that we can keep the apic_tpr correct + vmx_state->pri_proc_ctrls.cr8_ld_exit = 1; + vmx_state->pri_proc_ctrls.cr8_str_exit = 1; + + /* Setup paging */ if (core->shdw_pg_mode == SHADOW_PAGING) { - PrintDebug("Creating initial shadow page table\n"); + PrintDebug(core->vm_info, core, "Creating initial shadow page table\n"); if (v3_init_passthrough_pts(core) == -1) { - PrintError("Could not initialize passthrough page tables\n"); + PrintError(core->vm_info, core, "Could not initialize passthrough page tables\n"); return -1; } #define CR0_PE 0x00000001 #define CR0_PG 0x80000000 #define CR0_WP 0x00010000 // To ensure mem hooks work - vmx_ret |= check_vmcs_write(VMCS_CR0_MASK, (CR0_PE | CR0_PG | CR0_WP)); +#define CR0_NE 0x00000020 + vmx_ret |= check_vmcs_write(VMCS_CR0_MASK, (CR0_PE | CR0_PG | CR0_WP | CR0_NE)); + + + // Cause VM_EXIT whenever CR4.VMXE or CR4.PAE bits are written + vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE | CR4_PAE ); - core->ctrl_regs.cr3 = core->direct_map_pt; + v3_activate_passthrough_pt(core); // vmx_state->pinbased_ctrls |= NMI_EXIT; /* Add CR exits */ vmx_state->pri_proc_ctrls.cr3_ld_exit = 1; vmx_state->pri_proc_ctrls.cr3_str_exit = 1; - + + // Note that we intercept cr4.pae writes + // and we have cr4 read-shadowed to the shadow pager's cr4 + vmx_state->pri_proc_ctrls.invlpg_exit = 1; /* Add page fault exits */ @@ -221,16 +295,26 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) // Setup VMX Assist v3_vmxassist_init(core, vmx_state); + // Hook all accesses to EFER register + v3_hook_msr(core->vm_info, EFER_MSR, + &v3_handle_efer_read, + &v3_handle_efer_write, + core); + } else if ((core->shdw_pg_mode == NESTED_PAGING) && - (v3_cpu_types[core->pcpu_id] == V3_VMX_EPT_CPU)) { + (v3_mach_type == V3_VMX_EPT_CPU)) { #define CR0_PE 0x00000001 #define CR0_PG 0x80000000 #define CR0_WP 0x00010000 // To ensure mem hooks work - vmx_ret |= check_vmcs_write(VMCS_CR0_MASK, (CR0_PE | CR0_PG | CR0_WP)); +#define CR0_NE 0x00000020 + vmx_ret |= check_vmcs_write(VMCS_CR0_MASK, (CR0_PE | CR0_PG | CR0_WP | CR0_NE)); // vmx_state->pinbased_ctrls |= NMI_EXIT; + // Cause VM_EXIT whenever CR4.VMXE or CR4.PAE bits are written + vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE | CR4_PAE); + /* Disable CR exits */ vmx_state->pri_proc_ctrls.cr3_ld_exit = 0; vmx_state->pri_proc_ctrls.cr3_str_exit = 0; @@ -249,13 +333,16 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) - if (v3_init_ept(core, &hw_info) == -1) { - PrintError("Error initializing EPT\n"); + if (v3_init_nested_paging_core(core, &hw_info) == -1) { + PrintError(core->vm_info, core, "Error initializing EPT\n"); return -1; } + // Hook all accesses to EFER register + v3_hook_msr(core->vm_info, EFER_MSR, NULL, NULL, NULL); + } else if ((core->shdw_pg_mode == NESTED_PAGING) && - (v3_cpu_types[core->pcpu_id] == V3_VMX_EPT_UG_CPU)) { + (v3_mach_type == V3_VMX_EPT_UG_CPU)) { int i = 0; // For now we will assume that unrestricted guest mode is assured w/ EPT @@ -264,7 +351,7 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) core->rip = 0xfff0; core->vm_regs.rdx = 0x00000f00; core->ctrl_regs.rflags = 0x00000002; // The reserved bit is always 1 - core->ctrl_regs.cr0 = 0x00000030; + core->ctrl_regs.cr0 = 0x60010030; core->ctrl_regs.cr4 = 0x00002010; // Enable VMX and PSE flag @@ -336,13 +423,24 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) vmx_state->pri_proc_ctrls.invlpg_exit = 0; - if (v3_init_ept(core, &hw_info) == -1) { - PrintError("Error initializing EPT\n"); + // Cause VM_EXIT whenever the CR4.VMXE bit is set + vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE); +#define CR0_NE 0x00000020 +#define CR0_CD 0x40000000 + vmx_ret |= check_vmcs_write(VMCS_CR0_MASK, CR0_NE | CR0_CD); + ((struct cr0_32 *)&(core->shdw_pg_state.guest_cr0))->ne = 1; + ((struct cr0_32 *)&(core->shdw_pg_state.guest_cr0))->cd = 0; + + if (v3_init_nested_paging_core(core, &hw_info) == -1) { + PrintError(core->vm_info, core, "Error initializing EPT\n"); return -1; } + // Hook all accesses to EFER register + // v3_hook_msr(core->vm_info, EFER_MSR, &debug_efer_read, &debug_efer_write, core); + v3_hook_msr(core->vm_info, EFER_MSR, NULL, NULL, NULL); } else { - PrintError("Invalid Virtual paging mode\n"); + PrintError(core->vm_info, core, "Invalid Virtual paging mode (pg_mode=%d) (mach_type=%d)\n", core->shdw_pg_mode, v3_mach_type); return -1; } @@ -358,17 +456,17 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) int max_msrs = (hw_info.misc_info.max_msr_cache_size + 1) * 4; int msr_ret = 0; - V3_Print("Setting up MSR load/store areas (max_msr_count=%d)\n", max_msrs); + V3_Print(core->vm_info, core, "Setting up MSR load/store areas (max_msr_count=%d)\n", max_msrs); if (max_msrs < 4) { - PrintError("Max MSR cache size is too small (%d)\n", max_msrs); + PrintError(core->vm_info, core, "Max MSR cache size is too small (%d)\n", max_msrs); return -1; } - vmx_state->msr_area_paddr = (addr_t)V3_AllocPages(1); + vmx_state->msr_area_paddr = (addr_t)V3_AllocPages(1); // need not be shadow-safe, not exposed to guest if (vmx_state->msr_area_paddr == (addr_t)NULL) { - PrintError("could not allocate msr load/store area\n"); + PrintError(core->vm_info, core, "could not allocate msr load/store area\n"); return -1; } @@ -410,12 +508,13 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) msr_ret |= v3_hook_msr(core->vm_info, FS_BASE_MSR, NULL, NULL, NULL); msr_ret |= v3_hook_msr(core->vm_info, GS_BASE_MSR, NULL, NULL, NULL); + msr_ret |= v3_hook_msr(core->vm_info, IA32_PAT_MSR, NULL, NULL, NULL); // Not sure what to do about this... Does not appear to be an explicit hardware cache version... msr_ret |= v3_hook_msr(core->vm_info, IA32_CSTAR_MSR, NULL, NULL, NULL); if (msr_ret != 0) { - PrintError("Error configuring MSR save/restore area\n"); + PrintError(core->vm_info, core, "Error configuring MSR save/restore area\n"); return -1; } @@ -448,16 +547,17 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) #endif + if (v3_update_vmcs_ctrl_fields(core)) { - PrintError("Could not write control fields!\n"); + PrintError(core->vm_info, core, "Could not write control fields!\n"); return -1; } /* if (v3_update_vmcs_host_state(core)) { - PrintError("Could not write host state\n"); + PrintError(core->vm_info, core, "Could not write host state\n"); return -1; } */ @@ -470,49 +570,91 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state) return 0; } -int v3_init_vmx_vmcs(struct guest_info * core, v3_vm_class_t vm_class) { + +static void __init_vmx_vmcs(void * arg) { + struct guest_info * core = arg; struct vmx_data * vmx_state = NULL; int vmx_ret = 0; vmx_state = (struct vmx_data *)V3_Malloc(sizeof(struct vmx_data)); + + if (!vmx_state) { + PrintError(core->vm_info, core, "Unable to allocate in initializing vmx vmcs\n"); + return; + } + memset(vmx_state, 0, sizeof(struct vmx_data)); - PrintDebug("vmx_data pointer: %p\n", (void *)vmx_state); + PrintDebug(core->vm_info, core, "vmx_data pointer: %p\n", (void *)vmx_state); - PrintDebug("Allocating VMCS\n"); + PrintDebug(core->vm_info, core, "Allocating VMCS\n"); vmx_state->vmcs_ptr_phys = allocate_vmcs(); - PrintDebug("VMCS pointer: %p\n", (void *)(vmx_state->vmcs_ptr_phys)); + PrintDebug(core->vm_info, core, "VMCS pointer: %p\n", (void *)(vmx_state->vmcs_ptr_phys)); core->vmm_data = vmx_state; vmx_state->state = VMX_UNLAUNCHED; - PrintDebug("Initializing VMCS (addr=%p)\n", core->vmm_data); + PrintDebug(core->vm_info, core, "Initializing VMCS (addr=%p)\n", core->vmm_data); // TODO: Fix vmcs fields so they're 32-bit - PrintDebug("Clearing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys); + PrintDebug(core->vm_info, core, "Clearing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys); vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys); if (vmx_ret != VMX_SUCCESS) { - PrintError("VMCLEAR failed\n"); - return -1; + PrintError(core->vm_info, core, "VMCLEAR failed\n"); + return; } - if (vm_class == V3_PC_VM) { - PrintDebug("Initializing VMCS\n"); + if (core->vm_info->vm_class == V3_PC_VM) { + PrintDebug(core->vm_info, core, "Initializing VMCS\n"); if (init_vmcs_bios(core, vmx_state) == -1) { - PrintError("Error initializing VMCS to BIOS state\n"); - return -1; + PrintError(core->vm_info, core, "Error initializing VMCS to BIOS state\n"); + return; } } else { - PrintError("Invalid VM Class\n"); - return -1; + PrintError(core->vm_info, core, "Invalid VM Class\n"); + return; } - PrintDebug("Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys); + PrintDebug(core->vm_info, core, "Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys); vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys); + core->core_run_state = CORE_STOPPED; + return; +} + + + +int v3_init_vmx_vmcs(struct guest_info * core, v3_vm_class_t vm_class) { + extern v3_cpu_arch_t v3_cpu_types[]; + + if (v3_cpu_types[V3_Get_CPU()] == V3_INVALID_CPU) { + int i = 0; + + for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) { + if (v3_cpu_types[i] != V3_INVALID_CPU) { + break; + } + } + + if (i == V3_CONFIG_MAX_CPUS) { + PrintError(core->vm_info, core, "Could not find VALID CPU for VMX guest initialization\n"); + return -1; + } + + V3_Call_On_CPU(i, __init_vmx_vmcs, core); + + } else { + __init_vmx_vmcs(core); + } + + if (core->core_run_state != CORE_STOPPED) { + PrintError(core->vm_info, core, "Error initializing VMX Core\n"); + return -1; + } + return 0; } @@ -535,45 +677,66 @@ int v3_deinit_vmx_vmcs(struct guest_info * core) { * JRL: This is broken */ int v3_vmx_save_core(struct guest_info * core, void * ctx){ - uint64_t vmcs_ptr = vmcs_store(); - - v3_chkpt_save(ctx, "vmcs_data", PAGE_SIZE, (void *)vmcs_ptr); - - return 0; + struct vmx_data * vmx_info = (struct vmx_data *)(core->vmm_data); + + // note that the vmcs pointer is an HPA, but we need an HVA + if (v3_chkpt_save(ctx, "vmcs_data", PAGE_SIZE_4KB, + V3_VAddr((void*) (vmx_info->vmcs_ptr_phys)))) { + PrintError(core->vm_info, core, "Could not save vmcs data for VMX\n"); + return -1; + } + + return 0; } int v3_vmx_load_core(struct guest_info * core, void * ctx){ - struct vmx_data * vmx_info = (struct vmx_data *)(core->vmm_data); - struct cr0_32 * shadow_cr0; - char vmcs[PAGE_SIZE_4KB]; - - v3_chkpt_load(ctx, "vmcs_data", PAGE_SIZE_4KB, vmcs); - - vmcs_clear(vmx_info->vmcs_ptr_phys); - vmcs_load((addr_t)vmcs); - - v3_vmx_save_vmcs(core); - - shadow_cr0 = (struct cr0_32 *)&(core->ctrl_regs.cr0); + struct vmx_data * vmx_info = (struct vmx_data *)(core->vmm_data); + struct cr0_32 * shadow_cr0; + addr_t vmcs_page_paddr; //HPA + + vmcs_page_paddr = (addr_t) V3_AllocPages(1); // need not be shadow-safe, not exposed to guest + + if (!vmcs_page_paddr) { + PrintError(core->vm_info, core, "Could not allocate space for a vmcs in VMX\n"); + return -1; + } + + if (v3_chkpt_load(ctx, "vmcs_data", PAGE_SIZE_4KB, + V3_VAddr((void *)vmcs_page_paddr)) == -1) { + PrintError(core->vm_info, core, "Could not load vmcs data for VMX\n"); + V3_FreePages((void*)vmcs_page_paddr,1); + return -1; + } + + vmcs_clear(vmx_info->vmcs_ptr_phys); + + // Probably need to delete the old one... + V3_FreePages((void*)(vmx_info->vmcs_ptr_phys),1); + + vmcs_load(vmcs_page_paddr); + + v3_vmx_save_vmcs(core); + shadow_cr0 = (struct cr0_32 *)&(core->ctrl_regs.cr0); - /* Get the CPU mode to set the guest_ia32e entry ctrl */ - if (core->shdw_pg_mode == SHADOW_PAGING) { - if (v3_get_vm_mem_mode(core) == VIRTUAL_MEM) { - if (v3_activate_shadow_pt(core) == -1) { - PrintError("Failed to activate shadow page tables\n"); - return -1; - } - } else { - if (v3_activate_passthrough_pt(core) == -1) { - PrintError("Failed to activate passthrough page tables\n"); - return -1; - } - } + /* Get the CPU mode to set the guest_ia32e entry ctrl */ + + if (core->shdw_pg_mode == SHADOW_PAGING) { + if (v3_get_vm_mem_mode(core) == VIRTUAL_MEM) { + if (v3_activate_shadow_pt(core) == -1) { + PrintError(core->vm_info, core, "Failed to activate shadow page tables\n"); + return -1; + } + } else { + if (v3_activate_passthrough_pt(core) == -1) { + PrintError(core->vm_info, core, "Failed to activate passthrough page tables\n"); + return -1; + } } - - return 0; + } + + return 0; } #endif @@ -593,7 +756,7 @@ static int update_irq_exit_state(struct guest_info * info) { if ((info->intr_core_state.irq_started == 1) && (idt_vec_info.valid == 0)) { #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Calling v3_injecting_intr\n"); + V3_Print(info->vm_info, info, "Calling v3_injecting_intr\n"); #endif info->intr_core_state.irq_started = 0; v3_injecting_intr(info, info->intr_core_state.irq_vector, V3_EXTERNAL_IRQ); @@ -625,14 +788,14 @@ static int update_irq_entry_state(struct guest_info * info) { int_info.error_code = 1; #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Injecting exception %d with error code %x\n", + V3_Print(info->vm_info, info, "Injecting exception %d with error code %x\n", int_info.vector, info->excp_state.excp_error_code); #endif } int_info.valid = 1; #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)(addr_t)info->rip); + V3_Print(info->vm_info, info, "Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)(addr_t)info->rip); #endif check_vmcs_write(VMCS_ENTRY_INT_INFO, int_info.value); @@ -644,7 +807,7 @@ static int update_irq_entry_state(struct guest_info * info) { if ((info->intr_core_state.irq_started == 1) && (idt_vec_info.valid == 1)) { #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("IRQ pending from previous injection\n"); + V3_Print(info->vm_info, info, "IRQ pending from previous injection\n"); #endif // Copy the IDT vectoring info over to reinject the old interrupt @@ -664,14 +827,21 @@ static int update_irq_entry_state(struct guest_info * info) { switch (v3_intr_pending(info)) { case V3_EXTERNAL_IRQ: { - info->intr_core_state.irq_vector = v3_get_intr(info); + + int irq = v3_get_intr(info); + + if (irq<0) { + break; + } + + info->intr_core_state.irq_vector = irq; ent_int.vector = info->intr_core_state.irq_vector; ent_int.type = 0; ent_int.error_code = 0; ent_int.valid = 1; #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Injecting Interrupt %d at exit %u(EIP=%p)\n", + V3_Print(info->vm_info, info, "Injecting Interrupt %d at exit %u(EIP=%p)\n", info->intr_core_state.irq_vector, (uint32_t)info->num_exits, (void *)(addr_t)info->rip); @@ -683,7 +853,7 @@ static int update_irq_entry_state(struct guest_info * info) { break; } case V3_NMI: - PrintDebug("Injecting NMI\n"); + PrintDebug(info->vm_info, info, "Injecting NMI\n"); ent_int.type = 2; ent_int.vector = 2; @@ -692,7 +862,7 @@ static int update_irq_entry_state(struct guest_info * info) { break; case V3_SOFTWARE_INTR: - PrintDebug("Injecting software interrupt\n"); + PrintDebug(info->vm_info, info, "Injecting software interrupt\n"); ent_int.type = 4; ent_int.valid = 1; @@ -716,7 +886,7 @@ static int update_irq_entry_state(struct guest_info * info) { check_vmcs_read(VMCS_EXIT_INSTR_LEN, &instr_len); #ifdef V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Enabling Interrupt-Window exiting: %d\n", instr_len); + V3_Print(info->vm_info, info, "Enabling Interrupt-Window exiting: %d\n", instr_len); #endif vmx_info->pri_proc_ctrls.int_wndw_exit = 1; @@ -739,18 +909,18 @@ static void print_exit_log(struct guest_info * info) { int i = 0; - V3_Print("\nExit Log (%d total exits):\n", (uint32_t)info->num_exits); + V3_Print(info->vm_info, info, "\nExit Log (%d total exits):\n", (uint32_t)info->num_exits); for (i = 0; i < 10; i++) { struct vmx_exit_info * tmp = &exit_log[cnt]; - V3_Print("%d:\texit_reason = %p\n", i, (void *)(addr_t)tmp->exit_reason); - V3_Print("\texit_qual = %p\n", (void *)tmp->exit_qual); - V3_Print("\tint_info = %p\n", (void *)(addr_t)tmp->int_info); - V3_Print("\tint_err = %p\n", (void *)(addr_t)tmp->int_err); - V3_Print("\tinstr_info = %p\n", (void *)(addr_t)tmp->instr_info); - V3_Print("\tguest_linear_addr= %p\n", (void *)(addr_t)tmp->guest_linear_addr); - V3_Print("\tRIP = %p\n", (void *)rip_log[cnt]); + V3_Print(info->vm_info, info, "%d:\texit_reason = %p\n", i, (void *)(addr_t)tmp->exit_reason); + V3_Print(info->vm_info, info, "\texit_qual = %p\n", (void *)tmp->exit_qual); + V3_Print(info->vm_info, info, "\tint_info = %p\n", (void *)(addr_t)tmp->int_info); + V3_Print(info->vm_info, info, "\tint_err = %p\n", (void *)(addr_t)tmp->int_err); + V3_Print(info->vm_info, info, "\tinstr_info = %p\n", (void *)(addr_t)tmp->instr_info); + V3_Print(info->vm_info, info, "\tguest_linear_addr= %p\n", (void *)(addr_t)tmp->guest_linear_addr); + V3_Print(info->vm_info, info, "\tRIP = %p\n", (void *)rip_log[cnt]); cnt--; @@ -763,41 +933,35 @@ static void print_exit_log(struct guest_info * info) { } -int -v3_vmx_schedule_timeout(struct guest_info * info) -{ - struct vmx_data * vmx_state = (struct vmx_data *)(info->vmm_data); - sint64_t cycles; - uint32_t timeout; - - /* Check if the hardware supports an active timeout */ -#define VMX_ACTIVE_PREEMPT_TIMER_PIN 0x40 - if (hw_info.pin_ctrls.req_mask & VMX_ACTIVE_PREEMPT_TIMER_PIN) { - /* The hardware doesn't support us modifying this pin control */ - return 0; - } +int +v3_vmx_config_tsc_virtualization(struct guest_info * info) { + struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); - /* Check if we have one to schedule and schedule it if we do */ - cycles = (sint64_t)info->time_state.next_timeout - (sint64_t)v3_get_guest_time(&info->time_state); - if (info->time_state.next_timeout == (ullong_t) -1) { - timeout = 0; - vmx_state->pin_ctrls.active_preempt_timer = 0; - } else if (cycles < 0) { - /* set the timeout to 0 to force an immediate re-exit since it expired between - * when we checked a timeout and now. IF SOMEONE CONTINAULLY SETS A SHORT TIMEOUT, - * THIS CAN LOCK US OUT OF THE GUEST! */ - timeout = 0; - vmx_state->pin_ctrls.active_preempt_timer = 1; + if (info->time_state.flags & VM_TIME_TRAP_RDTSC) { + if (!vmx_info->pri_proc_ctrls.rdtsc_exit) { + vmx_info->pri_proc_ctrls.rdtsc_exit = 1; + check_vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); + } } else { - /* The hardware supports scheduling a timeout, and we have one to - * schedule */ - timeout = (uint32_t)cycles >> hw_info.misc_info.tsc_multiple; - vmx_state->pin_ctrls.active_preempt_timer = 1; - } + sint64_t tsc_offset; + uint32_t tsc_offset_low, tsc_offset_high; + + if (vmx_info->pri_proc_ctrls.rdtsc_exit) { + vmx_info->pri_proc_ctrls.rdtsc_exit = 0; + check_vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); + } + + if (info->time_state.flags & VM_TIME_TSC_PASSTHROUGH) { + tsc_offset = 0; + } else { + tsc_offset = v3_tsc_host_offset(&info->time_state); + } + tsc_offset_high = (uint32_t)(( tsc_offset >> 32) & 0xffffffff); + tsc_offset_low = (uint32_t)(tsc_offset & 0xffffffff); - /* Actually program the timer based on the settings above. */ - check_vmcs_write(VMCS_PREEMPT_TIMER, timeout); - check_vmcs_write(VMCS_PIN_CTRLS, vmx_state->pin_ctrls.value); + check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high); + check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low); + } return 0; } @@ -811,30 +975,27 @@ v3_vmx_schedule_timeout(struct guest_info * info) */ int v3_vmx_enter(struct guest_info * info) { int ret = 0; - uint32_t tsc_offset_low, tsc_offset_high; struct vmx_exit_info exit_info; struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); + uint64_t guest_cycles = 0; // Conditionally yield the CPU if the timeslice has expired - v3_yield_cond(info); - - // Perform any additional yielding needed for time adjustment - v3_adjust_time(info); - - // Check for timeout - since this calls generic hooks in devices - // that may do things like pause the VM, it cannot be with interrupts - // disabled. - v3_check_timeout(info); + v3_schedule(info); - // disable global interrupts for vm state transition - v3_disable_ints(); +#ifdef V3_CONFIG_MEM_TRACK + v3_mem_track_entry(info); +#endif // Update timer devices late after being in the VM so that as much // of the time in the VM is accounted for as possible. Also do it before // updating IRQ entry state so that any interrupts the timers raise get - // handled on the next VM entry. Must be done with interrupts disabled. + // handled on the next VM entry. + v3_advance_time(info, NULL); v3_update_timers(info); + // disable global interrupts for vm state transition + v3_disable_ints(); + if (vmcs_store() != vmx_info->vmcs_ptr_phys) { vmcs_clear(vmx_info->vmcs_ptr_phys); vmcs_load(vmx_info->vmcs_ptr_phys); @@ -858,36 +1019,66 @@ int v3_vmx_enter(struct guest_info * info) { vmcs_write(VMCS_GUEST_CR3, guest_cr3); } - // Update vmx active preemption timer to exit at the next timeout if - // the hardware supports it. - v3_vmx_schedule_timeout(info); - - // Perform last-minute time bookkeeping prior to entering the VM - v3_time_enter_vm(info); - tsc_offset_high = (uint32_t)((v3_tsc_host_offset(&info->time_state) >> 32) & 0xffffffff); - tsc_offset_low = (uint32_t)(v3_tsc_host_offset(&info->time_state) & 0xffffffff); - check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high); - check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low); + // Perform last-minute time setup prior to entering the VM + v3_vmx_config_tsc_virtualization(info); if (v3_update_vmcs_host_state(info)) { v3_enable_ints(); - PrintError("Could not write host state\n"); + PrintError(info->vm_info, info, "Could not write host state\n"); return -1; } + + if (vmx_info->pin_ctrls.active_preempt_timer) { + /* Preemption timer is active */ + uint32_t preempt_window = 0xffffffff; - - if (vmx_info->state == VMX_UNLAUNCHED) { - vmx_info->state = VMX_LAUNCHED; - ret = v3_vmx_launch(&(info->vm_regs), info, &(info->ctrl_regs)); - } else { - V3_ASSERT(vmx_info->state != VMX_UNLAUNCHED); - ret = v3_vmx_resume(&(info->vm_regs), info, &(info->ctrl_regs)); + if (info->timeouts.timeout_active) { + preempt_window = info->timeouts.next_timeout; + } + + check_vmcs_write(VMCS_PREEMPT_TIMER, preempt_window); } - + V3_FP_ENTRY_RESTORE(info); + + { + uint64_t entry_tsc = 0; + uint64_t exit_tsc = 0; + +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY + v3_pwrstat_telemetry_enter(info); +#endif + +#ifdef V3_CONFIG_PMU_TELEMETRY + v3_pmu_telemetry_enter(info); +#endif - // PrintDebug("VMX Exit: ret=%d\n", ret); + if (vmx_info->state == VMX_UNLAUNCHED) { + vmx_info->state = VMX_LAUNCHED; + rdtscll(entry_tsc); + ret = v3_vmx_launch(&(info->vm_regs), info, &(info->ctrl_regs)); + rdtscll(exit_tsc); + + } else { + V3_ASSERT(info->vm_info, info,vmx_info->state != VMX_UNLAUNCHED); + rdtscll(entry_tsc); + ret = v3_vmx_resume(&(info->vm_regs), info, &(info->ctrl_regs)); + rdtscll(exit_tsc); + } + + guest_cycles = exit_tsc - entry_tsc; + +#ifdef V3_CONFIG_PMU_TELEMETRY + v3_pmu_telemetry_exit(info); +#endif + +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY + v3_pwrstat_telemetry_exit(info); +#endif + } + + // PrintDebug(info->vm_info, info, "VMX Exit: ret=%d\n", ret); if (ret != VMX_SUCCESS) { uint32_t error = 0; @@ -895,16 +1086,29 @@ int v3_vmx_enter(struct guest_info * info) { v3_enable_ints(); - PrintError("VMENTRY Error: %d (launch_ret = %d)\n", error, ret); + PrintError(info->vm_info, info, "VMENTRY Error: %d (launch_ret = %d)\n", error, ret); return -1; } + info->num_exits++; - // Immediate exit from VM time bookkeeping - v3_time_exit_vm(info); + V3_FP_EXIT_SAVE(info); - info->num_exits++; + /* If we have the preemption time, then use it to get more accurate guest time */ + if (vmx_info->pin_ctrls.active_preempt_timer) { + uint32_t cycles_left = 0; + check_vmcs_read(VMCS_PREEMPT_TIMER, &(cycles_left)); + + if (info->timeouts.timeout_active) { + guest_cycles = info->timeouts.next_timeout - cycles_left; + } else { + guest_cycles = 0xffffffff - cycles_left; + } + } + + // Immediate exit from VM time bookkeeping + v3_advance_time(info, &guest_cycles); /* Update guest state */ v3_vmx_save_vmcs(info); @@ -915,6 +1119,7 @@ int v3_vmx_enter(struct guest_info * info) { info->cpu_mode = v3_get_vm_cpu_mode(info); + check_vmcs_read(VMCS_EXIT_INSTR_LEN, &(exit_info.instr_len)); check_vmcs_read(VMCS_EXIT_INSTR_INFO, &(exit_info.instr_info)); check_vmcs_read(VMCS_EXIT_REASON, &(exit_info.exit_reason)); @@ -927,7 +1132,7 @@ int v3_vmx_enter(struct guest_info * info) { check_vmcs_read(VMCS_GUEST_PHYS_ADDR, &(exit_info.ept_fault_addr)); } - //PrintDebug("VMX Exit taken, id-qual: %u-%lu\n", exit_info.exit_reason, exit_info.exit_qual); + //PrintDebug(info->vm_info, info, "VMX Exit taken, id-qual: %u-%lu\n", exit_info.exit_reason, exit_info.exit_qual); exit_log[info->num_exits % 10] = exit_info; rip_log[info->num_exits % 10] = get_addr_linear(info, info->rip, &(info->segments.cs)); @@ -940,88 +1145,134 @@ int v3_vmx_enter(struct guest_info * info) { update_irq_exit_state(info); #endif - if (exit_info.exit_reason == VMEXIT_INTR_WINDOW) { + if (exit_info.exit_reason == VMX_EXIT_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 V3_CONFIG_DEBUG_INTERRUPTS - V3_Print("Interrupts available again! (RIP=%llx)\n", info->rip); + V3_Print(info->vm_info, info, "Interrupts available again! (RIP=%llx)\n", info->rip); #endif } + + // Lastly we check for an NMI exit, and reinject if so + { + struct vmx_basic_exit_info * basic_info = (struct vmx_basic_exit_info *)&(exit_info.exit_reason); + + if (basic_info->reason == VMX_EXIT_INFO_EXCEPTION_OR_NMI) { + if ((uint8_t)exit_info.int_info == 2) { + asm("int $2"); + } + } + } + // reenable global interrupts after vm exit v3_enable_ints(); // Conditionally yield the CPU if the timeslice has expired - v3_yield_cond(info); + v3_schedule(info); + v3_advance_time(info, NULL); + v3_update_timers(info); if (v3_handle_vmx_exit(info, &exit_info) == -1) { - PrintError("Error in VMX exit handler (Exit reason=%x)\n", exit_info.exit_reason); + PrintError(info->vm_info, info, "Error in VMX exit handler (Exit reason=%x)\n", exit_info.exit_reason); return -1; } + if (info->timeouts.timeout_active) { + /* Check to see if any timeouts have expired */ + v3_handle_timeouts(info, guest_cycles); + } + +#ifdef V3_CONFIG_MEM_TRACK + v3_mem_track_exit(info); +#endif + return 0; } int v3_start_vmx_guest(struct guest_info * info) { - PrintDebug("Starting VMX core %u\n", info->vcpu_id); - - if (info->vcpu_id == 0) { - info->core_run_state = CORE_RUNNING; - } else { - - PrintDebug("VMX core %u: Waiting for core initialization\n", info->vcpu_id); - - while (info->core_run_state == CORE_STOPPED) { + PrintDebug(info->vm_info, info, "Starting VMX core %u\n", info->vcpu_id); - if (info->vm_info->run_state == VM_STOPPED) { - // The VM was stopped before this core was initialized. - return 0; - } - - v3_yield(info); - //PrintDebug("VMX core %u: still waiting for INIT\n",info->vcpu_id); - } - - PrintDebug("VMX core %u initialized\n", info->vcpu_id); - - // We'll be paranoid about race conditions here - v3_wait_at_barrier(info); +#if V3_CONFIG_HVM + if (v3_setup_hvm_vm_for_boot(vm)) { + PrintError(vm, VCORE_NONE, "HVM setup for boot failed\n"); + return -1; } - - - PrintDebug("VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x), RIP=0x%p\n", - info->vcpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base), - info->segments.cs.limit, (void *)(info->rip)); - - - PrintDebug("VMX core %u: Launching VMX VM on logical core %u\n", info->vcpu_id, info->pcpu_id); - - v3_start_time(info); - +#endif + while (1) { - - if (info->vm_info->run_state == VM_STOPPED) { - info->core_run_state = CORE_STOPPED; - break; + if (info->core_run_state == CORE_STOPPED) { + if (info->vcpu_id == 0) { + info->core_run_state = CORE_RUNNING; + } else { + + PrintDebug(info->vm_info, info, "VMX core %u: Waiting for core initialization\n", info->vcpu_id); + + V3_NO_WORK(info); + + while (info->core_run_state == CORE_STOPPED) { + + if (info->vm_info->run_state == VM_STOPPED) { + // The VM was stopped before this core was initialized. + return 0; + } + + V3_STILL_NO_WORK(info); + //PrintDebug(info->vm_info, info, "VMX core %u: still waiting for INIT\n",info->vcpu_id); + } + + V3_HAVE_WORK_AGAIN(info); + + PrintDebug(info->vm_info, info, "VMX core %u initialized\n", info->vcpu_id); + + // We'll be paranoid about race conditions here + v3_wait_at_barrier(info); + } + + + PrintDebug(info->vm_info, info, "VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x), RIP=0x%p\n", + info->vcpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base), + info->segments.cs.limit, (void *)(info->rip)); + + + PrintDebug(info->vm_info, info, "VMX core %u: Launching VMX VM on logical core %u\n", info->vcpu_id, info->pcpu_id); + + v3_start_time(info); + + + if (info->vm_info->run_state == VM_STOPPED) { + info->core_run_state = CORE_STOPPED; + break; + } } - + + +#ifdef V3_CONFIG_PMU_TELEMETRY + v3_pmu_telemetry_start(info); +#endif + +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY + v3_pwrstat_telemetry_start(info); +#endif + + if (v3_vmx_enter(info) == -1) { - + addr_t host_addr; addr_t linear_addr = 0; info->vm_info->run_state = VM_ERROR; - V3_Print("VMX core %u: VMX ERROR!!\n", info->vcpu_id); + V3_Print(info->vm_info, info, "VMX core %u: VMX ERROR!!\n", info->vcpu_id); v3_print_guest_state(info); - V3_Print("VMX core %u\n", info->vcpu_id); + V3_Print(info->vm_info, info, "VMX core %u\n", info->vcpu_id); linear_addr = get_addr_linear(info, info->rip, &(info->segments.cs)); @@ -1031,9 +1282,9 @@ int v3_start_vmx_guest(struct guest_info * info) { v3_gva_to_hva(info, linear_addr, &host_addr); } - V3_Print("VMX core %u: Host Address of rip = 0x%p\n", info->vcpu_id, (void *)host_addr); + V3_Print(info->vm_info, info, "VMX core %u: Host Address of rip = 0x%p\n", info->vcpu_id, (void *)host_addr); - V3_Print("VMX core %u: Instr (15 bytes) at %p:\n", info->vcpu_id, (void *)host_addr); + V3_Print(info->vm_info, info, "VMX core %u: Instr (15 bytes) at %p:\n", info->vcpu_id, (void *)host_addr); v3_dump_mem((uint8_t *)host_addr, 15); v3_print_stack(info); @@ -1053,12 +1304,20 @@ int v3_start_vmx_guest(struct guest_info * info) { } /* if ((info->num_exits % 5000) == 0) { - V3_Print("VMX Exit number %d\n", (uint32_t)info->num_exits); + V3_Print(info->vm_info, info, "VMX Exit number %d\n", (uint32_t)info->num_exits); } */ } +#ifdef V3_CONFIG_PMU_TELEMETRY + v3_pmu_telemetry_end(info); +#endif + +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY + v3_pwrstat_telemetry_end(info); +#endif + return 0; } @@ -1075,20 +1334,20 @@ int v3_is_vmx_capable() { v3_cpuid(0x1, &eax, &ebx, &ecx, &edx); - PrintDebug("ECX: 0x%x\n", ecx); + PrintDebug(VM_NONE, VCORE_NONE, "ECX: 0x%x\n", ecx); if (ecx & CPUID_1_ECX_VTXFLAG) { v3_get_msr(VMX_FEATURE_CONTROL_MSR, &(feature_msr.hi), &(feature_msr.lo)); - PrintDebug("MSRREGlow: 0x%.8x\n", feature_msr.lo); + PrintDebug(VM_NONE, VCORE_NONE, "MSRREGlow: 0x%.8x\n", feature_msr.lo); if ((feature_msr.lo & CPUID_VMX_FEATURES) != CPUID_VMX_FEATURES) { - PrintDebug("VMX is locked -- enable in the BIOS\n"); + PrintDebug(VM_NONE, VCORE_NONE, "VMX is locked -- enable in the BIOS\n"); return 0; } } else { - PrintDebug("VMX not supported on this cpu\n"); + PrintDebug(VM_NONE, VCORE_NONE, "VMX not supported on this cpu\n"); return 0; } @@ -1100,7 +1359,7 @@ int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip) { // init vmcs bios if ((core->shdw_pg_mode == NESTED_PAGING) && - (v3_cpu_types[core->pcpu_id] == V3_VMX_EPT_UG_CPU)) { + (v3_mach_type == V3_VMX_EPT_UG_CPU)) { // easy core->rip = 0; core->segments.cs.selector = rip << 8; @@ -1119,10 +1378,11 @@ int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip) { void v3_init_vmx_cpu(int cpu_id) { addr_t vmx_on_region = 0; extern v3_cpu_arch_t v3_mach_type; + extern v3_cpu_arch_t v3_cpu_types[]; if (v3_mach_type == V3_INVALID_CPU) { if (v3_init_vmx_hw(&hw_info) == -1) { - PrintError("Could not initialize VMX hardware features on cpu %d\n", cpu_id); + PrintError(VM_NONE, VCORE_NONE, "Could not initialize VMX hardware features on cpu %d\n", cpu_id); return; } } @@ -1135,27 +1395,27 @@ void v3_init_vmx_cpu(int cpu_id) { if (vmx_on(vmx_on_region) == VMX_SUCCESS) { - V3_Print("VMX Enabled\n"); + V3_Print(VM_NONE, VCORE_NONE, "VMX Enabled\n"); host_vmcs_ptrs[cpu_id] = vmx_on_region; } else { - V3_Print("VMX already enabled\n"); + V3_Print(VM_NONE, VCORE_NONE, "VMX already enabled\n"); V3_FreePages((void *)vmx_on_region, 1); } - PrintDebug("VMXON pointer: 0x%p\n", (void *)host_vmcs_ptrs[cpu_id]); + PrintDebug(VM_NONE, VCORE_NONE, "VMXON pointer: 0x%p\n", (void *)host_vmcs_ptrs[cpu_id]); { struct vmx_sec_proc_ctrls sec_proc_ctrls; sec_proc_ctrls.value = v3_vmx_get_ctrl_features(&(hw_info.sec_proc_ctrls)); if (sec_proc_ctrls.enable_ept == 0) { - V3_Print("VMX EPT (Nested) Paging not supported\n"); + V3_Print(VM_NONE, VCORE_NONE, "VMX EPT (Nested) Paging not supported\n"); v3_cpu_types[cpu_id] = V3_VMX_CPU; } else if (sec_proc_ctrls.unrstrct_guest == 0) { - V3_Print("VMX EPT (Nested) Paging supported\n"); + V3_Print(VM_NONE, VCORE_NONE, "VMX EPT (Nested) Paging supported\n"); v3_cpu_types[cpu_id] = V3_VMX_EPT_CPU; } else { - V3_Print("VMX EPT (Nested) Paging + Unrestricted guest supported\n"); + V3_Print(VM_NONE, VCORE_NONE, "VMX EPT (Nested) Paging + Unrestricted guest supported\n"); v3_cpu_types[cpu_id] = V3_VMX_EPT_UG_CPU; } } @@ -1168,10 +1428,10 @@ void v3_deinit_vmx_cpu(int cpu_id) { v3_cpu_types[cpu_id] = V3_INVALID_CPU; if (host_vmcs_ptrs[cpu_id] != 0) { - V3_Print("Disabling VMX\n"); + V3_Print(VM_NONE, VCORE_NONE, "Disabling VMX\n"); if (vmx_off() != VMX_SUCCESS) { - PrintError("Error executing VMXOFF\n"); + PrintError(VM_NONE, VCORE_NONE, "Error executing VMXOFF\n"); } V3_FreePages((void *)host_vmcs_ptrs[cpu_id], 1);