X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=38eb602716e9dd20b78fcdf2e16bfef4b38f6564;hp=05370061545fd7b0ed70c899d231e68a569c75d4;hb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;hpb=5ac47589b79508967bd06b4022bbfc50de47423f

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 0537006..38eb602 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -35,25 +35,25 @@ struct v3_shadow_region * insert_shadow_region(struct guest_info * info,
 
 
 void v3_init_shadow_map(struct guest_info * info) {
-  v3_shdw_map_t * map = &(info->mem_map);
+    v3_shdw_map_t * map = &(info->mem_map);
 
-  map->shdw_regions.rb_node = NULL;
-  map->hook_hva = (addr_t)V3_VAddr(V3_AllocPages(1));
+    map->shdw_regions.rb_node = NULL;
+    map->hook_hva = (addr_t)V3_VAddr(V3_AllocPages(1));
 
 }
 
 void v3_delete_shadow_map(struct guest_info * info) {
-  struct rb_node * node = v3_rb_first(&(info->mem_map.shdw_regions));
-  struct v3_shadow_region * reg;
-  struct rb_node * tmp_node = NULL;
+    struct rb_node * node = v3_rb_first(&(info->mem_map.shdw_regions));
+    struct v3_shadow_region * reg;
+    struct rb_node * tmp_node = NULL;
   
-   while (node) {
-    reg = rb_entry(node, struct v3_shadow_region, tree_node);
-    tmp_node = node;
-    node = v3_rb_next(node);
+    while (node) {
+	reg = rb_entry(node, struct v3_shadow_region, tree_node);
+	tmp_node = node;
+	node = v3_rb_next(node);
 
-    v3_delete_shadow_region(info, reg);
-  }
+	v3_delete_shadow_region(info, reg);
+    }
 }
 
 
@@ -64,22 +64,22 @@ int v3_add_shadow_mem( struct guest_info *  info,
 		       addr_t               guest_addr_end,
 		       addr_t               host_addr)
 {
-  struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
-
-  entry->guest_start = guest_addr_start;
-  entry->guest_end = guest_addr_end;
-  entry->host_type = SHDW_REGION_ALLOCATED;
-  entry->host_addr = host_addr;
-  entry->write_hook = NULL;
-  entry->read_hook = NULL;
-  entry->priv_data = NULL;
-
-  if (insert_shadow_region(info, entry)) {
-    V3_Free(entry);
-    return -1;
-  }
-
-  return 0;
+    struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
+
+    entry->guest_start = guest_addr_start;
+    entry->guest_end = guest_addr_end;
+    entry->host_type = SHDW_REGION_ALLOCATED;
+    entry->host_addr = host_addr;
+    entry->write_hook = NULL;
+    entry->read_hook = NULL;
+    entry->priv_data = NULL;
+
+    if (insert_shadow_region(info, entry)) {
+	V3_Free(entry);
+	return -1;
+    }
+
+    return 0;
 }
 
 
@@ -89,23 +89,23 @@ int v3_hook_write_mem(struct guest_info * info, addr_t guest_addr_start, addr_t
 		      int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
 		      void * priv_data) {
 
-  struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
+    struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
 
 
-  entry->guest_start = guest_addr_start;
-  entry->guest_end = guest_addr_end;
-  entry->host_type = SHDW_REGION_WRITE_HOOK;
-  entry->host_addr = host_addr;
-  entry->write_hook = write;
-  entry->read_hook = NULL;
-  entry->priv_data = priv_data;
+    entry->guest_start = guest_addr_start;
+    entry->guest_end = guest_addr_end;
+    entry->host_type = SHDW_REGION_WRITE_HOOK;
+    entry->host_addr = host_addr;
+    entry->write_hook = write;
+    entry->read_hook = NULL;
+    entry->priv_data = priv_data;
 
-  if (insert_shadow_region(info, entry)) {
-    V3_Free(entry);
-    return -1;
-  }
+    if (insert_shadow_region(info, entry)) {
+	V3_Free(entry);
+	return -1;
+    }
 
-  return 0;  
+    return 0;  
 }
 
 int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t guest_addr_end,
@@ -113,22 +113,22 @@ int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t g
 		     int (*write)(addr_t guest_addr, void * src, uint_t length, void * priv_data),
 		     void * priv_data) {
   
-  struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
-
-  entry->guest_start = guest_addr_start;
-  entry->guest_end = guest_addr_end;
-  entry->host_type = SHDW_REGION_FULL_HOOK;
-  entry->host_addr = (addr_t)NULL;
-  entry->write_hook = write;
-  entry->read_hook = read;
-  entry->priv_data = priv_data;
+    struct v3_shadow_region * entry = (struct v3_shadow_region *)V3_Malloc(sizeof(struct v3_shadow_region));
+
+    entry->guest_start = guest_addr_start;
+    entry->guest_end = guest_addr_end;
+    entry->host_type = SHDW_REGION_FULL_HOOK;
+    entry->host_addr = (addr_t)NULL;
+    entry->write_hook = write;
+    entry->read_hook = read;
+    entry->priv_data = priv_data;
   
-  if (insert_shadow_region(info, entry)) {
-    V3_Free(entry);
-    return -1;
-  }
+    if (insert_shadow_region(info, entry)) {
+	V3_Free(entry);
+	return -1;
+    }
 
-  return 0;
+    return 0;
 }
 
 
