X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=65d01f47586b96c0755d168c4dadb23da2f4ab58;hp=615c8ecbc12c44d34a866a5ec111d1c807064980;hb=5f0b4f8c5f9f53cea37dde072b37d09ba316487d;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 615c8ec..65d01f4 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -1,327 +1,370 @@
-#include <palacios/vm_dev.h>
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm.h>
+#include <palacios/vmm_decoder.h>
 
 
-extern struct vmm_os_hooks *os_hooks;
-
-#ifndef NULL
-#define NULL 0
+#ifndef CONFIG_DEBUG_DEV_MGR
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
 #endif
 
-int dev_mgr_init(struct vmm_dev_mgr * mgr) {
-  mgr->dev_list.head = NULL;
-  mgr->dev_list.num_devs = 0;
-  return 0;
-}
 
+static struct hashtable * master_dev_table = NULL;
 
-int dev_mgr_deinit(struct vmm_dev_mgr * mgr)
-{
-  struct vm_device * dev = mgr->dev_list.head;
-
-  while (dev) { 
-    unattach_device(dev);
-    free_device(dev);
-    dev = dev->next;
-  }
-  return 0;
+static uint_t dev_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
 }
 
+static int dev_eq_fn(addr_t key1, addr_t key2) {
+    char * name1 = (char *)key1;
+    char * name2 = (char *)key2;
+    
+    return (strcmp(name1, name2) == 0);
+}
+
+
+int v3_init_devices() {
+    extern struct v3_device_info __start__v3_devices[];
+    extern struct v3_device_info __stop__v3_devices[];
+    struct v3_device_info * tmp_dev =  __start__v3_devices;
+    int i = 0;
 
+#ifdef CONFIG_DEBUG_DEV_MGR
+    {
+	int num_devices = (__stop__v3_devices - __start__v3_devices) / sizeof(struct v3_device_info);
+	PrintDebug("%d Virtual devices registered with Palacios\n", num_devices);
+    }
+#endif
 
+    PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices);
 
-int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
-  dev->next = mgr->dev_list.head;
-  dev->prev = 0;
-  if (dev->next) { 
-    dev->next->prev = dev;
-  }
-  mgr->dev_list.head = dev;
+    master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
 
-  mgr->dev_list.num_devs++;
 
-  return 0;
-}
 
-int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
-  if (mgr->dev_list.head == dev) { 
-    mgr->dev_list.head = dev->next;
-  } else {
-    dev->prev->next = dev->next;
-  }
-  if (dev->next) { 
-    dev->next->prev = dev->prev;
-  }
-  
-  mgr->dev_list.num_devs--;
-
-  return 0;
-}
+    while (tmp_dev != __stop__v3_devices) {
+	PrintDebug("Device: %s\n", tmp_dev->name);
 
+	if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) {
+	    PrintError("Multiple instance of device (%s)\n", tmp_dev->name);
+	    return -1;
+	}
 
-int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
-  hook->mgr_next = mgr->io_hooks.head;
-  hook->mgr_prev = NULL;
-  if (hook->mgr_next) {
-    hook->mgr_next->mgr_prev = hook;
-  }
-  mgr->io_hooks.head = hook;
+	if (v3_htable_insert(master_dev_table, 
+			     (addr_t)(tmp_dev->name), 
+			     (addr_t)(tmp_dev->init)) == 0) {
+	    PrintError("Could not add device %s to master list\n", tmp_dev->name);
+	    return -1;
+	}
+
+	tmp_dev = &(__start__v3_devices[++i]);
+    }
 
-  mgr->io_hooks.num_hooks++;
 
-  return 0;
+    return 0;
 }
 
 
-int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
-  if (mgr->io_hooks.head == hook) {
-    mgr->io_hooks.head = hook->mgr_next;
-  } else {
-    hook->mgr_prev->mgr_next = hook->mgr_next;
-  }
+int v3_init_dev_mgr(struct guest_info * info) {
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+
+    INIT_LIST_HEAD(&(mgr->dev_list));
+    mgr->num_devs = 0;
+
+    mgr->dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
 
-  if (hook->mgr_next) {
-    hook->mgr_next->mgr_prev = hook->mgr_prev;
-  }
-  
-  mgr->io_hooks.num_hooks--;
+    INIT_LIST_HEAD(&(mgr->blk_list));
+    INIT_LIST_HEAD(&(mgr->net_list));
+    INIT_LIST_HEAD(&(mgr->console_list));
 
-  return 0;
+    mgr->blk_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    mgr->net_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    mgr->console_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+    
+    return 0;
 }
 
 
