X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=54be157c84a5bab7eda91a1bca9eb608f8879c4c;hb=72396466a6eeb253948862b334a8534ab29313fe;hp=c7ee14c4950fd3d70a8838be6764bfa70c2fbc50;hpb=df58bd3c484a52b1e166dc28e7b9b6fd94e5a023;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index c7ee14c..54be157 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -2,10 +2,11 @@ #include #include #include -#include +#include #include #include + extern struct vmm_os_hooks * os_hooks; @@ -25,24 +26,50 @@ int handle_svm_exit(struct guest_info * info) { info->vm_regs.rsp = guest_state->rsp; + info->ctrl_regs.cr0 = guest_state->cr0; + info->ctrl_regs.cr2 = guest_state->cr2; + info->ctrl_regs.cr3 = guest_state->cr3; + info->ctrl_regs.cr4 = guest_state->cr4; + info->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR; + info->ctrl_regs.rflags = guest_state->rflags; + + get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + + exit_code = guest_ctrl->exit_code; + PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); // PrintDebugVMCB((vmcb_t*)(info->vmm_data)); + + // PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); + //PrintDebug("RIP: %x\n", guest_state->rip); + + + //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); + if (exit_code == VMEXIT_IOIO) { struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1); if (io_info->type == 0) { if (io_info->str) { - handle_svm_io_outs(info); + if (handle_svm_io_outs(info) == -1 ) { + return -1; + } } else { - handle_svm_io_out(info); + if (handle_svm_io_out(info) == -1) { + return -1; + } } } else { if (io_info->str) { - handle_svm_io_ins(info); + if (handle_svm_io_ins(info) == -1) { + return -1; + } } else { - handle_svm_io_in(info); + if (handle_svm_io_in(info) == -1) { + return -1; + } } } } else if (exit_code == VMEXIT_CR0_WRITE) { @@ -51,24 +78,64 @@ int handle_svm_exit(struct guest_info * info) { if (handle_cr0_write(info) == -1) { return -1; } + } else if (exit_code == VMEXIT_CR0_READ) { + PrintDebug("CR0 Read\n"); + + if (handle_cr0_read(info) == -1) { + return -1; + } + } else if (exit_code == VMEXIT_CR3_WRITE) { + PrintDebug("CR3 Write\n"); + + if (handle_cr3_write(info) == -1) { + return -1; + } + } else if (exit_code == VMEXIT_CR3_READ) { + PrintDebug("CR3 Read\n"); + + if (handle_cr3_read(info) == -1) { + return -1; + } + + } else if (exit_code == VMEXIT_EXCP14) { + addr_t fault_addr = guest_ctrl->exit_info2; + pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1); + + PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code); + + + + if (handle_shadow_pagefault(info, fault_addr, *error_code) == -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_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) { - handle_svm_intr(info); + + // handle_svm_intr(info); + + } else if (exit_code == VMEXIT_HLT) { + PrintDebug("Guest halted\n"); + return -1; } else { - addr_t rip_addr = get_addr_linear(info, guest_state->rip, guest_state->cs.selector); + addr_t rip_addr; char buf[15]; addr_t host_addr; + rip_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs)); + + + PrintDebug("SVM Returned:(VMCB=%x)\n", info->vmm_data); PrintDebug("RIP: %x\n", guest_state->rip); PrintDebug("RIP Linear: %x\n", rip_addr); @@ -105,21 +172,39 @@ int handle_svm_exit(struct guest_info * info) { // Update the low level state - if (intr_pending(&(info->intr_state))) { - guest_ctrl->EVENTINJ.vector = get_intr_number(&(info->intr_state)); - guest_ctrl->EVENTINJ.valid = 1; - - switch (get_intr_type(&(info->intr_state))) { - case EXTERNAL_IRQ: - 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; + + 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; + { + 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; + + injecting_intr(info, excp, EXCEPTION); + break; + } case SOFTWARE: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; @@ -133,6 +218,10 @@ 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.... @@ -140,10 +229,26 @@ int handle_svm_exit(struct guest_info * info) { } + + guest_state->cr0 = info->ctrl_regs.cr0; + guest_state->cr2 = info->ctrl_regs.cr2; + guest_state->cr3 = info->ctrl_regs.cr3; + guest_state->cr4 = info->ctrl_regs.cr4; + guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff; + guest_state->rflags = info->ctrl_regs.rflags; + + guest_state->rax = info->vm_regs.rax; guest_state->rip = info->rip; guest_state->rsp = info->vm_regs.rsp; + + set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + + if (exit_code == VMEXIT_INTR) { + PrintDebug("INTR ret IP = %x\n", guest_state->rip); + } + return 0; } @@ -173,19 +278,8 @@ int handle_svm_intr(struct guest_info * info) { 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; }