qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, berrange@redhat.com,
	huangy81@chinatelecom.cn, quintela@redhat.com,
	leobras@redhat.com, peterx@redhat.com
Cc: jdenemar@redhat.com
Subject: [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works
Date: Thu, 23 Jun 2022 17:53:32 +0100	[thread overview]
Message-ID: <20220623165354.197792-4-dgilbert@redhat.com> (raw)
In-Reply-To: <20220623165354.197792-1-dgilbert@redhat.com>

From: Leonardo Bras <leobras@redhat.com>

Somewhere between v6 and v7 the of the zero-copy-send patchset a crucial
part of the flushing mechanism got missing: incrementing zero_copy_queued.

Without that, the flushing interface becomes a no-op, and there is no
guarantee the buffer is really sent.

This can go as bad as causing a corruption in RAM during migration.

Fixes: 2bc58ffc2926 ("QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX")
Reported-by: 徐闯 <xuchuangxclwt@bytedance.com>
Signed-off-by: Leonardo Bras <leobras@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 io/channel-socket.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/io/channel-socket.c b/io/channel-socket.c
index b8c13dba7c..4466bb1cd4 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -611,6 +611,11 @@ static ssize_t qio_channel_socket_writev(QIOChannel *ioc,
                          "Unable to write to socket");
         return -1;
     }
+
+    if (flags & QIO_CHANNEL_WRITE_FLAG_ZERO_COPY) {
+        sioc->zero_copy_queued++;
+    }
+
     return ret;
 }
 #else /* WIN32 */
-- 
2.36.1



  parent reply	other threads:[~2022-06-23 16:57 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-23 16:53 [PULL 00/25] migration queue Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` Dr. David Alan Gilbert (git) [this message]
2022-06-23 16:53 ` [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 08/25] migration: rename rate limiting fields in QEMUFile Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed' Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 17/25] migration: introduce new constructors for QEMUFile Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 20/25] migration: remove the QEMUFileOps 'set_blocking' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 21/25] migration: remove the QEMUFileOps 'close' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 22/25] migration: remove the QEMUFileOps 'get_buffer' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 23/25] migration: remove the QEMUFileOps 'writev_buffer' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callback Dr. David Alan Gilbert (git)
2022-06-23 16:53 ` [PULL 25/25] migration: remove the QEMUFileOps abstraction Dr. David Alan Gilbert (git)
2022-06-23 21:37 ` [PULL 00/25] migration queue Richard Henderson
  -- strict thread matches above, loose matches on Subject: below --
2022-06-22  0:25 [PULL 00/25] Migration 20220621 patches Juan Quintela
2022-06-22  0:25 ` [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works Juan Quintela

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220623165354.197792-4-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=berrange@redhat.com \
    --cc=huangy81@chinatelecom.cn \
    --cc=jdenemar@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).