New upstream version 18.08

[deb_dpdk.git] / drivers / net / virtio / virtio_user / vhost_user.c

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index 91c6449..ef6e43d 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -138,12 +138,13 @@ struct hugepage_file_info {
 static int
 get_hugepage_file_info(struct hugepage_file_info huges[], int max)
 {
-       int idx;
+       int idx, k, exist;
        FILE *f;
        char buf[BUFSIZ], *tmp, *tail;
        char *str_underline, *str_start;
        int huge_index;
        uint64_t v_start, v_end;
+       struct stat stats;
 
        f = fopen("/proc/self/maps", "r");
        if (!f) {
@@ -183,16 +184,39 @@ get_hugepage_file_info(struct hugepage_file_info huges[], int max)
                if (sscanf(str_start, "map_%d", &huge_index) != 1)
                        continue;
 
+               /* skip duplicated file which is mapped to different regions */
+               for (k = 0, exist = -1; k < idx; ++k) {
+                       if (!strcmp(huges[k].path, tmp)) {
+                               exist = k;
+                               break;
+                       }
+               }
+               if (exist >= 0)
+                       continue;
+
                if (idx >= max) {
                        PMD_DRV_LOG(ERR, "Exceed maximum of %d", max);
                        goto error;
                }
+
                huges[idx].addr = v_start;
-               huges[idx].size = v_end - v_start;
+               huges[idx].size = v_end - v_start; /* To be corrected later */
                snprintf(huges[idx].path, PATH_MAX, "%s", tmp);
                idx++;
        }
 
+       /* correct the size for files who have many regions */
+       for (k = 0; k < idx; ++k) {
+               if (stat(huges[k].path, &stats) < 0) {
+                       PMD_DRV_LOG(ERR, "Failed to stat %s, %s\n",
+                                   huges[k].path, strerror(errno));
+                       continue;
+               }
+               huges[k].size = stats.st_size;
+               PMD_DRV_LOG(INFO, "file %s, size %zx\n",
+                           huges[k].path, huges[k].size);
+       }
+
        fclose(f);
        return idx;
 
@@ -263,6 +287,9 @@ vhost_user_sock(struct virtio_user_dev *dev,
 
        PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
 
+       if (dev->is_server && vhostfd < 0)
+               return -1;
+
        msg.request = req;
        msg.flags = VHOST_USER_VERSION;
        msg.size = 0;
@@ -378,6 +405,30 @@ vhost_user_sock(struct virtio_user_dev *dev,
        return 0;
 }
 
+#define MAX_VIRTIO_USER_BACKLOG 1
+static int
+virtio_user_start_server(struct virtio_user_dev *dev, struct sockaddr_un *un)
+{
+       int ret;
+       int flag;
+       int fd = dev->listenfd;
+
+       ret = bind(fd, (struct sockaddr *)un, sizeof(*un));
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "failed to bind to %s: %s; remove it and try again\n",
+                           dev->path, strerror(errno));
+               return -1;
+       }
+       ret = listen(fd, MAX_VIRTIO_USER_BACKLOG);
+       if (ret < 0)
+               return -1;
+
+       flag = fcntl(fd, F_GETFL);
+       fcntl(fd, F_SETFL, flag | O_NONBLOCK);
+
+       return 0;
+}
+
 /**
  * Set up environment to talk with a vhost user backend.
  *
@@ -405,13 +456,24 @@ vhost_user_setup(struct virtio_user_dev *dev)
        memset(&un, 0, sizeof(un));
        un.sun_family = AF_UNIX;
        snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path);
-       if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) {
-               PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno));
-               close(fd);
-               return -1;
+
+       if (dev->is_server) {
+               dev->listenfd = fd;
+               if (virtio_user_start_server(dev, &un) < 0) {
+                       PMD_DRV_LOG(ERR, "virtio-user startup fails in server mode");
+                       close(fd);
+                       return -1;
+               }
+               dev->vhostfd = -1;
+       } else {
+               if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) {
+                       PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno));
+                       close(fd);
+                       return -1;
+               }
+               dev->vhostfd = fd;
        }
 
-       dev->vhostfd = fd;
        return 0;
 }