X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=4f1ecb28936b711c5833f70def2794b7d4d17b17;hb=bb96a58c91406a06af87c21d76d1f08872667ea5;hp=5ab70f6526e9961e868ece32c159fcc247bc2241;hpb=333f5653d38e4f7b77425b0c18b2496f2b2f8660;p=palacios.git diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index 5ab70f6..4f1ecb2 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include // @@ -31,10 +34,11 @@ // // - +#if 0 #include #include +#include @@ -50,7 +54,6 @@ extern int Launch_VM(ullong_t vmcsPtr, uint_t eip); #define ROMBIOS_DEBUG_PORT 0x403 -static struct VM theVM; static uint_t GetLinearIP(struct VM * vm) { if (vm->state == VM_VMXASSIST_V8086_BIOS || vm->state == VM_VMXASSIST_V8086) { @@ -76,12 +79,7 @@ uint_t myregs = 0; - -extern uint_t VMCS_CLEAR(); -extern uint_t VMCS_LOAD(); -extern uint_t VMCS_STORE(); extern uint_t VMCS_LAUNCH(); -extern uint_t VMCS_RESUME(); extern uint_t Init_VMCS_HostState(); extern uint_t Init_VMCS_GuestState(); @@ -123,60 +121,61 @@ void DecodeCurrentInstruction(struct VM *vm, struct Instruction *inst) } -static void V8086ModeSegmentRegisterFixup(struct VM *vm) -{ - vm->vmcs.guestStateArea.cs.baseAddr = vm->vmcs.guestStateArea.cs.selector << 4; - vm->vmcs.guestStateArea.es.baseAddr = vm->vmcs.guestStateArea.es.selector << 4; - vm->vmcs.guestStateArea.ss.baseAddr = vm->vmcs.guestStateArea.ss.selector << 4; - vm->vmcs.guestStateArea.ds.baseAddr = vm->vmcs.guestStateArea.ds.selector << 4; - vm->vmcs.guestStateArea.fs.baseAddr = vm->vmcs.guestStateArea.fs.selector << 4; - vm->vmcs.guestStateArea.gs.baseAddr = vm->vmcs.guestStateArea.gs.selector << 4; -} - -static void SetupV8086ModeForBoot(struct VM *vm) +static void setup_v8086_mode_for_boot(struct guest_info* vm_info) { - vm->state = VM_VMXASSIST_V8086_BIOS; - - // Put guest into V8086 mode on return - vm->vmcs.guestStateArea.rflags |= EFLAGS_VM | EFLAGS_IOPL_HI | EFLAGS_IOPL_LO ; - - // We will start at f000:fff0 on return - // - // We want this to look as much as possible as a processor - // reset - vm->vmcs.guestStateArea.rip = 0xfff0; // note, 16 bit rip - vm->vmcs.guestStateArea.cs.selector = 0xf000; - vm->vmcs.guestStateArea.cs.limit = 0xffff; - vm->vmcs.guestStateArea.cs.access.as_dword = 0xf3; - - vm->vmcs.guestStateArea.ss.selector = 0x0000; - vm->vmcs.guestStateArea.ss.limit = 0xffff; - vm->vmcs.guestStateArea.ss.access.as_dword = 0xf3; - - vm->vmcs.guestStateArea.ds.selector = 0x0000; - vm->vmcs.guestStateArea.ds.limit = 0xffff; - vm->vmcs.guestStateArea.ds.access.as_dword = 0xf3; - - vm->vmcs.guestStateArea.es.selector = 0x0000; - vm->vmcs.guestStateArea.es.limit = 0xffff; - vm->vmcs.guestStateArea.es.access.as_dword = 0xf3; - - vm->vmcs.guestStateArea.fs.selector = 0x0000; - vm->vmcs.guestStateArea.fs.limit = 0xffff; - vm->vmcs.guestStateArea.fs.access.as_dword = 0xf3; - - vm->vmcs.guestStateArea.gs.selector = 0x0000; - vm->vmcs.guestStateArea.gs.limit = 0xffff; - vm->vmcs.guestStateArea.gs.access.as_dword = 0xf3; - - V8086ModeSegmentRegisterFixup(vm); - - PrintTrace_VMCSData(&(vm->vmcs)); + ((struct vmx_data*)vm_info->vmm_data)->state = VMXASSIST_V8086_BIOS; + ((struct rflags)info->ctrl_regs.rflags).vm = 1; + ((struct rflags)info->ctrl_regs.rflags).iopl = 3; + + + vm_info->rip = 0xfff0; + + vm_info->segments.cs.selector = 0xf000; + vm_info->segments.cs.base = 0xf000<<4; + vm_info->segments.cs.limit = 0xffff; + vm_info->segments.cs.type = 3; + vm_info->segments.cs.system = 1; + vm_info->segments.cs.dpl = 3; + vm_info->segments.cs.present = 1; + vm_info->segments.cs.granularity = 0; + + vm_info->segments.ss.selector = 0x0000; + vm_info->segments.ss.base = 0x0000<<4; + vm_info->segments.ss.limit = 0xffff; + vm_info->segments.ss.type = 3; + vm_info->segments.ss.system = 1; + vm_info->segments.ss.dpl = 3; + vm_info->segments.ss.present = 1; + vm_info->segments.ss.granularity = 0; + + vm_info->segments.es.selector = 0x0000; + vm_info->segments.es.base = 0x0000<<4; + vm_info->segments.es.limit = 0xffff; + vm_info->segments.es.type = 3; + vm_info->segments.es.system = 1; + vm_info->segments.es.dpl = 3; + vm_info->segments.es.present = 1; + vm_info->segments.es.granularity = 0; + + vm_info->segments.fs.selector = 0x0000; + vm_info->segments.fs.base = 0x0000<<4; + vm_info->segments.fs.limit = 0xffff; + vm_info->segments.fs.type = 3; + vm_info->segments.fs.system = 1; + vm_info->segments.fs.dpl = 3; + vm_info->segments.fs.present = 1; + vm_info->segments.fs.granularity = 0; + + vm_info->segments.gs.selector = 0x0000; + vm_info->segments.gs.base = 0x0000<<4; + vm_info->segments.gs.limit = 0xffff; + vm_info->segments.gs.type = 3; + vm_info->segments.gs.system = 1; + vm_info->segments.gs.dpl = 3; + vm_info->segments.gs.present = 1; + vm_info->segments.gs.granularity = 0; } - - - static void ConfigureExits(struct VM *vm) { @@ -343,7 +342,153 @@ int VMLaunch(struct VMDescriptor *vm) // // +#endif + +static int update_vmcs_host_state(struct guest_info * info) { + addr_t tmp; + + struct { + uint16_t limit; + addr_t base; + } __attribute__((packed)) tmp_seg; + + + struct v3_msr tmp_msr; + + __asm__ __volatile__ ( "movq %%cr0, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_CR0, tmp); + + + __asm__ __volatile__ ( "movq %%cr3, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_CR3, tmp); + + + __asm__ __volatile__ ( "movq %%cr4, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_CR4, tmp); + + + + + __asm__ __volatile__ ("sgdt (%0); " + : + :"q"(&tmp_seg) + : "memory" + ); + vmcs_write(VMCS_HOST_GDTR_BASE, tmp_seg.base); + + + __asm__ __volatile__ ("sidt (%0); " + : + :"q"(&tmp_seg) + : "memory" + ); + vmcs_write(VMCS_HOST_IDTR_BASE, tmp_seg.base); + + /* How do we handle this...? + __asm__ __volatile__ ("str (%0); " + : + :"q"(&tmp_seg) + : "memory" + ); + vmcs_write(VMCS_HOST_TR_BASE, tmp_seg.base); + */ + +#define FS_BASE_MSR 0xc0000100 +#define GS_BASE_MSR 0xc0000101 + + // FS.BASE MSR + v3_get_msr(FS_BASE_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + vmcs_write(VMCS_HOST_FS_BASE, tmp_msr.value); + + // GS.BASE MSR + v3_get_msr(GS_BASE_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + vmcs_write(VMCS_HOST_GS_BASE, tmp_msr.value); + + + + __asm__ __volatile__ ( "movq %%cs, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_CS_SELECTOR, tmp); + + __asm__ __volatile__ ( "movq %%ss, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_SS_SELECTOR, tmp); + + __asm__ __volatile__ ( "movq %%ds, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_DS_SELECTOR, tmp); + + __asm__ __volatile__ ( "movq %%es, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_ES_SELECTOR, tmp); + + __asm__ __volatile__ ( "movq %%fs, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_FS_SELECTOR, tmp); + + __asm__ __volatile__ ( "movq %%gs, %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_GS_SELECTOR, tmp); + + __asm__ __volatile__ ( "str %0; " + : "=q"(tmp) + : + ); + vmcs_write(VMCS_HOST_TR_SELECTOR, tmp); + + +#define SYSENTER_CS_MSR 0x00000174 +#define SYSENTER_ESP_MSR 0x00000175 +#define SYSENTER_EIP_MSR 0x00000176 + + // SYSENTER CS MSR + v3_get_msr(SYSENTER_CS_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + vmcs_write(VMCS_HOST_SYSENTER_CS, tmp_msr.value); + // SYSENTER_ESP MSR + v3_get_msr(SYSENTER_ESP_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + vmcs_write(VMCS_HOST_SYSENTER_ESP, tmp_msr.value); + + // SYSENTER_EIP MSR + v3_get_msr(SYSENTER_EIP_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + vmcs_write(VMCS_HOST_SYSENTER_EIP, tmp_msr.value); + + + // RIP + // RSP + + return 0; +} + + + + + +static struct vmcs_data* vmxon_ptr; + + +#if 0 // For the 32 bit reserved bit fields // MB1s are in the low 32 bits, MBZs are in the high 32 bits of the MSR static uint32_t sanitize_bits1(uint32_t msr_num, uint32_t val) { @@ -353,7 +498,7 @@ static uint32_t sanitize_bits1(uint32_t msr_num, uint32_t val) { v3_get_msr(msr_num, &mask_msr.hi, &mask_msr.lo); - PrintDebug("MSR %x = %x : %x \n", msr_num, msr.hi, msr.lo); + PrintDebug("MSR %x = %x : %x \n", msr_num, mask_msr.hi, mask_msr.lo); val &= mask_msr.lo; val &= mask_msr.hi; @@ -362,6 +507,7 @@ static uint32_t sanitize_bits1(uint32_t msr_num, uint32_t val) { } + static addr_t sanitize_bits2(uint32_t msr_num0, uint32_t msr_num1, addr_t val) { v3_msr_t msr0, msr1; addr_t msr0_val, msr1_val; @@ -375,7 +521,7 @@ static addr_t sanitize_bits2(uint32_t msr_num0, uint32_t msr_num1, addr_t val) { msr0_val = msr0.value; msr1_val = msr1.value; - PrintDebug("MSR %x = %p, %x = %p \n", msr_num0, msr0_val, msr_num1, msr1_val); + PrintDebug("MSR %x = %p, %x = %p \n", msr_num0, (void*)msr0_val, msr_num1, (void*)msr1_val); val &= msr0_val; val &= msr1_val; @@ -383,24 +529,36 @@ static addr_t sanitize_bits2(uint32_t msr_num0, uint32_t msr_num1, addr_t val) { return val; } +static int setup_base_host_state() { + + + + // vmwrite(HOST_IDTR_BASE, + + +} + +#endif -static vmcs_t * allocate_vmcs() { +static struct vmcs_data* allocate_vmcs() { reg_ex_t msr; - vmcs_t * vmcs_page = (vmcs_t *)V3_VAddr(V3_AllocPages(1)); + struct vmcs_data* vmcs_page = (struct vmcs_data*)V3_VAddr(V3_AllocPages(1)); - memset(vmcb_page, 0, 4096); + memset(vmcs_page, 0, 4096); v3_get_msr(VMX_BASIC_MSR, &(msr.e_reg.high), &(msr.e_reg.low)); - *(uint32_t *)vmcs_page = ((struct vmx_basic_msr *)msr.val)->revision; + vmcs_page->revision = ((struct vmx_basic_msr*)&msr)->revision; return vmcs_page; } -static void init_vmcs_bios(vmcs_t * vmcs, struct guest_info * vm_info) { +static void init_vmcs_bios(struct guest_info * vm_info) +{ + } @@ -409,11 +567,17 @@ static void init_vmcs_bios(vmcs_t * vmcs, struct guest_info * vm_info) { static int init_vmx_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { v3_pre_config_guest(info, config_ptr); + struct vmx_data* data; + + PrintDebug("Allocating vmx_data\n"); + data = (struct vmx_data*)V3_Malloc(sizeof(struct vmx_data)); PrintDebug("Allocating VMCS\n"); - info->vmm_data = (void *)allocate_vmcs(); + data->vmcs = allocate_vmcs(); - PrintDebug("Initializing VMCS (addr=%p)\n", (void *)info->vmm_data); - init_vmcs_bios((vmcs_t *)(info->vmm_data), info); + info->vmm_data = (void*)data; + + PrintDebug("Initializing VMCS (addr=%p)\n", info->vmm_data); + init_vmcs_bios(info); v3_post_config_guest(info, config_ptr); @@ -423,7 +587,26 @@ static int init_vmx_guest(struct guest_info * info, struct v3_vm_config * config -static int start_svm_guest(struct guest_info *info) { +static int start_vmx_guest(struct guest_info *info) { + struct vmx_data* vmx_data = (struct vmx_data*)info->vmm_data; + int vmx_ret; + + // Have to do a whole lot of flag setting here + vmx_ret = vmcs_clear(vmx_data->vmcs); + if(vmx_ret != VMX_SUCCESS) { + PrintDebug("VMCS Clear failed\n"); + return -1; + } + vmx_ret = vmcs_load(vmx_data->vmcs); + if(vmx_ret != VMX_SUCCESS) { + PrintDebug("Executing VMPTRLD\n"); + return -1; + } + + + update_vmcs_host_state(info); + + // Setup guest state return -1; } @@ -433,25 +616,26 @@ static int start_svm_guest(struct guest_info *info) { int v3_is_vmx_capable() { - uint_t ret; v3_msr_t feature_msr; addr_t eax = 0, ebx = 0, ecx = 0, edx = 0; - v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx); + v3_cpuid(0x1, &eax, &ebx, &ecx, &edx); + + PrintDebug("ECX: %p\n", (void*)ecx); if (ecx & CPUID_1_ECX_VTXFLAG) { - v3_get_msr(IA32_FEATURE_CONTROL_MSR, &(feature_msr.hi), &(feature_msr.lo)); + v3_get_msr(VMX_FEATURE_CONTROL_MSR, &(feature_msr.hi), &(feature_msr.lo)); - PrintTrace("MSRREGlow: 0x%.8x\n", feature_msr.lo); + PrintTrace("MSRREGlow: 0x%.8x\n", feature_msr.lo); - if ((feature_msr.lo & FEATURE_CONTROL_VALID) != FEATURE_CONTROL_VALID) { - PrintDebug("VMX is locked -- enable in the BIOS\n"); - return 0; - } + if ((feature_msr.lo & FEATURE_CONTROL_VALID) != FEATURE_CONTROL_VALID) { + PrintDebug("VMX is locked -- enable in the BIOS\n"); + return 0; + } } else { - PrintDebug("VMX not supported on this cpu\n"); - return 0; + PrintDebug("VMX not supported on this cpu\n"); + return 0; } return 1; @@ -471,58 +655,49 @@ struct seg_descriptor { }; -static int setup_base_host_state() { - uint8_t gdt[10]; - - - - // vmwrite(HOST_IDTR_BASE, - -} +void v3_init_vmx(struct v3_ctrl_ops * vmm_ops) { + extern v3_cpu_arch_t v3_cpu_type; - -void v3_init_vmx(struct v3_ctrl_ops * vm_ops) { - v3_msr_t basic_msr; - - // Setup the host state save area - void * host_state = V3_AllocPages(1); - - v3_get_msr(VMX_BASIC_MSR, &(basic_msr.hi), &(basic_msr.lo)); - *(uint32_t *)host_state = ((struct vmx_basic_msr *)basic_msr.value)->revision; - - PrintDebug("VMX revision: 0x%p\n", host_state); - __asm__ __volatile__ ( - "movl %%cr4, %%ebx; " - "orl %%ebx, 0x00002000; " - "movl %%ebx, %%cr4" + "movq %%cr4, %%rbx; " + "orq $0x00002000,%%rbx; " + "movq %%rbx, %%cr4;" + : + : + : "%rbx" ); // Should check and return Error here.... __asm__ __volatile__ ( - "movl %%cr0, %%ebx; " - "orl %%ebx, 0x00000020; " - "movl %%ebx, %%cr0" + "movq %%cr0, %%rbx; " + "orq $0x00000020,%%rbx; " + "movq %%rbx, %%cr0;" + : + : + : "%rbx" ); + // Setup VMXON Region + vmxon_ptr = allocate_vmcs(); + PrintDebug("VMX revision: 0x%p\n", (void*)vmxon_ptr); - if (v3_enable_vmx(host_state) == 0) { - PrintDebug("VMX Enabled\n"); + if (v3_enable_vmx(vmxon_ptr) == 0) { + PrintDebug("VMX Enabled\n"); } else { - PrintError("VMX initialization failure\n"); - return; + PrintError("VMX initialization failure\n"); + return; } if (has_vmx_nested_paging() == 1) { - v3_cpu_type = V3_VMX_EPT_CPU; + v3_cpu_type = V3_VMX_EPT_CPU; } else { - v3_cpu_type = V3_VMX_CPU; + v3_cpu_type = V3_VMX_CPU; } // Setup the VMX specific vmm operations