Series comparison

-[Qemu-devel] [PULL 0/8] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-08 17:05:58 +0100)
+  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 31be8a2a97ecba7d31a82932286489cac318e9e9:
+for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  block/file-posix: add x-check-page-cache=on|off option (2018-05-11 16:43:05 +0100)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
-Block pull request
+Pull request
- * Support -drive cache.direct=off live migration for POSIX files
+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.
 ----------------------------------------------------------------
-Joe Perches (4):
+Fabian Ebner (1):
-  checkpatch: add a --strict check for utf-8 in commit logs
+  block/io_uring: resubmit when result is -EAGAIN
   checkpatch: ignore email headers better
   checkpatch: emit a warning on file add/move/delete
   checkpatch: reduce MAINTAINERS update message frequency
-Pasi Savanainen (1):
+Philippe Mathieu-Daudé (1):
-  checkpatch: check utf-8 content from a commit log when it's missing
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
     from charset
-Stefan Hajnoczi (3):
+Stefano Garzarella (1):
-  blockjob: drop block_job_pause/resume_all()
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
   block/file-posix: implement bdrv_co_invalidate_cache() on Linux
   block/file-posix: add x-check-page-cache=on|off option
- qapi/block-core.json         |   7 +-
+ MAINTAINERS      |  2 ++
- include/block/blockjob_int.h |  14 ----
+ block/io_uring.c | 16 +++++++++++++++-
- block/file-posix.c           | 146 ++++++++++++++++++++++++++++++++++-
+files changed, 17 insertions(+), 1 deletion(-)
  blockjob.c                   |  27 -------
  scripts/checkpatch.pl        |  56 +++++++++++++-
 files changed, 202 insertions(+), 48 deletions(-)
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 1/8] blockjob: drop block_job_pause/resume_all()
+Deleted patch
-Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't
-block_job_pause_all() in bdrv_drain_all()") removed the only callers of
-block_job_pause/resume_all().
-Pausing and resuming now happens in child_job_drained_begin/end() so
-it's no longer necessary to globally pause/resume jobs.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
-Message-id: 20180424085240.5798-1-stefanha@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- include/block/blockjob_int.h | 14 --------------
- blockjob.c                   | 27 ---------------------------
-files changed, 41 deletions(-)
-diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/block/blockjob_int.h
-+++ b/include/block/blockjob_int.h
-@@ -XXX,XX +XXX,XX @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
-  */
- void block_job_yield(BlockJob *job);
--/**
-- * block_job_pause_all:
-- *
-- * Asynchronously pause all jobs.
-- */
--void block_job_pause_all(void);
--
--/**
-- * block_job_resume_all:
-- *
-- * Resume all block jobs.  Must be paired with a preceding block_job_pause_all.
-- */
--void block_job_resume_all(void);
--
- /**
-  * block_job_early_fail:
-  * @bs: The block device.
-diff --git a/blockjob.c b/blockjob.c
-index XXXXXXX..XXXXXXX 100644
---- a/blockjob.c
-+++ b/blockjob.c
-@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
-     return job;
- }
--void block_job_pause_all(void)
--{
--    BlockJob *job = NULL;
--    while ((job = block_job_next(job))) {
--        AioContext *aio_context = blk_get_aio_context(job->blk);
--
--        aio_context_acquire(aio_context);
--        block_job_ref(job);
--        block_job_pause(job);
--        aio_context_release(aio_context);
--    }
--}
--
- void block_job_early_fail(BlockJob *job)
- {
-     assert(job->status == BLOCK_JOB_STATUS_CREATED);
-@@ -XXX,XX +XXX,XX @@ void coroutine_fn block_job_pause_point(BlockJob *job)
-     }
- }
--void block_job_resume_all(void)
--{
--    BlockJob *job, *next;
--
--    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {
--        AioContext *aio_context = blk_get_aio_context(job->blk);
--
--        aio_context_acquire(aio_context);
--        block_job_resume(job);
--        block_job_unref(job);
--        aio_context_release(aio_context);
--    }
--}
--
- /*
-  * Conditionally enter a block_job pending a call to fn() while
-  * under the block_job_lock critical section.
---
-.17.0

-[Qemu-devel] [PULL 2/8] checkpatch: add a --strict check for utf-8 in commit logs
+Deleted patch
-From: Joe Perches <joe@perches.com>
-Some find using utf-8 in commit logs inappropriate.
-Some patch commit logs contain unintended utf-8 characters when doing
-things like copy/pasting compilation output.
-Look for the start of any commit log by skipping initial lines that look
-like email headers and "From: " lines.
-Stop looking for utf-8 at the first signature line.
-Signed-off-by: Joe Perches <joe@perches.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Message-id: 20180430124651.10340-2-stefanha@redhat.com
-Suggested-by: Andrew Morton <akpm@linux-foundation.org>
-Cc: Andy Whitcroft <apw@shadowen.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-(cherry picked from commit 15662b3e8644905032c2e26808401a487d4e90c1)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Conflicts:
-  QEMU does not have CHK(), use WARN() instead.
-  QEMU WARN() only takes one argument, drop the 'type' value in the
-  first argument.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 30 ++++++++++++++++++++++++++----
-file changed, 26 insertions(+), 4 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ our $NonptrType;
- our $Type;
- our $Declare;
--our $UTF8    = qr {
--    [\x09\x0A\x0D\x20-\x7E]              # ASCII
--    | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-+our $NON_ASCII_UTF8    = qr{
-+    [\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
-     |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
-     | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-     |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
-@@ -XXX,XX +XXX,XX @@ our $UTF8    = qr {
-     |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
- }x;
-+our $UTF8    = qr{
-+    [\x09\x0A\x0D\x20-\x7E]              # ASCII
-+    | $NON_ASCII_UTF8
-+}x;
-+
- # There are still some false positives, but this catches most
- # common cases.
- our $typeTypedefs = qr{(?x:
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $signoff = 0;
-     my $is_patch = 0;
-+    my $in_header_lines = 1;
-+    my $in_commit_log = 0;        #Scanning lines before patch
-+
-     our @report = ();
-     our $cnt_lines = 0;
-     our $cnt_error = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
-         if ($line =~ /^diff --git.*?(\S+)$/) {
-             $realfile = $1;
-             $realfile =~ s@^([^/]*)/@@;
--
-         } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
-             $realfile = $1;
-             $realfile =~ s@^([^/]*)/@@;
-@@ -XXX,XX +XXX,XX @@ sub process {
-         if ($line =~ /^\s*signed-off-by:/i) {
-             # This is a signoff, if ugly, so do not double report.
-             $signoff++;
-+            $in_commit_log = 0;
-+
-             if (!($line =~ /^\s*Signed-off-by:/)) {
-                 ERROR("The correct form is \"Signed-off-by\"\n" .
-                     $herecurr);
-@@ -XXX,XX +XXX,XX @@ sub process {
-             ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
-         }
-+# Check if it's the start of a commit log
-+# (not a header line and we haven't seen the patch filename)
-+        if ($in_header_lines && $realfile =~ /^$/ &&
-+            $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
-+            $in_header_lines = 0;
-+            $in_commit_log = 1;
-+        }
-+
-+# Still not yet in a patch, check for any UTF-8
-+        if ($in_commit_log && $realfile =~ /^$/ &&
-+            $rawline =~ /$NON_ASCII_UTF8/) {
-+            WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
-+        }
-+
- # ignore non-hunk lines and lines being removed
-         next if (!$hunk_line || $line =~ /^-/);
---
-.17.0

-[Qemu-devel] [PULL 3/8] checkpatch: check utf-8 content from a commit log when it's missing from charset
+Deleted patch
-From: Pasi Savanainen <pasi.savanainen@nixu.com>
-Check that a commit log doesn't contain UTF-8 when a mail header
-explicitly defines a different charset, like
-'Content-Type: text/plain; charset="us-ascii"'
-Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Message-id: 20180430124651.10340-3-stefanha@redhat.com
-Cc: Joe Perches <joe@perches.com>
-Cc: Andy Whitcroft <apw@canonical.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-(cherry picked from commit fa64205df9dfd7b7662cc64a7e82115c00e428e5)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 13 +++++++++++--
-file changed, 11 insertions(+), 2 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $in_header_lines = 1;
-     my $in_commit_log = 0;        #Scanning lines before patch
-+    my $non_utf8_charset = 0;
-+
-     our @report = ();
-     our $cnt_lines = 0;
-     our $cnt_error = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
-             $in_commit_log = 1;
-         }
--# Still not yet in a patch, check for any UTF-8
--        if ($in_commit_log && $realfile =~ /^$/ &&
-+# Check if there is UTF-8 in a commit log when a mail header has explicitly
-+# declined it, i.e defined some charset where it is missing.
-+        if ($in_header_lines &&
-+            $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
-+            $1 !~ /utf-8/i) {
-+            $non_utf8_charset = 1;
-+        }
-+
-+        if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
-             $rawline =~ /$NON_ASCII_UTF8/) {
-             WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
-         }
---
-.17.0

-[Qemu-devel] [PULL 4/8] checkpatch: ignore email headers better
+Deleted patch
-From: Joe Perches <joe@perches.com>
-There are some patches created by git format-patch that when scanned by
-checkpatch report errors on lines like
-To:    address.tld
-This is a checkpatch false positive.
-Improve the logic a bit to ignore folded email headers to avoid emitting
-these messages.
-Signed-off-by: Joe Perches <joe@perches.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20180430124651.10340-4-stefanha@redhat.com
-(cherry picked from commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 5 +++--
-file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $signoff = 0;
-     my $is_patch = 0;
--    my $in_header_lines = 1;
-+    my $in_header_lines = $file ? 0 : 1;
-     my $in_commit_log = 0;        #Scanning lines before patch
-     my $non_utf8_charset = 0;
-@@ -XXX,XX +XXX,XX @@ sub process {
- # Check if it's the start of a commit log
- # (not a header line and we haven't seen the patch filename)
-         if ($in_header_lines && $realfile =~ /^$/ &&
--            $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
-+            !($rawline =~ /^\s+\S/ ||
-+              $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
-             $in_header_lines = 0;
-             $in_commit_log = 1;
-         }
---
-.17.0

-[Qemu-devel] [PULL 5/8] checkpatch: emit a warning on file add/move/delete
+Deleted patch
-From: Joe Perches <joe@perches.com>
-Whenever files are added, moved, or deleted, the MAINTAINERS file
-patterns can be out of sync or outdated.
-To try to keep MAINTAINERS more up-to-date, add a one-time warning
-whenever a patch does any of those.
-Signed-off-by: Joe Perches <joe@perches.com>
-Acked-by: Andy Whitcroft <apw@canonical.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20180430124651.10340-5-stefanha@redhat.com
-(cherry picked from commit 13f1937ef33950b1112049972249e6191b82e6c9)
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Conflicts:
-  QEMU WARN() only takes one argument, drop the 'type' value in the
-  first argument.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- scripts/checkpatch.pl | 12 +++++++++++-
-file changed, 11 insertions(+), 1 deletion(-)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index XXXXXXX..XXXXXXX 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -XXX,XX +XXX,XX @@ sub process {
-     my $in_header_lines = $file ? 0 : 1;
-     my $in_commit_log = 0;        #Scanning lines before patch
--
-+    my $reported_maintainer_file = 0;
-     my $non_utf8_charset = 0;
-     our @report = ();
-@@ -XXX,XX +XXX,XX @@ sub process {
-             }
-         }
-+# Check for added, moved or deleted files
-+        if (!$reported_maintainer_file && !$in_commit_log &&
-+            ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
-+             $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ ||
-+             ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
-+              (defined($1) || defined($2))))) {
-+            $reported_maintainer_file = 1;
-+            WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
-+        }
-+
- # Check for wrappage within a valid hunk of the file
-         if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
-             ERROR("patch seems to be corrupt (line wrapped?)\n" .
---
-.17.0

-[Qemu-devel] [PULL 8/8] block/file-posix: add x-check-page-cache=on|off option
+[PULL for-6.1 1/3] MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-mincore(2) checks whether pages are resident.  Use it to verify that
+From: Stefano Garzarella <sgarzare@redhat.com>
 page cache has been dropped.
-You can trigger a verification failure by mmapping the image file from
+I've been working with io_uring for a while so I'd like to help
-another process that loads a byte from a page, forcing it to become
+with reviews.
 resident.  bdrv_co_invalidate_cache() will fail while that process is
 alive.
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
+Message-Id: <20210728131515.131045-1-sgarzare@redhat.com>
 Message-id: 20180427162312.18583-3-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qapi/block-core.json |   7 ++-
+ MAINTAINERS | 1 +
- block/file-posix.c   | 100 ++++++++++++++++++++++++++++++++++++++++++-
+file changed, 1 insertion(+)
 files changed, 104 insertions(+), 3 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/MAINTAINERS
-+++ b/qapi/block-core.json
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ Linux io_uring
- # @locking:     whether to enable file locking. If set to 'auto', only enable
+ M: Aarushi Mehta <mehta.aaru20@gmail.com>
- #               when Open File Descriptor (OFD) locking API is available
+ M: Julia Suvorova <jusual@redhat.com>
- #               (default: auto, since 2.10)
+ M: Stefan Hajnoczi <stefanha@redhat.com>
-+# @x-check-cache-dropped: whether to check that page cache was dropped on live
++R: Stefano Garzarella <sgarzare@redhat.com>
-+#                         migration.  May cause noticeable delays if the image
+ L: qemu-block@nongnu.org
-+#                         file is large, do not use in production.
+ S: Maintained
-+#                         (default: off) (since: 2.13)
+ F: block/io_uring.c
  #
  # Since: 2.9
  ##
@@ -XXX,XX +XXX,XX @@
    'data': { 'filename': 'str',
              '*pr-manager': 'str',
              '*locking': 'OnOffAuto',
 -            '*aio': 'BlockdevAioOptions' } }
 +            '*aio': 'BlockdevAioOptions',
 +            '*x-check-cache-dropped': 'bool' } }
  ##
  # @BlockdevOptionsNull:
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
      bool page_cache_inconsistent:1;
      bool has_fallocate;
      bool needs_alignment;
 +    bool check_cache_dropped;
      PRManager *pr_mgr;
  } BDRVRawState;
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
  typedef struct BDRVRawReopenState {
      int fd;
      int open_flags;
 +    bool check_cache_dropped;
  } BDRVRawReopenState;
  static int fd_open(BlockDriverState *bs);
@@ -XXX,XX +XXX,XX @@ static QemuOptsList raw_runtime_opts = {
              .type = QEMU_OPT_STRING,
              .help = "id of persistent reservation manager object (default: none)",
          },
 +        {
 +            .name = "x-check-cache-dropped",
 +            .type = QEMU_OPT_BOOL,
 +            .help = "check that page cache was dropped on live migration (default: off)"
 +        },
          { /* end of list */ }
      },
  };
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
          }
      }
 +    s->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
 +                                               false);
 +
      s->open_flags = open_flags;
      raw_parse_flags(bdrv_flags, &s->open_flags);
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
  {
      BDRVRawState *s;
      BDRVRawReopenState *rs;
 +    QemuOpts *opts;
      int ret = 0;
      Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
      state->opaque = g_new0(BDRVRawReopenState, 1);
      rs = state->opaque;
 +    rs->fd = -1;
 +
 +    /* Handle options changes */
 +    opts = qemu_opts_create(&raw_runtime_opts, NULL, 0, &error_abort);
 +    qemu_opts_absorb_qdict(opts, state->options, &local_err);
 +    if (local_err) {
 +        error_propagate(errp, local_err);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
 +                                                s->check_cache_dropped);
      if (s->type == FTYPE_CD) {
          rs->open_flags |= O_NONBLOCK;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
      raw_parse_flags(state->flags, &rs->open_flags);
 -    rs->fd = -1;
 -
      int fcntl_flags = O_APPEND | O_NONBLOCK;
  #ifdef O_NOATIME
      fcntl_flags |= O_NOATIME;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
          }
      }
 +out:
 +    qemu_opts_del(opts);
      return ret;
  }