-int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  hook->dev_next = dev->io_hooks.head;
-  hook->dev_prev = NULL;
-  if (hook->dev_next) {
-    hook->dev_next->dev_prev = hook;
-  }
-  dev->io_hooks.head = hook;
+int v3_dev_mgr_deinit(struct guest_info * info) {
+    struct vm_device * dev;
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+    struct vm_device * tmp;
 
-  dev->io_hooks.num_hooks++;
+    list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
+	v3_detach_device(dev);
+	v3_free_device(dev);
+    }
 
-  return 0;
+    return 0;
 }
 
 
-int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
-  if (dev->io_hooks.head == hook) {
-    dev->io_hooks.head = hook->dev_next;
-  } else {
-    hook->dev_prev->dev_next = hook->dev_next;
-  }
 
-  if (hook->dev_next) {
-    hook->dev_next->dev_prev = hook->dev_prev;
-  }
-  
-  dev->io_hooks.num_hooks--;
+int v3_create_device(struct guest_info * info, const char * dev_name, v3_cfg_tree_t * cfg) {
+    int (*dev_init)(struct guest_info * info, void * cfg_data);
 
-  return 0;
-}
+    dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name);
 
+    if (dev_init == NULL) {
+	PrintError("Could not find device %s in master device table\n", dev_name);
+	return -1;
+    }
 
-struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
-  struct dev_io_hook * tmp = mgr->io_hooks.head;
 
-  while (tmp) {
-    if (tmp->port == port) {
-      break;
+    if (dev_init(info, cfg) == -1) {
+	PrintError("Could not initialize Device %s\n", dev_name);
+	return -1;
     }
-    tmp = tmp->mgr_next;
-  }
 
-  return tmp;
+    return 0;
 }
 
-struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
-  struct dev_io_hook * tmp = dev->io_hooks.head;
 
-  while (tmp) {
-    if (tmp->port == port) {
-      break;
+void v3_free_device(struct vm_device * dev) {
+    V3_Free(dev);
+}
+
+
+
+struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) {
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+
+    if (!dev_name) {
+	return NULL;
     }
-    tmp = tmp->dev_next;
-  }
 
-  return tmp;
+    return (struct vm_device *)v3_htable_search(mgr->dev_table, (addr_t)dev_name);
 }
 
 
+/****************************************************************/
+/* The remaining functions are called by the devices themselves */
+/****************************************************************/
 
+/* IO HOOKS */
+int v3_dev_hook_io(struct vm_device * dev, uint16_t port,
+		   int (*read)(uint16_t port, void * dst, uint_t length, struct vm_device * dev),
+		   int (*write)(uint16_t port, void * src, uint_t length, struct vm_device * dev)) {
+    return v3_hook_io_port(dev->vm, port, 
+			   (int (*)(ushort_t, void *, uint_t, void *))read, 
+			   (int (*)(ushort_t, void *, uint_t, void *))write, 
+			   (void *)dev);
+}
 
-int attach_device(struct guest_info * vm, struct vm_device * dev) {
-  struct vmm_dev_mgr *mgr= &(vm->dev_mgr);
-  
-  dev->vm = vm;
-  dev_mgr_add_device(mgr, dev);
-  dev->ops->init(dev);
 
-  return 0;
+int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
+    return v3_unhook_io_port(dev->vm, port);
 }
 