@@ -137,41 +137,41 @@ int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t g
 static inline 
 struct v3_shadow_region * __insert_shadow_region(struct guest_info * info, 
 						 struct v3_shadow_region * region) {
-  struct rb_node ** p = &(info->mem_map.shdw_regions.rb_node);
-  struct rb_node * parent = NULL;
-  struct v3_shadow_region * tmp_region;
-
-  while (*p) {
-    parent = *p;
-    tmp_region = rb_entry(parent, struct v3_shadow_region, tree_node);
-
-    if (region->guest_end <= tmp_region->guest_start) {
-      p = &(*p)->rb_left;
-    } else if (region->guest_start >= tmp_region->guest_end) {
-      p = &(*p)->rb_right;
-    } else {
-      return tmp_region;
+    struct rb_node ** p = &(info->mem_map.shdw_regions.rb_node);
+    struct rb_node * parent = NULL;
+    struct v3_shadow_region * tmp_region;
+
+    while (*p) {
+	parent = *p;
+	tmp_region = rb_entry(parent, struct v3_shadow_region, tree_node);
+
+	if (region->guest_end <= tmp_region->guest_start) {
+	    p = &(*p)->rb_left;
+	} else if (region->guest_start >= tmp_region->guest_end) {
+	    p = &(*p)->rb_right;
+	} else {
+	    return tmp_region;
+	}
     }
-  }
 
-  rb_link_node(&(region->tree_node), parent, p);
+    rb_link_node(&(region->tree_node), parent, p);
   
-  return NULL;
+    return NULL;
 }
 
 
 static inline
 struct v3_shadow_region * insert_shadow_region(struct guest_info * info, 
  					       struct v3_shadow_region * region) {
-  struct v3_shadow_region * ret;
+    struct v3_shadow_region * ret;
 
-  if ((ret = __insert_shadow_region(info, region))) {
-    return ret;
-  }
+    if ((ret = __insert_shadow_region(info, region))) {
+	return ret;
+    }
   
-  v3_rb_insert_color(&(region->tree_node), &(info->mem_map.shdw_regions));
+    v3_rb_insert_color(&(region->tree_node), &(info->mem_map.shdw_regions));
 
-  return NULL;
+    return NULL;
 }
 						 
 
@@ -185,125 +185,125 @@ int handle_special_page_fault(struct guest_info * info,
 			      addr_t fault_gva, addr_t fault_gpa, 
 			      pf_error_t access_info) 
 {
- struct v3_shadow_region * reg = v3_get_shadow_region(info, fault_gpa);
+    struct v3_shadow_region * reg = v3_get_shadow_region(info, fault_gpa);
 
-  PrintDebug("Handling Special Page Fault\n");
+    PrintDebug("Handling Special Page Fault\n");
 
-  switch (reg->host_type) {
-  case SHDW_REGION_WRITE_HOOK:
-    return v3_handle_mem_wr_hook(info, fault_gva, fault_gpa, reg, access_info);
-  case SHDW_REGION_FULL_HOOK:
-    return v3_handle_mem_full_hook(info, fault_gva, fault_gpa, reg, access_info);
-  default:
-    return -1;
-  }
+    switch (reg->host_type) {
+	case SHDW_REGION_WRITE_HOOK:
+	    return v3_handle_mem_wr_hook(info, fault_gva, fault_gpa, reg, access_info);
+	case SHDW_REGION_FULL_HOOK:
+	    return v3_handle_mem_full_hook(info, fault_gva, fault_gpa, reg, access_info);
+	default:
+	    return -1;
+    }
 
-  return 0;
+    return 0;
 
 }
 
 int v3_handle_mem_wr_hook(struct guest_info * info, addr_t guest_va, addr_t guest_pa, 
 			  struct v3_shadow_region * reg, pf_error_t access_info) {
 
-  addr_t dst_addr = (addr_t)V3_VAddr((void *)v3_get_shadow_addr(reg, guest_pa));
+    addr_t dst_addr = (addr_t)V3_VAddr((void *)v3_get_shadow_addr(reg, guest_pa));
 
-  if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, reg->write_hook, reg->priv_data) == -1) {
-    PrintError("Write hook emulation failed\n");
-    return -1;
-  }
+    if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, reg->write_hook, reg->priv_data) == -1) {
+	PrintError("Write hook emulation failed\n");
+	return -1;
+    }
 
