#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_direct_paging.h>
extern void v3_stgi();
extern void v3_clgi();
ushort_t port = iter->port;
uchar_t * bitmap = (uchar_t *)io_port_bitmap;
- PrintDebug("%d: Hooking Port %d\n", i, port);
+ //PrintDebug("%d: Hooking Port %d\n", i, port);
bitmap += (port / 8);
// PrintDebug("Setting Bit for port 0x%x\n", port);
/* 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));
+ vm_info->direct_map_pt = (addr_t)V3_PAddr(v3_create_direct_passthrough_pts(vm_info));
/* End Test */
vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL;
while (1) {
ullong_t tmp_tsc;
- uint_t vm_cr_low = 0, vm_cr_high = 0;
+
+
+
+#define MSR_STAR 0xc0000081
+#define MSR_LSTAR 0xc0000082
+#define MSR_CSTAR 0xc0000083
+#define MSR_SF_MASK 0xc0000084
+#define MSR_GS_BASE 0xc0000101
+
+ struct v3_msr host_cstar;
+ struct v3_msr host_star;
+ struct v3_msr host_lstar;
+ struct v3_msr host_syscall_mask;
+ struct v3_msr host_gs_base;
v3_enable_ints();
v3_clgi();
(void *)(addr_t)info->rip);
*/
- v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
- rdtscll(info->time_state.cached_host_tsc);
+ v3_get_msr(MSR_STAR, &(host_star.hi), &(host_star.lo));
+ v3_get_msr(MSR_LSTAR, &(host_lstar.hi), &(host_lstar.lo));
+ v3_get_msr(MSR_CSTAR, &(host_cstar.hi), &(host_cstar.lo));
+ v3_get_msr(MSR_SF_MASK, &(host_syscall_mask.hi), &(host_syscall_mask.lo));
+ v3_get_msr(MSR_GS_BASE, &(host_gs_base.hi), &(host_gs_base.lo));
+ 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);
- v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
+ v3_set_msr(MSR_STAR, host_star.hi, host_star.lo);
+ v3_set_msr(MSR_LSTAR, host_lstar.hi, host_lstar.lo);
+ v3_set_msr(MSR_CSTAR, host_cstar.hi, host_cstar.lo);
+ v3_set_msr(MSR_SF_MASK, host_syscall_mask.hi, host_syscall_mask.lo);
+ v3_set_msr(MSR_GS_BASE, host_gs_base.hi, host_gs_base.lo);
+
//PrintDebug("SVM Returned\n");
v3_stgi();
- if ((num_exits % 1000) == 0) {
+ if ((num_exits % 5000) == 0) {
PrintDebug("SVM Exit number %d\n", num_exits);
- v3_print_profile(info);
+ if (info->enable_profiler)
+ v3_print_profile(info);
}
v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
- PrintDebug("CPUID_FEATURE_IDS_ecx=0x%p\n", (void *)ecx);
+ PrintDebug("CPUID_FEATURE_IDS_ecx=%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%p\n", (void *)edx);
+ PrintDebug("CPUID_FEATURE_IDS_edx=%p\n", (void *)edx);
if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml) == 0) {
PrintDebug("SVM BIOS Disabled, not unlockable\n");
PrintDebug("SVM is available and enabled.\n");
v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
-
- PrintDebug("CPUID_FEATURE_IDS_edx=0x%p\n", (void *)edx);
+ PrintDebug("CPUID_FEATURE_IDS_eax=%p\n", (void *)eax);
+ PrintDebug("CPUID_FEATURE_IDS_ebx=%p\n", (void *)ebx);
+ PrintDebug("CPUID_FEATURE_IDS_ecx=%p\n", (void *)ecx);
+ PrintDebug("CPUID_FEATURE_IDS_edx=%p\n", (void *)edx);
+
if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
PrintDebug("SVM Nested Paging not supported\n");