-int unattach_device(struct vm_device * dev) {
-  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
-  dev->ops->deinit(dev);
-  dev_mgr_remove_device(mgr, dev);
-  dev->vm = NULL;
 
-  return 0;
-}
+int v3_detach_device(struct vm_device * dev) {
+    struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
+    dev->ops->free(dev);
 
+    list_del(&(dev->dev_link));
+    mgr->num_devs--;
 
-int dev_hook_io(struct vm_device   *dev,
-		ushort_t            port,
-		int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
-		int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
+    dev->vm = NULL;
 
-  struct dev_io_hook *hook = os_hooks->malloc(sizeof(struct dev_io_hook));
-  
-  if (!hook) { 
     return -1;
-  }
+}
 
 
-  if (hook_io_port(&(dev->vm->io_map), port, 
-		   (int (*)(ushort_t, void *, uint_t, void *))read, 
-		   (int (*)(ushort_t, void *, uint_t, void *))write, 
-		   (void *)dev) == 0) {
+struct vm_device * v3_allocate_device(char * name, 
+				      struct v3_device_ops * ops, 
+				      void * private_data) {
+    struct vm_device * dev = NULL;
 
-    hook->dev = dev;
-    hook->port = port;
-    hook->read = read;
-    hook->write = write;
-    
-    dev_mgr_add_io_hook(&(dev->vm->dev_mgr), hook);
-    dev_add_io_hook(dev, hook);
-  } else {
-    return -1;
-  }
+    dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
+
+    strncpy(dev->name, name, 32);
+    dev->ops = ops;
+    dev->private_data = private_data;
 
-  return 0;
+    dev->vm = NULL;
+
+    return dev;
 }
 
 
-int dev_unhook_io(struct vm_device   *dev,
-		  ushort_t            port) {
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) {
+    struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
 
-  struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
-  struct dev_io_hook * hook = dev_mgr_find_io_hook(mgr, port);
+    dev->vm = vm;
 
-  if (!hook) { 
-    return -1;
-  }
+    list_add(&(dev->dev_link), &(mgr->dev_list));
+    mgr->num_devs++;
 
-  dev_mgr_remove_io_hook(mgr, hook);
-  dev_remove_io_hook(dev, hook);
 
-  return unhook_io_port(&(dev->vm->io_map), port);
+    v3_htable_insert(mgr->dev_table, (addr_t)(dev->name), (addr_t)dev);
+
+    return 0;
 }
 
 
 
-int dev_mgr_hook_mem(struct guest_info    *vm,
-		     struct vm_device   *device,
-		     void               *start,
-		     void               *end)
-{
+void v3_print_dev_mgr(struct guest_info * info) {
+    struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+    struct vm_device * dev;
 
-  struct dev_mem_hook *hook = os_hooks->malloc(sizeof(struct dev_mem_hook));
-  
-  if (!hook) { 
-    return -1;
-  }
+    V3_Print("%d devices registered with manager\n", mgr->num_devs);
 
+    list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
+	V3_Print("Device: %s\n", dev->name);
+    }
 
-    
+    return;
+}
 
-  /* not implemented yet
-  hook_memory(vm->mem_map, 
-	      guest_physical_address_start, 
-	      guest_physical_address_end, 
-	      read,
-	      write,
-	      device);
 
-  */
 
-  return -1;   // remove when hook_memory works
 
+struct blk_frontend {
+    int (*connect)(struct guest_info * info, 
+		    void * frontend_data, 
+		    struct v3_dev_blk_ops * ops, 
+		    v3_cfg_tree_t * cfg, 
+		    void * priv_data);
+	
 
-  hook->addr_start = start;
-  hook->addr_end = end;
+    struct list_head blk_node;
 
-  return 0;
-  
+    void * priv_data;
+};
+
+
+
+int v3_dev_add_blk_frontend(struct guest_info * info, 
+			    char * name, 
+			    int (*connect)(struct guest_info * info, 
+					    void * frontend_data, 
+					    struct v3_dev_blk_ops * ops, 
+					    v3_cfg_tree_t * cfg, 
+					    void * priv_data), 
+			    void * priv_data) {
+
+    struct blk_frontend * frontend = NULL;
+
+    frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend));
+    memset(frontend, 0, sizeof(struct blk_frontend));
+    
+    frontend->connect = connect;
+    frontend->priv_data = priv_data;
+	
+    list_add(&(frontend->blk_node), &(info->dev_mgr.blk_list));
+    v3_htable_insert(info->dev_mgr.blk_table, (addr_t)(name), (addr_t)frontend);
+
+    return 0;
 }
 
