X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=1c646573a35001c009efa87df04489ddf6806e3a;hb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597;hp=6d38fb7cc38bbf79f05d22bbc3b6448056ff5558;hpb=a7dc3322984b3c76fe990de506418e180ec1b0de;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 6d38fb7..1c64657 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -24,27 +24,38 @@ #include #include #include -#include +#include #include #include #include #include #include -#include #include +#include #include +#ifdef CONFIG_SYMBIOTIC +#include +#endif + +#ifdef CONFIG_TELEMETRY +#include +#endif int v3_handle_svm_exit(struct guest_info * info) { vmcb_ctrl_t * guest_ctrl = 0; vmcb_saved_state_t * guest_state = 0; ulong_t exit_code = 0; - + +#ifdef CONFIG_SYMBIOTIC + static int sym_started = 0; +#endif + + 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 +63,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,77 +73,62 @@ 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)); - info->cpu_mode = v3_get_cpu_mode(info); - info->mem_mode = v3_get_mem_mode(info); - + 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; - 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 +#ifdef CONFIG_SYMBIOTIC + if (0) { + // ignore interrupt injection if we just started a symcall + PrintDebug("SVM Exit: %s (rip=%p) (info1=%p) (info2=%p)\n", vmexit_code_to_str(exit_code), + (void *)(addr_t)info->rip, (void *)(addr_t)guest_ctrl->exit_info1, + (void *)(addr_t)guest_ctrl->exit_info2); + if (exit_code == VMEXIT_EXCP14) { + PrintGuestPageTree(info, guest_ctrl->exit_info2, info->shdw_pg_state.guest_cr3); } - } + } +#endif - - // 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 + if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { - //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); - } - +#ifdef CONFIG_DEBUG_INTERRUPTS + PrintDebug("INTAK cycle completed for irq %d\n", info->intr_state.irq_vector); +#endif + info->intr_state.irq_started = 1; + info->intr_state.irq_pending = 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); - } + v3_injecting_intr(info, info->intr_state.irq_vector, V3_EXTERNAL_IRQ); } + if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) { +#ifdef CONFIG_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; + } else { +#ifdef CONFIG_DEBUG_INTERRUPTS + PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector); +#endif + } - if (info->enable_profiler) { - rdtscll(info->profiler.start_time); + +#ifdef CONFIG_TELEMETRY + if (info->enable_telemetry) { + v3_telemetry_start_exit(info); } +#endif + - //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); switch (exit_code) { @@ -163,11 +158,11 @@ int v3_handle_svm_exit(struct guest_info * info) { return -1; } } - } break; } case VMEXIT_MSR: + if (guest_ctrl->exit_info1 == 0) { if (v3_handle_msr_read(info) == -1) { return -1; @@ -182,8 +177,16 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; + + case VMEXIT_CPUID: + if (v3_handle_cpuid(info) == -1) { + PrintError("Error handling CPUID\n"); + return -1; + } + + break; case VMEXIT_CR0_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR0 Write\n"); #endif if (v3_handle_cr0_write(info) == -1) { @@ -191,7 +194,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR0_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR0 Read\n"); #endif if (v3_handle_cr0_read(info) == -1) { @@ -199,15 +202,16 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR3_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR3 Write\n"); #endif if (v3_handle_cr3_write(info) == -1) { return -1; } + break; case VMEXIT_CR3_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR3 Read\n"); #endif if (v3_handle_cr3_read(info) == -1) { @@ -215,7 +219,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR4_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR4 Write\n"); #endif if (v3_handle_cr4_write(info) == -1) { @@ -223,7 +227,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR4_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR4 Read\n"); #endif if (v3_handle_cr4_read(info) == -1) { @@ -233,7 +237,7 @@ int v3_handle_svm_exit(struct guest_info * info) { case VMEXIT_EXCP14: { addr_t fault_addr = guest_ctrl->exit_info2; pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1); -#ifdef DEBUG_SHADOW_PAGING +#ifdef CONFIG_DEBUG_SHADOW_PAGING PrintDebug("PageFault at %p (error=%d)\n", (void *)fault_addr, *(uint_t *)error_code); #endif @@ -263,7 +267,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } case VMEXIT_INVLPG: if (info->shdw_pg_mode == SHADOW_PAGING) { -#ifdef DEBUG_SHADOW_PAGING +#ifdef CONFIG_DEBUG_SHADOW_PAGING PrintDebug("Invlpg\n"); #endif if (v3_handle_shadow_invlpg(info) == -1) { @@ -275,13 +279,15 @@ int v3_handle_svm_exit(struct guest_info * info) { /* * Hypercall */ - + + // VMMCALL is a 3 byte op + // We do this early because some hypercalls can change the rip... + info->rip += 3; + if (v3_handle_hypercall(info) == -1) { return -1; } - - // VMMCALL is a 3 byte op - info->rip += 3; + break; case VMEXIT_INTR: // handled by interrupt dispatch earlier @@ -290,21 +296,21 @@ int v3_handle_svm_exit(struct guest_info * info) { // handle_svm_smi(info); // ignored for now break; case VMEXIT_HLT: -#ifdef DEBUG_HALT +#ifdef CONFIG_DEBUG_HALT PrintDebug("Guest halted\n"); #endif - if (v3_handle_svm_halt(info) == -1) { + if (v3_handle_halt(info) == -1) { return -1; } break; case VMEXIT_PAUSE: - //PrintDebug("Guest paused\n"); + PrintDebug("Guest paused\n"); if (v3_handle_svm_pause(info) == -1) { return -1; } break; case VMEXIT_WBINVD: -#ifdef DEBUG_EMULATOR +#ifdef CONFIG_DEBUG_EMULATOR PrintDebug("WBINVD\n"); #endif if (v3_handle_svm_wbinvd(info) == -1) { @@ -342,7 +348,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); } @@ -351,31 +357,48 @@ int v3_handle_svm_exit(struct guest_info * info) { } // END OF SWITCH (EXIT_CODE) - - if (info->enable_profiler) { - rdtscll(info->profiler.end_time); - v3_profile_exit(info, exit_code); +#ifdef CONFIG_TELEMETRY + if (info->enable_telemetry) { + v3_telemetry_end_exit(info, exit_code); } - +#endif + + + +#ifdef CONFIG_SYMBIOTIC + v3_activate_sym_call(info); +#endif + + 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_state->dr6 = info->dbg_regs.dr6; + guest_state->dr7 = info->dbg_regs.dr7; + guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff; + guest_state->rflags = info->ctrl_regs.rflags; + guest_state->efer = info->ctrl_regs.efer; + + guest_state->cpl = info->cpl; + + v3_set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + + guest_state->rax = info->vm_regs.rax; + guest_state->rip = info->rip; + guest_state->rsp = info->vm_regs.rsp; - // Update the low level state - if (info->intr_state.irq_pending == 1) { - 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_excp_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 +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Injecting exception %d with error code %x\n", excp, guest_ctrl->EVENTINJ.error_code); #endif } @@ -383,27 +406,47 @@ int v3_handle_svm_exit(struct guest_info * info) { 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); + + + +#ifdef CONFIG_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 (v3_intr_pending(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) - - + +#ifdef CONFIG_SYMBIOTIC + } else if (info->sym_state.call_active == 1) { + // ignore interrupt injection if we just started a symcall + PrintDebug("Symcall active\n"); + sym_started = 1; +#endif + + } else if (info->intr_state.irq_started == 1) { +#ifdef CONFIG_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 { + switch (v3_intr_pending(info)) { + case V3_EXTERNAL_IRQ: { + uint32_t irq = v3_get_intr(info); + 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 +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Injecting Interrupt %d (EIP=%p)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, (void *)(addr_t)info->rip); @@ -411,46 +454,27 @@ 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; } } - 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_state->dr6 = info->dbg_regs.dr6; - guest_state->dr7 = info->dbg_regs.dr7; - guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff; - guest_state->rflags = info->ctrl_regs.rflags; - guest_state->efer = info->ctrl_regs.efer; - - guest_state->cpl = info->cpl; - - 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);