-  return 0;
+    return 0;
 }
 
 int v3_handle_mem_full_hook(struct guest_info * info, addr_t guest_va, addr_t guest_pa, 
 			    struct v3_shadow_region * reg, pf_error_t access_info) {
   
-  addr_t op_addr = info->mem_map.hook_hva;
+    addr_t op_addr = info->mem_map.hook_hva;
 
-  if (access_info.write == 1) {
-    if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, reg->write_hook, reg->priv_data) == -1) {
-      PrintError("Write Full Hook emulation failed\n");
-      return -1;
-    }
-  } else {
-    if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, reg->read_hook, reg->write_hook, reg->priv_data) == -1) {
-      PrintError("Read Full Hook emulation failed\n");
-      return -1;
+    if (access_info.write == 1) {
+	if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, reg->write_hook, reg->priv_data) == -1) {
+	    PrintError("Write Full Hook emulation failed\n");
+	    return -1;
+	}
+    } else {
+	if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, reg->read_hook, reg->write_hook, reg->priv_data) == -1) {
+	    PrintError("Read Full Hook emulation failed\n");
+	    return -1;
+	}
     }
-  }
 
-  return 0;
+    return 0;
 }
 
 
 
 struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t guest_addr) {
-  struct rb_node * n = info->mem_map.shdw_regions.rb_node;
-  struct v3_shadow_region * reg = NULL;
-
-  while (n) {
-    reg = rb_entry(n, struct v3_shadow_region, tree_node);
-
-    if (guest_addr < reg->guest_start) {
-      n = n->rb_left;
-    } else if (guest_addr >= reg->guest_end) {
-      n = n->rb_right;
-    } else {
-      return reg;
+    struct rb_node * n = info->mem_map.shdw_regions.rb_node;
+    struct v3_shadow_region * reg = NULL;
+
+    while (n) {
+	reg = rb_entry(n, struct v3_shadow_region, tree_node);
+
+	if (guest_addr < reg->guest_start) {
+	    n = n->rb_left;
+	} else if (guest_addr >= reg->guest_end) {
+	    n = n->rb_right;
+	} else {
+	    return reg;
+	}
     }
-  }
 
-  return NULL;
+    return NULL;
 }
 
 
 
 addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr) {
-  if ( (reg) && 
-       (reg->host_type != SHDW_REGION_FULL_HOOK) &&
-       (reg->host_type != SHDW_REGION_INVALID) ) {
-    return (guest_addr - reg->guest_start) + reg->host_addr;
-  } else {
-    PrintError("MEM Region Invalid\n");
-    return 0;
-  }
+    if ( (reg) && 
+	 (reg->host_type != SHDW_REGION_FULL_HOOK) &&
+	 (reg->host_type != SHDW_REGION_INVALID) ) {
+	return (guest_addr - reg->guest_start) + reg->host_addr;
+    } else {
+	PrintError("MEM Region Invalid\n");
+	return 0;
+    }
 }
 
 
 
 void v3_delete_shadow_region(struct guest_info * info, struct v3_shadow_region * reg) {
-  if (reg != NULL) {
-    v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions));
+    if (reg != NULL) {
+	v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions));
 
