X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=490e3428560ad8333e49f7be4f8bb936d98a3eb1;hp=ae275c165f32edeaf5f5a83eb24a8c44af43c616;hb=23bb96e0a0572322649a4a7d74c52b248064b2ba;hpb=9928ec9289de6658a2830370b1d1b514833515d0 diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index ae275c1..490e342 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -36,8 +36,6 @@ #include -#include - #include #include @@ -126,7 +124,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { vm_info->vm_regs.rdx = 0x00000f00; - guest_state->cr0 = 0x60000010; + + guest_state->cr0 = 0x60010010; // Set the WP flag so the memory hooks work in real-mode guest_state->cs.selector = 0xf000; @@ -266,9 +265,6 @@ static int init_svm_guest(struct guest_info * info, struct v3_vm_config * config return 0; } - - -// 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_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); @@ -280,10 +276,14 @@ static int start_svm_guest(struct guest_info *info) { //PrintDebugVMCB((vmcb_t*)(info->vmm_data)); info->run_state = VM_RUNNING; - + rdtscll(info->yield_start_cycle); + + while (1) { ullong_t tmp_tsc; + // Conditionally yield the CPU if the timeslice has expired + v3_yield_cond(info); /* PrintDebug("SVM Entry to CS=%p rip=%p...\n", @@ -309,18 +309,18 @@ static int start_svm_guest(struct guest_info *info) { // reenable global interrupts after vm exit v3_stgi(); + + // Conditionally yield the CPU if the timeslice has expired + v3_yield_cond(info); + + v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); num_exits++; if ((num_exits % 5000) == 0) { PrintDebug("SVM Exit number %d\n", num_exits); - - if (info->enable_profiler) { - v3_print_profile(info); - } } - if (v3_handle_svm_exit(info) != 0) { vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); addr_t host_addr; @@ -340,17 +340,18 @@ static int start_svm_guest(struct guest_info *info) { PrintDebug("exit_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2)); PrintDebug("exit_info2 high = 0x%.8x\n", *(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); } else if (info->mem_mode == VIRTUAL_MEM) { guest_va_to_host_va(info, linear_addr, &host_addr); } - PrintDebug("Host Address of rip = 0x%p\n", (void *)host_addr); PrintDebug("Instr (15 bytes) at %p:\n", (void *)host_addr); - PrintTraceMemDump((uchar_t *)host_addr, 15); + v3_dump_mem((uint8_t *)host_addr, 15); break; } @@ -369,11 +370,11 @@ int v3_is_svm_capable() { uint_t vm_cr_low = 0, vm_cr_high = 0; addr_t eax = 0, ebx = 0, ecx = 0, edx = 0; - v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx); + v3_cpuid(CPUID_EXT_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_ecx=%p\n", (void *)ecx); + PrintDebug("CPUID_EXT_FEATURE_IDS_ecx=%p\n", (void *)ecx); - if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { + if ((ecx & CPUID_EXT_FEATURE_IDS_ecx_svm_avail) == 0) { PrintDebug("SVM Not Available\n"); return 0; } else { @@ -386,7 +387,7 @@ int v3_is_svm_capable() { v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_edx=%p\n", (void *)edx); + PrintDebug("CPUID_SVM_REV_AND_FEATURE_IDS_edx=%p\n", (void *)edx); if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { PrintDebug("SVM BIOS Disabled, not unlockable\n"); @@ -399,10 +400,10 @@ int v3_is_svm_capable() { PrintDebug("SVM is available and enabled.\n"); v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_eax=%p\n", (void *)eax); - PrintDebug("CPUID_FEATURE_IDS_ebx=%p\n", (void *)ebx); - PrintDebug("CPUID_FEATURE_IDS_ecx=%p\n", (void *)ecx); - PrintDebug("CPUID_FEATURE_IDS_edx=%p\n", (void *)edx); + PrintDebug("CPUID_SVM_REV_AND_FEATURE_IDS_eax=%p\n", (void *)eax); + PrintDebug("CPUID_SVM_REV_AND_FEATURE_IDS_ebx=%p\n", (void *)ebx); + PrintDebug("CPUID_SVM_REV_AND_FEATURE_IDS_ecx=%p\n", (void *)ecx); + PrintDebug("CPUID_SVM_REV_AND_FEATURE_IDS_edx=%p\n", (void *)edx); if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { @@ -421,7 +422,7 @@ static int has_svm_nested_paging() { v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - //PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); + //PrintDebug("CPUID_EXT_FEATURE_IDS_edx=0x%x\n", edx); if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { PrintDebug("SVM Nested Paging not supported\n"); @@ -445,11 +446,9 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { PrintDebug("SVM Enabled\n"); - // Setup the host state save area host_vmcb = V3_AllocPages(4); - /* 64-BIT-ISSUE */ // msr.e_reg.high = 0; //msr.e_reg.low = (uint_t)host_vmcb; @@ -460,69 +459,6 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { - /* - * Test VMSAVE/VMLOAD Latency - */ -#define vmsave ".byte 0x0F,0x01,0xDB ; " -#define vmload ".byte 0x0F,0x01,0xDA ; " - { - uint32_t start_lo, start_hi; - uint32_t end_lo, end_hi; - uint64_t start, end; - - __asm__ __volatile__ ( - "rdtsc ; " - "movl %%eax, %%esi ; " - "movl %%edx, %%edi ; " - "movq %%rcx, %%rax ; " - vmsave - "rdtsc ; " - : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),"=d"(end_hi) - : "c"(host_vmcb), "0"(0), "1"(0), "2"(0), "3"(0) - ); - - start = start_hi; - start <<= 32; - start += start_lo; - - end = end_hi; - end <<= 32; - end += end_lo; - - - PrintDebug("VMSave Cycle Latency: %d\n", (uint32_t)(end - start)); - - - - - __asm__ __volatile__ ( - "rdtsc ; " - "movl %%eax, %%esi ; " - "movl %%edx, %%edi ; " - "movq %%rcx, %%rax ; " - vmload - "rdtsc ; " - : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),"=d"(end_hi) - : "c"(host_vmcb), "0"(0), "1"(0), "2"(0), "3"(0) - ); - - start = start_hi; - start <<= 32; - start += start_lo; - - end = end_hi; - end <<= 32; - end += end_lo; - - - PrintDebug("VMLoad Cycle Latency: %d\n", (uint32_t)(end - start)); - - - - } - - - /* End Latency Test */ if (has_svm_nested_paging() == 1) { v3_cpu_type = V3_SVM_REV3_CPU; @@ -589,126 +525,63 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { -/*static void Init_VMCB(vmcb_t * vmcb, struct guest_info vm_info) { - 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; - - - guest_state->rsp = vm_info.vm_regs.rsp; - guest_state->rip = vm_info.rip; - - - //ctrl_area->instrs.instrs.CR0 = 1; - ctrl_area->cr_reads.cr0 = 1; - ctrl_area->cr_writes.cr0 = 1; - - guest_state->efer |= EFER_MSR_svm_enable; - guest_state->rflags = 0x00000002; // The reserved bit is always 1 - ctrl_area->svm_instrs.VMRUN = 1; - // guest_state->cr0 = 0x00000001; // PE - ctrl_area->guest_ASID = 1; - - - ctrl_area->exceptions.de = 1; - ctrl_area->exceptions.df = 1; - ctrl_area->exceptions.pf = 1; - ctrl_area->exceptions.ts = 1; - ctrl_area->exceptions.ss = 1; - ctrl_area->exceptions.ac = 1; - ctrl_area->exceptions.mc = 1; - ctrl_area->exceptions.gp = 1; - ctrl_area->exceptions.ud = 1; - ctrl_area->exceptions.np = 1; - ctrl_area->exceptions.of = 1; - ctrl_area->exceptions.nmi = 1; - - guest_state->cs.selector = 0x0000; - guest_state->cs.limit=~0u; - guest_state->cs.base = guest_state->cs.selector<<4; - guest_state->cs.attrib.raw = 0xf3; - - - struct vmcb_selector *segregs [] = {&(guest_state->ss), &(guest_state->ds), &(guest_state->es), &(guest_state->fs), &(guest_state->gs), NULL}; - for ( i = 0; segregs[i] != NULL; i++) { - struct vmcb_selector * seg = segregs[i]; +#if 0 +/* + * Test VMSAVE/VMLOAD Latency + */ +#define vmsave ".byte 0x0F,0x01,0xDB ; " +#define vmload ".byte 0x0F,0x01,0xDA ; " +{ + uint32_t start_lo, start_hi; + uint32_t end_lo, end_hi; + uint64_t start, end; - seg->selector = 0x0000; - seg->base = seg->selector << 4; - seg->attrib.raw = 0xf3; - seg->limit = ~0u; - } - - if (vm_info.io_map.num_ports > 0) { - struct vmm_io_hook * iter; - addr_t io_port_bitmap; + __asm__ __volatile__ ( + "rdtsc ; " + "movl %%eax, %%esi ; " + "movl %%edx, %%edi ; " + "movq %%rcx, %%rax ; " + vmsave + "rdtsc ; " + : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),"=d"(end_hi) + : "c"(host_vmcb), "0"(0), "1"(0), "2"(0), "3"(0) + ); - io_port_bitmap = (addr_t)V3_AllocPages(3); - memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3); + start = start_hi; + start <<= 32; + start += start_lo; - ctrl_area->IOPM_BASE_PA = io_port_bitmap; + end = end_hi; + end <<= 32; + end += end_lo; + + PrintDebug("VMSave Cycle Latency: %d\n", (uint32_t)(end - start)); + + __asm__ __volatile__ ( + "rdtsc ; " + "movl %%eax, %%esi ; " + "movl %%edx, %%edi ; " + "movq %%rcx, %%rax ; " + vmload + "rdtsc ; " + : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),"=d"(end_hi) + : "c"(host_vmcb), "0"(0), "1"(0), "2"(0), "3"(0) + ); + + start = start_hi; + start <<= 32; + start += start_lo; - //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap); + end = end_hi; + end <<= 32; + end += end_lo; - FOREACH_IO_HOOK(vm_info.io_map, iter) { - ushort_t port = iter->port; - uchar_t * bitmap = (uchar_t *)io_port_bitmap; - bitmap += (port / 8); - PrintDebug("Setting Bit in block %x\n", bitmap); - *bitmap |= 1 << (port % 8); + PrintDebug("VMLoad Cycle Latency: %d\n", (uint32_t)(end - start)); } + /* End Latency Test */ - - //PrintDebugMemDump((uchar_t*)io_port_bitmap, PAGE_SIZE *2); - - ctrl_area->instrs.IOIO_PROT = 1; - } - - ctrl_area->instrs.INTR = 1; - - - - if (vm_info.page_mode == SHADOW_PAGING) { - PrintDebug("Creating initial shadow page table\n"); - vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pts_32(&vm_info) & ~0xfff); - PrintDebug("Created\n"); - - guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3; - - ctrl_area->cr_reads.cr3 = 1; - ctrl_area->cr_writes.cr3 = 1; - - - ctrl_area->instrs.INVLPG = 1; - ctrl_area->instrs.INVLPGA = 1; - - guest_state->g_pat = 0x7040600070406ULL; - - guest_state->cr0 |= 0x80000000; - } else if (vm_info.page_mode == NESTED_PAGING) { - // Flush the TLB on entries/exits - //ctrl_area->TLB_CONTROL = 1; - - // Enable Nested Paging - //ctrl_area->NP_ENABLE = 1; - - //PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE)); - - // Set the Nested Page Table pointer - // ctrl_area->N_CR3 = ((addr_t)vm_info.page_tables); - // ctrl_area->N_CR3 = (addr_t)(vm_info.page_tables); - - // ctrl_area->N_CR3 = Get_CR3(); - // guest_state->cr3 |= (Get_CR3() & 0xfffff000); - - // guest_state->g_pat = 0x7040600070406ULL; - } - - - -} -*/ +#endif