Series comparison

-[PULL 0/3] Block patches
+[Qemu-devel] [PULL v2 0/3] Block patches
-The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
+The following changes since commit bec9c64ef7be8063f1192608b83877bc5c9ea217:
-  Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)
+  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-02-13 18:24:08 +0000)
 are available in the Git repository at:
-  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
+  git://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:
+for you to fetch changes up to d2f668b74907cbd96d9df0774971768ed06de2f0:
-  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
+  misc: fix spelling (2018-02-15 09:39:49 +0000)
 ----------------------------------------------------------------
 Pull request
-Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
+v2:
-improvements.
+ * Dropped Fam's git-publish series because there is still ongoing discussion
 ----------------------------------------------------------------
-Liu Yiding (1):
+Marc-André Lureau (1):
-  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
+  misc: fix spelling
 Sakshi Kaushik (1):
   Implements Backend Program conventions for vhost-user-scsi
 Stefan Hajnoczi (1):
-  contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
+  vl: pause vcpus before stopping iothreads
- docs/tools/virtiofsd.rst                  |  5 ++
+Wolfgang Bumiller (1):
- contrib/vhost-user-blk/vhost-user-blk.c   |  3 +-
+  ratelimit: don't align wait time with slices
- contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
- tools/virtiofsd/helper.c                  |  3 +
+ include/qemu/ratelimit.h   | 11 +++++------
-files changed, 62 insertions(+), 26 deletions(-)
+ util/qemu-coroutine-lock.c |  2 +-
  vl.c                       | 12 ++++++++++--
 files changed, 16 insertions(+), 9 deletions(-)
 --
-.35.1
+.14.3

