Series comparison

-[Qemu-devel] [PATCH 0/5] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit fb68096da3d35e64c88cd610c1fa42766c58e92a:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Revert "tests: use memfd in vhost-user-test" (2018-02-13 09:51:52 +0000)
+  Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)
 are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 64b01feca991e5b19a5d750ef77cdca92b68bdbb:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  misc: fix spelling (2018-02-13 15:38:17 +0000)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
 Pull request
 The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
 request needs to be resubmitted.
 The MAINTAINERS changes carry no risk and we might as well include them in QEMU
 .1.
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Fabian Ebner (1):
   block/io_uring: resubmit when result is -EAGAIN
-Fam Zheng (2):
+Philippe Mathieu-Daudé (1):
-  Add a git-publish configuration file
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
   README: Document 'git-publish' workflow
-Marc-André Lureau (1):
+Stefano Garzarella (1):
-  misc: fix spelling
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-Stefan Hajnoczi (1):
+ MAINTAINERS      |  2 ++
-  vl: pause vcpus before stopping iothreads
+ block/io_uring.c | 16 +++++++++++++++-
+files changed, 17 insertions(+), 1 deletion(-)
 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 ++++++++--
  .gitpublish                | 58 ++++++++++++++++++++++++++++++++++++++++++++++
  README                     | 31 ++++++++++++++++++++++++-
 files changed, 104 insertions(+), 10 deletions(-)
  create mode 100644 .gitpublish
 --
-.14.3
+.31.1

-[Qemu-devel] [PATCH 1/5] Add a git-publish configuration file
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-git-publish [1] is a convenient tool to send patches and has been
-popular among QEMU developers.  Recently it has been made available in
-Fedora official repo thanks to Stefan's work.
-One nice feature of the tool is a per-project configuration with
-profiles, especially in which the cccmd option is a handy method to
-create the Cc list.
-[1]: https://github.com/stefanha/git-publish
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-id: 20180205054725.25634-2-famz@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- .gitpublish | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-file changed, 58 insertions(+)
- create mode 100644 .gitpublish
-diff --git a/.gitpublish b/.gitpublish
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/.gitpublish
-@@ -XXX,XX +XXX,XX @@
-+#
-+# Common git-publish profiles that can be used to send patches to QEMU upstream.
-+#
-+# See https://github.com/stefanha/git-publish for more information
-+#
-+[gitpublishprofile "default"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "rfc"]
-+base = master
-+prefix = RFC PATCH
-+to = qemu-devel@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "stable"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-stable@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "trivial"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-trivial@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "block"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-block@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "arm"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-arm@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "s390"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-s390@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-+
-+[gitpublishprofile "ppc"]
-+base = master
-+prefix = PATCH
-+to = qemu-devel@nongnu.org
-+cc = qemu-ppc@nongnu.org
-+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
---
-.14.3

-[Qemu-devel] [PATCH 2/5] README: Document 'git-publish' workflow
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-[Fixed s/git-profile/git-publish/ typo and s/for once/the first time/.
---Stefan]
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-id: 20180205054725.25634-3-famz@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- README | 31 ++++++++++++++++++++++++++++++-
-file changed, 30 insertions(+), 1 deletion(-)
-diff --git a/README b/README
-index XXXXXXX..XXXXXXX 100644
---- a/README
-+++ b/README
-@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
-    git clone git://git.qemu.org/qemu.git
--When submitting patches, the preferred approach is to use 'git
-+When submitting patches, one common approach is to use 'git
- format-patch' and/or 'git send-email' to format & send the mail to the
- qemu-devel@nongnu.org mailing list. All patches submitted must contain
- a 'Signed-off-by' line from the author. Patches should follow the
- guidelines set out in the HACKING and CODING_STYLE files.
-+A 'git-publish' utility was created to make above process less
-+cumbersome, and is highly recommended for making regular contributions,
-+or even just for sending consecutive patch series revisions. It also
-+requires a working 'git send-email' setup, and by default doesn't
-+automate everything, so you may want to go through the above steps
-+manually the first time.
-+
-+For installation instructions, please go to
-+
-+  https://github.com/stefanha/git-publish
-+
-+The workflow with 'git-publish' is:
-+
-+  $ git checkout master -b my-feature
-+  $ # work on new commits, add your 'Signed-off-by' lines to each
-+  $ git publish
-+
-+Your patch series will be sent and tagged as my-feature-v1 if you need to refer
-+back to it in the future.
-+
-+Sending v2:
-+
-+  $ git checkout my-feature # same topic branch
-+  $ # making changes to the commits (using 'git rebase', for example)
-+  $ git publish
-+
-+Your patch series will be sent with 'v2' tag in the subject and the git tip
-+will be tagged as my-feature-v2.
-+
- Additional information on submitting patches can be found online via
- the QEMU website
---
-.14.3

