X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=5b0b7619d11fbf3ed934916771de86d5ade37760;hb=18cc68af5caa15264a853167e9d2d885cb79317a;hp=b89d28c0082abca8fa2b04b4689b1cfeb8df3750;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index b89d28c..5b0b761 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -32,7 +32,7 @@ #include #include #include - +#include @@ -64,21 +64,38 @@ int v3_handle_svm_exit(struct guest_info * info) { info->ctrl_regs.efer = guest_state->efer; get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); - info->cpu_mode = v3_get_cpu_mode(info); - info->mem_mode = v3_get_mem_mode(info); + info->cpu_mode = v3_get_vm_cpu_mode(info); + info->mem_mode = v3_get_vm_mem_mode(info); exit_code = guest_ctrl->exit_code; + // PrintDebug("SVM Exit: %s (rip=%p) (info1=%p)\n", vmexit_code_to_str(exit_code), + // (void *)(addr_t)info->rip, (void *)(addr_t)guest_ctrl->exit_info1); + + if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { + +#ifdef DEBUG_INTERRUPTS + PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector); +#endif + if (!guest_ctrl->exit_int_info.valid) { + info->intr_state.irq_pending = 0; + // PrintDebug("Injected Interrupt %d\n", info->intr_state.irq_vector); + v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ); + } else { +#ifdef DEBUG_INTERRUPTS + PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector); +#endif + } + } + // 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: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); if ((0) && (exit_code <= VMEXIT_EXCP14)) { uchar_t instr[32]; @@ -125,7 +142,7 @@ int v3_handle_svm_exit(struct guest_info * info) { switch (exit_code) { case 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) { @@ -233,12 +250,20 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; } - case VMEXIT_NPF: + case VMEXIT_NPF: { + addr_t fault_addr = guest_ctrl->exit_info2; + pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1); - PrintError("Currently unhandled Nested Page Fault\n"); - return -1; - + if (info->shdw_pg_mode == NESTED_PAGING) { + if (v3_handle_nested_pagefault(info, fault_addr, *error_code) == -1) { + return -1; + } + } else { + PrintError("Currently unhandled Nested Page Fault\n"); + return -1; + } break; + } case VMEXIT_INVLPG: if (info->shdw_pg_mode == SHADOW_PAGING) { #ifdef DEBUG_SHADOW_PAGING @@ -320,7 +345,7 @@ int v3_handle_svm_exit(struct guest_info * info) { if (info->shdw_pg_mode == SHADOW_PAGING) { - PrintHostPageTables(info, info->ctrl_regs.cr3); + // PrintHostPageTables(info, info->ctrl_regs.cr3); //PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3); } @@ -334,12 +359,41 @@ int v3_handle_svm_exit(struct guest_info * info) { rdtscll(info->profiler.end_time); v3_profile_exit(info, exit_code); } - - // Update the low level state - if (v3_intr_pending(info)) { + if (v3_excp_pending(info)) { + uint_t excp = v3_get_excp_number(info); + + guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION; + + if (info->excp_state.excp_error_code_valid) { + guest_ctrl->EVENTINJ.error_code = info->excp_state.excp_error_code; + guest_ctrl->EVENTINJ.ev = 1; +#ifdef DEBUG_INTERRUPTS + PrintDebug("Injecting exception %d with error code %x\n", excp, guest_ctrl->EVENTINJ.error_code); +#endif + } + + guest_ctrl->EVENTINJ.vector = excp; + + guest_ctrl->EVENTINJ.valid = 1; +#ifdef DEBUG_INTERRUPTS + PrintDebug("Injecting Exception %d (EIP=%p)\n", + guest_ctrl->EVENTINJ.vector, + (void *)(addr_t)info->rip); +#endif + v3_injecting_excp(info, excp); + } else if (info->intr_state.irq_pending == 1) { +#ifdef DEBUG_INTERRUPTS + PrintDebug("IRQ pending from previous injection\n"); +#endif + guest_ctrl->guest_ctrl.V_IRQ = 1; + guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector; + guest_ctrl->guest_ctrl.V_IGN_TPR = 1; + guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; + + } else if (v3_intr_pending(info)) { switch (v3_get_intr_type(info)) { case EXTERNAL_IRQ: { @@ -347,52 +401,26 @@ int v3_handle_svm_exit(struct guest_info * info) { // check to see if ==-1 (non exists) - /* - 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; + #ifdef DEBUG_INTERRUPTS PrintDebug("Injecting Interrupt %d (EIP=%p)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, (void *)(addr_t)info->rip); #endif - v3_injecting_intr(info, irq, EXTERNAL_IRQ); + + info->intr_state.irq_pending = 1; + info->intr_state.irq_vector = irq; break; } case NMI: guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI; break; - case EXCEPTION: { - uint_t excp = v3_get_intr_number(info); - - guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION; - - if (info->intr_state.excp_error_code_valid) { //PAD - guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code; - guest_ctrl->EVENTINJ.ev = 1; -#ifdef DEBUG_INTERRUPTS - PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code); -#endif - } - - guest_ctrl->EVENTINJ.vector = excp; - - guest_ctrl->EVENTINJ.valid = 1; -#ifdef DEBUG_INTERRUPTS - PrintDebug("Injecting Interrupt %d (EIP=%p)\n", - guest_ctrl->EVENTINJ.vector, - (void *)(addr_t)info->rip); -#endif - v3_injecting_intr(info, excp, EXCEPTION); - break; - } case SOFTWARE_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; @@ -407,11 +435,10 @@ int v3_handle_svm_exit(struct guest_info * info) { } } else { -#ifdef DEBUG_INTERRUPTS - PrintDebug("No interrupts/exceptions pending\n"); -#endif + //PrintDebug("Not interrupts or exceptions pending\n"); } - + + guest_state->cr0 = info->ctrl_regs.cr0; guest_state->cr2 = info->ctrl_regs.cr2; guest_state->cr3 = info->ctrl_regs.cr3;