Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Separate VNET from Palacios, add its own host_hooks for interfaces from host OS for...
[palacios.git] / palacios / src / palacios / vmm_dev_mgr.c
index f578f02..a6f71e5 100644 (file)
@@ -23,7 +23,7 @@
 #include <palacios/vmm_decoder.h>
 
 
-#ifndef CONFIG_DEBUG_DEV_MGR
+#ifndef V3_CONFIG_DEBUG_DEV_MGR
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -50,7 +50,7 @@ int V3_init_devices() {
     struct v3_device_info * tmp_dev =  __start__v3_devices;
     int i = 0;
 
-#ifdef CONFIG_DEBUG_DEV_MGR
+#ifdef V3_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);
@@ -86,6 +86,12 @@ int V3_init_devices() {
 }
 
 
+int V3_deinit_devices() {    
+    v3_free_htable(master_dev_table, 0, 0);
+    return 0;
+}
+
+
 int v3_init_dev_mgr(struct v3_vm_info * vm) {
     struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
 
@@ -175,55 +181,108 @@ struct vm_device * v3_find_dev(struct v3_vm_info * vm, const char * dev_name) {
 /* The remaining functions are called by the devices themselves */
 /****************************************************************/
 
-struct dev_io_hook {
-    uint16_t port;
+typedef enum {DEV_IO_HOOK, DEV_MSR_HOOK, DEV_CPUID_HOOK, DEV_MEM_HOOK, DEV_HCALL_HOOK} dev_rsrc_type_t;
 
-    struct list_head node;
+struct dev_rsrc {
+    dev_rsrc_type_t type;
+    uint64_t rsrc;
 
+    struct list_head node;
 };
 
-/* IO HOOKS */
+
+
+static int add_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) {
+    struct dev_rsrc * resource = NULL;
+
+    resource = V3_Malloc(sizeof(struct dev_rsrc));
+
+    if (resource == NULL) {
+       PrintError("Error: Could not allocate device resource\n");
+       return -1;
+    }
+
+    resource->rsrc = rsrc_id;
+    resource->type = type;
+
+    list_add(&(resource->node), &(dev->res_hooks));
+    return 0;
+}
+
+static int free_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) {
+    struct dev_rsrc * resource = NULL;
+    struct dev_rsrc * tmp;
+
+    list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) {
+       if ((resource->type == type) && 
+           (resource->rsrc == rsrc_id)) {
+
+           list_del(&(resource->node));
+           V3_Free(resource);
+           
+           return 0;
+       }
+    }
+
+    return -1;
+}
+
+
 int v3_dev_hook_io(struct vm_device * dev, uint16_t port,
                   int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
                   int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data)) {
-    struct dev_io_hook * io_hook = NULL;
     int ret = 0;
     
-   ret = v3_hook_io_port(dev->vm, port, 
-                        (int (*)(struct guest_info * core, ushort_t, void *, uint_t, void *))read, 
-                        (int (*)(struct guest_info * core, ushort_t, void *, uint_t, void *))write, 
-                        (void *)dev->private_data);
+    ret = v3_hook_io_port(dev->vm, port, 
+                         (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))read, 
+                         (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))write, 
+                         (void *)dev->private_data);
 
-   if (ret == -1) {
-       return -1;
-   }
+    if (ret == -1) {
+       return -1;
+    }
 
-   io_hook = V3_Malloc(sizeof(struct dev_io_hook));
+    if (add_resource(dev, DEV_IO_HOOK, port) == -1) {
+       v3_unhook_io_port(dev->vm, port);
+       PrintError("Could not allocate io hook dev state\n");
+       return -1;
+    }
+    
+    return 0;
+}
 
-   if (io_hook == NULL) {
-       PrintError("Could not allocate io hook dev state\n");
-       return -1;
-   }
 
-   io_hook->port = port;
-   list_add(&(io_hook->node), &(dev->io_hooks));
+int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
+    if (free_resource(dev, DEV_IO_HOOK, port) == 0) {
+       return v3_unhook_io_port(dev->vm, port);           
+    } 
 
-   return 0;
+    return -1;
 }
 
 
-int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
-    struct dev_io_hook * io_hook = NULL;
-    struct dev_io_hook * tmp;
+int v3_dev_hook_msr(struct vm_device * dev, uint32_t msr,
+                   int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data),
+                   int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data)) {
+    int ret = 0;
 
-    list_for_each_entry_safe(io_hook, tmp, &(dev->io_hooks), node) {
-       if (io_hook->port == port) {
+    ret = v3_hook_msr(dev->vm, msr, read, write, dev->private_data);
 
-           list_del(&(io_hook->node));
-           V3_Free(io_hook);
-           
-           return v3_unhook_io_port(dev->vm, port);        
-       }
+    if (ret == -1) {
+       return -1;
+    }
+
+    if (add_resource(dev, DEV_MSR_HOOK, msr) == -1) {
+       v3_unhook_msr(dev->vm, msr);
+       return -1;
+    }
+
+    return 0;
+}
+                 
+int v3_dev_unhook_msr(struct vm_device * dev, uint32_t msr) {
+    if (free_resource(dev, DEV_MSR_HOOK, msr) == 0) {
+       return v3_unhook_msr(dev->vm, msr);
     }
 
     return -1;
@@ -231,15 +290,21 @@ int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
 
 
 
+
 int v3_remove_device(struct vm_device * dev) {
     struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
-    struct dev_io_hook * io_hook = NULL;
-    struct dev_io_hook * tmp;
+    struct dev_rsrc * resource = NULL;
+    struct dev_rsrc * tmp;
+
+    list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) {
+       if (resource->type == DEV_IO_HOOK) {
+           v3_unhook_io_port(dev->vm, (uint16_t)(resource->rsrc));
+       } else if (resource->type == DEV_MSR_HOOK) {
+           v3_unhook_msr(dev->vm, (uint32_t)(resource->rsrc));
+       }
 
-    list_for_each_entry_safe(io_hook, tmp, &(dev->io_hooks), node) {
-       v3_unhook_io_port(dev->vm, io_hook->port);          
-       list_del(&(io_hook->node));
-       V3_Free(io_hook);    
+       list_del(&(resource->node));
+       V3_Free(resource);    
     }
 
     if (dev->ops->free) {
@@ -271,7 +336,7 @@ struct vm_device * v3_add_device(struct v3_vm_info * vm,
        return NULL;
     }
 
-    INIT_LIST_HEAD(&(dev->io_hooks));
+    INIT_LIST_HEAD(&(dev->res_hooks));
 
     strncpy(dev->name, name, 32);
     dev->ops = ops;