X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=76a57ddcb091f6f666de04c90bc677d173fb0ee1;hb=6ce5a308d167ac392c0f0ca66811f51580358191;hp=e1f503499890a11818b3d21b827b6a13b2e70fa2;hpb=9fa4d593b592f3619310332bad6db2222d93679a;p=palacios-OLD.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index e1f5034..76a57dd 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -45,10 +45,14 @@ #include + +// This is a global pointer to the host's VMCB +static void * host_vmcb = NULL; + extern void v3_stgi(); extern void v3_clgi(); //extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs, uint64_t * fs, uint64_t * gs); -extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs); +extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs, vmcb_t * host_vmcb); static vmcb_t * Allocate_VMCB() { @@ -67,10 +71,11 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { uint_t i; - guest_state->rsp = vm_info->vm_regs.rsp; - // guest_state->rip = vm_info->rip; + // + guest_state->rsp = 0x00; guest_state->rip = 0xfff0; + guest_state->cpl = 0; guest_state->efer |= EFER_MSR_svm_enable; @@ -245,29 +250,18 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { } -static int init_svm_guest(struct guest_info *info, struct v3_vm_config * config_ptr) { - v3_config_guest(info, config_ptr); +static int init_svm_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - PrintDebug("Allocating VMCB\n"); - info->vmm_data = (void*)Allocate_VMCB(); - Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info); + v3_pre_config_guest(info, config_ptr); - v3_config_devices(info, config_ptr); + 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); - - info->run_state = VM_STOPPED; - - info->vm_regs.rdi = 0; - info->vm_regs.rsi = 0; - info->vm_regs.rbp = 0; - info->vm_regs.rsp = 0; - info->vm_regs.rbx = 0; - info->vm_regs.rdx = 0; - info->vm_regs.rcx = 0; - info->vm_regs.rax = 0; + v3_post_config_guest(info, config_ptr); return 0; } @@ -276,7 +270,7 @@ static int init_svm_guest(struct guest_info *info, struct v3_vm_config * config_ // can we start a kernel thread here... static int start_svm_guest(struct guest_info *info) { - vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); + // 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)); uint_t num_exits = 0; @@ -291,89 +285,32 @@ static int start_svm_guest(struct guest_info *info) { ullong_t tmp_tsc; -#ifdef __V3_64BIT__ - -#define MSR_LSTAR 0xc0000082 -#define MSR_CSTAR 0xc0000083 -#define MSR_SF_MASK 0xc0000084 -#define MSR_GS_BASE 0xc0000101 -#define MSR_KERNGS_BASE 0xc0000102 - struct v3_msr host_cstar; - struct v3_msr host_lstar; - struct v3_msr host_syscall_mask; - struct v3_msr host_gs_base; - struct v3_msr host_kerngs_base; - -#else - -#define MSR_STAR 0xc0000081 -#define MSR_SYSENTER_CS 0x00000174 -#define MSR_SYSENTER_ESP 0x00000175 -#define MSR_SYSENTER_EIP 0x00000176 - struct v3_msr host_star; - struct v3_msr host_sysenter_cs; - struct v3_msr host_sysenter_esp; - struct v3_msr host_sysenter_eip; - -#endif - - - /* PrintDebug("SVM Entry to CS=%p rip=%p...\n", (void *)(addr_t)info->segments.cs.base, (void *)(addr_t)info->rip); */ - -#ifdef __V3_64BIT__ - v3_get_msr(MSR_SF_MASK, &(host_syscall_mask.hi), &(host_syscall_mask.lo)); - v3_get_msr(MSR_LSTAR, &(host_lstar.hi), &(host_lstar.lo)); - v3_get_msr(MSR_CSTAR, &(host_cstar.hi), &(host_cstar.lo)); - v3_get_msr(MSR_GS_BASE, &(host_gs_base.hi), &(host_gs_base.lo)); - v3_get_msr(MSR_KERNGS_BASE, &(host_kerngs_base.hi), &(host_kerngs_base.lo)); -#else - v3_get_msr(MSR_SYSENTER_CS, &(host_sysenter_cs.hi), &(host_sysenter_cs.lo)); - v3_get_msr(MSR_SYSENTER_ESP, &(host_sysenter_esp.hi), &(host_sysenter_esp.lo)); - v3_get_msr(MSR_SYSENTER_EIP, &(host_sysenter_eip.hi), &(host_sysenter_eip.lo)); - v3_get_msr(MSR_STAR, &(host_star.hi), &(host_star.lo)); -#endif - + // disable global interrupts for vm state transition + v3_clgi(); rdtscll(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)); + v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcb); rdtscll(tmp_tsc); - -#ifdef __V3_64BIT__ - v3_set_msr(MSR_SF_MASK, host_syscall_mask.hi, host_syscall_mask.lo); - v3_set_msr(MSR_LSTAR, host_lstar.hi, host_lstar.lo); - v3_set_msr(MSR_CSTAR, host_cstar.hi, host_cstar.lo); - v3_set_msr(MSR_GS_BASE, host_gs_base.hi, host_gs_base.lo); - v3_set_msr(MSR_KERNGS_BASE, host_kerngs_base.hi, host_kerngs_base.lo); -#else - v3_set_msr(MSR_SYSENTER_CS, host_sysenter_cs.hi, host_sysenter_cs.lo); - v3_set_msr(MSR_SYSENTER_ESP, host_sysenter_esp.hi, host_sysenter_esp.lo); - v3_set_msr(MSR_SYSENTER_EIP, host_sysenter_eip.hi, host_sysenter_eip.lo); - v3_set_msr(MSR_STAR, host_star.hi, host_star.lo); -#endif - //PrintDebug("SVM Returned\n"); - + // reenable global interrupts after vm exit + v3_stgi(); v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); num_exits++; - - //PrintDebug("Turning on global interrupts\n"); - v3_stgi(); - v3_clgi(); if ((num_exits % 5000) == 0) { PrintDebug("SVM Exit number %d\n", num_exits); @@ -383,7 +320,6 @@ static int start_svm_guest(struct guest_info *info) { } } - if (v3_handle_svm_exit(info) != 0) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); @@ -394,23 +330,7 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("SVM ERROR!!\n"); - PrintDebug("RIP: %p\n", (void *)(addr_t)(guest_state->rip)); - - - linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs)); - - - PrintDebug("RIP Linear: %p\n", (void *)linear_addr); - v3_print_segments(info); - v3_print_ctrl_regs(info); - if (info->shdw_pg_mode == SHADOW_PAGING) { - PrintDebug("Shadow Paging Guest Registers:\n"); - PrintDebug("\tGuest CR0=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr0)); - PrintDebug("\tGuest CR3=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr3)); - PrintDebug("\tGuest EFER=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_efer.value)); - // CR4 - } - v3_print_GPRs(info); + v3_print_guest_state(info); PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code); @@ -516,7 +436,6 @@ static int has_svm_nested_paging() { void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { reg_ex_t msr; - void * host_state; extern v3_cpu_arch_t v3_cpu_type; // Enable SVM on the CPU @@ -528,15 +447,15 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { // Setup the host state save area - host_state = V3_AllocPages(4); + host_vmcb = V3_AllocPages(4); /* 64-BIT-ISSUE */ // msr.e_reg.high = 0; - //msr.e_reg.low = (uint_t)host_state; - msr.r_reg = (addr_t)host_state; + //msr.e_reg.low = (uint_t)host_vmcb; + msr.r_reg = (addr_t)host_vmcb; - PrintDebug("Host State being saved at %p\n", (void *)(addr_t)host_state); + PrintDebug("Host State being saved at %p\n", (void *)(addr_t)host_vmcb); v3_set_msr(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low); if (has_svm_nested_paging() == 1) {