[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works |
Date: |
Thu, 23 Jun 2022 17:53:32 +0100 |
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
- [PULL 00/25] migration queue, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 02/25] QIOChannelSocket: Introduce assert and reduce ifdefs to improve readability, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works,
Dr. David Alan Gilbert (git) <=
- [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed', Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Dr. David Alan Gilbert (git), 2022/06/23