@@ -XXX,XX +XXX,XX @@ static void raw_reopen_commit(BDRVReopenState *state)
      BDRVRawReopenState *rs = state->opaque;
      BDRVRawState *s = state->bs->opaque;
 +    s->check_cache_dropped = rs->check_cache_dropped;
      s->open_flags = rs->open_flags;
      qemu_close(s->fd);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
      return ret | BDRV_BLOCK_OFFSET_VALID;
  }
 +#if defined(__linux__)
 +/* Verify that the file is not in the page cache */
 +static void check_cache_dropped(BlockDriverState *bs, Error **errp)
 +{
 +    const size_t window_size = 128 * 1024 * 1024;
 +    BDRVRawState *s = bs->opaque;
 +    void *window = NULL;
 +    size_t length = 0;
 +    unsigned char *vec;
 +    size_t page_size;
 +    off_t offset;
 +    off_t end;
 +
 +    /* mincore(2) page status information requires 1 byte per page */
 +    page_size = sysconf(_SC_PAGESIZE);
 +    vec = g_malloc(DIV_ROUND_UP(window_size, page_size));
 +
 +    end = raw_getlength(bs);
 +
 +    for (offset = 0; offset < end; offset += window_size) {
 +        void *new_window;
 +        size_t new_length;
 +        size_t vec_end;
 +        size_t i;
 +        int ret;
 +
 +        /* Unmap previous window if size has changed */
 +        new_length = MIN(end - offset, window_size);
 +        if (new_length != length) {
 +            munmap(window, length);
 +            window = NULL;
 +            length = 0;
 +        }
 +
 +        new_window = mmap(window, new_length, PROT_NONE, MAP_PRIVATE,
 +                          s->fd, offset);
 +        if (new_window == MAP_FAILED) {
 +            error_setg_errno(errp, errno, "mmap failed");
 +            break;
 +        }
 +
 +        window = new_window;
 +        length = new_length;
 +
 +        ret = mincore(window, length, vec);
 +        if (ret < 0) {
 +            error_setg_errno(errp, errno, "mincore failed");
 +            break;
 +        }
 +
 +        vec_end = DIV_ROUND_UP(length, page_size);
 +        for (i = 0; i < vec_end; i++) {
 +            if (vec[i] & 0x1) {
 +                error_setg(errp, "page cache still in use!");
 +                break;
 +            }
 +        }
 +    }
 +
 +    if (window) {
 +        munmap(window, length);
 +    }
 +
 +    g_free(vec);
 +}
 +#endif /* __linux__ */
 +
  static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
                                                   Error **errp)
  {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
          error_setg_errno(errp, ret, "fadvise failed");
          return;
      }
 +
 +    if (s->check_cache_dropped) {
 +        check_cache_dropped(bs, errp);
 +    }
  #else /* __linux__ */
      /* Do nothing.  Live migration to a remote host with cache.direct=off is
       * unsupported on other host operating systems.  Cache consistency issues
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 7/8] block/file-posix: implement bdrv_co_invalidate_cache() on Linux
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-On Linux posix_fadvise(POSIX_FADV_DONTNEED) invalidates pages*.  Use
+From: Fabian Ebner <f.ebner@proxmox.com>
 this to drop page cache on the destination host during shared storage
 migration.  This way the destination host will read the latest copy of
 the data and will not use stale data from the page cache.
-The flow is as follows:
+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.
-. Source host writes out all dirty pages and inactivates drives.
+Resubmitting such requests should allow block jobs to complete, even
-. QEMU_VM_EOF is sent on migration stream.
+if such spurious errors are encountered.
 . Destination host invalidates caches before accessing drives.
-This patch enables live migration even with -drive cache.direct=off.
+Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
+Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-* Terms and conditions may apply, please see patch for details.
+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>
 Reviewed-by: Fam Zheng <famz@redhat.com>
 Message-id: 20180427162312.18583-2-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/file-posix.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 46 insertions(+)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/block/io_uring.c
-+++ b/block/file-posix.c
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
-     return ret | BDRV_BLOCK_OFFSET_VALID;
+         total_bytes = ret + luringcb->total_read;
- }
+         if (ret < 0) {
-+static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
+-            if (ret == -EINTR) {
-+                                                 Error **errp)
++            /*
-+{
++             * Only writev/readv/fsync requests on regular files or host block
-+    BDRVRawState *s = bs->opaque;
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
-+    int ret;
++             * known to happen sometimes with Linux SCSI. Submit again and hope
-+
++             * the request completes successfully.
-+    ret = fd_open(bs);
++             *
-+    if (ret < 0) {
++             * For more information, see:
-+        error_setg_errno(errp, -ret, "The file descriptor is not open");
++             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
-+        return;
++             *
-+    }
++             * 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
-+    if (s->open_flags & O_DIRECT) {
++             * genuine -EAGAIN results that should not be resubmitted
-+        return; /* No host kernel page cache */
++             * immediately.
-+    }
++             */
-+
++            if (ret == -EINTR || ret == -EAGAIN) {
-+#if defined(__linux__)
+                 luring_resubmit(s, luringcb);
-+    /* This sets the scene for the next syscall... */
+                 continue;
-+    ret = bdrv_co_flush(bs);
+             }
 +    if (ret < 0) {
 +        error_setg_errno(errp, -ret, "flush failed");
 +        return;
 +    }
 +
 +    /* Linux does not invalidate pages that are dirty, locked, or mmapped by a
 +     * process.  These limitations are okay because we just fsynced the file,
 +     * we don't use mmap, and the file should not be in use by other processes.
 +     */
 +    ret = posix_fadvise(s->fd, 0, 0, POSIX_FADV_DONTNEED);
 +    if (ret != 0) { /* the return value is a positive errno */
 +        error_setg_errno(errp, ret, "fadvise failed");
 +        return;
 +    }
 +#else /* __linux__ */
 +    /* Do nothing.  Live migration to a remote host with cache.direct=off is
 +     * unsupported on other host operating systems.  Cache consistency issues
 +     * may occur but no error is reported here, partly because that's the
 +     * historical behavior and partly because it's hard to differentiate valid
 +     * configurations that should not cause errors.
 +     */
 +#endif /* !__linux__ */
 +}
 +
  static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
      int64_t offset, int bytes,
      BlockCompletionFunc *cb, void *opaque)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
      .bdrv_co_create_opts = raw_co_create_opts,
      .bdrv_has_zero_init = bdrv_has_zero_init_1,
      .bdrv_co_block_status = raw_co_block_status,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,
      .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
      .bdrv_reopen_abort   = raw_reopen_abort,
      .bdrv_co_create_opts = hdev_co_create_opts,
      .create_opts         = &raw_create_opts,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
      .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
      .bdrv_reopen_abort   = raw_reopen_abort,
      .bdrv_co_create_opts = hdev_co_create_opts,
      .create_opts         = &raw_create_opts,
 +    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
      .bdrv_co_preadv         = raw_co_preadv,
 --
