#include <palacios/vmm_direct_paging.h>
-#ifndef DEBUG_SHADOW_PAGING
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
+#ifndef CONFIG_DEBUG_SHADOW_PAGING
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
};
-DEFINE_HASHTABLE_INSERT(add_pte_map, addr_t, addr_t);
-DEFINE_HASHTABLE_SEARCH(find_pte_map, addr_t, addr_t);
-//DEFINE_HASHTABLE_REMOVE(del_pte_map, addr_t, addr_t, 0);
-
-
-
-static uint_t pte_hash_fn(addr_t key) {
- return hash_long(key, 32);
-}
-
-static int pte_equals(addr_t key1, addr_t key2) {
- return (key1 == key2);
-}
static struct shadow_page_data * create_new_shadow_pt(struct guest_info * info);
-static void inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
+static int inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
static int is_guest_pf(pt_access_status_t guest_access, pt_access_status_t shadow_access);
state->guest_cr3 = 0;
state->guest_cr0 = 0;
+ state->guest_efer.value = 0x0LL;
INIT_LIST_HEAD(&(state->page_list));
-
- state->cached_ptes = NULL;
- state->cached_cr3 = 0;
return 0;
}
// creates new shadow page tables
// updates the shadow CR3 register to point to the new pts
int v3_activate_shadow_pt(struct guest_info * info) {
- switch (v3_get_cpu_mode(info)) {
+ switch (v3_get_vm_cpu_mode(info)) {
case PROTECTED:
return activate_shadow_pt_32(info);
case LONG_16_COMPAT:
return activate_shadow_pt_64(info);
default:
- PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+ PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
return -1;
}
}
-int v3_activate_passthrough_pt(struct guest_info * info) {
- // For now... But we need to change this....
- // As soon as shadow paging becomes active the passthrough tables are hosed
- // So this will cause chaos if it is called at that time
- info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);
- //PrintError("Activate Passthrough Page tables not implemented\n");
- return 0;
+// This must flush any caches
+// and reset the cr3 value to the correct value
+int v3_invalidate_shadow_pts(struct guest_info * info) {
+ return v3_activate_shadow_pt(info);
}
-
int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
- if (v3_get_mem_mode(info) == PHYSICAL_MEM) {
+ if (v3_get_vm_mem_mode(info) == PHYSICAL_MEM) {
// If paging is not turned on we need to handle the special cases
return v3_handle_passthrough_pagefault(info, fault_addr, error_code);
- } else if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
+ } else if (v3_get_vm_mem_mode(info) == VIRTUAL_MEM) {
- switch (v3_get_cpu_mode(info)) {
+ switch (v3_get_vm_cpu_mode(info)) {
case PROTECTED:
return handle_shadow_pagefault_32(info, fault_addr, error_code);
break;
return handle_shadow_pagefault_64(info, fault_addr, error_code);
break;
default:
- PrintError("Unhandled CPU Mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+ PrintError("Unhandled CPU Mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
return -1;
}
} else {
int ret = 0;
addr_t vaddr = 0;
- if (v3_get_mem_mode(info) != VIRTUAL_MEM) {
+ if (v3_get_vm_mem_mode(info) != VIRTUAL_MEM) {
// Paging must be turned on...
// should handle with some sort of fault I think
PrintError("ERROR: INVLPG called in non paged mode\n");
return -1;
}
- if (v3_get_mem_mode(info) == PHYSICAL_MEM) {
+ if (v3_get_vm_mem_mode(info) == PHYSICAL_MEM) {
ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
} else {
ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
info->rip += dec_instr.instr_length;
- switch (v3_get_cpu_mode(info)) {
+ switch (v3_get_vm_cpu_mode(info)) {
case PROTECTED:
return handle_shadow_invlpg_32(info, vaddr);
case PROTECTED_PAE:
case LONG_16_COMPAT:
return handle_shadow_invlpg_64(info, vaddr);
default:
- PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+ PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
return -1;
}
}
}
-static void inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
+static int inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
+
+#ifdef CONFIG_PROFILE_VMM
if (info->enable_profiler) {
info->profiler.guest_pf_cnt++;
}
+#endif
info->ctrl_regs.cr2 = fault_addr;
- v3_raise_exception_with_error(info, PF_EXCEPTION, *(uint_t *)&error_code);
+
+ return v3_raise_exception_with_error(info, PF_EXCEPTION, *(uint_t *)&error_code);
}