net/sfc/base: update autogenerated MCDI and TLV headers

[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 97bd832..a6df97a 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
  */
 
 #include <sys/socket.h>
@@ -407,6 +378,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.
  *
@@ -434,13 +429,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;
 }