-    V3_Free(reg);
-  }
+	V3_Free(reg);
+    }
 }
 
 
 
 
 void print_shadow_map(struct guest_info * info) {
-  struct rb_node * node = v3_rb_first(&(info->mem_map.shdw_regions));
-  struct v3_shadow_region * reg;
-  int i = 0;
+    struct rb_node * node = v3_rb_first(&(info->mem_map.shdw_regions));
+    struct v3_shadow_region * reg;
+    int i = 0;
 
-  PrintDebug("Memory Layout:\n");
+    PrintDebug("Memory Layout:\n");
 
-  do {
-    reg = rb_entry(node, struct v3_shadow_region, tree_node);
+    do {
+	reg = rb_entry(node, struct v3_shadow_region, tree_node);
 
-    PrintDebug("%d:  0x%p - 0x%p -> 0x%p\n", i, 
-	       (void *)(reg->guest_start), 
-	       (void *)(reg->guest_end - 1), 
-	       (void *)(reg->host_addr));
+	PrintDebug("%d:  0x%p - 0x%p -> 0x%p\n", i, 
+		   (void *)(reg->guest_start), 
+		   (void *)(reg->guest_end - 1), 
+		   (void *)(reg->host_addr));
 
-    PrintDebug("\t(%s) (WriteHook = 0x%p) (ReadHook = 0x%p)\n", 
-	       v3_shdw_region_type_to_str(reg->host_type),
-	       (void *)(reg->write_hook), 
-	       (void *)(reg->read_hook));
+	PrintDebug("\t(%s) (WriteHook = 0x%p) (ReadHook = 0x%p)\n", 
+		   v3_shdw_region_type_to_str(reg->host_type),
+		   (void *)(reg->write_hook), 
+		   (void *)(reg->read_hook));
     
-    i++;
-  } while ((node = v3_rb_next(node)));
+	i++;
+    } while ((node = v3_rb_next(node)));
 }
 
 
@@ -315,15 +315,15 @@ static const uchar_t  SHDW_REGION_ALLOCATED_STR[] = "SHDW_REGION_ALLOCATED";
 
 
 const uchar_t * v3_shdw_region_type_to_str(v3_shdw_region_type_t type) {
-  switch (type) {
-  case SHDW_REGION_WRITE_HOOK:
-    return SHDW_REGION_WRITE_HOOK_STR;
-  case SHDW_REGION_FULL_HOOK:
-    return SHDW_REGION_FULL_HOOK_STR;
-  case SHDW_REGION_ALLOCATED:
-    return SHDW_REGION_ALLOCATED_STR;
-  default:
-    return SHDW_REGION_INVALID_STR;
-  }
+    switch (type) {
+	case SHDW_REGION_WRITE_HOOK:
+	    return SHDW_REGION_WRITE_HOOK_STR;
+	case SHDW_REGION_FULL_HOOK:
+	    return SHDW_REGION_FULL_HOOK_STR;
+	case SHDW_REGION_ALLOCATED:
+	    return SHDW_REGION_ALLOCATED_STR;
+	default:
+	    return SHDW_REGION_INVALID_STR;
+    }
 }