From d32439f6eb5f0d628c1a9d559007dda3083ec7b8 Mon Sep 17 00:00:00 2001

From: "plai@redhat.com" <plai@redhat.com>

Date: Thu, 21 Jun 2018 18:54:40 +0200

Subject: [PATCH 161/268] vhost-user-bridge: support host notifier

RH-Author: plai@redhat.com

Message-id: <1529607285-9942-6-git-send-email-plai@redhat.com>

Patchwork-id: 80934

O-Subject: [RHEL7.6 PATCH BZ 1526645 05/10] vhost-user-bridge: support host notifier

Bugzilla: 1526645

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

RH-Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

From: Tiwei Bie <tiwei.bie@intel.com>

This patch introduces the host notifier support in

vhost-user-bridge. A new option (-H) is added to use

the host notifier. This is mainly used to test the

host notifier implementation in vhost user.

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit e3af2928f8270498097af163bb023b633c0d8d1c)

Signed-off-by: Paul Lai <plai@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 tests/vhost-user-bridge.c | 98 +++++++++++++++++++++++++++++++++++++++++++++--

 1 file changed, 95 insertions(+), 3 deletions(-)

diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c

index e0605a5..0884294 100644

--- a/tests/vhost-user-bridge.c

+++ b/tests/vhost-user-bridge.c

@@ -29,6 +29,7 @@

 #define _FILE_OFFSET_BITS 64

+#include "qemu/atomic.h"

 #include "qemu/osdep.h"

 #include "qemu/iov.h"

 #include "standard-headers/linux/virtio_net.h"

@@ -65,6 +66,11 @@ typedef struct VubrDev {

     int sock;

     int ready;

     int quit;

+    struct {

+        int fd;

+        void *addr;

+        pthread_t thread;

+    } notifier;

 } VubrDev;

 static void

@@ -445,14 +451,22 @@ static uint64_t

 vubr_get_features(VuDev *dev)

 {

     return 1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE |

-        1ULL << VIRTIO_NET_F_MRG_RXBUF;

+        1ULL << VIRTIO_NET_F_MRG_RXBUF |

+        1ULL << VIRTIO_F_VERSION_1;

 }

 static void

 vubr_queue_set_started(VuDev *dev, int qidx, bool started)

 {

+    VubrDev *vubr = container_of(dev, VubrDev, vudev);

     VuVirtq *vq = vu_get_queue(dev, qidx);

+    if (started && vubr->notifier.fd >= 0) {

+        vu_set_queue_host_notifier(dev, vq, vubr->notifier.fd,

+                                   getpagesize(),

+                                   qidx * getpagesize());

+    }

+

     if (qidx % 2 == 1) {

         vu_set_queue_handler(dev, vq, started ? vubr_handle_tx : NULL);

     }

@@ -522,6 +536,8 @@ vubr_new(const char *path, bool client)

         vubr_die("socket");

     }

+    dev->notifier.fd = -1;

+

     un.sun_family = AF_UNIX;

     strcpy(un.sun_path, path);

     len = sizeof(un.sun_family) + strlen(path);

@@ -559,6 +575,73 @@ vubr_new(const char *path, bool client)

     return dev;

 }

+static void *notifier_thread(void *arg)

+{

+    VuDev *dev = (VuDev *)arg;

+    VubrDev *vubr = container_of(dev, VubrDev, vudev);

+    int pagesize = getpagesize();

+    int qidx;

+

+    while (true) {

+        for (qidx = 0; qidx < VHOST_MAX_NR_VIRTQUEUE; qidx++) {

+            uint16_t *n = vubr->notifier.addr + pagesize * qidx;

+

+            if (*n == qidx) {

+                *n = 0xffff;

+                /* We won't miss notifications if we reset

+                 * the memory first. */

+                smp_mb();

+

+                DPRINT("Got a notification for queue%d via host notifier.\n",

+                       qidx);

+

+                if (qidx % 2 == 1) {

+                    vubr_handle_tx(dev, qidx);

+                }

+            }

+            usleep(1000);

+        }

+    }

+

+    return NULL;

+}

+

+static void

+vubr_host_notifier_setup(VubrDev *dev)

+{

+    char template[] = "/tmp/vubr-XXXXXX";

+    pthread_t thread;

+    size_t length;

+    void *addr;

+    int fd;

+

+    length = getpagesize() * VHOST_MAX_NR_VIRTQUEUE;

+

+    fd = mkstemp(template);

+    if (fd < 0) {

+        vubr_die("mkstemp()");

+    }

+

+    if (posix_fallocate(fd, 0, length) != 0) {

+        vubr_die("posix_fallocate()");

+    }

+

+    addr = mmap(NULL, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

+    if (addr == MAP_FAILED) {

+        vubr_die("mmap()");

+    }

+

+    memset(addr, 0xff, length);

+

+    if (pthread_create(&thread, NULL, notifier_thread, &dev->vudev) != 0) {

+        vubr_die("pthread_create()");

+    }

+

+    dev->notifier.fd = fd;

+    dev->notifier.addr = addr;

+    dev->notifier.thread = thread;

+}

+

 static void

 vubr_set_host(struct sockaddr_in *saddr, const char *host)

 {

@@ -673,8 +756,9 @@ main(int argc, char *argv[])

     VubrDev *dev;

     int opt;

     bool client = false;

+    bool host_notifier = false;

-    while ((opt = getopt(argc, argv, "l:r:u:c")) != -1) {

+    while ((opt = getopt(argc, argv, "l:r:u:cH")) != -1) {

         switch (opt) {

         case 'l':

@@ -693,6 +777,9 @@ main(int argc, char *argv[])

         case 'c':

             client = true;

             break;

+        case 'H':

+            host_notifier = true;

+            break;

         default:

             goto out;

         }

@@ -708,6 +795,10 @@ main(int argc, char *argv[])

         return 1;

     }

+    if (host_notifier) {

+        vubr_host_notifier_setup(dev);

+    }

+

     vubr_backend_udp_setup(dev, lhost, lport, rhost, rport);

     vubr_run(dev);

@@ -717,7 +808,7 @@ main(int argc, char *argv[])

 out:

     fprintf(stderr, "Usage: %s ", argv[0]);

-    fprintf(stderr, "[-c] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n");

+    fprintf(stderr, "[-c] [-H] [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n");

     fprintf(stderr, "\t-u path to unix doman socket. default: %s\n",

             DEFAULT_UD_SOCKET);

     fprintf(stderr, "\t-l local host and port. default: %s:%s\n",

@@ -725,6 +816,7 @@ out:

     fprintf(stderr, "\t-r remote host and port. default: %s:%s\n",

             DEFAULT_RHOST, DEFAULT_RPORT);

     fprintf(stderr, "\t-c client mode\n");

+    fprintf(stderr, "\t-H use host notifier\n");

     return 1;

 }

-- 

1.8.3.1