X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=a88ff0e097a525125fba75abb7311f88264f18ba;hb=3a0ee76fe3accce60ae161615cadc6e56cac008b;hp=945aa70d0f9a50e84213a0030ce94a83d2618905;hpb=1f7a670397e97ea1028294d7b7b45d6ef1797d65;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 945aa70..a88ff0e 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -44,6 +44,12 @@ #include +#ifndef CONFIG_DEBUG_SVM +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + + uint32_t v3_last_exit; // This is a global pointer to the host's VMCB @@ -67,15 +73,13 @@ static vmcb_t * Allocate_VMCB() { -static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { +static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) { vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb); vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb); uint_t i; // - - ctrl_area->svm_instrs.VMRUN = 1; ctrl_area->svm_instrs.VMMCALL = 1; ctrl_area->svm_instrs.VMLOAD = 1; @@ -83,7 +87,6 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->svm_instrs.STGI = 1; ctrl_area->svm_instrs.CLGI = 1; ctrl_area->svm_instrs.SKINIT = 1; - ctrl_area->svm_instrs.RDTSCP = 1; ctrl_area->svm_instrs.ICEBP = 1; ctrl_area->svm_instrs.WBINVD = 1; ctrl_area->svm_instrs.MONITOR = 1; @@ -93,6 +96,12 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->instrs.CPUID = 1; ctrl_area->instrs.HLT = 1; + +#ifdef CONFIG_TIME_VIRTUALIZE_TSC + ctrl_area->instrs.RDTSC = 1; + ctrl_area->svm_instrs.RDTSCP = 1; +#endif + // guest_state->cr0 = 0x00000001; // PE /* @@ -113,7 +122,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->instrs.NMI = 1; - ctrl_area->instrs.SMI = 1; + ctrl_area->instrs.SMI = 0; // allow SMIs to run in guest ctrl_area->instrs.INIT = 1; ctrl_area->instrs.PAUSE = 1; ctrl_area->instrs.shutdown_evts = 1; @@ -125,37 +134,37 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { /* Setup Guest Machine state */ - vm_info->vm_regs.rsp = 0x00; - vm_info->rip = 0xfff0; + core->vm_regs.rsp = 0x00; + core->rip = 0xfff0; - vm_info->vm_regs.rdx = 0x00000f00; + core->vm_regs.rdx = 0x00000f00; - vm_info->cpl = 0; + core->cpl = 0; - vm_info->ctrl_regs.rflags = 0x00000002; // The reserved bit is always 1 - vm_info->ctrl_regs.cr0 = 0x60010010; // Set the WP flag so the memory hooks work in real-mode - vm_info->ctrl_regs.efer |= EFER_MSR_svm_enable; + core->ctrl_regs.rflags = 0x00000002; // The reserved bit is always 1 + core->ctrl_regs.cr0 = 0x60010010; // Set the WP flag so the memory hooks work in real-mode + core->ctrl_regs.efer |= EFER_MSR_svm_enable; - vm_info->segments.cs.selector = 0xf000; - vm_info->segments.cs.limit = 0xffff; - vm_info->segments.cs.base = 0x0000000f0000LL; + core->segments.cs.selector = 0xf000; + core->segments.cs.limit = 0xffff; + core->segments.cs.base = 0x0000000f0000LL; // (raw attributes = 0xf3) - vm_info->segments.cs.type = 0x3; - vm_info->segments.cs.system = 0x1; - vm_info->segments.cs.dpl = 0x3; - vm_info->segments.cs.present = 1; + core->segments.cs.type = 0x3; + core->segments.cs.system = 0x1; + core->segments.cs.dpl = 0x3; + core->segments.cs.present = 1; - struct v3_segment * segregs [] = {&(vm_info->segments.ss), &(vm_info->segments.ds), - &(vm_info->segments.es), &(vm_info->segments.fs), - &(vm_info->segments.gs), NULL}; + struct v3_segment * segregs [] = {&(core->segments.ss), &(core->segments.ds), + &(core->segments.es), &(core->segments.fs), + &(core->segments.gs), NULL}; for ( i = 0; segregs[i] != NULL; i++) { struct v3_segment * seg = segregs[i]; @@ -172,31 +181,28 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { seg->present = 1; } - vm_info->segments.gdtr.limit = 0x0000ffff; - vm_info->segments.gdtr.base = 0x0000000000000000LL; - vm_info->segments.idtr.limit = 0x0000ffff; - vm_info->segments.idtr.base = 0x0000000000000000LL; + core->segments.gdtr.limit = 0x0000ffff; + core->segments.gdtr.base = 0x0000000000000000LL; + core->segments.idtr.limit = 0x0000ffff; + core->segments.idtr.base = 0x0000000000000000LL; - vm_info->segments.ldtr.selector = 0x0000; - vm_info->segments.ldtr.limit = 0x0000ffff; - vm_info->segments.ldtr.base = 0x0000000000000000LL; - vm_info->segments.tr.selector = 0x0000; - vm_info->segments.tr.limit = 0x0000ffff; - vm_info->segments.tr.base = 0x0000000000000000LL; + core->segments.ldtr.selector = 0x0000; + core->segments.ldtr.limit = 0x0000ffff; + core->segments.ldtr.base = 0x0000000000000000LL; + core->segments.tr.selector = 0x0000; + core->segments.tr.limit = 0x0000ffff; + core->segments.tr.base = 0x0000000000000000LL; - vm_info->dbg_regs.dr6 = 0x00000000ffff0ff0LL; - vm_info->dbg_regs.dr7 = 0x0000000000000400LL; + core->dbg_regs.dr6 = 0x00000000ffff0ff0LL; + core->dbg_regs.dr7 = 0x0000000000000400LL; - v3_init_svm_io_map(vm_info); - ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr(vm_info->io_map.arch_data); + ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr(core->vm_info->io_map.arch_data); ctrl_area->instrs.IOIO_PROT = 1; - - - v3_init_svm_msr_map(vm_info); - ctrl_area->MSRPM_BASE_PA = (addr_t)V3_PAddr(vm_info->msr_map.arch_data); - ctrl_area->instrs.MSR_PROT = 1; + + ctrl_area->MSRPM_BASE_PA = (addr_t)V3_PAddr(core->vm_info->msr_map.arch_data); + ctrl_area->instrs.MSR_PROT = 1; PrintDebug("Exiting on interrupts\n"); @@ -204,7 +210,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->instrs.INTR = 1; - if (vm_info->shdw_pg_mode == SHADOW_PAGING) { + if (core->shdw_pg_mode == SHADOW_PAGING) { PrintDebug("Creating initial shadow page table\n"); /* JRL: This is a performance killer, and a simplistic solution */ @@ -213,17 +219,17 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->guest_ASID = 1; - if (v3_init_passthrough_pts(vm_info) == -1) { + if (v3_init_passthrough_pts(core) == -1) { PrintError("Could not initialize passthrough page tables\n"); return ; } - vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL; + core->shdw_pg_state.guest_cr0 = 0x0000000000000010LL; PrintDebug("Created\n"); - vm_info->ctrl_regs.cr0 |= 0x80000000; - vm_info->ctrl_regs.cr3 = vm_info->direct_map_pt; + core->ctrl_regs.cr0 |= 0x80000000; + core->ctrl_regs.cr3 = core->direct_map_pt; ctrl_area->cr_reads.cr0 = 1; ctrl_area->cr_writes.cr0 = 1; @@ -232,10 +238,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { ctrl_area->cr_reads.cr3 = 1; ctrl_area->cr_writes.cr3 = 1; - v3_hook_msr(vm_info, EFER_MSR, + v3_hook_msr(core->vm_info, EFER_MSR, &v3_handle_efer_read, &v3_handle_efer_write, - vm_info); + core); ctrl_area->instrs.INVLPG = 1; @@ -245,7 +251,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { - } else if (vm_info->shdw_pg_mode == NESTED_PAGING) { + } else if (core->shdw_pg_mode == NESTED_PAGING) { // Flush the TLB on entries/exits ctrl_area->TLB_CONTROL = 1; ctrl_area->guest_ASID = 1; @@ -256,12 +262,12 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * vm_info) { PrintDebug("NP_Enable at 0x%p\n", (void *)&(ctrl_area->NP_ENABLE)); // Set the Nested Page Table pointer - if (v3_init_passthrough_pts(vm_info) == -1) { + if (v3_init_passthrough_pts(core) == -1) { PrintError("Could not initialize Nested page tables\n"); return ; } - ctrl_area->N_CR3 = vm_info->direct_map_pt; + ctrl_area->N_CR3 = core->direct_map_pt; guest_state->g_pat = 0x7040600070406ULL; } @@ -289,27 +295,30 @@ int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class) { static int update_irq_exit_state(struct guest_info * info) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); - if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { + // Fix for QEMU bug using EVENTINJ as an internal cache + guest_ctrl->EVENTINJ.valid = 0; + + if ((info->intr_core_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { #ifdef CONFIG_DEBUG_INTERRUPTS - PrintDebug("INTAK cycle completed for irq %d\n", info->intr_state.irq_vector); + PrintDebug("INTAK cycle completed for irq %d\n", info->intr_core_state.irq_vector); #endif - info->intr_state.irq_started = 1; - info->intr_state.irq_pending = 0; + info->intr_core_state.irq_started = 1; + info->intr_core_state.irq_pending = 0; - v3_injecting_intr(info, info->intr_state.irq_vector, V3_EXTERNAL_IRQ); + v3_injecting_intr(info, info->intr_core_state.irq_vector, V3_EXTERNAL_IRQ); } - if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) { + if ((info->intr_core_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) { #ifdef CONFIG_DEBUG_INTERRUPTS - PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector); + PrintDebug("Interrupt %d taken by guest\n", info->intr_core_state.irq_vector); #endif // Interrupt was taken fully vectored - info->intr_state.irq_started = 0; + info->intr_core_state.irq_started = 0; - } else { + } else if ((info->intr_core_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 1)) { #ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector); #endif @@ -322,6 +331,12 @@ static int update_irq_exit_state(struct guest_info * info) { static int update_irq_entry_state(struct guest_info * info) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); + + if (info->intr_core_state.irq_pending == 0) { + guest_ctrl->guest_ctrl.V_IRQ = 0; + guest_ctrl->guest_ctrl.V_INTR_VECTOR = 0; + } + if (v3_excp_pending(info)) { uint_t excp = v3_get_excp_number(info); @@ -348,12 +363,12 @@ static int update_irq_entry_state(struct guest_info * info) { #endif v3_injecting_excp(info, excp); - } else if (info->intr_state.irq_started == 1) { + } else if (info->intr_core_state.irq_started == 1) { #ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("IRQ pending from previous injection\n"); #endif guest_ctrl->guest_ctrl.V_IRQ = 1; - guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector; + guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_core_state.irq_vector; guest_ctrl->guest_ctrl.V_IGN_TPR = 1; guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; @@ -373,8 +388,8 @@ static int update_irq_entry_state(struct guest_info * info) { (void *)(addr_t)info->rip); #endif - info->intr_state.irq_pending = 1; - info->intr_state.irq_vector = irq; + info->intr_core_state.irq_pending = 1; + info->intr_core_state.irq_vector = irq; break; } @@ -410,9 +425,11 @@ static int update_irq_entry_state(struct guest_info * info) { int v3_svm_enter(struct guest_info * info) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - ullong_t tmp_tsc; addr_t exit_code = 0, exit_info1 = 0, exit_info2 = 0; + v3_update_timers(info); + v3_adjust_time(info); + // Conditionally yield the CPU if the timeslice has expired v3_yield_cond(info); @@ -438,8 +455,8 @@ int v3_svm_enter(struct guest_info * info) { guest_state->rip = info->rip; guest_state->rsp = info->vm_regs.rsp; -#ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 0) { +#ifdef CONFIG_SYMCALL + if (info->sym_core_state.symcall_state.sym_call_active == 0) { update_irq_entry_state(info); } #else @@ -455,36 +472,28 @@ int v3_svm_enter(struct guest_info * info) { (void *)(addr_t)info->rip); */ -#ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 1) { +#ifdef CONFIG_SYMCALL + if (info->sym_core_state.symcall_state.sym_call_active == 1) { if (guest_ctrl->guest_ctrl.V_IRQ == 1) { V3_Print("!!! Injecting Interrupt during Sym call !!!\n"); } } #endif - - rdtscll(info->time_state.cached_host_tsc); - guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc; + guest_ctrl->TSC_OFFSET = v3_tsc_host_offset(&info->time_state); //V3_Print("Calling v3_svm_launch\n"); - + v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]); - - //V3_Print("SVM Returned: Exit Code: %x, guest_rip=%lx\n", (uint32_t)(guest_ctrl->exit_code), (unsigned long)guest_state->rip); + //V3_Print("SVM Returned: Exit Code: %x, guest_rip=%lx\n", (uint32_t)(guest_ctrl->exit_code), (unsigned long)guest_state->rip); v3_last_exit = (uint32_t)(guest_ctrl->exit_code); - rdtscll(tmp_tsc); - //PrintDebug("SVM Returned\n"); info->num_exits++; - v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); - - // Save Guest state from VMCB info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; @@ -514,8 +523,8 @@ int v3_svm_enter(struct guest_info * info) { exit_info2 = guest_ctrl->exit_info2; -#ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 0) { +#ifdef CONFIG_SYMCALL + if (info->sym_core_state.symcall_state.sym_call_active == 0) { update_irq_exit_state(info); } #else @@ -531,6 +540,7 @@ int v3_svm_enter(struct guest_info * info) { v3_yield_cond(info); + if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) { PrintError("Error in SVM exit handler\n"); return -1; @@ -541,56 +551,87 @@ int v3_svm_enter(struct guest_info * info) { } -int v3_start_svm_guest(struct guest_info *info) { +int v3_start_svm_guest(struct guest_info * info) { // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); // vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); + PrintDebug("Starting SVM core %u\n", info->cpu_id); + + if (info->cpu_id == 0) { + info->core_run_state = CORE_RUNNING; + info->vm_info->run_state = VM_RUNNING; + } else { + PrintDebug("SVM core %u: Waiting for core initialization\n", info->cpu_id); + while (info->core_run_state == CORE_STOPPED) { + v3_yield(info); + //PrintDebug("SVM core %u: still waiting for INIT\n",info->cpu_id); + } + + PrintDebug("SVM core %u initialized\n", info->cpu_id); + } + + PrintDebug("SVM core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x), RIP=0x%p\n", + info->cpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base), + info->segments.cs.limit, (void *)(info->rip)); - PrintDebug("Launching SVM VM (vmcb=%p)\n", (void *)info->vmm_data); + + + PrintDebug("SVM core %u: Launching SVM VM (vmcb=%p)\n", info->cpu_id, (void *)info->vmm_data); //PrintDebugVMCB((vmcb_t*)(info->vmm_data)); - info->run_state = VM_RUNNING; - rdtscll(info->yield_start_cycle); - + v3_start_time(info); while (1) { + + if (info->vm_info->run_state == VM_STOPPED) { + info->core_run_state = CORE_STOPPED; + break; + } + if (v3_svm_enter(info) == -1) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); addr_t host_addr; addr_t linear_addr = 0; - info->run_state = VM_ERROR; + info->vm_info->run_state = VM_ERROR; - V3_Print("SVM ERROR!!\n"); + V3_Print("SVM core %u: SVM ERROR!!\n", info->cpu_id); v3_print_guest_state(info); - V3_Print("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code); + V3_Print("SVM core %u: SVM Exit Code: %p\n", info->cpu_id, (void *)(addr_t)guest_ctrl->exit_code); - V3_Print("exit_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1)); - V3_Print("exit_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4)); + V3_Print("SVM core %u: exit_info1 low = 0x%.8x\n", info->cpu_id, *(uint_t*)&(guest_ctrl->exit_info1)); + V3_Print("SVM core %u: exit_info1 high = 0x%.8x\n", info->cpu_id, *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4)); - V3_Print("exit_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2)); - V3_Print("exit_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4)); + V3_Print("SVM core %u: exit_info2 low = 0x%.8x\n", info->cpu_id, *(uint_t*)&(guest_ctrl->exit_info2)); + V3_Print("SVM core %u: exit_info2 high = 0x%.8x\n", info->cpu_id, *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4)); linear_addr = get_addr_linear(info, info->rip, &(info->segments.cs)); if (info->mem_mode == PHYSICAL_MEM) { - guest_pa_to_host_va(info, linear_addr, &host_addr); + v3_gpa_to_hva(info, linear_addr, &host_addr); } else if (info->mem_mode == VIRTUAL_MEM) { - guest_va_to_host_va(info, linear_addr, &host_addr); + v3_gva_to_hva(info, linear_addr, &host_addr); } - V3_Print("Host Address of rip = 0x%p\n", (void *)host_addr); + V3_Print("SVM core %u: Host Address of rip = 0x%p\n", info->cpu_id, (void *)host_addr); - V3_Print("Instr (15 bytes) at %p:\n", (void *)host_addr); + V3_Print("SVM core %u: Instr (15 bytes) at %p:\n", info->cpu_id, (void *)host_addr); v3_dump_mem((uint8_t *)host_addr, 15); v3_print_stack(info); break; } + + + if (info->vm_info->run_state == VM_STOPPED) { + info->core_run_state = CORE_STOPPED; + break; + } + /* if ((info->num_exits % 5000) == 0) { @@ -599,6 +640,9 @@ int v3_start_svm_guest(struct guest_info *info) { */ } + + // Need to take down the other cores on error... + return 0; }