X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=00a9ebd0ae4c8feb87ae2ea2acd7b0e6e0fde623;hb=85dbf9793951dfd1cc387b5b54284983ab984c1b;hp=121da9fc905fc288a23afa1bc285aa5e170d7704;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 121da9f..00a9ebd 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -1,3 +1,26 @@ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + + + + #include #include @@ -10,35 +33,24 @@ #include #include +#include +#include - -extern uint_t cpuid_ecx(uint_t op); -extern uint_t cpuid_edx(uint_t op); -extern void Get_MSR(uint_t MSR, uint_t * high_byte, uint_t * low_byte); -extern void Set_MSR(uint_t MSR, uint_t high_byte, uint_t low_byte); -extern uint_t launch_svm(vmcb_t * vmcb_addr); -extern void safe_svm_launch(vmcb_t * vmcb_addr, struct v3_gprs * gprs); - -extern void STGI(); -extern void CLGI(); - extern uint_t Get_CR3(); -extern void DisableInts(); -extern void EnableInts(); - - +extern void v3_stgi(); +extern void v3_clgi(); +extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs); static vmcb_t * Allocate_VMCB() { - vmcb_t * vmcb_page = (vmcb_t *)V3_AllocPages(1); - + vmcb_t * vmcb_page = (vmcb_t *)V3_VAddr(V3_AllocPages(1)); memset(vmcb_page, 0, 4096); @@ -68,6 +80,20 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { guest_state->efer |= EFER_MSR_svm_enable; guest_state->rflags = 0x00000002; // The reserved bit is always 1 ctrl_area->svm_instrs.VMRUN = 1; + ctrl_area->svm_instrs.VMMCALL = 1; + ctrl_area->svm_instrs.VMLOAD = 1; + ctrl_area->svm_instrs.VMSAVE = 1; + 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; + ctrl_area->svm_instrs.MWAIT_always = 1; + ctrl_area->svm_instrs.MWAIT_if_armed = 1; + + ctrl_area->instrs.HLT = 1; // guest_state->cr0 = 0x00000001; // PE ctrl_area->guest_ASID = 1; @@ -107,6 +133,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { guest_state->cs.attrib.raw = 0xf3; + /* DEBUG FOR RETURN CODE */ + ctrl_area->exit_code = 1; + + 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]; @@ -138,10 +168,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { struct vmm_io_hook * iter; addr_t io_port_bitmap; - io_port_bitmap = (addr_t)V3_AllocPages(3); + io_port_bitmap = (addr_t)V3_VAddr(V3_AllocPages(3)); memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3); - ctrl_area->IOPM_BASE_PA = io_port_bitmap; + ctrl_area->IOPM_BASE_PA = (addr_t)V3_PAddr((void *)io_port_bitmap); //PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap); @@ -150,7 +180,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { uchar_t * bitmap = (uchar_t *)io_port_bitmap; bitmap += (port / 8); - PrintDebug("Setting Bit for port 0x%x\n", port); + // PrintDebug("Setting Bit for port 0x%x\n", port); *bitmap |= 1 << (port % 8); } @@ -255,6 +285,7 @@ static int init_svm_guest(struct guest_info *info) { } + // 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)); @@ -272,31 +303,37 @@ static int start_svm_guest(struct guest_info *info) { ullong_t tmp_tsc; - EnableInts(); - CLGI(); + v3_enable_ints(); + v3_clgi(); - // PrintDebug("SVM Entry to rip=%x...\n", info->rip); + PrintDebug("SVM Entry to rip=%x...\n", info->rip); rdtscll(info->time_state.cached_host_tsc); guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc; - safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs)); + v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs)); rdtscll(tmp_tsc); - //PrintDebug("SVM Returned\n"); + PrintDebug("SVM Returned\n"); + + { + uint_t x = 0; + PrintDebug("RSP=%p\n", &x); + } v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); num_exits++; - STGI(); + PrintDebug("Turning on global interrupts\n"); + v3_stgi(); + + + PrintDebug("SVM Exit number %d\n", num_exits); - if ((num_exits % 25) == 0) { - PrintDebug("SVM Exit number %d\n", num_exits); - } - if (handle_svm_exit(info) != 0) { + if (v3_handle_svm_exit(info) != 0) { addr_t host_addr; addr_t linear_addr = 0; @@ -311,22 +348,22 @@ static int start_svm_guest(struct guest_info *info) { linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs)); - PrintDebug("RIP Linear: %x\n", linear_addr); - PrintV3Segments(info); - PrintV3CtrlRegs(info); - PrintV3GPRs(info); + PrintDebug("RIP Linear: %\n", linear_addr); + v3_print_segments(info); + v3_print_ctrl_regs(info); + v3_print_GPRs(info); if (info->mem_mode == PHYSICAL_MEM) { - guest_pa_to_host_pa(info, linear_addr, &host_addr); + guest_pa_to_host_va(info, linear_addr, &host_addr); } else if (info->mem_mode == VIRTUAL_MEM) { - guest_va_to_host_pa(info, linear_addr, &host_addr); + guest_va_to_host_va(info, linear_addr, &host_addr); } PrintDebug("Host Address of rip = 0x%x\n", host_addr); PrintDebug("Instr (15 bytes) at %x:\n", host_addr); - PrintTraceMemDump((char*)host_addr, 15); + PrintTraceMemDump((uchar_t *)host_addr, 15); break; } @@ -337,37 +374,36 @@ static int start_svm_guest(struct guest_info *info) { + /* Checks machine SVM capability */ /* Implemented from: AMD Arch Manual 3, sect 15.4 */ -int is_svm_capable() { +int v3_is_svm_capable() { #if 1 // Dinda - - uint_t ret; uint_t vm_cr_low = 0, vm_cr_high = 0; + addr_t eax = 0, ebx = 0, ecx = 0, edx = 0; - - ret = cpuid_ecx(CPUID_FEATURE_IDS); + v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_ecx=0x%x\n",ret); + PrintDebug("CPUID_FEATURE_IDS_ecx=0x%x\n", ecx); - if ((ret & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { + if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { PrintDebug("SVM Not Available\n"); return 0; } else { - Get_MSR(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); + v3_get_msr(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); - PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n",vm_cr_high,vm_cr_low); + PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n", vm_cr_high, vm_cr_low); if ((vm_cr_low & SVM_VM_CR_MSR_svmdis) == 1) { PrintDebug("SVM is available but is disabled.\n"); - ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); - if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { + if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { PrintDebug("SVM BIOS Disabled, not unlockable\n"); } else { PrintDebug("SVM is locked with a key\n"); @@ -377,11 +413,11 @@ int is_svm_capable() { } else { PrintDebug("SVM is available and enabled.\n"); - ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); - if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { + if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { PrintDebug("SVM Nested Paging not supported\n"); } else { PrintDebug("SVM Nested Paging supported\n"); @@ -393,24 +429,24 @@ int is_svm_capable() { } #else + uint_t eax = 0, ebx = 0, ecx = 0, edx = 0; + addr_t vm_cr_low = 0, vm_cr_high = 0; - uint_t ret = cpuid_ecx(CPUID_FEATURE_IDS); - uint_t vm_cr_low = 0, vm_cr_high = 0; - + v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - if ((ret & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { + if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) { PrintDebug("SVM Not Available\n"); return 0; } - Get_MSR(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); + v3_get_msr(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low); - PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n",vm_cr_high,vm_cr_low); + PrintDebug("SVM_VM_CR_MSR = 0x%x 0x%x\n", vm_cr_high, vm_cr_low); // this part is clearly wrong, since the np bit is in // edx, not ecx - if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 1) { + if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 1) { PrintDebug("Nested Paging not supported\n"); } else { PrintDebug("Nested Paging supported\n"); @@ -421,9 +457,9 @@ int is_svm_capable() { return 1; } - ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { + if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) { PrintDebug("SVM BIOS Disabled, not unlockable\n"); } else { PrintDebug("SVM is locked with a key\n"); @@ -435,14 +471,14 @@ int is_svm_capable() { } -int has_svm_nested_paging() { - uint32_t ret; +static int has_svm_nested_paging() { + addr_t eax = 0, ebx = 0, ecx = 0, edx = 0; - ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS); + v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx); - //PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n",ret); + //PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx); - if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { + if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) { PrintDebug("SVM Nested Paging not supported\n"); return 0; } else { @@ -454,15 +490,15 @@ int has_svm_nested_paging() { -void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { +void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) { reg_ex_t msr; void * host_state; // Enable SVM on the CPU - Get_MSR(EFER_MSR, &(msr.e_reg.high), &(msr.e_reg.low)); + v3_get_msr(EFER_MSR, &(msr.e_reg.high), &(msr.e_reg.low)); msr.e_reg.low |= EFER_MSR_svm_enable; - Set_MSR(EFER_MSR, 0, msr.e_reg.low); + v3_set_msr(EFER_MSR, 0, msr.e_reg.low); PrintDebug("SVM Enabled\n"); @@ -470,12 +506,14 @@ void Init_SVM(struct vmm_ctrl_ops * vmm_ops) { // Setup the host state save area host_state = V3_AllocPages(4); - msr.e_reg.high = 0; - msr.e_reg.low = (uint_t)host_state; + /* 64-BIT-ISSUE */ + // msr.e_reg.high = 0; + //msr.e_reg.low = (uint_t)host_state; + msr.r_reg = (addr_t)host_state; - PrintDebug("Host State being saved at %x\n", (uint_t)host_state); - Set_MSR(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low); + PrintDebug("Host State being saved at %x\n", (addr_t)host_state); + v3_set_msr(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low);