X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=fa711629c6e3f890c4a8a673f52a258b1c81c5b2;hb=b07ca7a7edd31d34a8dc613e3d208bbeedd44661;hp=fed3d258f5399d3b842b634f1d656710206491fb;hpb=eb87f60800c8634e37d1f8e71cd8f88605f2a46e;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index fed3d25..fa71162 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -1,15 +1,12 @@ #include #include #include -#include +#include #include #include #include -extern struct vmm_os_hooks * os_hooks; - - int handle_svm_exit(struct guest_info * info) { vmcb_ctrl_t * guest_ctrl = 0; vmcb_saved_state_t * guest_state = 0; @@ -23,7 +20,8 @@ int handle_svm_exit(struct guest_info * info) { info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; info->vm_regs.rax = guest_state->rax; - info->vm_regs.rsp = guest_state->rsp; + + info->cpl = guest_state->cpl; info->ctrl_regs.cr0 = guest_state->cr0; @@ -38,7 +36,12 @@ int handle_svm_exit(struct guest_info * info) { exit_code = guest_ctrl->exit_code; - PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); + + // Disable printing io exits due to bochs debug messages + //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) { + + PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); + // } // PrintDebugVMCB((vmcb_t*)(info->vmm_data)); @@ -103,20 +106,25 @@ int handle_svm_exit(struct guest_info * info) { PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code); - - - if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) { + if (info->shdw_pg_mode == SHADOW_PAGING) { + if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) { + return -1; + } + } else { + PrintDebug("Page fault in un implemented paging mode\n"); return -1; } + } else if (exit_code == VMEXIT_INVLPG) { + if (info->shdw_pg_mode == SHADOW_PAGING) { + PrintDebug("Invlpg\n"); + if (handle_shadow_invlpg(info) == -1) { + return -1; + } + } + /* - } else if (( (exit_code == VMEXIT_CR3_READ) || - (exit_code == VMEXIT_CR3_WRITE) || - (exit_code == VMEXIT_INVLPG) || (exit_code == VMEXIT_INVLPGA) || - (exit_code == VMEXIT_EXCP14)) && - (info->page_mode == SHADOW_PAGING)) { - handle_shadow_paging(info); */ } else if (exit_code == VMEXIT_INTR) { @@ -150,8 +158,18 @@ int handle_svm_exit(struct guest_info * info) { - if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) { - PrintDebug("Could not translate guest_state->rip to host address\n"); + if (info->mem_mode == PHYSICAL_MEM) { + if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) { + PrintDebug("Could not translate guest_state->rip to host address\n"); + return -1; + } + } else if (info->mem_mode == VIRTUAL_MEM) { + if (guest_va_to_host_pa(info, guest_state->rip, &host_addr) == -1) { + PrintDebug("Could not translate guest_state->rip to host address\n"); + return -1; + } + } else { + PrintDebug("Invalid memory mode\n"); return -1; } @@ -161,7 +179,11 @@ int handle_svm_exit(struct guest_info * info) { PrintDebug("Reading from 0x%x in guest\n", rip_addr); - read_guest_pa_memory(info, rip_addr, 15, buf); + if (info->mem_mode == PHYSICAL_MEM) { + read_guest_pa_memory(info, rip_addr, 15, buf); + } else { + read_guest_va_memory(info, rip_addr, 15, buf); + } PrintTraceMemDump(buf, 15); @@ -172,26 +194,53 @@ int handle_svm_exit(struct guest_info * info) { // Update the low level state - if (intr_pending(&(info->intr_state))) { - - switch (get_intr_type(&(info->intr_state))) { - case EXTERNAL_IRQ: - guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state)); - guest_ctrl->EVENTINJ.valid = 1; - guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR; - - break; + if (intr_pending(info)) { + + switch (get_intr_type(info)) { + case EXTERNAL_IRQ: + { + uint_t irq = get_intr_number(info); + /* + guest_ctrl->EVENTINJ.vector = irq; + guest_ctrl->EVENTINJ.valid = 1; + guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR; + */ + + guest_ctrl->guest_ctrl.V_IRQ = 1; + guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq; + guest_ctrl->guest_ctrl.V_IGN_TPR = 1; + guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; + + PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip); + + injecting_intr(info, irq, EXTERNAL_IRQ); + + break; + } case NMI: guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI; break; case EXCEPTION: - guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION; - guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code; - break; - case SOFTWARE: + { + uint_t excp = get_intr_number(info); + + guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION; + + if (info->intr_state.excp_error_code) { + guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code; + guest_ctrl->EVENTINJ.ev = 1; + } + + guest_ctrl->EVENTINJ.vector = excp; + + PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip); + injecting_intr(info, excp, EXCEPTION); + break; + } + case SOFTWARE_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; - case VIRTUAL: + case VIRTUAL_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR; break; @@ -201,15 +250,6 @@ int handle_svm_exit(struct guest_info * info) { return -1; } - - PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip); - - - // IMPORTANT TODO - // We need to figure out stack parameters.... - - //EVENTINJ.error_code - } @@ -221,6 +261,8 @@ int handle_svm_exit(struct guest_info * info) { guest_state->rflags = info->ctrl_regs.rflags; + guest_state->cpl = info->cpl; + guest_state->rax = info->vm_regs.rax; guest_state->rip = info->rip; guest_state->rsp = info->vm_regs.rsp; @@ -235,34 +277,3 @@ int handle_svm_exit(struct guest_info * info) { return 0; } - - - -int handle_shadow_paging(struct guest_info * info) { - vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); - // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - - if (guest_ctrl->exit_code == VMEXIT_CR3_READ) { - - } - - return 0; -} - - - -int handle_svm_intr(struct guest_info * info) { - vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); - // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - - //struct Interrupt_Info * int_info = &(guest_ctrl->exit_int_info); - - //struct vmm_irq_hook * get_irq_hook(&(info->irq_map), int_info->vector); - - PrintDebug("SVM Returned: Exit Code: %x\n",guest_ctrl->exit_code); - PrintDebug("V_INTR_VECTOR: 0x%x\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR); - - while(1); - - return 0; -}