[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] migration/multifd: correct multifd_send_thread to trace the f
From: |
Juan Quintela |
Subject: |
[PULL 6/7] migration/multifd: correct multifd_send_thread to trace the flags |
Date: |
Thu, 16 Mar 2023 16:12:24 +0100 |
From: Wei Wang <wei.w.wang@intel.com>
The p->flags could be updated via the send_prepare callback, e.g. OR-ed
with MULTIFD_FLAG_ZLIB via zlib_send_prepare. Assign p->flags to the
local "flags" before the send_prepare callback could only get partial of
p->flags. Fix it by moving the assignment of p->flags to the local flags
after the callback, so that the correct flags can be traced.
Fixes: ab7cbb0b9a3b ("multifd: Make no compression operations into its own
structure")
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/multifd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 5e85c3ea9b..cbc0dfe39b 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -677,7 +677,7 @@ static void *multifd_send_thread(void *opaque)
if (p->pending_job) {
uint64_t packet_num = p->packet_num;
- uint32_t flags = p->flags;
+ uint32_t flags;
p->normal_num = 0;
if (use_zero_copy_send) {
@@ -699,6 +699,7 @@ static void *multifd_send_thread(void *opaque)
}
}
multifd_send_fill_packet(p);
+ flags = p->flags;
p->flags = 0;
p->num_packets++;
p->total_normal_pages += p->normal_num;
--
2.39.2
- [PULL 0/7] Migration 20230316 patches, Juan Quintela, 2023/03/16
- [PULL 2/7] migration/rdma: Fix return-path case, Juan Quintela, 2023/03/16
- [PULL 5/7] migration/rdma: Remove deprecated variable rdma_return_path, Juan Quintela, 2023/03/16
- [PULL 1/7] migration: Wait on preempt channel in preempt thread, Juan Quintela, 2023/03/16
- [PULL 4/7] migration/xbzrle: fix out-of-bounds write with axv512, Juan Quintela, 2023/03/16
- [PULL 6/7] migration/multifd: correct multifd_send_thread to trace the flags,
Juan Quintela <=
- [PULL 7/7] migration: fix populate_vfio_info, Juan Quintela, 2023/03/16
- [PULL 3/7] migration/xbzrle: use ctz64 to avoid undefined result, Juan Quintela, 2023/03/16
- Re: [PULL 0/7] Migration 20230316 patches, Peter Maydell, 2023/03/17