void * page = 0;
void *temp;
- temp = V3_AllocPagesExtended(1, PAGE_SIZE_4KB, -1, 0); // no constraints
+ temp = V3_AllocPagesExtended(1, PAGE_SIZE_4KB,
+ core->resource_control.pg_node_id,
+ core->resource_control.pg_filter_func,
+ core->resource_control.pg_filter_state);
if (!temp) {
PrintError(VM_NONE, VCORE_NONE,"Cannot allocate page\n");
int v3_init_passthrough_pts(struct guest_info * info) {
+ if (info->shdw_pg_mode == NESTED_PAGING && is_vmx_nested()) {
+ // skip - ept_init will do this allocation
+ return 0;
+ }
info->direct_map_pt = (addr_t)V3_PAddr((void *)create_generic_pt_page(info));
return 0;
}
int v3_free_passthrough_pts(struct guest_info * core) {
v3_cpu_mode_t mode = v3_get_vm_cpu_mode(core);
+ if (core->shdw_pg_mode == NESTED_PAGING && is_vmx_nested()) {
+ // there are no passthrough page tables, but
+ // the EPT implementation is using direct_map_pt to store
+ // the EPT root table pointer... and the EPT tables
+ // are not compatible with regular x86 tables, so we
+ // must not attempt to free them here...
+ return 0;
+ }
+
+ // we are either in shadow or in SVM nested
+ // in either case, we can nuke the PTs
+
// Delete the old direct map page tables
switch(mode) {
case REAL:
case LONG:
case LONG_32_COMPAT:
// Long mode will only use 32PAE page tables...
- delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(core->direct_map_pt)));
+ if (core->direct_map_pt) {
+ delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(core->direct_map_pt)));
+ }
break;
default:
PrintError(core->vm_info, core, "Unknown CPU Mode\n");
{
INIT_LIST_HEAD(&(vm->passthrough_impl.event_callback_list));
v3_rw_lock_init(&(vm->passthrough_impl.event_callback_lock));
+ vm->passthrough_impl.inited=1;
return 0;
}
struct passthrough_event_callback *cb,*temp;
addr_t flags;
+ if (!vm->passthrough_impl.inited) {
+ return 0;
+ }
+
flags=v3_write_lock_irqsave(&(vm->passthrough_impl.event_callback_lock));
list_for_each_entry_safe(cb,
{
INIT_LIST_HEAD(&(vm->nested_impl.event_callback_list));
v3_rw_lock_init(&(vm->nested_impl.event_callback_lock));
+ vm->nested_impl.inited=1;
return 0;
}
return init_ept(core, (struct vmx_hw_info *) hwinfo);
} else {
// no initialization for SVM
+ // the direct map page tables are used since the
+ // nested pt format is identical to the main pt format
return 0;
}
}
struct nested_event_callback *cb,*temp;
addr_t flags;
+ if (!vm->nested_impl.inited) {
+ return 0;
+ }
+
flags=v3_write_lock_irqsave(&(vm->nested_impl.event_callback_lock));
list_for_each_entry_safe(cb,
int v3_deinit_nested_paging_core(struct guest_info *core)
{
- // nothing to do.. probably dealloc? FIXME PAD
-
- return 0;
+ if (core->shdw_pg_mode == NESTED_PAGING) {
+ if (is_vmx_nested()) {
+ return deinit_ept(core);
+ } else {
+ // SVM nested deinit is handled by the passthrough paging teardown
+ return 0;
+ }
+ } else {
+ // not relevant
+ return 0;
+ }
}