X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_mem.h;h=775d9ed541ede504afb5a6f9206eb645a75c2169;hb=77472ac6e4de7f87a8d8b8c9a554e1fcb05206a5;hp=37f93209043a09a9b832730e9c6e192130e65b6e;hpb=b93aeabee44c82139a9afd065dfcaca8ac6688ad;p=palacios.git

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index 37f9320..775d9ed 100644
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -34,6 +34,11 @@
 struct guest_info;
 struct v3_vm_info;
 
+#ifdef V3_CONFIG_SWAPPING
+#include <palacios/vmm_swapping.h>
+#endif
+
+
 
 
 #define V3_MEM_CORE_ANY ((uint16_t)-1)
@@ -44,18 +49,26 @@ typedef struct {
     union {
 	uint16_t value;
 	struct {
+	    // These reflect the VMM's intent for the shadow or nested pts 
+	    // that will implement the region.   The guest's intent is in
+	    // its own page tables.
 	    uint8_t read   : 1;
 	    uint8_t write  : 1;
 	    uint8_t exec   : 1;
 	    uint8_t base   : 1;
 	    uint8_t alloced : 1;
+	    uint8_t limit32 : 1; // must be < 4GB in host
+#ifdef V3_CONFIG_SWAPPING 
+	    uint8_t swapped : 1;
+	    uint8_t pinned : 1;
+#endif 
 	} __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed)) v3_mem_flags_t;
 
 
 
-struct v3_shadow_region {
+struct v3_mem_region {
     addr_t                  guest_start; 
     addr_t                  guest_end; 
 
@@ -64,20 +77,27 @@ struct v3_shadow_region {
     addr_t                  host_addr; // This either points to a host address mapping
 
     int (*unhandled)(struct guest_info * info, addr_t guest_va, addr_t guest_pa, 
-		     struct v3_shadow_region * reg, pf_error_t access_info);
+		     struct v3_mem_region * reg, pf_error_t access_info);
 
     void * priv_data;
 
-    int core_id;
+    int core_id;     // The virtual core this region is assigned to (-1 means all cores)
+    int numa_id;     // The NUMA node this region is allocated from
+
+#ifdef V3_CONFIG_SWAPPING 
+    struct v3_swap_region_state swap_state;
+#endif
 
     struct rb_node tree_node; // This for memory regions mapped to the global map
 };
 
 
 struct v3_mem_map {
-    struct v3_shadow_region base_region;
 
-    struct rb_root shdw_regions;
+    struct rb_root mem_regions;
+    
+    uint32_t num_base_regions;
+    struct v3_mem_region * base_regions;
 };
 
 
@@ -88,12 +108,12 @@ void v3_delete_mem_map(struct v3_vm_info * vm);
 
 
 
-struct v3_shadow_region * v3_create_mem_region(struct v3_vm_info * vm, uint16_t core_id, 
+struct v3_mem_region * v3_create_mem_region(struct v3_vm_info * vm, uint16_t core_id, 
 					       addr_t guest_addr_start, addr_t guest_addr_end);
 
-int v3_insert_shadow_region(struct v3_vm_info * vm, struct v3_shadow_region * reg);
+int v3_insert_mem_region(struct v3_vm_info * vm, struct v3_mem_region * reg);
 
-void v3_delete_shadow_region(struct v3_vm_info * vm, struct v3_shadow_region * reg);
+void v3_delete_mem_region(struct v3_vm_info * vm, struct v3_mem_region * reg);
 
 
 /* This is a shortcut function for creating + inserting a memory region which redirects to host memory */
@@ -102,22 +122,21 @@ int v3_add_shadow_mem(struct v3_vm_info * vm, uint16_t core_id,
 
 
 
-struct v3_shadow_region * v3_get_shadow_region(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr);
-
-
-addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, uint16_t core_id, addr_t guest_addr);
-
+struct v3_mem_region * v3_get_mem_region(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr);
+struct v3_mem_region * v3_get_base_region(struct v3_vm_info * vm, addr_t gpa);
 
 
+uint32_t v3_get_max_page_size(struct guest_info * core, addr_t fault_addr, v3_cpu_mode_t mode);
 
 
 void v3_print_mem_map(struct v3_vm_info * vm);
 
 
+void v3_init_mem();
+void v3_deinit_mem();
 
 
-
-#endif // ! __V3VEE__
+#endif /* ! __V3VEE__ */
 
 
 #endif