+int v3_dev_connect_blk(struct guest_info * info, 
+		       char * frontend_name, 
+		       struct v3_dev_blk_ops * ops, 
+		       v3_cfg_tree_t * cfg, 
+		       void * private_data) {
 
-int dev_mgr_unhook_mem(struct guest_info    *vm,
-		       struct vm_device   *device,
-		       void               *start,
-		       void               *end) 
-{
-  struct dev_mem_hook *hook = device->mem_hooks.head;
+    struct blk_frontend * frontend = NULL;
 
-  while (hook) { 
-    if (((hook->addr_start) == start) && (hook->addr_end == end)) {
-      break;
+    frontend = (struct blk_frontend *)v3_htable_search(info->dev_mgr.blk_table,
+						       (addr_t)frontend_name);
+    
+    if (frontend == NULL) {
+	PrintError("Could not find frontend blk device %s\n", frontend_name);
+	return 0;
     }
-  }
 
-  if (!hook) { 
-    // Very bad - unhooking something that doesn't exist!
-    return -1;
-  }
+    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
+	PrintError("Error connecting to block frontend %s\n", frontend_name);
+	return -1;
+    }
+
+    return 0;
+}
 
 
-  /* not implemented yet
-  return unhook_mem_port(vm->mem_map,
-			 guest_physical_start,
-		         guest_physical_end) ;
 
-  */
-  return -1;
-}
+struct net_frontend {
+    int (*connect)(struct guest_info * info, 
+		    void * frontend_data, 
+		    struct v3_dev_net_ops * ops, 
+		    v3_cfg_tree_t * cfg, 
+		    void * priv_data);
+	
 
+    struct list_head net_node;
 
+    void * priv_data;
+};
 
 
-void PrintDebugDevMgr(struct vmm_dev_mgr * mgr) {
-  struct vm_device * dev = mgr->dev_list.head;
+int v3_dev_add_net_frontend(struct guest_info * info, 
+			    char * name, 
+			    int (*connect)(struct guest_info * info, 
+					    void * frontend_data, 
+					    struct v3_dev_net_ops * ops, 
+					    v3_cfg_tree_t * cfg, 
+					    void * private_data), 
+			    void * priv_data)
+{
+    struct net_frontend * frontend = NULL;
 
-  while (dev) {
-    PrintDebugDev(dev);
-    dev = dev->next;
-  }
+    frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend));
+    memset(frontend, 0, sizeof(struct net_frontend));
+    
+    frontend->connect = connect;
+    frontend->priv_data = priv_data;
+	
+    list_add(&(frontend->net_node), &(info->dev_mgr.net_list));
+    v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
 
-  return;
+    return 0;
 }
 
 
-void PrintDebugDev(struct vm_device * dev) {
-  
-  PrintDebug("Device: %s\n", dev->name);
-  PrintDebugDevIO(dev);
-}
+int v3_dev_connect_net(struct guest_info * info, 
+		       char * frontend_name, 
+		       struct v3_dev_net_ops * ops, 
+		       v3_cfg_tree_t * cfg, 
+		       void * private_data)
+{
+    struct net_frontend * frontend = NULL;
 
-void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {
+    frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table,
+						       (addr_t)frontend_name);
+    
+    if (frontend == NULL) {
+	PrintError("Could not find frontend net device %s\n", frontend_name);
+	return 0;
+    }
 
-}
+    if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
+	PrintError("Error connecting to net frontend %s\n", frontend_name);
+	return -1;
+    }
 
-void PrintDebugDevIO(struct vm_device * dev) {
-  struct dev_io_hook * hook = dev->io_hooks.head;
-  
-  PrintDebug("IO Hooks (%d) for Device: %s\n", dev->io_hooks.num_hooks, dev->name);
-  
-  while (hook) {
-    PrintDebug("\tPort: 0x%x (read=0x%x), (write=0x%x)\n", hook->port, hook->read, hook->write);
-    hook = hook->dev_next;
-  }
-
-  return;
+    return 0;
 }
+