-.17.0
+.31.1

-[Qemu-devel] [PULL 6/8] checkpatch: reduce MAINTAINERS update message frequency
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-From: Joe Perches <joe@perches.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
-When files are being added/moved/deleted and a patch contains an update to
+I'm interested in following the activity around the NVMe bdrv.
 the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly
 and do not emit the "does MAINTAINERS need updating?" message.
-Reported by many people.
+Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210728183340.2018313-1-philmd@redhat.com
 Signed-off-by: Joe Perches <joe@perches.com>
 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Reviewed-by: Markus Armbruster <armbru@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 20180430124651.10340-6-stefanha@redhat.com
 (cherry picked from e0d975b1b439c4fef58fbc306c542c94f48bb849)
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- scripts/checkpatch.pl | 6 ++++++
+ MAINTAINERS | 1 +
-file changed, 6 insertions(+)
+file changed, 1 insertion(+)
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
+diff --git a/MAINTAINERS b/MAINTAINERS
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/scripts/checkpatch.pl
+--- a/MAINTAINERS
-+++ b/scripts/checkpatch.pl
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ sub process {
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
-             }
+ NVMe Block Driver
-         }
+ M: Stefan Hajnoczi <stefanha@redhat.com>
+ R: Fam Zheng <fam@euphon.net>
-+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
-+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+ L: qemu-block@nongnu.org
-+        if ($line =~ /^\s*MAINTAINERS\s*\|/) {
+ S: Supported
-+            $reported_maintainer_file = 1;
+ F: block/nvme*
 +        }
 +
  # Check for added, moved or deleted files
          if (!$reported_maintainer_file && !$in_commit_log &&
              ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
 --
-.17.0
+.31.1

The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-05-08 17:05:58 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 31be8a2a97ecba7d31a82932286489cac318e9e9:

block/file-posix: add x-check-page-cache=on|off option (2018-05-11 16:43:05 +0100)

----------------------------------------------------------------
Block pull request

* Support -drive cache.direct=off live migration for POSIX files

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

Joe Perches (4):
  checkpatch: add a --strict check for utf-8 in commit logs
  checkpatch: ignore email headers better
  checkpatch: emit a warning on file add/move/delete
  checkpatch: reduce MAINTAINERS update message frequency

Pasi Savanainen (1):
  checkpatch: check utf-8 content from a commit log when it's missing
    from charset

Stefan Hajnoczi (3):
  blockjob: drop block_job_pause/resume_all()
  block/file-posix: implement bdrv_co_invalidate_cache() on Linux
  block/file-posix: add x-check-page-cache=on|off option

-- 
2.17.0

Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't
block_job_pause_all() in bdrv_drain_all()") removed the only callers of
block_job_pause/resume_all().

Pausing and resuming now happens in child_job_drained_begin/end() so
it's no longer necessary to globally pause/resume jobs.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20180424085240.5798-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/block/blockjob_int.h | 14 --------------
 blockjob.c                   | 27 ---------------------------
 2 files changed, 41 deletions(-)

diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -XXX,XX +XXX,XX @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
  */
 void block_job_yield(BlockJob *job);
 
-/**
- * block_job_pause_all:
- *
- * Asynchronously pause all jobs.
- */
-void block_job_pause_all(void);
-
-/**
- * block_job_resume_all:
- *
- * Resume all block jobs.  Must be paired with a preceding block_job_pause_all.
- */
-void block_job_resume_all(void);
-
 /**
  * block_job_early_fail:
  * @bs: The block device.
diff --git a/blockjob.c b/blockjob.c
index XXXXXXX..XXXXXXX 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
     return job;
 }
 
-void block_job_pause_all(void)
-{
-    BlockJob *job = NULL;
-    while ((job = block_job_next(job))) {
-        AioContext *aio_context = blk_get_aio_context(job->blk);
-
-        aio_context_acquire(aio_context);
-        block_job_ref(job);
-        block_job_pause(job);
-        aio_context_release(aio_context);
-    }
-}
-
 void block_job_early_fail(BlockJob *job)
 {
     assert(job->status == BLOCK_JOB_STATUS_CREATED);
@@ -XXX,XX +XXX,XX @@ void coroutine_fn block_job_pause_point(BlockJob *job)
     }
 }
 
-void block_job_resume_all(void)
-{
-    BlockJob *job, *next;
-
-    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {
-        AioContext *aio_context = blk_get_aio_context(job->blk);
-
-        aio_context_acquire(aio_context);
-        block_job_resume(job);
-        block_job_unref(job);
-        aio_context_release(aio_context);
-    }
-}
-
 /*
  * Conditionally enter a block_job pending a call to fn() while
  * under the block_job_lock critical section.
-- 
2.17.0

From: Joe Perches <joe@perches.com>

Some find using utf-8 in commit logs inappropriate.

Some patch commit logs contain unintended utf-8 characters when doing
things like copy/pasting compilation output.

Look for the start of any commit log by skipping initial lines that look
like email headers and "From: " lines.

Stop looking for utf-8 at the first signature line.

Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Message-id: 20180430124651.10340-2-stefanha@redhat.com
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 15662b3e8644905032c2e26808401a487d4e90c1)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Conflicts:
  QEMU does not have CHK(), use WARN() instead.

QEMU WARN() only takes one argument, drop the 'type' value in the
  first argument.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ our $NonptrType;
 our $Type;
 our $Declare;
 
-our $UTF8	= qr {
-	[\x09\x0A\x0D\x20-\x7E]              # ASCII
-	| [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+our $NON_ASCII_UTF8	= qr{
+	[\xC2-\xDF][\x80-\xBF]               # non-overlong 2-byte
 	|  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
 	| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
 	|  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
@@ -XXX,XX +XXX,XX @@ our $UTF8	= qr {
 	|  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
 
+our $UTF8	= qr{
+	[\x09\x0A\x0D\x20-\x7E]              # ASCII
+	| $NON_ASCII_UTF8
+}x;
+
 # There are still some false positives, but this catches most
 # common cases.
 our $typeTypedefs = qr{(?x:
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $signoff = 0;
 	my $is_patch = 0;
 
+	my $in_header_lines = 1;
+	my $in_commit_log = 0;		#Scanning lines before patch
+
 	our @report = ();
 	our $cnt_lines = 0;
 	our $cnt_error = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 		if ($line =~ /^diff --git.*?(\S+)$/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
-
 		} elsif ($line =~ /^\+\+\+\s+(\S+)/) {
 			$realfile = $1;
 			$realfile =~ s@^([^/]*)/@@;
@@ -XXX,XX +XXX,XX @@ sub process {
 		if ($line =~ /^\s*signed-off-by:/i) {
 			# This is a signoff, if ugly, so do not double report.
 			$signoff++;
+			$in_commit_log = 0;
+
 			if (!($line =~ /^\s*Signed-off-by:/)) {
 				ERROR("The correct form is \"Signed-off-by\"\n" .
 					$herecurr);
@@ -XXX,XX +XXX,XX @@ sub process {
 			ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
 		}
 
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+		if ($in_header_lines && $realfile =~ /^$/ &&
+		    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+			$in_header_lines = 0;
+			$in_commit_log = 1;
+		}
+
+# Still not yet in a patch, check for any UTF-8
+		if ($in_commit_log && $realfile =~ /^$/ &&
+		    $rawline =~ /$NON_ASCII_UTF8/) {
+			WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
+		}
+
 # ignore non-hunk lines and lines being removed
 		next if (!$hunk_line || $line =~ /^-/);
 
-- 
2.17.0

From: Pasi Savanainen <pasi.savanainen@nixu.com>

Check that a commit log doesn't contain UTF-8 when a mail header
explicitly defines a different charset, like

'Content-Type: text/plain; charset="us-ascii"'

Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Message-id: 20180430124651.10340-3-stefanha@redhat.com
Cc: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit fa64205df9dfd7b7662cc64a7e82115c00e428e5)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $in_header_lines = 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
 
+	my $non_utf8_charset = 0;
+
 	our @report = ();
 	our $cnt_lines = 0;
 	our $cnt_error = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 			$in_commit_log = 1;
 		}
 
-# Still not yet in a patch, check for any UTF-8
-		if ($in_commit_log && $realfile =~ /^$/ &&
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+		if ($in_header_lines &&
+		    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+		    $1 !~ /utf-8/i) {
+			$non_utf8_charset = 1;
+		}
+
+		if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
 		    $rawline =~ /$NON_ASCII_UTF8/) {
 			WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
 		}
-- 
2.17.0

From: Joe Perches <joe@perches.com>

There are some patches created by git format-patch that when scanned by
checkpatch report errors on lines like

To:	address.tld

This is a checkpatch false positive.

Improve the logic a bit to ignore folded email headers to avoid emitting
these messages.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-4-stefanha@redhat.com
(cherry picked from commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 	my $signoff = 0;
 	my $is_patch = 0;
 
-	my $in_header_lines = 1;
+	my $in_header_lines = $file ? 0 : 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
 
 	my $non_utf8_charset = 0;
@@ -XXX,XX +XXX,XX @@ sub process {
 # Check if it's the start of a commit log
 # (not a header line and we haven't seen the patch filename)
 		if ($in_header_lines && $realfile =~ /^$/ &&
-		    $rawline !~ /^(commit\b|from\b|\w+:).+$/i) {
+		    !($rawline =~ /^\s+\S/ ||
+		      $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
 			$in_header_lines = 0;
 			$in_commit_log = 1;
 		}
-- 
2.17.0

From: Joe Perches <joe@perches.com>

Whenever files are added, moved, or deleted, the MAINTAINERS file
patterns can be out of sync or outdated.

To try to keep MAINTAINERS more up-to-date, add a one-time warning
whenever a patch does any of those.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-5-stefanha@redhat.com
(cherry picked from commit 13f1937ef33950b1112049972249e6191b82e6c9)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>

Conflicts:
  QEMU WARN() only takes one argument, drop the 'type' value in the
  first argument.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 
 	my $in_header_lines = $file ? 0 : 1;
 	my $in_commit_log = 0;		#Scanning lines before patch
-
+	my $reported_maintainer_file = 0;
 	my $non_utf8_charset = 0;
 
 	our @report = ();
@@ -XXX,XX +XXX,XX @@ sub process {
 			}
 		}
 
+# Check for added, moved or deleted files
+		if (!$reported_maintainer_file && !$in_commit_log &&
+		    ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
+		     $line =~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ ||
+		     ($line =~ /\{\s*([\w\/\.\-]*)\s*\=\>\s*([\w\/\.\-]*)\s*\}/ &&
+		      (defined($1) || defined($2))))) {
+			$reported_maintainer_file = 1;
+			WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\n" . $herecurr);
+		}
+
 # Check for wrappage within a valid hunk of the file
 		if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
 			ERROR("patch seems to be corrupt (line wrapped?)\n" .
-- 
2.17.0

From: Joe Perches <joe@perches.com>

When files are being added/moved/deleted and a patch contains an update to
the MAINTAINERS file, assume it's to update the MAINTAINERS file correctly
and do not emit the "does MAINTAINERS need updating?" message.

Reported by many people.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180430124651.10340-6-stefanha@redhat.com
(cherry picked from e0d975b1b439c4fef58fbc306c542c94f48bb849)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/checkpatch.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -XXX,XX +XXX,XX @@ sub process {
 			}
 		}
 
+# Check if MAINTAINERS is being updated.  If so, there's probably no need to
+# emit the "does MAINTAINERS need updating?" message on file add/move/delete
+		if ($line =~ /^\s*MAINTAINERS\s*\|/) {
+			$reported_maintainer_file = 1;
+		}
+
 # Check for added, moved or deleted files
 		if (!$reported_maintainer_file && !$in_commit_log &&
 		    ($line =~ /^(?:new|deleted) file mode\s*\d+\s*$/ ||
-- 
2.17.0

On Linux posix_fadvise(POSIX_FADV_DONTNEED) invalidates pages*.  Use
this to drop page cache on the destination host during shared storage
migration.  This way the destination host will read the latest copy of
the data and will not use stale data from the page cache.

The flow is as follows:

1. Source host writes out all dirty pages and inactivates drives.
2. QEMU_VM_EOF is sent on migration stream.
3. Destination host invalidates caches before accessing drives.

This patch enables live migration even with -drive cache.direct=off.

* Terms and conditions may apply, please see patch for details.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20180427162312.18583-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/file-posix.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
     return ret | BDRV_BLOCK_OFFSET_VALID;
 }
 
+static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
+                                                 Error **errp)
+{
+    BDRVRawState *s = bs->opaque;
+    int ret;
+
+    ret = fd_open(bs);
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "The file descriptor is not open");
+        return;
+    }
+
+    if (s->open_flags & O_DIRECT) {
+        return; /* No host kernel page cache */
+    }
+
+#if defined(__linux__)
+    /* This sets the scene for the next syscall... */
+    ret = bdrv_co_flush(bs);
+    if (ret < 0) {
+        error_setg_errno(errp, -ret, "flush failed");
+        return;
+    }
+
+    /* Linux does not invalidate pages that are dirty, locked, or mmapped by a
+     * process.  These limitations are okay because we just fsynced the file,
+     * we don't use mmap, and the file should not be in use by other processes.
+     */
+    ret = posix_fadvise(s->fd, 0, 0, POSIX_FADV_DONTNEED);
+    if (ret != 0) { /* the return value is a positive errno */
+        error_setg_errno(errp, ret, "fadvise failed");
+        return;
+    }
+#else /* __linux__ */
+    /* Do nothing.  Live migration to a remote host with cache.direct=off is
+     * unsupported on other host operating systems.  Cache consistency issues
+     * may occur but no error is reported here, partly because that's the
+     * historical behavior and partly because it's hard to differentiate valid
+     * configurations that should not cause errors.
+     */
+#endif /* !__linux__ */
+}
+
 static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
     int64_t offset, int bytes,
     BlockCompletionFunc *cb, void *opaque)
