X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_mem.h;fp=palacios%2Finclude%2Fpalacios%2Fvmm_mem.h;h=ae4ca0587e2fce9b995883b387f091ed1dcd52cf;hp=3616bc7799718d9ccd3e5073c432d2ea500611f5;hb=24178516ccd9f46718b687d4c630415eb63ff595;hpb=19b0b4544674b4f9bc727da5242d625f18821a48

diff --git a/palacios/include/palacios/vmm_mem.h b/palacios/include/palacios/vmm_mem.h
index 3616bc7..ae4ca05 100644
--- a/palacios/include/palacios/vmm_mem.h
+++ b/palacios/include/palacios/vmm_mem.h
@@ -28,6 +28,8 @@
 #include <palacios/vmm_types.h>
 
 #include <palacios/vmm_paging.h>
+#include <palacios/vmm_rbtree.h>
+
 
 struct guest_info;
 
@@ -40,18 +42,17 @@ typedef enum shdw_region_type {
   SHDW_REGION_WRITE_HOOK,                 // This region is mapped as read-only (page faults on write)
   SHDW_REGION_FULL_HOOK,                  // This region is mapped as not present (always generate page faults)
   SHDW_REGION_ALLOCATED,                  // Region is a section of host memory
-  SHDW_REGION_UNALLOCATED,                // Region is mapped on demand
-} shdw_region_type_t;
+} v3_shdw_region_type_t;
 
 
+typedef struct rb_root v3_shdw_map_t;
 
-struct vmm_mem_hook;
 
-struct shadow_region {
+struct v3_shadow_region {
   addr_t                  guest_start; 
   addr_t                  guest_end; 
 
-  shdw_region_type_t      host_type;
+  v3_shdw_region_type_t   host_type;
   
   addr_t                  host_addr; // This either points to a host address mapping
 
@@ -63,83 +64,61 @@ struct shadow_region {
 
   void * priv_data;
 
-  struct shadow_region *next, *prev;
+  struct rb_node tree_node;
 };
 
 
 
-struct shadow_map {
-  uint_t num_regions;
-
-  struct shadow_region * head;
-};
+void v3_init_shadow_map(struct guest_info * info);
+void v3_delete_shadow_map(struct guest_info * info);
 
 
+int v3_add_shadow_mem(struct guest_info * guest_info, 
+		      addr_t guest_addr_start,
+		      addr_t guest_addr_end,
+		      addr_t host_addr);
 
-void init_shadow_region(struct shadow_region * entry,
-			addr_t               guest_addr_start,
-			addr_t               guest_addr_end,
-			shdw_region_type_t   shdw_region_type);
-
+int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
+		     int (*read)(addr_t guest_addr, void * dst, uint_t length, void * priv_data),
+		     int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
+		     void * priv_data);
 
-int add_shadow_region_passthrough(struct guest_info * guest_info, 
-				  addr_t guest_addr_start,
-				  addr_t guest_addr_end,
-				  addr_t host_addr);
+int v3_hook_write_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
+		      addr_t host_addr,
+		      int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
+		      void * priv_data);
 
-void init_shadow_map(struct guest_info * info);
-void free_shadow_map(struct shadow_map * map);
 
-struct shadow_region * get_shadow_region_by_addr(struct shadow_map * map, addr_t guest_addr);
 
-struct shadow_region * get_shadow_region_by_index(struct shadow_map * map, uint_t index);
 
-shdw_region_type_t lookup_shadow_map_addr(struct shadow_map * map, addr_t guest_addr, addr_t * host_addr);
 
-shdw_region_type_t get_shadow_addr_type(struct guest_info * info, addr_t guest_addr);
-addr_t get_shadow_addr(struct guest_info * info, addr_t guest_addr);
 
-// Semantics:
-// Adding a region that overlaps with an existing region results is undefined
-// and will probably fail
-int add_shadow_region(struct shadow_map * map, struct shadow_region * entry);
+void v3_delete_shadow_region(struct guest_info * info, struct v3_shadow_region * reg);
 
-// Semantics:
-// Deletions result in splitting
-int delete_shadow_region(struct shadow_map * map,
-			 addr_t guest_start, 
-			 addr_t guest_end);
 
+struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t guest_addr);
+addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr);
 
-void print_shadow_map(struct shadow_map * map);
 
 
 
-struct shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t addr);
 
-int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
-		     int (*read)(addr_t guest_addr, void * dst, uint_t length, void * priv_data),
-		     int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
-		     void * priv_data);
+void print_shadow_map(struct guest_info * info);
 
-int v3_hook_write_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
-		      addr_t host_addr,
-		      int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
-		      void * priv_data);
 
 
 
 
+const uchar_t * v3_shdw_region_type_to_str(v3_shdw_region_type_t type);
 
-const uchar_t * shdw_region_type_to_str(shdw_region_type_t type);
 
 
 int handle_special_page_fault(struct guest_info * info, addr_t fault_addr, addr_t gp_addr, pf_error_t access_info);
 
 int v3_handle_mem_wr_hook(struct guest_info * info, addr_t guest_va, addr_t guest_pa, 
-			  struct shadow_region * reg, pf_error_t access_info);
+			  struct v3_shadow_region * reg, pf_error_t access_info);
 int v3_handle_mem_full_hook(struct guest_info * info, addr_t guest_va, addr_t guest_pa, 
-			    struct shadow_region * reg, pf_error_t access_info);
+			    struct v3_shadow_region * reg, pf_error_t access_info);
 
 #endif // ! __V3VEE__