-[Qemu-devel] [PATCH 5/5] misc: fix spelling
+[PULL for-6.1 1/3] MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-From: Marc-André Lureau <marcandre.lureau@redhat.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-s/pupulate/populate
+I've been working with io_uring for a while so I'd like to help
 with reviews.
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Message-Id: <20210728131515.131045-1-sgarzare@redhat.com>
 Message-id: 20180208162447.10851-1-marcandre.lureau@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/qemu-coroutine-lock.c | 2 +-
+ MAINTAINERS | 1 +
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/util/qemu-coroutine-lock.c
+--- a/MAINTAINERS
-+++ b/util/qemu-coroutine-lock.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ void qemu_co_queue_run_restart(Coroutine *co)
+@@ -XXX,XX +XXX,XX @@ Linux io_uring
-      * invalid memory.  Therefore, use a temporary queue and do not touch
+ M: Aarushi Mehta <mehta.aaru20@gmail.com>
-      * the "co" coroutine as soon as you enter another one.
+ M: Julia Suvorova <jusual@redhat.com>
-      *
+ M: Stefan Hajnoczi <stefanha@redhat.com>
--     * In its turn resumed "co" can pupulate "co_queue_wakeup" queue with
++R: Stefano Garzarella <sgarzare@redhat.com>
-+     * In its turn resumed "co" can populate "co_queue_wakeup" queue with
+ L: qemu-block@nongnu.org
-      * new coroutines to be woken up.  The caller, who has resumed "co",
+ S: Maintained
-      * will be responsible for traversing the same queue, which may cause
+ F: block/io_uring.c
       * a different wakeup order but not any missing wakeups.
 --
-.14.3
+.31.1