@@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = {
     .bdrv_co_create_opts = raw_co_create_opts,
     .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_co_block_status = raw_co_block_status,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
     .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,
 
     .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
     .bdrv_reopen_abort   = raw_reopen_abort,
     .bdrv_co_create_opts = hdev_co_create_opts,
     .create_opts         = &raw_create_opts,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
     .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
 
     .bdrv_co_preadv         = raw_co_preadv,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_reopen_abort   = raw_reopen_abort,
     .bdrv_co_create_opts = hdev_co_create_opts,
     .create_opts         = &raw_create_opts,
+    .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
 
 
     .bdrv_co_preadv         = raw_co_preadv,
-- 
2.17.0

mincore(2) checks whether pages are resident.  Use it to verify that
page cache has been dropped.

You can trigger a verification failure by mmapping the image file from
another process that loads a byte from a page, forcing it to become
resident.  bdrv_co_invalidate_cache() will fail while that process is
alive.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20180427162312.18583-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qapi/block-core.json |   7 ++-
 block/file-posix.c   | 100 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 # @locking:     whether to enable file locking. If set to 'auto', only enable
 #               when Open File Descriptor (OFD) locking API is available
 #               (default: auto, since 2.10)
+# @x-check-cache-dropped: whether to check that page cache was dropped on live
+#                         migration.  May cause noticeable delays if the image
+#                         file is large, do not use in production.
+#                         (default: off) (since: 2.13)
 #
 # Since: 2.9
 ##
@@ -XXX,XX +XXX,XX @@
   'data': { 'filename': 'str',
             '*pr-manager': 'str',
             '*locking': 'OnOffAuto',
-            '*aio': 'BlockdevAioOptions' } }
+            '*aio': 'BlockdevAioOptions',
+            '*x-check-cache-dropped': 'bool' } }
 
 ##
 # @BlockdevOptionsNull:
diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
     bool page_cache_inconsistent:1;
     bool has_fallocate;
     bool needs_alignment;
+    bool check_cache_dropped;
 
     PRManager *pr_mgr;
 } BDRVRawState;
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRawState {
 typedef struct BDRVRawReopenState {
     int fd;
     int open_flags;
+    bool check_cache_dropped;
 } BDRVRawReopenState;
 
 static int fd_open(BlockDriverState *bs);
@@ -XXX,XX +XXX,XX @@ static QemuOptsList raw_runtime_opts = {
             .type = QEMU_OPT_STRING,
             .help = "id of persistent reservation manager object (default: none)",
         },
+        {
+            .name = "x-check-cache-dropped",
+            .type = QEMU_OPT_BOOL,
+            .help = "check that page cache was dropped on live migration (default: off)"
+        },
         { /* end of list */ }
     },
 };
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         }
     }
 
+    s->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
+                                               false);
+
     s->open_flags = open_flags;
     raw_parse_flags(bdrv_flags, &s->open_flags);
 
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 {
     BDRVRawState *s;
     BDRVRawReopenState *rs;
+    QemuOpts *opts;
     int ret = 0;
     Error *local_err = NULL;
 
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 
     state->opaque = g_new0(BDRVRawReopenState, 1);
     rs = state->opaque;
+    rs->fd = -1;
+
+    /* Handle options changes */
+    opts = qemu_opts_create(&raw_runtime_opts, NULL, 0, &error_abort);
+    qemu_opts_absorb_qdict(opts, state->options, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    rs->check_cache_dropped = qemu_opt_get_bool(opts, "x-check-cache-dropped",
+                                                s->check_cache_dropped);
 
     if (s->type == FTYPE_CD) {
         rs->open_flags |= O_NONBLOCK;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
 
     raw_parse_flags(state->flags, &rs->open_flags);
 
-    rs->fd = -1;
-
     int fcntl_flags = O_APPEND | O_NONBLOCK;
 #ifdef O_NOATIME
     fcntl_flags |= O_NOATIME;
@@ -XXX,XX +XXX,XX @@ static int raw_reopen_prepare(BDRVReopenState *state,
         }
     }
 
+out:
+    qemu_opts_del(opts);
     return ret;
 }
 
@@ -XXX,XX +XXX,XX @@ static void raw_reopen_commit(BDRVReopenState *state)
     BDRVRawReopenState *rs = state->opaque;
     BDRVRawState *s = state->bs->opaque;
 
+    s->check_cache_dropped = rs->check_cache_dropped;
     s->open_flags = rs->open_flags;
 
     qemu_close(s->fd);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
     return ret | BDRV_BLOCK_OFFSET_VALID;
 }
 
