X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=f7fd96efc074b557af1df8cb03cd1cb880af3cf8;hb=e03d97f01158ab87a941e1eac394e68643fd7194;hp=5b0b7619d11fbf3ed934916771de86d5ade37760;hpb=18cc68af5caa15264a853167e9d2d885cb79317a;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 5b0b761..f7fd96e 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -44,7 +44,6 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - // Update the high level state info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; @@ -52,7 +51,6 @@ int v3_handle_svm_exit(struct guest_info * info) { info->cpl = guest_state->cpl; - info->ctrl_regs.cr0 = guest_state->cr0; info->ctrl_regs.cr2 = guest_state->cr2; info->ctrl_regs.cr3 = guest_state->cr3; @@ -63,71 +61,39 @@ int v3_handle_svm_exit(struct guest_info * info) { info->ctrl_regs.rflags = guest_state->rflags; info->ctrl_regs.efer = guest_state->efer; - get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + v3_get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); 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); + PrintDebug("INTAK cycle completed for irq %d\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 - } - } + info->intr_state.irq_started = 1; + info->intr_state.irq_pending = 0; - - - // Disable printing io exits due to bochs debug messages - //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) { - - - if ((0) && (exit_code <= VMEXIT_EXCP14)) { - uchar_t instr[32]; - int ret; - // Dump out the instr stream + v3_injecting_intr(info, info->intr_state.irq_vector, V3_EXTERNAL_IRQ); + } - //PrintDebug("RIP: %x\n", guest_state->rip); - PrintDebug("\n\n\nRIP Linear: %p\n", (void *)get_addr_linear(info, info->rip, &(info->segments.cs))); - - v3_print_GPRs(info); - v3_print_ctrl_regs(info); - - - // OK, now we will read the instruction - // The only difference between PROTECTED and PROTECTED_PG is whether we read - // from guest_pa or guest_va - if (info->mem_mode == PHYSICAL_MEM) { - // The real rip address is actually a combination of the rip + CS base - ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr); - } else { - ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr); - } - + if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) { +#ifdef DEBUG_INTERRUPTS + PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector); +#endif + // Interrupt was taken fully vectored + info->intr_state.irq_started = 0; - if (ret != 32) { - // I think we should inject a GPF into the guest - PrintDebug("Could not read instruction (ret=%d)\n", ret); - } else { - PrintDebug("Instr Stream:\n"); - PrintTraceMemDump(instr, 32); - } + } else { +#ifdef DEBUG_INTERRUPTS + PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector); +#endif } @@ -136,7 +102,7 @@ int v3_handle_svm_exit(struct guest_info * info) { rdtscll(info->profiler.start_time); } - + //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); switch (exit_code) { @@ -166,7 +132,6 @@ int v3_handle_svm_exit(struct guest_info * info) { return -1; } } - } break; } @@ -361,7 +326,6 @@ int v3_handle_svm_exit(struct guest_info * info) { } - if (v3_excp_pending(info)) { uint_t excp = v3_get_excp_number(info); @@ -384,7 +348,7 @@ int v3_handle_svm_exit(struct guest_info * info) { (void *)(addr_t)info->rip); #endif v3_injecting_excp(info, excp); - } else if (info->intr_state.irq_pending == 1) { + } else if (info->intr_state.irq_started == 1) { #ifdef DEBUG_INTERRUPTS PrintDebug("IRQ pending from previous injection\n"); #endif @@ -393,15 +357,11 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl->guest_ctrl.V_IGN_TPR = 1; guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; - } else if (v3_intr_pending(info)) { + } else { + switch (v3_intr_pending(info)) { + case V3_EXTERNAL_IRQ: { + uint32_t irq = v3_get_intr(info); - switch (v3_get_intr_type(info)) { - case EXTERNAL_IRQ: { - uint_t irq = v3_get_intr_number(info); - - // check to see if ==-1 (non exists) - - guest_ctrl->guest_ctrl.V_IRQ = 1; guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq; guest_ctrl->guest_ctrl.V_IGN_TPR = 1; @@ -415,27 +375,24 @@ int v3_handle_svm_exit(struct guest_info * info) { info->intr_state.irq_pending = 1; info->intr_state.irq_vector = irq; - + break; } - case NMI: + case V3_NMI: guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI; break; - case SOFTWARE_INTR: + case V3_SOFTWARE_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; - case VIRTUAL_INTR: - guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR; + case V3_VIRTUAL_IRQ: + guest_ctrl->EVENTINJ.type = SVM_INJECTION_IRQ; break; - - case INVALID_INTR: + + case V3_INVALID_INTR: default: - PrintError("Attempted to issue an invalid interrupt\n"); - return -1; + break; } - } else { - //PrintDebug("Not interrupts or exceptions pending\n"); } @@ -456,7 +413,7 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_state->rsp = info->vm_regs.rsp; - set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + v3_set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); if (exit_code == VMEXIT_INTR) { //PrintDebug("INTR ret IP = %x\n", guest_state->rip);