#include <palacios/vmm_lowlevel.h>
#include <palacios/svm_msr.h>
+#include <palacios/vmm_rbtree.h>
+
+#include <palacios/vmm_profiler.h>
extern void v3_stgi();
//ctrl_area->instrs.instrs.CR0 = 1;
ctrl_area->cr_reads.cr0 = 1;
ctrl_area->cr_writes.cr0 = 1;
- ctrl_area->cr_reads.cr4 = 1;
+ //ctrl_area->cr_reads.cr4 = 1;
ctrl_area->cr_writes.cr4 = 1;
*/
guest_state->efer |= EFER_MSR_svm_enable;
+ vm_info->guest_efer.value = 0x0LL;
v3_hook_msr(vm_info, EFER_MSR,
- NULL, /*&v3_handle_efer_read,*/
+ &v3_handle_efer_read,
&v3_handle_efer_write,
vm_info);
guest_state->cr0 = 0x60000010;
+
guest_state->cs.selector = 0xf000;
guest_state->cs.limit=0xffff;
guest_state->cs.base = 0x0000000f0000LL;
- if (vm_info->io_map.num_ports > 0) {
- struct vmm_io_hook * iter;
+ if ( !RB_EMPTY_ROOT(&(vm_info->io_map)) ) {
+ struct v3_io_hook * iter;
+ struct rb_node * io_node = v3_rb_first(&(vm_info->io_map));
addr_t io_port_bitmap;
-
+ int i = 0;
+
io_port_bitmap = (addr_t)V3_VAddr(V3_AllocPages(3));
memset((uchar_t*)io_port_bitmap, 0, PAGE_SIZE * 3);
//PrintDebug("Setting up IO Map at 0x%x\n", io_port_bitmap);
- FOREACH_IO_HOOK(vm_info->io_map, iter) {
+ do {
+ iter = rb_entry(io_node, struct v3_io_hook, tree_node);
+
ushort_t port = iter->port;
uchar_t * bitmap = (uchar_t *)io_port_bitmap;
+ PrintDebug("%d: Hooking Port %d\n", i, port);
bitmap += (port / 8);
// PrintDebug("Setting Bit for port 0x%x\n", port);
*bitmap |= 1 << (port % 8);
- }
+
+ i++;
+ } while ((io_node = v3_rb_next(io_node)));
//PrintDebugMemDump((uchar_t*)io_port_bitmap, PAGE_SIZE *2);
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->direct_map_pt;
ullong_t tmp_tsc;
uint_t vm_cr_low = 0, vm_cr_high = 0;
-
v3_enable_ints();
v3_clgi();
- //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
+ /*
+ PrintDebug("SVM Entry to CS=%p rip=%p...\n",
+ (void *)(addr_t)info->segments.cs.base,
+ (void *)(addr_t)info->rip);
+ */
v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
v3_stgi();
- if (num_exits % 25 == 0) {
+ if ((num_exits % 5000) == 0) {
PrintDebug("SVM Exit number %d\n", num_exits);
+ if (info->enable_profiler)
+ v3_print_profile(info);
}
+
if (v3_handle_svm_exit(info) != 0) {
vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
PrintDebug("RIP Linear: %p\n", (void *)linear_addr);
v3_print_segments(info);
v3_print_ctrl_regs(info);
+ if (info->shdw_pg_mode == SHADOW_PAGING) {
+ PrintDebug("Shadow Paging Guest Registers:\n");
+ PrintDebug("\tGuest CR0=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr0));
+ PrintDebug("\tGuest CR3=%p\n", (void *)(addr_t)(info->shdw_pg_state.guest_cr3));
+ // efer
+ // CR4
+ }
v3_print_GPRs(info);
-
-
PrintDebug("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code);
PrintDebug("exit_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
break;
}
+
}
return 0;
}