X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-host-dev.c;h=23adb35956319be27a92fd7dc0e1720c6d8c923f;hb=a5d2c00cc461b4a60a1360a2a0bba55cef467bab;hp=ca5de91f7ff1092500a0ac39ad6200c9dcccf70c;hpb=cfedaa152e9e6b3518b547d06fed1df371dc90e8;p=palacios.git diff --git a/linux_module/iface-host-dev.c b/linux_module/iface-host-dev.c index ca5de91..23adb35 100644 --- a/linux_module/iface-host-dev.c +++ b/linux_module/iface-host-dev.c @@ -126,14 +126,14 @@ struct palacios_host_dev { #define DEEP_DEBUG 0 #define SHALLOW_DEBUG 0 -#if DEEP_DEBUG -#define DEEP_DEBUG_PRINT(fmt, args...) DEBUG((fmt), ##args) +#if DEEP_DEBUG == 1 +#define DEEP_DEBUG_PRINT(fmt, args...) DEBUG(fmt, ##args) #else #define DEEP_DEBUG_PRINT(fmt, args...) #endif -#if SHALLOW_DEBUG -#define SHALLOW_DEBUG_PRINT(fmt, args...) INFO((fmt), ##args) +#if SHALLOW_DEBUG == 1 +#define SHALLOW_DEBUG_PRINT(fmt, args...) INFO(fmt, ##args) #else #define SHALLOW_DEBUG_PRINT(fmt, args...) #endif @@ -149,6 +149,7 @@ struct palacios_host_device_user { char url[MAX_URL]; // what is the url describing the device v3_guest_dev_t guestdev; // what is the palacios-side device + v3_guest_dev_intr_t guestintr; // what is the palacios-side device interrupt info wait_queue_head_t user_wait_queue; // user space processes waiting on us (should be only one) wait_queue_head_t host_wait_queue; // host threads (should only be one) waiting on user space @@ -299,21 +300,22 @@ static unsigned int host_dev_poll(struct file * filp, return -EFAULT; } - spin_lock_irqsave(&(dev->lock),f); + palacios_spinlock_lock_irqsave(&(dev->lock),f); + + + // register ourselves on the user wait queue + poll_wait(filp, &(dev->user_wait_queue), poll_tb); if (dev->waiting) { // Yes, we have a request if you want it! - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: poll done immediate\n"); return POLLIN | POLLRDNORM; } // No request yet, so we need to wait for one to show up. - // register ourselves on the user wait queue - poll_wait(filp, &(dev->user_wait_queue), poll_tb); - - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: poll delayed\n"); // We will get called again when that queue is woken up @@ -329,9 +331,9 @@ static int host_dev_release(struct inode * i, struct file * filp) INFO("palacios: user side is closing host device \"%s\"\n",dev->url); - spin_lock_irqsave(&(dev->lock), f); + palacios_spinlock_lock_irqsave(&(dev->lock), f); dev->connected = 0; - spin_unlock_irqrestore(&(dev->lock), f); + palacios_spinlock_unlock_irqrestore(&(dev->lock), f); // it is the palacios->host interface's responsibility to ignore // reads/writes until connected is true @@ -367,6 +369,7 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg switch (op.type) { case PALACIOS_HOST_DEV_USER_REQUEST_READ_GUEST: { + // possible overflow here, but only if user is asking for too much... void *temp = palacios_alloc(op.len); DEEP_DEBUG_PRINT("palacios: hostdev: read guest\n"); @@ -433,11 +436,18 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg } break; - case PALACIOS_HOST_DEV_USER_REQUEST_IRQ_GUEST: { + case PALACIOS_HOST_DEV_USER_REQUEST_IRQ_RAISE_GUEST: { + + DEEP_DEBUG_PRINT("palacios: hostdev: irq raise guest\n"); + + return v3_host_dev_raise_irq(dev, dev->guestdev, dev->guestintr, op.irq); + } + break; + case PALACIOS_HOST_DEV_USER_REQUEST_IRQ_LOWER_GUEST: { - DEEP_DEBUG_PRINT("palacios: hostdev: irq guest\n"); + DEEP_DEBUG_PRINT("palacios: hostdev: irq lower guest\n"); - return v3_host_dev_raise_irq(dev, dev->guestdev, op.irq); + return v3_host_dev_lower_irq(dev, dev->guestdev, dev->guestintr, op.irq); } break; @@ -456,24 +466,26 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg DEEP_DEBUG_PRINT("palacios: hostdev: request size of request\n"); - spin_lock_irqsave(&(dev->lock),f); + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (!(dev->waiting)) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: no request available\n"); schedule(); // avoid livelock for polling user space process SUSPICOUS return 0; // no request available now } - + + // safe to unlock here since if we are in the waiting state + // the palacios side will not modify the request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + if (copy_to_user(argp,&(dev->req->data_len),sizeof(uint64_t))) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: unable to copy to user for host device \"%s\"\n",dev->url); return -EFAULT; // failed to copy! } - spin_unlock_irqrestore(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: hostdev: have request\n"); return 1; // have request for you @@ -486,25 +498,25 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg unsigned long f; - spin_lock_irqsave(&(dev->lock),f); + palacios_spinlock_lock_irqsave(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: pull request\n"); if (!(dev->waiting) || !(dev->req)) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: no request to pull\n"); return 0; // no request available now } + // Safe to unlock here since if we are in the waiting + // state, the request will not be modified by the palacios side + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); if (copy_to_user(argp,dev->req,dev->req->data_len)) { - spin_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: unable to copy to user for host device \"%s\"\n",dev->url); return -EFAULT; // failed to copy! } - spin_unlock_irqrestore(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: hostdev: request pulled\n"); return 1; // copied request for you @@ -517,47 +529,41 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg uint64_t user_datalen; uint64_t old_len; - spin_lock_irqsave(&(dev->lock),f); + palacios_spinlock_lock_irqsave(&(dev->lock),f); DEEP_DEBUG_PRINT("palacios: hostdev: push response\n"); if (!(dev->waiting)) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: hostdev: no matching request for pushed response\n"); return 0; // no request outstanding, so we do not need a response! } + // Safe to unlock here as the palacios side will not + // modify the request or copy the response until we + // reset dev->waiting + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + if (copy_from_user(&user_datalen,argp,sizeof(uint64_t))) { - spin_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: unable to copy from user for host device \"%s\"\n",dev->url); return -EFAULT; // failed to copy! } if (user_datalenlock),f); ERROR("palacios: user has response that is too small on host device \"%s\"\n",dev->url); return -EFAULT; } if (!palacios_bigenough_reqresp(dev->resp,user_datalen-sizeof(struct palacios_host_dev_host_request_response))) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: response not big enough, dropping lock to resize on device \"%s\"\n",dev->url); + DEEP_DEBUG_PRINT("palacios: response not big enough, resizing on device \"%s\"\n",dev->url); - spin_unlock_irqrestore(&(dev->lock),f); if (palacios_resize_reqresp(&(dev->resp),user_datalen-sizeof(struct palacios_host_dev_host_request_response),0)) { ERROR("palacios: unable to resize to accept response of size %llu from user for host device \"%s\"\n",user_datalen,dev->url); return -EFAULT; - } else { - // reacquire the lock - // There shouldn't be a race here, since there should - // be exactly one user space thread giving us a response for this device - // and it is blocked waiting for us to finish - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacuired lock on device \"%s\"\n",dev->url); - } + } } //We only copy data_len bytes from user, but we will @@ -565,7 +571,6 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg old_len = dev->resp->len; if (copy_from_user(dev->resp, argp, user_datalen)) { dev->resp->len=old_len; - spin_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: unable to copy from user for host device \"%s\"\n",dev->url); return -EFAULT; // failed to copy! } @@ -575,8 +580,6 @@ static long host_dev_ioctl(struct file * fp, unsigned int val, unsigned long arg // now have valid response! dev->waiting=0; - spin_unlock_irqrestore(&(dev->lock),f); - // wake the palacios side up so that it sees it cycle_response_request(dev); @@ -629,22 +632,22 @@ static int host_dev_connect(struct v3_guest * guest, unsigned int cmd, unsigned // URL. If we don't find it after a while, we give up for (i=0;ilock),f1); + palacios_spinlock_lock_irqsave(&(host_dev->lock),f1); list_for_each_entry(dev,&(host_dev->devs), node) { if (!strncasecmp(url,dev->url,MAX_URL)) { // found it - spin_lock_irqsave(&(dev->lock),f2); + palacios_spinlock_lock_irqsave(&(dev->lock),f2); if (dev->connected) { ERROR("palacios: device for \"%s\" is already connected!\n",url); - spin_unlock_irqrestore(&(dev->lock),f2); - spin_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f2); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f1); return -1; } else { dev->fd = anon_inode_getfd("v3-hostdev", &host_dev_fops, dev, 0); if (dev->fd<0) { ERROR("palacios: cannot create fd for device \"%s\"\n",url); - spin_unlock_irqrestore(&(dev->lock),f2); - spin_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f2); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f1); return -1; } dev->connected=1; @@ -658,14 +661,14 @@ static int host_dev_connect(struct v3_guest * guest, unsigned int cmd, unsigned dev->resp=0; } INFO("palacios: connected fd for device \"%s\"\n",url); - spin_unlock_irqrestore(&(dev->lock),f2); - spin_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f2); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f1); return dev->fd; } - spin_unlock_irqrestore(&(dev->lock),f2); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f2); } } - spin_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f1); ssleep(RENDEZVOUS_RETRY_SECS); } @@ -705,13 +708,13 @@ static int palacios_host_dev_rendezvous(struct palacios_host_device_user *dev) // Now wait until we are noticed! for (i=0;ilock),f); + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->connected) { INFO("palacios: connection with user side established for host device \"%s\" fd=%d\n",dev->url,dev->fd); - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); return 0; } - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ssleep(RENDEZVOUS_RETRY_SECS); } @@ -727,6 +730,7 @@ static int palacios_host_dev_rendezvous(struct palacios_host_device_user *dev) static v3_host_dev_t palacios_host_dev_open_deferred(char *url, v3_bus_class_t bus, v3_guest_dev_t gdev, + v3_guest_dev_intr_t gintr, void *host_priv_data) { struct v3_guest *guest= (struct v3_guest*)host_priv_data; @@ -758,16 +762,16 @@ static v3_host_dev_t palacios_host_dev_open_deferred(char *url, } // Check to see if a device of this url already exists, which would be ugly - spin_lock_irqsave(&(host_dev->lock),f); + palacios_spinlock_lock_irqsave(&(host_dev->lock),f); list_for_each_entry(dev,&(host_dev->devs), node) { if (!strncasecmp(url,dev->url,MAX_URL)) { // found it - spin_unlock_irqrestore(&(host_dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f); ERROR("palacios: a host device with url \"%s\" already exists in the guest!\n",url); return NULL; } } - spin_unlock_irqrestore(&(host_dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f); INFO("palacios: creating host device \"%s\"\n",url); @@ -782,20 +786,23 @@ static v3_host_dev_t palacios_host_dev_open_deferred(char *url, memset(dev,0,sizeof(struct palacios_host_device_user)); strncpy(dev->url,url,MAX_URL); + dev->url[MAX_URL-1] = 0; dev->guestdev = gdev; + dev->guestintr = gintr; + dev->guest = guest; - spin_lock_init(&(dev->lock)); + palacios_spinlock_init(&(dev->lock)); init_waitqueue_head(&(dev->user_wait_queue)); init_waitqueue_head(&(dev->host_wait_queue)); // Insert ourselves into the list - spin_lock_irqsave(&(host_dev->lock),f); + palacios_spinlock_lock_irqsave(&(host_dev->lock),f); list_add(&(dev->node),&(host_dev->devs)); - spin_unlock_irqrestore(&(host_dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f); INFO("palacios: host device \"%s\" created with deferred rendezvous\n",url); @@ -825,9 +832,9 @@ static int palacios_host_dev_close(v3_host_dev_t hostdev) return -1; } - spin_lock_irqsave(&(host_dev->lock),f1); + palacios_spinlock_lock_irqsave(&(host_dev->lock),f1); - spin_lock_irqsave(&(dev->lock),f2); + palacios_spinlock_lock_irqsave(&(dev->lock),f2); if (dev->connected) { dev->connected=0; @@ -836,9 +843,11 @@ static int palacios_host_dev_close(v3_host_dev_t hostdev) list_del(&(dev->node)); - spin_unlock_irqrestore(&(dev->lock),f2); - spin_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f2); + palacios_spinlock_unlock_irqrestore(&(host_dev->lock),f1); + palacios_spinlock_deinit(&(dev->lock)); + palacios_host_dev_user_free(dev); return 0; @@ -858,41 +867,31 @@ static uint64_t palacios_host_dev_read_io(v3_host_dev_t hostdev, DEEP_DEBUG_PRINT("palacios: hostdev: read io port 0x%x\n",port); - - spin_lock_irqsave(&(dev->lock),f); - if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued i/o read request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } - + // if we're not waiting on user, we have access to + // to the request and response fields + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); // resize request (no data) if (!palacios_bigenough_reqresp(dev->req,0)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),0,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); - } + } } @@ -905,21 +904,17 @@ static uint64_t palacios_host_dev_read_io(v3_host_dev_t hostdev, dev->waiting=1; - spin_unlock_irqrestore(&(dev->lock),f); - // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - - spin_lock_irqsave(&(dev->lock),f); + // no need to lock, we own the response since + // waiting is now 0 op_len = dev->resp->op_len < len ? dev->resp->op_len : len ; memcpy(dest,dev->resp->data, op_len); - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -934,37 +929,31 @@ static uint64_t palacios_host_dev_read_mem(v3_host_dev_t hostdev, DEEP_DEBUG_PRINT("palacios: hostdev: read mem 0x%p\n",gpa); - spin_lock_irqsave(&(dev->lock),f); if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); + //palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued memory read request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } + + // We now are assured to have ownership over request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); // resize request (no data) if (!palacios_bigenough_reqresp(dev->req,0)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),0,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); } } @@ -977,21 +966,15 @@ static uint64_t palacios_host_dev_read_mem(v3_host_dev_t hostdev, dev->waiting=1; - spin_unlock_irqrestore(&(dev->lock),f); - // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - spin_lock_irqsave(&(dev->lock),f); - op_len = dev->resp->op_len < len ? dev->resp->op_len : len ; memcpy(dest,dev->resp->data, op_len); - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -1004,40 +987,34 @@ static uint64_t palacios_host_dev_read_conf(v3_host_dev_t hostdev, unsigned long f; uint64_t op_len; - DEEP_DEBUG_PRINT("palacios: hostdev: read conf 0x%p\n",(void*)offset); + DEEP_DEBUG_PRINT("palacios: hostdev: read conf 0x%p (len=%lld)\n",(void*)offset, len); - spin_lock_irqsave(&(dev->lock),f); if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); + //palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued config read request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } + // Now have exclusive access to request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + // resize request (no data) if (!palacios_bigenough_reqresp(dev->req,0)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),0,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); - } + } } dev->req->type=PALACIOS_HOST_DEV_HOST_REQUEST_READ_CONF; @@ -1049,21 +1026,15 @@ static uint64_t palacios_host_dev_read_conf(v3_host_dev_t hostdev, dev->waiting=1; - spin_unlock_irqrestore(&(dev->lock),f); - // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - spin_lock_irqsave(&(dev->lock),f); - op_len = dev->resp->op_len < len ? dev->resp->op_len : len ; memcpy(dest,dev->resp->data, op_len); - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -1079,38 +1050,32 @@ static uint64_t palacios_host_dev_write_io(v3_host_dev_t hostdev, DEEP_DEBUG_PRINT("palacios: hostdev: write io port 0x%x \n",port); - spin_lock_irqsave(&(dev->lock),f); if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); + //palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued i/o write request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } + // have exclusive access to request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + // resize request if (!palacios_bigenough_reqresp(dev->req,len)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),len,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); - } + } } dev->req->type=PALACIOS_HOST_DEV_HOST_REQUEST_WRITE_IO; @@ -1124,19 +1089,13 @@ static uint64_t palacios_host_dev_write_io(v3_host_dev_t hostdev, dev->waiting=1; - spin_unlock_irqrestore(&(dev->lock),f); - // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - spin_lock_irqsave(&(dev->lock),f); - op_len = dev->resp->op_len < len ? dev->resp->op_len : len ; - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -1152,38 +1111,33 @@ static uint64_t palacios_host_dev_write_mem(v3_host_dev_t hostdev, DEEP_DEBUG_PRINT("palacios: hostdev: write mem 0x%p\n",gpa); - spin_lock_irqsave(&(dev->lock),f); if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); + //palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); + if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued memory write request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } + // Now have exclusive access to request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + // resize request if (!palacios_bigenough_reqresp(dev->req,len)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),len,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); - } + } } dev->req->type=PALACIOS_HOST_DEV_HOST_REQUEST_WRITE_MEM; @@ -1197,19 +1151,13 @@ static uint64_t palacios_host_dev_write_mem(v3_host_dev_t hostdev, dev->waiting=1; - spin_unlock_irqrestore(&(dev->lock),f); - // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - spin_lock_irqsave(&(dev->lock),f); - op_len= dev->resp->op_len < len ? dev->resp->op_len : len ; - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -1227,38 +1175,32 @@ static uint64_t palacios_host_dev_write_conf(v3_host_dev_t hostdev, DEEP_DEBUG_PRINT("palacios: hostdev: write conf 0x%p\n",(void*)offset); - spin_lock_irqsave(&(dev->lock),f); if (palacios_host_dev_rendezvous(dev)) { - spin_unlock_irqrestore(&(dev->lock),f); + //palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: ignoring request as user side is not connected (and did not rendezvous) for host device \"%s\"\n",dev->url); return 0; } + palacios_spinlock_lock_irqsave(&(dev->lock),f); if (dev->waiting) { - spin_unlock_irqrestore(&(dev->lock),f); + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); ERROR("palacios: guest issued config write request with host device \"%s\" in wrong state (waiting=%d, connected=%d)\n",dev->url,dev->waiting,dev->connected); return 0; } + // Have exclusive access to request + palacios_spinlock_unlock_irqrestore(&(dev->lock),f); + // resize request if (!palacios_bigenough_reqresp(dev->req,len)) { // not enough room. - // we drop the lock, turn on interrupts, resize, and then retry - DEEP_DEBUG_PRINT("palacios: request not big enough, dropping lock to resize on device \"%s\"\n",dev->url); - - spin_unlock_irqrestore(&(dev->lock),f); + DEEP_DEBUG_PRINT("palacios: request not big enough, resizing on device \"%s\"\n",dev->url); if (palacios_resize_reqresp(&(dev->req),len,0)) { ERROR("palacios: cannot resize for request on device \"%s\"\n",dev->url); return 0; - } else { - // reacquire the lock - // There shouldn't be a race here since there should not be another - // request from palacios until this one finishes - spin_lock_irqsave(&(dev->lock),f); - DEEP_DEBUG_PRINT("palacios: reacquired lock on device \"%s\"\n",dev->url); - } + } } dev->req->type=PALACIOS_HOST_DEV_HOST_REQUEST_WRITE_CONF; @@ -1271,20 +1213,14 @@ static uint64_t palacios_host_dev_write_conf(v3_host_dev_t hostdev, memcpy(dev->req->data,src,len); dev->waiting=1; - - spin_unlock_irqrestore(&(dev->lock),f); // hand over to the user space and wait for it to respond cycle_request_response(dev); // We're back! So now we'll hand the response back to Palacios - spin_lock_irqsave(&(dev->lock),f); - op_len = dev->resp->op_len < len ? dev->resp->op_len : len ; - spin_unlock_irqrestore(&(dev->lock),f); - return op_len; } @@ -1320,6 +1256,11 @@ static int host_dev_init( void ) { } +static int host_dev_deinit(void) { + // nothing to do + return 0; +} + static int host_dev_guest_init(struct v3_guest * guest, void ** vm_data ) { struct palacios_host_dev * host_dev = palacios_alloc(sizeof(struct palacios_host_dev)); @@ -1330,7 +1271,7 @@ static int host_dev_guest_init(struct v3_guest * guest, void ** vm_data ) { INIT_LIST_HEAD(&(host_dev->devs)); - spin_lock_init(&(host_dev->lock)); + palacios_spinlock_init(&(host_dev->lock)); *vm_data = host_dev; @@ -1343,7 +1284,10 @@ static int host_dev_guest_init(struct v3_guest * guest, void ** vm_data ) { static int host_dev_guest_deinit(struct v3_guest * guest, void * vm_data) { - palacios_free(vm_data); + struct palacios_host_dev * host_dev = (struct palacios_host_dev *) vm_data; + remove_guest_ctrl(guest, V3_VM_HOST_DEV_CONNECT); + palacios_spinlock_deinit(&(host_dev->lock)); + palacios_free(host_dev); return 0; } @@ -1353,7 +1297,7 @@ static int host_dev_guest_deinit(struct v3_guest * guest, void * vm_data) { static struct linux_ext host_dev_ext = { .name = "HOST_DEVICE_INTERFACE", .init = host_dev_init, - .deinit = NULL, + .deinit = host_dev_deinit, .guest_init = host_dev_guest_init, .guest_deinit = host_dev_guest_deinit };