#include <geekos/svm_handler.h>
#include <geekos/vmm_debug.h>
+#include <geekos/vm_guest_mem.h>
/* TEMPORARY BECAUSE SVM IS WEIRD */
Get_MSR(SVM_VM_CR_MSR, &vm_cr_high, &vm_cr_low);
+ if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 1) {
+ PrintDebug("Nested Paging not supported\n");
+ }
+
if ((vm_cr_low & SVM_VM_CR_MSR_svmdis) == 0) {
return 1;
}
ret = cpuid_edx(CPUID_SVM_REV_AND_FEATURE_IDS);
-
-
- if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
- PrintDebug("Nested Paging not supported\n");
- }
if ((ret & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) {
PrintDebug("SVM BIOS Disabled, not unlockable\n");
//info->page_tables = generate_guest_page_tables(&(info->mem_layout), &(info->mem_list));
//PrintDebugPageTables(info->page_tables);
-
PrintDebug("Initializing VMCB (addr=%x)\n", info->vmm_data);
Init_VMCB((vmcb_t*)(info->vmm_data), *info);
-
- info->vm_regs.rbx = 0;
- info->vm_regs.rcx = 0;
- info->vm_regs.rdx = 0;
- info->vm_regs.rsi = 0;
+ // info->rip = 0;
+
info->vm_regs.rdi = 0;
+ info->vm_regs.rsi = 0;
info->vm_regs.rbp = 0;
-
+ info->vm_regs.rsp = 0;
+ info->vm_regs.rbx = 0;
+ info->vm_regs.rdx = 0;
+ info->vm_regs.rcx = 0;
+ info->vm_regs.rax = 0;
+
return 0;
}
while (1) {
+ PrintDebug("SVM Launch Args (vmcb=%x), (info=%x), (vm_regs=%x)\n", info->vmm_data, &(info->vm_regs));
+ PrintDebug("Launching to RIP: %x\n", info->rip);
safe_svm_launch((vmcb_t*)(info->vmm_data), &(info->vm_regs));
//launch_svm((vmcb_t*)(info->vmm_data));
PrintDebug("SVM Returned\n");
if (handle_svm_exit(info) != 0) {
+ // handle exit code....
break;
}
}
}
-void Init_VMCB_Real(vmcb_t * vmcb, guest_info_t vm_info) {
+void Init_VMCB_Real(vmcb_t * vmcb, struct guest_info vm_info) {
vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb);
uint_t i;
- guest_state->rsp = vm_info.rsp;
+ guest_state->rsp = vm_info.vm_regs.rsp;
guest_state->rip = vm_info.rip;
-
-
-
guest_state->efer |= EFER_MSR_svm_enable;
guest_state->rflags = 0x00000002; // The reserved bit is always 1
ctrl_area->svm_instrs.instrs.VMRUN = 1;
- // guest_state->cr0 = 0x00000001; // PE
ctrl_area->guest_ASID = 1;
guest_state->cr0 = 0x60000010;
*bitmap |= 1 << (port % 8);
}
- // memset((uchar_t*)io_port_bitmap, 0xff, PAGE_SIZE * 2);
- //PrintDebugMemDump((uchar_t*)io_port_bitmap, PAGE_SIZE *2);
-
ctrl_area->instrs.instrs.IOIO_PROT = 1;
}
if (vm_info.page_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info.shadow_page_state.shadow_cr3.e_reg.low |= ((addr_t)create_passthrough_pde32_pts(&(vm_info.mem_map)) & ~0xfff);
+ vm_info.shdw_pg_state.shadow_cr3.e_reg.low |= ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff);
PrintDebug("Created\n");
- guest_state->cr3 = vm_info.shadow_page_state.shadow_cr3.r_reg;
+ guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3.r_reg;
ctrl_area->cr_reads.crs.cr3 = 1;
ctrl_area->cr_writes.crs.cr3 = 1;
guest_state->g_pat = 0x7040600070406ULL;
+ vm_info.shdw_pg_state.guest_cr0.e_reg.low = guest_state->cr0;
guest_state->cr0 |= 0x80000000;
} else if (vm_info.page_mode == NESTED_PAGING) {
// Flush the TLB on entries/exits
}
-void Init_VMCB(vmcb_t * vmcb, guest_info_t vm_info) {
+void Init_VMCB(vmcb_t * vmcb, struct guest_info vm_info) {
vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb);
uint_t i;
- guest_state->rsp = vm_info.rsp;
+ guest_state->rsp = vm_info.vm_regs.rsp;
guest_state->rip = vm_info.rip;
-
+ //ctrl_area->instrs.instrs.CR0 = 1;
+ ctrl_area->cr_reads.crs.cr0 = 1;
ctrl_area->cr_writes.crs.cr0 = 1;
guest_state->efer |= EFER_MSR_svm_enable;
if (vm_info.page_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info.shadow_page_state.shadow_cr3.e_reg.low |= ((addr_t)create_passthrough_pde32_pts(&(vm_info.mem_map)) & ~0xfff);
+ vm_info.shdw_pg_state.shadow_cr3.e_reg.low |= ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff);
PrintDebug("Created\n");
- guest_state->cr3 = vm_info.shadow_page_state.shadow_cr3.r_reg;
+ guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3.r_reg;
ctrl_area->cr_reads.crs.cr3 = 1;
ctrl_area->cr_writes.crs.cr3 = 1;
- ctrl_area->cr_reads.crs.cr0 = 1;
- ctrl_area->cr_writes.crs.cr0 = 1;
+
ctrl_area->instrs.instrs.INVLPG = 1;
ctrl_area->instrs.instrs.INVLPGA = 1;
- ctrl_area->instrs.instrs.CR0 = 1;
-
-
guest_state->g_pat = 0x7040600070406ULL;
}
-void Init_VMCB_pe(vmcb_t *vmcb, guest_info_t vm_info) {
+void Init_VMCB_pe(vmcb_t *vmcb, struct guest_info vm_info) {
vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb);
uint_t i = 0;
- guest_state->rsp = vm_info.rsp;
+ guest_state->rsp = vm_info.vm_regs.rsp;
guest_state->rip = vm_info.rip;