X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging.c;h=5f5be4c559f4e31e0e5060c86e49085417c45dfb;hb=89537429397b93017ff307983442321665028f98;hp=b044b1f1342723fac393edcc1b8aa19790a395be;hpb=94f67717b6461df514dc225ed84f03b44c44061b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index b044b1f..5f5be4c 100644
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -31,9 +31,18 @@
 #endif
 
 
-static addr_t create_generic_pt_page() {
+static addr_t create_generic_pt_page(struct guest_info *core) {
     void * page = 0;
-    page = V3_VAddr(V3_AllocPages(1));
+    void *temp;
+
+    temp = V3_AllocPagesExtended(1, PAGE_SIZE_4KB, -1, 
+				 core->shdw_pg_mode==SHADOW_PAGING ? V3_ALLOC_PAGES_CONSTRAINT_4GB : 0);
+    if (!temp) { 
+	PrintError(VM_NONE, VCORE_NONE,"Cannot allocate page\n");
+	return 0;
+    }
+
+    page = V3_VAddr(temp);
     memset(page, 0, PAGE_SIZE);
 
     return (addr_t)page;
@@ -45,7 +54,7 @@ static addr_t create_generic_pt_page() {
 #include "vmm_direct_paging_64.h"
 
 int v3_init_passthrough_pts(struct guest_info * info) {
-    info->direct_map_pt = (addr_t)V3_PAddr((void *)create_generic_pt_page());
+    info->direct_map_pt = (addr_t)V3_PAddr((void *)create_generic_pt_page(info));
     return 0;
 }
 
@@ -66,7 +75,7 @@ int v3_free_passthrough_pts(struct guest_info * core) {
 	    delete_page_tables_32pae((pdpe32pae_t *)V3_VAddr((void *)(core->direct_map_pt)));
 	    break;
 	default:
-	    PrintError("Unknown CPU Mode\n");
+	    PrintError(core->vm_info, core, "Unknown CPU Mode\n");
 	    return -1;
 	    break;
     }
@@ -93,7 +102,7 @@ int v3_activate_passthrough_pt(struct guest_info * info) {
     // 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");
+    //PrintError(info->vm_info, info, "Activate Passthrough Page tables not implemented\n");
     return 0;
 }
 
@@ -113,7 +122,7 @@ int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr,
 	    return handle_passthrough_pagefault_32pae(info, fault_addr, error_code);
 
 	default:
-	    PrintError("Unknown CPU Mode\n");
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
 	    break;
     }
     return -1;
@@ -125,7 +134,7 @@ int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
     v3_cpu_mode_t mode = v3_get_host_cpu_mode();
 
 
-    PrintDebug("Nested PageFault: fault_addr=%p, error_code=%u\n", (void *)fault_addr, *(uint_t *)&error_code);
+    PrintDebug(info->vm_info, info, "Nested PageFault: fault_addr=%p, error_code=%u\n", (void *)fault_addr, *(uint_t *)&error_code);
 
     switch(mode) {
 	case REAL:
@@ -140,7 +149,7 @@ int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
 	    return handle_passthrough_pagefault_64(info, fault_addr, error_code);	    
 	
 	default:
-	    PrintError("Unknown CPU Mode\n");
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
 	    break;
     }
     return -1;
@@ -161,13 +170,35 @@ int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
 	    return invalidate_addr_32pae(info, inv_addr);
 
 	default:
-	    PrintError("Unknown CPU Mode\n");
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
 	    break;
     }
     return -1;
 }
 
 
+int v3_invalidate_passthrough_addr_range(struct guest_info * info, 
+					 addr_t inv_addr_start, addr_t inv_addr_end) {
+    v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
+
+    switch(mode) {
+	case REAL:
+	case PROTECTED:
+	    return invalidate_addr_32_range(info, inv_addr_start, inv_addr_end);
+
+	case PROTECTED_PAE:
+	case LONG:
+	case LONG_32_COMPAT:
+	    // Long mode will only use 32PAE page tables...
+	    return invalidate_addr_32pae_range(info, inv_addr_start, inv_addr_end);
+
+	default:
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
+	    break;
+    }
+    return -1;
+}
+
 int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
 
 #ifdef __V3_64BIT__
@@ -189,7 +220,36 @@ int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
 	    return invalidate_addr_64(info, inv_addr);	    
 	
 	default:
-	    PrintError("Unknown CPU Mode\n");
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
+	    break;
+    }
+
+    return -1;
+}
+
+int v3_invalidate_nested_addr_range(struct guest_info * info, 
+				    addr_t inv_addr_start, addr_t inv_addr_end) {
+
+#ifdef __V3_64BIT__
+    v3_cpu_mode_t mode = LONG;
+#else 
+    v3_cpu_mode_t mode = PROTECTED;
+#endif
+
+    switch(mode) {
+	case REAL:
+	case PROTECTED:
+	    return invalidate_addr_32_range(info, inv_addr_start, inv_addr_end);
+
+	case PROTECTED_PAE:
+  	    return invalidate_addr_32pae_range(info, inv_addr_start, inv_addr_end);
+
+	case LONG:
+	case LONG_32_COMPAT:
+  	    return invalidate_addr_64_range(info, inv_addr_start, inv_addr_end);	    
+	
+	default:
+	    PrintError(info->vm_info, info, "Unknown CPU Mode\n");
 	    break;
     }