X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=0211b99b97bad6dd822fcea5d54639577dfa9235;hp=b05644155aac6fbc94893064230337e44eb6af4d;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index b056441..0211b99 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -20,103 +20,95 @@
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
+#include <palacios/vm_guest.h>
 
 
 
-
-#ifndef DEBUG_IO
+#ifndef CONFIG_DEBUG_IO
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
 
 
-static int default_write(ushort_t port, void *src, uint_t length, void * priv_data);
-static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data);
+static int default_write(uint16_t port, void *src, uint_t length, void * priv_data);
+static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data);
 
 
-void init_vmm_io_map(struct guest_info * info) {
-  struct vmm_io_map * io_map = &(info->io_map);
-  io_map->num_ports = 0;
-  io_map->head = NULL;
-}
+void v3_init_io_map(struct guest_info * info) {
 
+  info->io_map.map.rb_node = NULL;
+  info->io_map.arch_data = NULL;
+  info->io_map.update_map = NULL;
 
+}
 
 
 
-static int add_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) {
 
-  if (!(io_map->head)) {
-    io_map->head = io_hook;
-    io_map->num_ports = 1;
-    return 0;
-  } else if (io_map->head->port > io_hook->port) {
-    io_hook->next = io_map->head;
+static inline struct v3_io_hook * __insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) {
+  struct rb_node ** p = &(info->io_map.map.rb_node);
+  struct rb_node * parent = NULL;
+  struct v3_io_hook * tmp_hook = NULL;
 
-    io_map->head->prev = io_hook;
-    io_map->head = io_hook;
-    io_map->num_ports++;
+  while (*p) {
+    parent = *p;
+    tmp_hook = rb_entry(parent, struct v3_io_hook, tree_node);
 
-    return 0;
-  } else {
-    struct vmm_io_hook * tmp_hook = io_map->head;
-    
-    while ((tmp_hook->next)  && 
-	   (tmp_hook->next->port <= io_hook->port)) {
-	tmp_hook = tmp_hook->next;
-    }
-    
-    if (tmp_hook->port == io_hook->port) {
-      //tmp_hook->read = io_hook->read;
-      //tmp_hook->write = io_hook->write;
-      //V3_Free(io_hook);
-      return -1;
+    if (hook->port < tmp_hook->port) {
+      p = &(*p)->rb_left;
+    } else if (hook->port > tmp_hook->port) {
+      p = &(*p)->rb_right;
     } else {
-      io_hook->prev = tmp_hook;
-      io_hook->next = tmp_hook->next;
+      return tmp_hook;
+    }
+  }
+  rb_link_node(&(hook->tree_node), parent, p);
 
-      if (tmp_hook->next) {
-	tmp_hook->next->prev = io_hook;
-      }
+  return NULL;
+}
 
-      tmp_hook->next = io_hook;
 
-      io_map->num_ports++;
-      return 0;
-    }
+static inline struct v3_io_hook * insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) {
+  struct v3_io_hook * ret;
+
+  if ((ret = __insert_io_hook(info, hook))) {
+    return ret;
   }
-  return -1;
+
+  v3_rb_insert_color(&(hook->tree_node), &(info->io_map.map));
+
+  return NULL;
 }
 
-static int remove_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) {
-  if (io_map->head == io_hook) {
-    io_map->head = io_hook->next;
-  } else if (io_hook->prev) {
-    io_hook->prev->next = io_hook->next;
-  } else {
-    return -1;
-    // data corruption failure
-  }
-  
-  if (io_hook->next) {
-    io_hook->next->prev = io_hook->prev;
-  }
 
-  io_map->num_ports--;
+struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint16_t port) {
+  struct rb_node * n = info->io_map.map.rb_node;
+  struct v3_io_hook * hook = NULL;
 
-  return 0;
+  while (n) {
+    hook = rb_entry(n, struct v3_io_hook, tree_node);
+    
+    if (port < hook->port) {
+      n = n->rb_left;
+    } else if (port > hook->port) {
+      n = n->rb_right;
+    } else {
+      return hook;
+    }
+  }
+
+  return NULL;
 }
 
 
 
 
 
