X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fgeekos%2Fvmm_mem.h;h=e52ae7c092e8fff7b7c77261bf6afa67d5e65c85;hb=5ad0c835a5bd7181a7a342478bd398ad73712306;hp=877382ce045284f9f40f47ba9e3b3ac3c94ae9b9;hpb=4939ecae04ce6416f404670640620a23aee9b914;p=palacios-OLD.git

diff --git a/palacios/include/geekos/vmm_mem.h b/palacios/include/geekos/vmm_mem.h
index 877382c..e52ae7c 100644
--- a/palacios/include/geekos/vmm_mem.h
+++ b/palacios/include/geekos/vmm_mem.h
@@ -4,94 +4,100 @@
 
 #include <geekos/ktypes.h>
 
+typedef ulong_t addr_t;
 
 /*
- * The mem list is TEMPORARY, simply to lock down which pages are assigned to the VM
- * We will remove it and use the host page allocation mechanism in the future
- */
-
-
-typedef unsigned long addr_t;
-
-
-typedef struct mem_region {
-  addr_t addr;
-  uint_t num_pages;
-
-  struct mem_region * next;
-  struct mem_region * prev;
-} mem_region_t;
-
-
-typedef struct vmm_mem_list {
-  uint_t num_pages;
-  bool long_mode;
 
+        Guest                  Shadow                 Host
+  Virtual   Physical    Virtual     Physical   Virtual     Physical
+               OK                      OK
+               OK                      NOK
+               NOK                     OK
+               NOK                     NOK
+
+*/
+
+// These are the types of physical memory address regions
+// from the perspective of the guest
+typedef enum guest_region_type { 
+  GUEST_REGION_NOTHING, 
+  GUEST_REGION_PHYSICAL_MEMORY, 
+  GUEST_REGION_MEMORY_MAPPED_DEVICE} guest_region_type_t;
+
+// These are the types of physical memory address regions
+// from the perspective of the HOST
+typedef enum host_region_type { 
+  HOST_REGION_INVALID,                    // This region is INVALID (this is a return type, to denote errors)
+  HOST_REGION_NOTHING,                    // This region is mapped as not present (always generate page faults)
+  HOST_REGION_PHYSICAL_MEMORY,            // Region is a section of host memory
+  HOST_REGION_MEMORY_MAPPED_DEVICE,       // Region is allocated for DMA
+  HOST_REGION_UNALLOCATED,                // Region is mapped on demand
+  HOST_REGION_REMOTE,                     // Region is located on a remote machine
+  HOST_REGION_SWAPPED,                    // Region is swapped
+} host_region_type_t;
+
+
+
+typedef struct shadow_region {
+  guest_region_type_t     guest_type;
+  addr_t                  guest_start; 
+  addr_t                  guest_end; 
+
+  host_region_type_t      host_type;
+  union host_addr_t {
+    struct physical_addr { 
+       addr_t                  host_start; 
+    }                     phys_addr;
+    // Other addresses, like on disk, etc, would go here
+  }                       host_addr;
+  struct shadow_region *next, *prev;
+} shadow_region_t;
+
+
+
+typedef struct shadow_map {
   uint_t num_regions;
-  mem_region_t * head;
-  //  mem_region_t * tail;
-} vmm_mem_list_t;
-
-
-
-/** Memory layout **/
-/* Describes the layout of memory for the guest */
-/* We use this to build the guest page tables */
-
-typedef enum region_type {GUEST, UNMAPPED, SHARED} region_type_t;
-
-
-typedef struct layout_region {
-  addr_t start;
-  addr_t end;
-
-  region_type_t type;
-
-  addr_t host_addr;
-
-  struct layout_region * next;
-  struct layout_region * prev;
-} layout_region_t;
-
-
-typedef struct vmm_mem_layout {
-  uint_t num_pages;
-  uint_t num_regions;
-
-  layout_region_t * head;
-} vmm_mem_layout_t;
-
-
-/*** FOR THE LOVE OF GOD WRITE SOME UNIT TESTS FOR THIS THING ***/
-
-void init_mem_list(vmm_mem_list_t * list);
-void free_mem_list(vmm_mem_list_t * list);
 
-int add_mem_list_pages(vmm_mem_list_t * list, addr_t addr, uint_t num_pages);
-int remove_mem_list_pages(vmm_mem_list_t * list, addr_t addr, uint_t num_pages);
+  shadow_region_t * head;
+} shadow_map_t;
 
-mem_region_t * get_mem_list_cursor(vmm_mem_list_t * list, addr_t addr);
 
-addr_t get_mem_list_addr(vmm_mem_list_t * list, uint_t index);
+void init_shadow_region(shadow_region_t * entry,
+			   addr_t               guest_addr_start,
+			   addr_t               guest_addr_end,
+			   guest_region_type_t  guest_region_type,
+			   host_region_type_t   host_region_type);
 
-void print_mem_list(vmm_mem_list_t * list);
+void init_shadow_region_physical(shadow_region_t * entry,
+				    addr_t               guest_addr_start,
+				    addr_t               guest_addr_end,
+				    guest_region_type_t  guest_region_type,
+				    addr_t               host_addr_start,
+				    host_region_type_t   host_region_type);
+  
+void init_shadow_map(shadow_map_t * map);
+void free_shadow_map(shadow_map_t * map);
 
+shadow_region_t * get_shadow_region_by_addr(shadow_map_t * map, addr_t guest_addr);
 
-void init_mem_layout(vmm_mem_layout_t * layout);
-void free_mem_layout(vmm_mem_layout_t * layout);
+shadow_region_t * get_shadow_region_by_index(shadow_map_t * map, uint_t index);
 
+host_region_type_t lookup_shadow_map_addr(shadow_map_t * map, addr_t guest_addr, addr_t * host_addr);
 
-int add_mem_range(vmm_mem_layout_t * layout, layout_region_t * region);
-int add_shared_mem_range(vmm_mem_layout_t * layout, addr_t start, addr_t end, addr_t host_addr);
-int add_unmapped_mem_range(vmm_mem_layout_t * layout, addr_t start, addr_t end);
-int add_guest_mem_range(vmm_mem_layout_t * layout, addr_t start, addr_t end);
 
+// Semantics:
+// Adding a region that overlaps with an existing region results is undefined
+// and will probably fail
+int add_shadow_region(shadow_map_t * map, shadow_region_t * entry);
 
-addr_t get_mem_layout_addr(vmm_mem_layout_t * layout, uint_t index);
-layout_region_t * get_mem_layout_region(vmm_mem_layout_t * layout, addr_t addr);
+// Semantics:
+// Deletions result in splitting
+int delete_shadow_region(shadow_map_t * map,
+			     addr_t guest_start, 
+			     addr_t guest_end);
 
-void print_mem_layout(vmm_mem_layout_t * layout);
 
+void print_shadow_map(shadow_map_t * map);