X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=50d2b85087c7b5c6a73f3a6d18b894072e6e6016;hb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;hp=ba7f5b3fc56bfe27efa1c7ef1a9d8644e20189cf;hpb=9a2cb919a10e02ddaa418560854ef72c2081070d;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index ba7f5b3..50d2b85 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -39,12 +39,13 @@ #include #include -#include #include #include +uint32_t v3_last_exit; + // This is a global pointer to the host's VMCB static addr_t host_vmcbs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0}; @@ -66,7 +67,7 @@ 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; @@ -124,37 +125,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]; @@ -171,31 +172,32 @@ 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); + /** THESE NEED TO BE MOVED TO GLOBAL LOCATION **/ + v3_init_svm_io_map(core->vm_info); + 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); + v3_init_svm_msr_map(core->vm_info); + 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"); @@ -203,7 +205,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 */ @@ -212,17 +214,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; @@ -231,10 +233,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; @@ -244,7 +246,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; @@ -255,58 +257,58 @@ 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; } } -static int init_svm_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - - - v3_pre_config_guest(info, config_ptr); +int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class) { PrintDebug("Allocating VMCB\n"); info->vmm_data = (void*)Allocate_VMCB(); - - PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data); - Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); - - v3_post_config_guest(info, config_ptr); + + if (vm_class == V3_PC_VM) { + PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data); + Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); + } else { + PrintError("Invalid VM class\n"); + return -1; + } return 0; } -static int update_irq_state_atomic(struct guest_info * info) { +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)) { + 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 { #ifdef CONFIG_DEBUG_INTERRUPTS @@ -318,7 +320,7 @@ static int update_irq_state_atomic(struct guest_info * info) { } -static int update_irq_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 (v3_excp_pending(info)) { @@ -347,12 +349,12 @@ static int update_irq_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; @@ -372,8 +374,8 @@ static int update_irq_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; } @@ -436,6 +438,16 @@ int v3_svm_enter(struct guest_info * info) { guest_state->rax = info->vm_regs.rax; guest_state->rip = info->rip; guest_state->rsp = info->vm_regs.rsp; + +#ifdef CONFIG_SYMBIOTIC + if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) { + update_irq_entry_state(info); + } +#else + update_irq_entry_state(info); +#endif + + /* ** */ /* @@ -445,7 +457,7 @@ int v3_svm_enter(struct guest_info * info) { */ #ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 1) { + if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 1) { if (guest_ctrl->guest_ctrl.V_IRQ == 1) { V3_Print("!!! Injecting Interrupt during Sym call !!!\n"); } @@ -454,10 +466,15 @@ int v3_svm_enter(struct guest_info * info) { 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 = info->time_state.guest_tsc - info->time_state.cached_host_tsc; v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]); + + v3_last_exit = (uint32_t)(guest_ctrl->exit_code); + + // v3_print_cond("SVM Returned: Exit Code: %x\n", (uint32_t)(guest_ctrl->exit_code)); + rdtscll(tmp_tsc); //PrintDebug("SVM Returned\n"); @@ -497,11 +514,11 @@ int v3_svm_enter(struct guest_info * info) { #ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 0) { - update_irq_state_atomic(info); + if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) { + update_irq_exit_state(info); } #else - update_irq_state_atomic(info); + update_irq_exit_state(info); #endif @@ -518,19 +535,12 @@ int v3_svm_enter(struct guest_info * info) { return -1; } -#ifdef CONFIG_SYMBIOTIC - if (info->sym_state.sym_call_active == 0) { - update_irq_state(info); - } -#else - update_irq_state(info); -#endif return 0; } -static int 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)); @@ -539,7 +549,7 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("Launching SVM VM (vmcb=%p)\n", (void *)info->vmm_data); //PrintDebugVMCB((vmcb_t*)(info->vmm_data)); - info->run_state = VM_RUNNING; + info->vm_info->run_state = VM_RUNNING; rdtscll(info->yield_start_cycle); @@ -549,7 +559,7 @@ static int start_svm_guest(struct guest_info *info) { 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"); @@ -581,13 +591,12 @@ static int start_svm_guest(struct guest_info *info) { break; } +/* if ((info->num_exits % 5000) == 0) { V3_Print("SVM Exit number %d\n", (uint32_t)info->num_exits); } - - +*/ - } return 0; } @@ -690,15 +699,6 @@ void v3_init_svm_cpu(int cpu_id) { } -void v3_init_svm_hooks(struct v3_ctrl_ops * vmm_ops) { - - // Setup the SVM specific vmm operations - vmm_ops->init_guest = &init_svm_guest; - vmm_ops->start_guest = &start_svm_guest; - vmm_ops->has_nested_paging = &has_svm_nested_paging; - - return; -}