-extern uint_t Get_CR3();
-
-
-
extern void v3_stgi();
extern void v3_clgi();
extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs);
-
+#include <palacios/vmm_ctrl_regs.h>
static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
ctrl_area->cr_reads.cr0 = 1;
ctrl_area->cr_writes.cr0 = 1;
+
+ /* Set up the efer to enable 64 bit page tables */
+ /*
+ {
+ struct efer_64 * efer = (struct efer_64 *)&(guest_state->efer);
+ struct cr4_32 * cr4 = (struct cr4_32 *)&(guest_state->cr4);
+ efer->lma = 1;
+ efer->lme = 1;
+
+ cr4->pae = 1;
+ }
+ */
+
guest_state->efer |= EFER_MSR_svm_enable;
+
+
+
guest_state->rflags = 0x00000002; // The reserved bit is always 1
ctrl_area->svm_instrs.VMRUN = 1;
ctrl_area->svm_instrs.VMMCALL = 1;
if (vm_info->shdw_pg_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info->direct_map_pt = (addr_t)create_passthrough_pde32_pts(vm_info);
- vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+
+
+
+ /* Testing 64 bit page tables for long paged real mode guests */
+ // vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info));
+ vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32(vm_info));
+ /* End Test */
+
+ //vm_info->shdw_pg_state.shadow_cr3 |= (vm_info->direct_map_pt & ~0xfff);
+ vm_info->shdw_pg_state.shadow_cr3 = 0;
vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
PrintDebug("Created\n");
- guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+ //guest_state->cr3 = vm_info->shdw_pg_state.shadow_cr3;
+
+ guest_state->cr3 = vm_info->direct_map_pt;
+
//PrintDebugPageTables((pde32_t*)(vm_info->shdw_pg_state.shadow_cr3.e_reg.low));
// Enable Nested Paging
ctrl_area->NP_ENABLE = 1;
- PrintDebug("NP_Enable at 0x%x\n", &(ctrl_area->NP_ENABLE));
+ PrintDebug("NP_Enable at 0x%p\n", (void *)&(ctrl_area->NP_ENABLE));
// Set the Nested Page Table pointer
- vm_info->direct_map_pt = ((addr_t)create_passthrough_pde32_pts(vm_info) & ~0xfff);
+ vm_info->direct_map_pt = ((addr_t)create_passthrough_pts_32(vm_info) & ~0xfff);
ctrl_area->N_CR3 = vm_info->direct_map_pt;
// ctrl_area->N_CR3 = Get_CR3();
// PrintDebugPageTables(info->page_tables);
- PrintDebug("Initializing VMCB (addr=%x)\n", info->vmm_data);
+ PrintDebug("Initializing VMCB (addr=%p)\n", (void *)info->vmm_data);
Init_VMCB_BIOS((vmcb_t*)(info->vmm_data), info);
- PrintDebug("Launching SVM VM (vmcb=%x)\n", info->vmm_data);
+ PrintDebug("Launching SVM VM (vmcb=%p)\n", (void *)info->vmm_data);
//PrintDebugVMCB((vmcb_t*)(info->vmm_data));
info->run_state = VM_RUNNING;
while (1) {
ullong_t tmp_tsc;
+ uint_t vm_cr_low = 0, vm_cr_high = 0;
v3_enable_ints();
v3_clgi();
- PrintDebug("SVM Entry to rip=%x...\n", info->rip);
+
+ //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
+
+ v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
rdtscll(info->time_state.cached_host_tsc);
+
guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
v3_svm_launch((vmcb_t*)V3_PAddr(info->vmm_data), &(info->vm_regs));
-
rdtscll(tmp_tsc);
- PrintDebug("SVM Returned\n");
-
+
+ v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
+ //PrintDebug("SVM Returned\n");
+
+
+#if PrintDebug
{
uint_t x = 0;
- PrintDebug("RSP=%p\n", &x);
+ PrintDebug("RSP=%p\n", (void *)&x);
}
+#endif
v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
num_exits++;
- PrintDebug("Turning on global interrupts\n");
+ //PrintDebug("Turning on global interrupts\n");
v3_stgi();
- PrintDebug("SVM Exit number %d\n", num_exits);
+ //PrintDebug("SVM Exit number %d\n", num_exits);
PrintDebug("SVM ERROR!!\n");
- PrintDebug("RIP: %x\n", guest_state->rip);
+ PrintDebug("RIP: %p\n", (void *)(addr_t)(guest_state->rip));
linear_addr = get_addr_linear(info, guest_state->rip, &(info->segments.cs));
- PrintDebug("RIP Linear: %\n", linear_addr);
+ PrintDebug("RIP Linear: %p\n", (void *)linear_addr);
v3_print_segments(info);
v3_print_ctrl_regs(info);
v3_print_GPRs(info);
}
- PrintDebug("Host Address of rip = 0x%x\n", host_addr);
+ PrintDebug("Host Address of rip = 0x%p\n", (void *)host_addr);
- PrintDebug("Instr (15 bytes) at %x:\n", host_addr);
+ PrintDebug("Instr (15 bytes) at %p:\n", (void *)host_addr);
PrintTraceMemDump((uchar_t *)host_addr, 15);
break;
v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
- PrintDebug("CPUID_FEATURE_IDS_ecx=0x%x\n", ecx);
+ PrintDebug("CPUID_FEATURE_IDS_ecx=0x%p\n", (void *)ecx);
if ((ecx & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) {
PrintDebug("SVM Not Available\n");
v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
- PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx);
+ PrintDebug("CPUID_FEATURE_IDS_edx=0x%p\n", (void *)edx);
if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) {
PrintDebug("SVM BIOS Disabled, not unlockable\n");
v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
- PrintDebug("CPUID_FEATURE_IDS_edx=0x%x\n", edx);
+ PrintDebug("CPUID_FEATURE_IDS_edx=0x%p\n", (void *)edx);
if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
PrintDebug("SVM Nested Paging not supported\n");
//msr.e_reg.low = (uint_t)host_state;
msr.r_reg = (addr_t)host_state;
- PrintDebug("Host State being saved at %x\n", (addr_t)host_state);
+ PrintDebug("Host State being saved at %p\n", (void *)(addr_t)host_state);
v3_set_msr(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low);
if (vm_info.page_mode == SHADOW_PAGING) {
PrintDebug("Creating initial shadow page table\n");
- vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pde32_pts(&vm_info) & ~0xfff);
+ vm_info.shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pts_32(&vm_info) & ~0xfff);
PrintDebug("Created\n");
guest_state->cr3 = vm_info.shdw_pg_state.shadow_cr3;