-int v3_hook_io_port(struct guest_info * info, uint_t port, 
-		    int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data),
-		    int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
+int v3_hook_io_port(struct guest_info * info, uint16_t port, 
+		    int (*read)(uint16_t port, void * dst, uint_t length, void * priv_data),
+		    int (*write)(uint16_t port, void * src, uint_t length, void * priv_data), 
 		    void * priv_data) {
-  struct vmm_io_map * io_map = &(info->io_map);
-  struct vmm_io_hook * io_hook = (struct vmm_io_hook *)V3_Malloc(sizeof(struct vmm_io_hook));
+  struct v3_io_hook * io_hook = (struct v3_io_hook *)V3_Malloc(sizeof(struct v3_io_hook));
 
   io_hook->port = port;
 
@@ -132,52 +124,84 @@ int v3_hook_io_port(struct guest_info * info, uint_t port,
     io_hook->write = write;
   }
 
-  io_hook->next = NULL;
-  io_hook->prev = NULL;
 
   io_hook->priv_data = priv_data;
 
-  if (add_io_hook(io_map, io_hook) != 0) {
-    V3_Free(io_hook);
-    return -1;
+  if (insert_io_hook(info, io_hook)) {
+      PrintError("Could not insert IO hook for port %u (0x%x)\n", port, port);
+      V3_Free(io_hook);
+      return -1;
+  }
+
+  if (info->io_map.update_map) {
+      if (info->io_map.update_map(info, port, 
+				  ((read == NULL) ? 0 : 1), 
+				  ((write == NULL) ? 0 : 1)) == -1) {
+	  PrintError("Could not update IO map for port %u (0x%x)\n", port, port);
+	  V3_Free(io_hook);
+	  return -1;
+      }
   }
 
   return 0;
 }
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port) {
-  struct vmm_io_map * io_map = &(info->io_map);
-  struct vmm_io_hook * hook = v3_get_io_hook(io_map, port);
+int v3_unhook_io_port(struct guest_info * info, uint16_t port) {
+    struct v3_io_hook * hook = v3_get_io_hook(info, port);
 
-  if (hook == NULL) {
-    return -1;
-  }
+    if (hook == NULL) {
+	PrintError("Could not find port to unhook %u (0x%x)\n", port, port);
+	return -1;
+    }
 
-  remove_io_hook(io_map, hook);
-  return 0;
+    v3_rb_erase(&(hook->tree_node), &(info->io_map.map));
+
+    if (info->io_map.update_map) {
+	// set the arch map to default (this should be 1, 1)
+	info->io_map.update_map(info, port, 0, 0);
+    }
+
+    V3_Free(hook);
+
+    return 0;
 }
 
 
-struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port) {
-  struct vmm_io_hook * tmp_hook;
-  FOREACH_IO_HOOK(*io_map, tmp_hook) {
-    if (tmp_hook->port == port) {
-      return tmp_hook;
+
+
+
+
+
+void v3_refresh_io_map(struct guest_info * info) {
+    struct v3_io_map * io_map = &(info->io_map);
+    struct v3_io_hook * tmp = NULL;
+    
+    if (io_map->update_map == NULL) {
+	PrintError("Trying to refresh an io map with no backend\n");
+	return;
     }
-  }
-  return NULL;
+
+    v3_rb_for_each_entry(tmp, &(io_map->map), tree_node) {
+	io_map->update_map(info, tmp->port, 
+			   ((tmp->read == NULL) ? 0 : 1), 
+			   ((tmp->write == NULL) ? 0 : 1));
+    }
+
 }
 
 
 
-void PrintDebugIOMap(struct vmm_io_map * io_map) {
-  struct vmm_io_hook * iter = io_map->head;
+void v3_print_io_map(struct guest_info * info) {
+    struct v3_io_map * io_map = &(info->io_map);
+    struct v3_io_hook * tmp_hook = NULL;
 
-  PrintDebug("VMM IO Map (Entries=%d)\n", io_map->num_ports);
+    V3_Print("VMM IO Map\n");
 
-  while (iter) {
-    PrintDebug("IO Port: %hu (Read=%x) (Write=%x)\n", iter->port, iter->read, iter->write);
-  }
+    v3_rb_for_each_entry(tmp_hook, &(io_map->map), tree_node) {
+	V3_Print("IO Port: %hu (Read=%p) (Write=%p)\n", 
+		 tmp_hook->port, 
+		 (void *)(tmp_hook->read), (void *)(tmp_hook->write));
+    }
 }
 
 
@@ -185,7 +209,7 @@ void PrintDebugIOMap(struct vmm_io_map * io_map) {
 /*
  * Write a byte to an I/O port.
  */
-void v3_outb(ushort_t port, uchar_t value) {
+void v3_outb(uint16_t port, uint8_t value) {
     __asm__ __volatile__ (
 	"outb %b0, %w1"
 	:
@@ -196,8 +220,8 @@ void v3_outb(ushort_t port, uchar_t value) {
 /*
  * Read a byte from an I/O port.
  */
-uchar_t v3_inb(ushort_t port) {
-    uchar_t value;
+uint8_t v3_inb(uint16_t port) {
+    uint8_t value;
 
     __asm__ __volatile__ (
 	"inb %w1, %b0"
@@ -211,7 +235,7 @@ uchar_t v3_inb(ushort_t port) {
 /*
  * Write a word to an I/O port.
  */
-void v3_outw(ushort_t port, ushort_t value) {
+void v3_outw(uint16_t port, uint16_t value) {
     __asm__ __volatile__ (
 	"outw %w0, %w1"
 	:
@@ -222,8 +246,8 @@ void v3_outw(ushort_t port, ushort_t value) {
 /*
  * Read a word from an I/O port.
  */
-ushort_t v3_inw(ushort_t port) {
-    ushort_t value;
+uint16_t v3_inw(uint16_t port) {
+    uint16_t value;
 
     __asm__ __volatile__ (
 	"inw %w1, %w0"
@@ -237,7 +261,7 @@ ushort_t v3_inw(ushort_t port) {
 /*
  * Write a double word to an I/O port.
  */
-void v3_outdw(ushort_t port, uint_t value) {
+void v3_outdw(uint16_t port, uint_t value) {
     __asm__ __volatile__ (
 	"outl %0, %1"
 	:
@@ -248,7 +272,7 @@ void v3_outdw(ushort_t port, uint_t value) {
 /*
  * Read a double word from an I/O port.
  */
-uint_t v3_indw(ushort_t port) {
+uint_t v3_indw(uint16_t port) {
     uint_t value;
 
     __asm__ __volatile__ (
@@ -264,45 +288,30 @@ uint_t v3_indw(ushort_t port) {
 
 
 /* FIX ME */
-static int default_write(ushort_t port, void *src, uint_t length, void * priv_data) {
-  /*
+static int default_write(uint16_t port, void * src, uint_t length, void * priv_data) {
+    if (length == 1) {
+	v3_outb(port, *(uint8_t *)src);
+    } else if (length == 2) {
+	v3_outw(port, *(uint16_t *)src);
+    } else if (length == 4) {
+	v3_outdw(port, *(uint32_t *)src);
+    } else {
+	return -1;
+    }
     
-  if (length == 1) {
-  __asm__ __volatile__ (
-  "outb %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  } else if (length == 2) {
-  __asm__ __volatile__ (
-  "outw %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  } else if (length == 4) {
-  __asm__ __volatile__ (
-  "outw %b0, %w1"
-  :
-  : "a" (*dst), "Nd" (port)
-  );
-  }
-  */
-  return 0;
+    return length;
 }
 
-static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data) {
-
-  /*    
-	uchar_t value;
-
-    __asm__ __volatile__ (
-	"inb %w1, %b0"
-	: "=a" (value)
-	: "Nd" (port)
-    );
-
-    return value;
-  */
+static int default_read(uint16_t port, void * dst, uint_t length, void * priv_data) {
+    if (length == 1) {
+	*(uint8_t *)dst = v3_inb(port);
+    } else if (length == 2) {
+	*(uint16_t *)dst = v3_inw(port);
+    } else if (length == 4) {
+	*(uint32_t *)dst = v3_indw(port);
+    } else {
+	return -1;
+    }
 
-  return 0;
+    return length;
 }