+#if defined(__linux__)
+/* Verify that the file is not in the page cache */
+static void check_cache_dropped(BlockDriverState *bs, Error **errp)
+{
+    const size_t window_size = 128 * 1024 * 1024;
+    BDRVRawState *s = bs->opaque;
+    void *window = NULL;
+    size_t length = 0;
+    unsigned char *vec;
+    size_t page_size;
+    off_t offset;
+    off_t end;
+
+    /* mincore(2) page status information requires 1 byte per page */
+    page_size = sysconf(_SC_PAGESIZE);
+    vec = g_malloc(DIV_ROUND_UP(window_size, page_size));
+
+    end = raw_getlength(bs);
+
+    for (offset = 0; offset < end; offset += window_size) {
+        void *new_window;
+        size_t new_length;
+        size_t vec_end;
+        size_t i;
+        int ret;
+
+        /* Unmap previous window if size has changed */
+        new_length = MIN(end - offset, window_size);
+        if (new_length != length) {
+            munmap(window, length);
+            window = NULL;
+            length = 0;
+        }
+
+        new_window = mmap(window, new_length, PROT_NONE, MAP_PRIVATE,
+                          s->fd, offset);
+        if (new_window == MAP_FAILED) {
+            error_setg_errno(errp, errno, "mmap failed");
+            break;
+        }
+
+        window = new_window;
+        length = new_length;
+
+        ret = mincore(window, length, vec);
+        if (ret < 0) {
+            error_setg_errno(errp, errno, "mincore failed");
+            break;
+        }
+
+        vec_end = DIV_ROUND_UP(length, page_size);
+        for (i = 0; i < vec_end; i++) {
+            if (vec[i] & 0x1) {
+                error_setg(errp, "page cache still in use!");
+                break;
+            }
+        }
+    }
+
+    if (window) {
+        munmap(window, length);
+    }
+
+    g_free(vec);
+}
+#endif /* __linux__ */
+
 static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
                                                  Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
         error_setg_errno(errp, ret, "fadvise failed");
         return;
     }
+
+    if (s->check_cache_dropped) {
+        check_cache_dropped(bs, errp);
+    }
 #else /* __linux__ */
     /* Do nothing.  Live migration to a remote host with cache.direct=off is
      * unsupported on other host operating systems.  Cache consistency issues
-- 
2.17.0

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