-[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
+[Qemu-devel] [PULL v2 1/3] vl: pause vcpus before stopping iothreads
-The GLib documentation says "a NULL-terminated array of GOptionEntrys"
+Commit dce8921b2baaf95974af8176406881872067adfa ("iothread: Stop threads
-so we'd better make sure there is a terminator that lets
+before main() quits") introduced iothread_stop_all() to avoid the
-g_option_context_add_main_entries() know when the end of the array has
+following virtio-scsi assertion failure:
-been reached.
   assert(blk_get_aio_context(d->conf.blk) == s->ctx);
 Back then the assertion failed because when bdrv_close_all() made
 d->conf.blk NULL, blk_get_aio_context() returned the global AioContext
 instead of s->ctx.
 The same assertion can still fail today when vcpus submit new I/O
 requests after iothread_stop_all() has moved the BDS to the global
 AioContext.
 This patch hardens the iothread_stop_all() approach by pausing vcpus
 before calling iothread_stop_all().
 Note that the assertion failure is a race condition.  It is not possible
 to reproduce it reliably.
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Message-id: 20180201110708.8080-1-stefanha@redhat.com
 Message-id: 20220411150057.3009667-1-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
+ vl.c | 12 ++++++++++--
-file changed, 2 insertions(+), 1 deletion(-)
+file changed, 10 insertions(+), 2 deletions(-)
-diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
+diff --git a/vl.c b/vl.c
 index XXXXXXX..XXXXXXX 100644
---- a/contrib/vhost-user-blk/vhost-user-blk.c
+--- a/vl.c
-+++ b/contrib/vhost-user-blk/vhost-user-blk.c
++++ b/vl.c
-@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
+@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
-     {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
-      "block device or file path", "PATH"},
+     main_loop();
-     { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
+     replay_disable_events();
--      "Enable read-only", NULL }
++
-+      "Enable read-only", NULL },
++    /* The ordering of the following is delicate.  Stop vcpus to prevent new
-+    { NULL, },
++     * I/O requests being queued by the guest.  Then stop IOThreads (this
- };
++     * includes a drain operation and completes all request processing).  At
++     * this point emulated devices are still associated with their IOThreads
- int main(int argc, char **argv)
++     * (if any) but no longer have any work to do.  Only then can we close
 +     * block devices safely because we know there is no more I/O coming.
 +     */
 +    pause_all_vcpus();
      iothread_stop_all();
 -
 -    pause_all_vcpus();
      bdrv_close_all();
 +
      res_free();
      /* vhost-user must be cleaned up before chardevs.  */
 --
-.35.1
+.14.3

-[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
+[Qemu-devel] [PULL v2 2/3] ratelimit: don't align wait time with slices
-From: Liu Yiding <liuyd.fnst@fujitsu.com>
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
+It is possible for rate limited writes to keep overshooting a slice's
-description of it to docs/helper.
+quota by a tiny amount causing the slice-aligned waiting period to
 effectively halve the rate.
-Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>
+Reviewed-by: Alberto Garcia <berto@igalia.com>
+Message-id: 20180207071758.6818-1-w.bumiller@proxmox.com
 [Small documentation fixes: s/as client supports/as the client supports/
 and s/.  /. /.
 --Stefan]
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- docs/tools/virtiofsd.rst | 5 +++++
+ include/qemu/ratelimit.h | 11 +++++------
- tools/virtiofsd/helper.c | 3 +++
+file changed, 5 insertions(+), 6 deletions(-)
 files changed, 8 insertions(+)
-diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
+diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
 index XXXXXXX..XXXXXXX 100644
---- a/docs/tools/virtiofsd.rst
+--- a/include/qemu/ratelimit.h
-+++ b/docs/tools/virtiofsd.rst
++++ b/include/qemu/ratelimit.h
-@@ -XXX,XX +XXX,XX @@ Options
+@@ -XXX,XX +XXX,XX @@ typedef struct {
-     label. Server will try to set that label on newly created file
+ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
-     atomically wherever possible.
+ {
+     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-+  * killpriv_v2|no_killpriv_v2 -
+-    uint64_t delay_slices;
-+    Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
++    double delay_slices;
-+    by default as long as the client supports it. Enabling this option helps
-+    with performance in write path.
+     assert(limit->slice_quota && limit->slice_ns);
-+
- .. option:: --socket-path=PATH
+@@ -XXX,XX +XXX,XX @@ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
+         return 0;
-   Listen on vhost-user UNIX domain socket at PATH.
+     }
-diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
-index XXXXXXX..XXXXXXX 100644
+-    /* Quota exceeded. Calculate the next time slice we may start
---- a/tools/virtiofsd/helper.c
+-     * sending data again. */
-+++ b/tools/virtiofsd/helper.c
+-    delay_slices = (limit->dispatched + limit->slice_quota - 1) /
-@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
+-        limit->slice_quota;
-            "    -o announce_submounts      Announce sub-mount points to the guest\n"
++    /* Quota exceeded. Wait based on the excess amount and then start a new
-            "    -o posix_acl/no_posix_acl  Enable/Disable posix_acl. (default: disabled)\n"
++     * slice. */
-            "    -o security_label/no_security_label  Enable/Disable security label. (default: disabled)\n"
++    delay_slices = (double)limit->dispatched / limit->slice_quota;
-+           "    -o killpriv_v2/no_killpriv_v2\n"
+     limit->slice_end_time = limit->slice_start_time +
-+           "                               Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
+-        delay_slices * limit->slice_ns;
-+           "                               (default: enabled as long as client supports it)\n"
++        (uint64_t)(delay_slices * limit->slice_ns);
-            );
+     return limit->slice_end_time - now;
  }
 --
-.35.1
+.14.3

-[PULL 1/3] Implements Backend Program conventions for vhost-user-scsi
+[Qemu-devel] [PULL v2 3/3] misc: fix spelling
-From: Sakshi Kaushik <sakshikaushik717@gmail.com>
+From: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
+s/pupulate/populate
 Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com
-[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-consistency, fix --fd which was rejected due to an outdated
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---socket-path check, and add missing entries[] terminator.
+Message-id: 20180208162447.10851-1-marcandre.lureau@redhat.com
 --Stefan]
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
+ util/qemu-coroutine-lock.c | 2 +-
-file changed, 52 insertions(+), 25 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
+diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
 index XXXXXXX..XXXXXXX 100644
---- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+--- a/util/qemu-coroutine-lock.c
-+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
++++ b/util/qemu-coroutine-lock.c
-@@ -XXX,XX +XXX,XX @@ fail:
+@@ -XXX,XX +XXX,XX @@ void qemu_co_queue_run_restart(Coroutine *co)
+      * invalid memory.  Therefore, use a temporary queue and do not touch
- /** vhost-user-scsi **/
+      * the "co" coroutine as soon as you enter another one.
+      *
-+static int opt_fdnum = -1;
+-     * In its turn resumed "co" can pupulate "co_queue_wakeup" queue with
-+static char *opt_socket_path;
++     * In its turn resumed "co" can populate "co_queue_wakeup" queue with
-+static gboolean opt_print_caps;
+      * new coroutines to be woken up.  The caller, who has resumed "co",
-+static char *iscsi_uri;
+      * will be responsible for traversing the same queue, which may cause
-+
+      * a different wakeup order but not any missing wakeups.
 +static GOptionEntry entries[] = {
 +    { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
 +      "Print capabilities", NULL },
 +    { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
 +      "Use inherited fd socket", "FDNUM" },
 +    { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri,
 +      "iSCSI URI to connect to", "FDNUM" },
 +    { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
 +      "Use UNIX socket path", "PATH" },
 +    { NULL, }
 +};
 +
  int main(int argc, char **argv)
  {
      VusDev *vdev_scsi = NULL;
 -    char *unix_fn = NULL;
 -    char *iscsi_uri = NULL;
 -    int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
 +    int lsock = -1, csock = -1, err = EXIT_SUCCESS;
 -    while ((opt = getopt(argc, argv, "u:i:")) != -1) {
 -        switch (opt) {
 -        case 'h':
 -            goto help;
 -        case 'u':
 -            unix_fn = g_strdup(optarg);
 -            break;
 -        case 'i':
 -            iscsi_uri = g_strdup(optarg);
 -            break;
 -        default:
 -            goto help;
 -        }
 +    GError *error = NULL;
 +    GOptionContext *context;
 +
 +    context = g_option_context_new(NULL);
 +    g_option_context_add_main_entries(context, entries, NULL);
 +    if (!g_option_context_parse(context, &argc, &argv, &error)) {
 +        g_printerr("Option parsing failed: %s\n", error->message);
 +        exit(EXIT_FAILURE);
 +    }
 +
 +    if (opt_print_caps) {
 +        g_print("{\n");
 +        g_print("  \"type\": \"scsi\"\n");
 +        g_print("}\n");
 +        goto out;
      }
 -    if (!unix_fn || !iscsi_uri) {
 +
 +    if (!iscsi_uri) {
          goto help;
      }
 -    lsock = unix_sock_new(unix_fn);
 -    if (lsock < 0) {
 -        goto err;
 +    if (opt_socket_path) {
 +        lsock = unix_sock_new(opt_socket_path);
 +        if (lsock < 0) {
 +            exit(EXIT_FAILURE);
 +        }
 +    } else if (opt_fdnum < 0) {
 +        g_print("%s\n", g_option_context_get_help(context, true, NULL));
 +        exit(EXIT_FAILURE);
 +    } else {
 +        lsock = opt_fdnum;
      }
      csock = accept(lsock, NULL, NULL);
@@ -XXX,XX +XXX,XX @@ out:
      if (vdev_scsi) {
          g_main_loop_unref(vdev_scsi->loop);
          g_free(vdev_scsi);
 -        unlink(unix_fn);
 +        unlink(opt_socket_path);
      }
      if (csock >= 0) {
          close(csock);
@@ -XXX,XX +XXX,XX @@ out:
      if (lsock >= 0) {
          close(lsock);
      }
 -    g_free(unix_fn);
 +    g_free(opt_socket_path);
      g_free(iscsi_uri);
      return err;
@@ -XXX,XX +XXX,XX @@ err:
      goto out;
  help:
 -    fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
 +    fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
              argv[0]);
 -    fprintf(stderr, "          -u path to unix socket\n");
 -    fprintf(stderr, "          -i iscsi uri for lun 0\n");
 +    fprintf(stderr, "          -s, --socket-path=SOCKET_PATH path to unix socket\n");
 +    fprintf(stderr, "          -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
 +    fprintf(stderr, "          -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
 +    fprintf(stderr, "          -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
      fprintf(stderr, "          -h print help and quit\n");
      goto err;
 --
-.35.1
+.14.3

The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:

Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:

virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)

----------------------------------------------------------------
Pull request

Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
improvements.

----------------------------------------------------------------

Liu Yiding (1):
  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option

Sakshi Kaushik (1):
  Implements Backend Program conventions for vhost-user-scsi

Stefan Hajnoczi (1):
  contrib/vhost-user-blk: add missing GOptionEntry NULL terminator

docs/tools/virtiofsd.rst                  |  5 ++
 contrib/vhost-user-blk/vhost-user-blk.c   |  3 +-
 contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
 tools/virtiofsd/helper.c                  |  3 +
 4 files changed, 62 insertions(+), 26 deletions(-)

-- 
2.35.1

From: Sakshi Kaushik <sakshikaushik717@gmail.com>

Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com

[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
consistency, fix --fd which was rejected due to an outdated
--socket-path check, and add missing entries[] terminator.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index XXXXXXX..XXXXXXX 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -XXX,XX +XXX,XX @@ fail:
 
 /** vhost-user-scsi **/
 
+static int opt_fdnum = -1;
+static char *opt_socket_path;
+static gboolean opt_print_caps;
+static char *iscsi_uri;
+
+static GOptionEntry entries[] = {
+    { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
+      "Print capabilities", NULL },
+    { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
+      "Use inherited fd socket", "FDNUM" },
+    { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri,
+      "iSCSI URI to connect to", "FDNUM" },
+    { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
+      "Use UNIX socket path", "PATH" },
+    { NULL, }
+};
+
 int main(int argc, char **argv)
 {
     VusDev *vdev_scsi = NULL;
-    char *unix_fn = NULL;
-    char *iscsi_uri = NULL;
-    int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
+    int lsock = -1, csock = -1, err = EXIT_SUCCESS;
 
-    while ((opt = getopt(argc, argv, "u:i:")) != -1) {
-        switch (opt) {
-        case 'h':
-            goto help;
-        case 'u':
-            unix_fn = g_strdup(optarg);
-            break;
-        case 'i':
-            iscsi_uri = g_strdup(optarg);
-            break;
-        default:
-            goto help;
-        }
+    GError *error = NULL;
+    GOptionContext *context;
+
+    context = g_option_context_new(NULL);
+    g_option_context_add_main_entries(context, entries, NULL);
+    if (!g_option_context_parse(context, &argc, &argv, &error)) {
+        g_printerr("Option parsing failed: %s\n", error->message);
+        exit(EXIT_FAILURE);
+    }
+
+    if (opt_print_caps) {
+        g_print("{\n");
+        g_print("  \"type\": \"scsi\"\n");
+        g_print("}\n");
+        goto out;
     }
-    if (!unix_fn || !iscsi_uri) {
+
+    if (!iscsi_uri) {
         goto help;
     }
 
-    lsock = unix_sock_new(unix_fn);
-    if (lsock < 0) {
-        goto err;
+    if (opt_socket_path) {
+        lsock = unix_sock_new(opt_socket_path);
+        if (lsock < 0) {
+            exit(EXIT_FAILURE);
+        }
+    } else if (opt_fdnum < 0) {
+        g_print("%s\n", g_option_context_get_help(context, true, NULL));
+        exit(EXIT_FAILURE);
+    } else {
+        lsock = opt_fdnum;
     }
 
     csock = accept(lsock, NULL, NULL);
@@ -XXX,XX +XXX,XX @@ out:
     if (vdev_scsi) {
         g_main_loop_unref(vdev_scsi->loop);
         g_free(vdev_scsi);
-        unlink(unix_fn);
+        unlink(opt_socket_path);
     }
     if (csock >= 0) {
         close(csock);
@@ -XXX,XX +XXX,XX @@ out:
     if (lsock >= 0) {
         close(lsock);
     }
-    g_free(unix_fn);
+    g_free(opt_socket_path);
     g_free(iscsi_uri);
 
     return err;
@@ -XXX,XX +XXX,XX @@ err:
     goto out;
 
 help:
-    fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
+    fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
             argv[0]);
-    fprintf(stderr, "          -u path to unix socket\n");
-    fprintf(stderr, "          -i iscsi uri for lun 0\n");
+    fprintf(stderr, "          -s, --socket-path=SOCKET_PATH path to unix socket\n");
+    fprintf(stderr, "          -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
+    fprintf(stderr, "          -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
+    fprintf(stderr, "          -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
     fprintf(stderr, "          -h print help and quit\n");
 
     goto err;
-- 
2.35.1

The GLib documentation says "a NULL-terminated array of GOptionEntrys"
so we'd better make sure there is a terminator that lets
g_option_context_add_main_entries() know when the end of the array has
been reached.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20220411150057.3009667-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
     {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
      "block device or file path", "PATH"},
     { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
-      "Enable read-only", NULL }
+      "Enable read-only", NULL },
+    { NULL, },
 };
 
 int main(int argc, char **argv)
-- 
2.35.1

From: Liu Yiding <liuyd.fnst@fujitsu.com>

virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
description of it to docs/helper.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>

[Small documentation fixes: s/as client supports/as the client supports/
and s/.  /. /.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/tools/virtiofsd.rst | 5 +++++
 tools/virtiofsd/helper.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/tools/virtiofsd.rst
+++ b/docs/tools/virtiofsd.rst
@@ -XXX,XX +XXX,XX @@ Options
     label. Server will try to set that label on newly created file
     atomically wherever possible.
 
+  * killpriv_v2|no_killpriv_v2 -
+    Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
+    by default as long as the client supports it. Enabling this option helps
+    with performance in write path.
+
 .. option:: --socket-path=PATH
 
   Listen on vhost-user UNIX domain socket at PATH.
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
            "    -o announce_submounts      Announce sub-mount points to the guest\n"
            "    -o posix_acl/no_posix_acl  Enable/Disable posix_acl. (default: disabled)\n"
            "    -o security_label/no_security_label  Enable/Disable security label. (default: disabled)\n"
+           "    -o killpriv_v2/no_killpriv_v2\n"
+           "                               Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
+           "                               (default: enabled as long as client supports it)\n"
            );
 }
 
-- 
2.35.1

The following changes since commit bec9c64ef7be8063f1192608b83877bc5c9ea217:

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-02-13 18:24:08 +0000)

are available in the Git repository at:

git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to d2f668b74907cbd96d9df0774971768ed06de2f0:

misc: fix spelling (2018-02-15 09:39:49 +0000)

----------------------------------------------------------------
Pull request

v2:
 * Dropped Fam's git-publish series because there is still ongoing discussion

----------------------------------------------------------------

Marc-André Lureau (1):
  misc: fix spelling

Stefan Hajnoczi (1):
  vl: pause vcpus before stopping iothreads

Wolfgang Bumiller (1):
  ratelimit: don't align wait time with slices

include/qemu/ratelimit.h   | 11 +++++------
 util/qemu-coroutine-lock.c |  2 +-
 vl.c                       | 12 ++++++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

-- 
2.14.3

Commit dce8921b2baaf95974af8176406881872067adfa ("iothread: Stop threads
before main() quits") introduced iothread_stop_all() to avoid the
following virtio-scsi assertion failure:

assert(blk_get_aio_context(d->conf.blk) == s->ctx);

Back then the assertion failed because when bdrv_close_all() made
d->conf.blk NULL, blk_get_aio_context() returned the global AioContext
instead of s->ctx.

The same assertion can still fail today when vcpus submit new I/O
requests after iothread_stop_all() has moved the BDS to the global
AioContext.

This patch hardens the iothread_stop_all() approach by pausing vcpus
before calling iothread_stop_all().

Note that the assertion failure is a race condition.  It is not possible
to reproduce it reliably.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180201110708.8080-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 vl.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index XXXXXXX..XXXXXXX 100644
--- a/vl.c
+++ b/vl.c
@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
 
     main_loop();
     replay_disable_events();
+
+    /* The ordering of the following is delicate.  Stop vcpus to prevent new
+     * I/O requests being queued by the guest.  Then stop IOThreads (this
+     * includes a drain operation and completes all request processing).  At
+     * this point emulated devices are still associated with their IOThreads
+     * (if any) but no longer have any work to do.  Only then can we close
+     * block devices safely because we know there is no more I/O coming.
+     */
+    pause_all_vcpus();
     iothread_stop_all();
-
-    pause_all_vcpus();
     bdrv_close_all();
+
     res_free();
 
     /* vhost-user must be cleaned up before chardevs.  */
-- 
2.14.3

From: Wolfgang Bumiller <w.bumiller@proxmox.com>

It is possible for rate limited writes to keep overshooting a slice's
quota by a tiny amount causing the slice-aligned waiting period to
effectively halve the rate.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20180207071758.6818-1-w.bumiller@proxmox.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/qemu/ratelimit.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/ratelimit.h
+++ b/include/qemu/ratelimit.h
@@ -XXX,XX +XXX,XX @@ typedef struct {
 static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
 {
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-    uint64_t delay_slices;
+    double delay_slices;
 
     assert(limit->slice_quota && limit->slice_ns);
 
@@ -XXX,XX +XXX,XX @@ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
         return 0;
     }
 
-    /* Quota exceeded. Calculate the next time slice we may start
-     * sending data again. */
-    delay_slices = (limit->dispatched + limit->slice_quota - 1) /
-        limit->slice_quota;
+    /* Quota exceeded. Wait based on the excess amount and then start a new
+     * slice. */
+    delay_slices = (double)limit->dispatched / limit->slice_quota;
     limit->slice_end_time = limit->slice_start_time +
-        delay_slices * limit->slice_ns;
+        (uint64_t)(delay_slices * limit->slice_ns);
     return limit->slice_end_time - now;
 }
 
-- 
2.14.3

From: Marc-André Lureau <marcandre.lureau@redhat.com>

s/pupulate/populate

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20180208162447.10851-1-marcandre.lureau@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/qemu-coroutine-lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -XXX,XX +XXX,XX @@ void qemu_co_queue_run_restart(Coroutine *co)
      * invalid memory.  Therefore, use a temporary queue and do not touch
      * the "co" coroutine as soon as you enter another one.
      *
-     * In its turn resumed "co" can pupulate "co_queue_wakeup" queue with
+     * In its turn resumed "co" can populate "co_queue_wakeup" queue with
      * new coroutines to be woken up.  The caller, who has resumed "co",
      * will be responsible for traversing the same queue, which may cause
      * a different wakeup order but not any missing wakeups.
-- 
2.14.3