#include <palacios/svm_msr.h>
#include <palacios/vmm_profiler.h>
#include <palacios/vmm_hypercall.h>
-
+#include <palacios/vmm_direct_paging.h>
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;
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;
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;
+ // 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)) {
- // Interrupt was taken in the guest
+
#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
- v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
- }
- info->intr_state.irq_pending = 0;
-
+ 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))) {
-
-
- // 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];
- 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
}
rdtscll(info->profiler.start_time);
}
-
+
//PrintDebug("SVM Returned: Exit Code: %x\n",exit_code);
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) {
return -1;
}
}
-
}
break;
}
}
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
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);
}
rdtscll(info->profiler.end_time);
v3_profile_exit(info, exit_code);
}
-
-
- // Update the low level state
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) {
(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)
-
-
+ } else if (info->intr_state.irq_started == 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 {
+ 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;
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->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);