-[Qemu-devel] [PATCH 4/5] ratelimit: don't align wait time with slices
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+From: Fabian Ebner <f.ebner@proxmox.com>
-It is possible for rate limited writes to keep overshooting a slice's
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
-quota by a tiny amount causing the slice-aligned waiting period to
+completion path, which will end up being the result in the completed
-effectively halve the rate.
+io_uring request.
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Resubmitting such requests should allow block jobs to complete, even
-Reviewed-by: Alberto Garcia <berto@igalia.com>
+if such spurious errors are encountered.
-Message-id: 20180207071758.6818-1-w.bumiller@proxmox.com
 Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
 Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
 Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- include/qemu/ratelimit.h | 11 +++++------
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 5 insertions(+), 6 deletions(-)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/include/qemu/ratelimit.h
+--- a/block/io_uring.c
-+++ b/include/qemu/ratelimit.h
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ typedef struct {
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
- static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
+         total_bytes = ret + luringcb->total_read;
- {
-     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
+         if (ret < 0) {
--    uint64_t delay_slices;
+-            if (ret == -EINTR) {
-+    double delay_slices;
++            /*
++             * Only writev/readv/fsync requests on regular files or host block
-     assert(limit->slice_quota && limit->slice_ns);
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
++             * known to happen sometimes with Linux SCSI. Submit again and hope
-@@ -XXX,XX +XXX,XX @@ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
++             * the request completes successfully.
-         return 0;
++             *
-     }
++             * For more information, see:
++             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
--    /* Quota exceeded. Calculate the next time slice we may start
++             *
--     * sending data again. */
++             * If the code is changed to submit other types of requests in the
--    delay_slices = (limit->dispatched + limit->slice_quota - 1) /
++             * future, then this workaround may need to be extended to deal with
--        limit->slice_quota;
++             * genuine -EAGAIN results that should not be resubmitted
-+    /* Quota exceeded. Wait based on the excess amount and then start a new
++             * immediately.
-+     * slice. */
++             */
-+    delay_slices = (double)limit->dispatched / limit->slice_quota;
++            if (ret == -EINTR || ret == -EAGAIN) {
-     limit->slice_end_time = limit->slice_start_time +
+                 luring_resubmit(s, luringcb);
--        delay_slices * limit->slice_ns;
+                 continue;
-+        (uint64_t)(delay_slices * limit->slice_ns);
+             }
      return limit->slice_end_time - now;
  }
 --
-.14.3
+.31.1

-[Qemu-devel] [PATCH 3/5] vl: pause vcpus before stopping iothreads
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-Commit dce8921b2baaf95974af8176406881872067adfa ("iothread: Stop threads
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
 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);
+I'm interested in following the activity around the NVMe bdrv.
-Back then the assertion failed because when bdrv_close_all() made
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-d->conf.blk NULL, blk_get_aio_context() returned the global AioContext
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
 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 ++++++++++--
+ MAINTAINERS | 1 +
-file changed, 10 insertions(+), 2 deletions(-)
+file changed, 1 insertion(+)
-diff --git a/vl.c b/vl.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/vl.c
+--- a/MAINTAINERS
-+++ b/vl.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
+ NVMe Block Driver
-     main_loop();
+ M: Stefan Hajnoczi <stefanha@redhat.com>
-     replay_disable_events();
+ R: Fam Zheng <fam@euphon.net>
-+
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-+    /* The ordering of the following is delicate.  Stop vcpus to prevent new
+ L: qemu-block@nongnu.org
-+     * I/O requests being queued by the guest.  Then stop IOThreads (this
+ S: Supported
-+     * includes a drain operation and completes all request processing).  At
+ F: block/nvme*
 +     * 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.  */
 --
-.14.3
+.31.1

The following changes since commit fb68096da3d35e64c88cd610c1fa42766c58e92a:

Revert "tests: use memfd in vhost-user-test" (2018-02-13 09:51:52 +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 64b01feca991e5b19a5d750ef77cdca92b68bdbb:

misc: fix spelling (2018-02-13 15:38:17 +0000)

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

Fam Zheng (2):
  Add a git-publish configuration file
  README: Document 'git-publish' workflow

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 ++++++++--
 .gitpublish                | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 README                     | 31 ++++++++++++++++++++++++-
 5 files changed, 104 insertions(+), 10 deletions(-)
 create mode 100644 .gitpublish

-- 
2.14.3

From: Fam Zheng <famz@redhat.com>

git-publish [1] is a convenient tool to send patches and has been
popular among QEMU developers.  Recently it has been made available in
Fedora official repo thanks to Stefan's work.

One nice feature of the tool is a per-project configuration with
profiles, especially in which the cccmd option is a handy method to
create the Cc list.

[1]: https://github.com/stefanha/git-publish

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180205054725.25634-2-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitpublish | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .gitpublish

diff --git a/.gitpublish b/.gitpublish
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/.gitpublish
@@ -XXX,XX +XXX,XX @@
+#
+# Common git-publish profiles that can be used to send patches to QEMU upstream.
+#
+# See https://github.com/stefanha/git-publish for more information
+#
+[gitpublishprofile "default"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "rfc"]
+base = master
+prefix = RFC PATCH
+to = qemu-devel@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "stable"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-stable@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "trivial"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-trivial@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "block"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-block@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "arm"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-arm@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "s390"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-s390@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
+
+[gitpublishprofile "ppc"]
+base = master
+prefix = PATCH
+to = qemu-devel@nongnu.org
+cc = qemu-ppc@nongnu.org
+cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-- 
2.14.3

From: Fam Zheng <famz@redhat.com>

[Fixed s/git-profile/git-publish/ typo and s/for once/the first time/.
--Stefan]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180205054725.25634-3-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 README | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/README b/README
index XXXXXXX..XXXXXXX 100644
--- a/README
+++ b/README
@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
 
    git clone git://git.qemu.org/qemu.git
 
-When submitting patches, the preferred approach is to use 'git
+When submitting patches, one common approach is to use 'git
 format-patch' and/or 'git send-email' to format & send the mail to the
 qemu-devel@nongnu.org mailing list. All patches submitted must contain
 a 'Signed-off-by' line from the author. Patches should follow the
 guidelines set out in the HACKING and CODING_STYLE files.
 
+A 'git-publish' utility was created to make above process less
+cumbersome, and is highly recommended for making regular contributions,
+or even just for sending consecutive patch series revisions. It also
+requires a working 'git send-email' setup, and by default doesn't
+automate everything, so you may want to go through the above steps
+manually the first time.
+
+For installation instructions, please go to
+
+  https://github.com/stefanha/git-publish
+
+The workflow with 'git-publish' is:
+
+  $ git checkout master -b my-feature
+  $ # work on new commits, add your 'Signed-off-by' lines to each
+  $ git publish
+
+Your patch series will be sent and tagged as my-feature-v1 if you need to refer
+back to it in the future.
+
+Sending v2:
+
+  $ git checkout my-feature # same topic branch
+  $ # making changes to the commits (using 'git rebase', for example)
+  $ git publish
+
+Your patch series will be sent with 'v2' tag in the subject and the git tip
+will be tagged as my-feature-v2.
+
 Additional information on submitting patches can be found online via
 the QEMU website
 
-- 
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

The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:

Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)

are available in the Git repository at:

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

for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:

MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)

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

The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
request needs to be resubmitted.

The MAINTAINERS changes carry no risk and we might as well include them in QEMU
6.1.

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

Fabian Ebner (1):
  block/io_uring: resubmit when result is -EAGAIN

Philippe Mathieu-Daudé (1):
  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver

Stefano Garzarella (1):
  MAINTAINERS: add Stefano Garzarella as io_uring reviewer

MAINTAINERS      |  2 ++
 block/io_uring.c | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

-- 
2.31.1

From: Fabian Ebner <f.ebner@proxmox.com>

Linux SCSI can throw spurious -EAGAIN in some corner cases in its
completion path, which will end up being the result in the completed
io_uring request.

Resubmitting such requests should allow block jobs to complete, even
if such spurious errors are encountered.

Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io_uring.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/block/io_uring.c b/block/io_uring.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
         total_bytes = ret + luringcb->total_read;
 
         if (ret < 0) {
-            if (ret == -EINTR) {
+            /*
+             * Only writev/readv/fsync requests on regular files or host block
+             * devices are submitted. Therefore -EAGAIN is not expected but it's
+             * known to happen sometimes with Linux SCSI. Submit again and hope
+             * the request completes successfully.
+             *
+             * For more information, see:
+             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
+             *
+             * If the code is changed to submit other types of requests in the
+             * future, then this workaround may need to be extended to deal with
+             * genuine -EAGAIN results that should not be resubmitted
+             * immediately.
+             */
+            if (ret == -EINTR || ret == -EAGAIN) {
                 luring_resubmit(s, luringcb);
                 continue;
             }
-- 
2.31.1