X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-vm.c;h=04b338a6e3c2f3d6104e5387fe33568fe2e49117;hb=3d2ae914c0dae420aa777ad0b298060b808434f1;hp=4f53bcb47b511c7201f0c7206f984bb82f953d7a;hpb=ae06bda339f919423d0a2291759850dcee3f85da;p=palacios-OLD.git diff --git a/linux_module/palacios-vm.c b/linux_module/palacios-vm.c index 4f53bcb..04b338a 100644 --- a/linux_module/palacios-vm.c +++ b/linux_module/palacios-vm.c @@ -16,36 +16,109 @@ #include #include #include - +#include #include #include "palacios.h" #include "palacios-vm.h" +#include "linux-exts.h" + + +struct vm_ctrl { + unsigned int cmd; + + int (*handler)(struct v3_guest * guest, + unsigned int cmd, unsigned long arg, + void * priv_data); + + void * priv_data; + + struct rb_node tree_node; +}; + + +static inline struct vm_ctrl * __insert_ctrl(struct v3_guest * vm, + struct vm_ctrl * ctrl) { + struct rb_node ** p = &(vm->vm_ctrls.rb_node); + struct rb_node * parent = NULL; + struct vm_ctrl * tmp_ctrl = NULL; + + while (*p) { + parent = *p; + tmp_ctrl = rb_entry(parent, struct vm_ctrl, tree_node); + + if (ctrl->cmd < tmp_ctrl->cmd) { + p = &(*p)->rb_left; + } else if (ctrl->cmd > tmp_ctrl->cmd) { + p = &(*p)->rb_right; + } else { + return tmp_ctrl; + } + } + + rb_link_node(&(ctrl->tree_node), parent, p); + + return NULL; +} + + + +int add_guest_ctrl(struct v3_guest * guest, unsigned int cmd, + int (*handler)(struct v3_guest * guest, + unsigned int cmd, unsigned long arg, + void * priv_data), + void * priv_data) { + struct vm_ctrl * ctrl = kmalloc(sizeof(struct vm_ctrl), GFP_KERNEL); + + if (ctrl == NULL) { + printk("Error: Could not allocate vm ctrl %d\n", cmd); + return -1; + } + + ctrl->cmd = cmd; + ctrl->handler = handler; + ctrl->priv_data = priv_data; + + if (__insert_ctrl(guest, ctrl) != NULL) { + printk("Could not insert guest ctrl %d\n", cmd); + kfree(ctrl); + return -1; + } + + rb_insert_color(&(ctrl->tree_node), &(guest->vm_ctrls)); + + return 0; +} + + +static struct vm_ctrl * get_ctrl(struct v3_guest * guest, unsigned int cmd) { + struct rb_node * n = guest->vm_ctrls.rb_node; + struct vm_ctrl * ctrl = NULL; + + while (n) { + ctrl = rb_entry(n, struct vm_ctrl, tree_node); + + if (cmd < ctrl->cmd) { + n = n->rb_left; + } else if (cmd > ctrl->cmd) { + n = n->rb_right; + } else { + return ctrl; + } + } + + return NULL; +} + -#ifdef V3_CONFIG_STREAM -#include "palacios-stream.h" -#endif -#ifdef V3_CONFIG_CONSOLE -#include "palacios-console.h" -#endif -#ifdef V3_CONFIG_EXT_INSPECTOR -#include "palacios-inspector.h" -#endif -#ifdef V3_CONFIG_GRAPHICS_CONSOLE -#include "palacios-graphics-console.h" -#endif -#ifdef V3_CONFIG_HOST_DEVICE -#include "palacios-host-dev.h" -#define HOST_DEV_URL_LEN 256 -#endif extern struct class * v3_class; -#define STREAM_NAME_LEN 128 + static long v3_vm_ioctl(struct file * filp, unsigned int ioctl, unsigned long arg) { @@ -62,74 +135,17 @@ static long v3_vm_ioctl(struct file * filp, break; } - case V3_VM_CONSOLE_CONNECT: { -#ifdef V3_CONFIG_CONSOLE - return connect_console(guest); -#else - printk("Console support not available\n"); - return -EFAULT; -#endif - break; - } - - case V3_VM_STREAM_CONNECT: { -#ifdef V3_CONFIG_STREAM - void __user * argp = (void __user *)arg; - char path_name[STREAM_NAME_LEN]; + default: { + struct vm_ctrl * ctrl = get_ctrl(guest, ioctl); - if (copy_from_user(path_name, argp, STREAM_NAME_LEN)) { - printk("%s(%d): copy from user error...\n", __FILE__, __LINE__); - return -EFAULT; + if (ctrl) { + return ctrl->handler(guest, ioctl, arg, ctrl->priv_data); } - - return open_stream(path_name); -#else - printk("Stream support Not available\n"); - return -EFAULT; -#endif - break; - } - - case V3_VM_HOST_DEV_CONNECT: { -#ifdef V3_CONFIG_HOST_DEVICE - void __user * argp = (void __user *)arg; - char host_dev_url[HOST_DEV_URL_LEN]; - - if (copy_from_user(host_dev_url, argp, HOST_DEV_URL_LEN)) { - printk("copy from user error getting url for host device connect...\n"); - return -EFAULT; - } - - return connect_host_dev(guest,host_dev_url); -#else - printk("palacios: Host device support not available\n"); - return -EFAULT; -#endif - break; - } - - case V3_VM_FB_INPUT: -#ifdef V3_CONFIG_GRAPHICS_CONSOLE - return palacios_graphics_console_user_input(&(guest->graphics_console), - (struct v3_fb_input __user *) arg) ; -#else - return -EFAULT; -#endif - break; - case V3_VM_FB_QUERY: -#ifdef V3_CONFIG_GRAPHICS_CONSOLE - return palacios_graphics_console_user_query(&(guest->graphics_console), - (struct v3_fb_query_response __user *) arg); -#else - return -EFAULT; -#endif - break; - - - default: - printk("\tUnhandled\n"); + + printk("\tUnhandled ctrl cmd: %d\n", ioctl); return -EINVAL; + } } return 0; @@ -178,6 +194,16 @@ int start_palacios_vm(void * arg) { // allow_signal(SIGKILL); unlock_kernel(); + init_vm_extensions(guest); + + guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name); + + if (guest->v3_ctx == NULL) { + printk("palacios: failed to create vm\n"); + complete(&(guest->start_done)); + return -1; + } + printk("Creating VM device: Major %d, Minor %d\n", MAJOR(guest->vm_dev), MINOR(guest->vm_dev)); @@ -192,6 +218,7 @@ int start_palacios_vm(void * arg) { if (err) { printk("Fails to add cdev\n"); + v3_free_vm(guest->v3_ctx); complete(&(guest->start_done)); return -1; } @@ -199,15 +226,7 @@ int start_palacios_vm(void * arg) { if (device_create(v3_class, NULL, guest->vm_dev, guest, "v3-vm%d", MINOR(guest->vm_dev)) == NULL){ printk("Fails to create device\n"); cdev_del(&(guest->cdev)); - complete(&(guest->start_done)); - return -1; - } - - guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name); - - if (guest->v3_ctx == NULL) { - printk("palacios: failed to create vm\n"); - cdev_del(&(guest->cdev)); + v3_free_vm(guest->v3_ctx); complete(&(guest->start_done)); return -1; } @@ -216,12 +235,6 @@ int start_palacios_vm(void * arg) { printk("palacios: launching vm\n"); - -#ifdef V3_CONFIG_EXT_INSPECTOR - inspect_vm(guest); -#endif - - if (v3_start_vm(guest->v3_ctx, 0xffffffff) < 0) { printk("palacios: launch of vm failed\n"); device_destroy(v3_class, guest->vm_dev);