#include <palacios/svm_msr.h>
#include <palacios/vmm_profiler.h>
#include <palacios/vmm_hypercall.h>
-
+#include <palacios/vmm_direct_paging.h>
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)) {
- // Interrupt was taken in the guest
+
#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
}
}
- 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];
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) {
}
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 (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)) {
return -1;
}
+ } else {
+ //PrintDebug("Not interrupts or exceptions pending\n");
}