[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 18/21] migration/rdma: Don't use imaginary transfers
From: |
Juan Quintela |
Subject: |
[PATCH 18/21] migration/rdma: Don't use imaginary transfers |
Date: |
Mon, 8 May 2023 15:09:06 +0200 |
RDMA protocol is completely asynchronous, so in qemu_rdma_save_page()
they "invent" that a byte has been transferred. And then they call
qemu_file_credit_transfer() and ram_transferred_add() with that byte.
Just remove that calls as nothing has been sent.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/qemu-file.c | 5 +----
migration/ram.c | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 0086d67d83..951f046c39 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -346,13 +346,10 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t
block_offset,
if (ret != RAM_SAVE_CONTROL_DELAYED &&
ret != RAM_SAVE_CONTROL_NOT_SUPP) {
- if (bytes_sent && *bytes_sent > 0) {
- qemu_file_credit_transfer(f, *bytes_sent);
- } else if (ret < 0) {
+ if (ret < 0) {
qemu_file_set_error(f, ret);
}
}
-
return ret;
}
diff --git a/migration/ram.c b/migration/ram.c
index 558f2ed3b1..f889e39a20 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1349,7 +1349,6 @@ static bool control_save_page(PageSearchStatus *pss,
RAMBlock *block,
}
if (bytes_xmit) {
- ram_transferred_add(bytes_xmit);
*pages = 1;
}
--
2.40.0
- Re: [PATCH 07/21] migration: Correct transferred bytes value, (continued)
- [PATCH 08/21] migration: Move setup_time to mig_stats, Juan Quintela, 2023/05/08
- [PATCH 09/21] qemu-file: Account for rate_limit usage on qemu_fflush(), Juan Quintela, 2023/05/08
- [PATCH 11/21] migration: Move migration_total_bytes() to migration-stats.c, Juan Quintela, 2023/05/08
- [PATCH 15/21] migration: Don't abuse qemu_file transferred for RDMA, Juan Quintela, 2023/05/08
- [PATCH 18/21] migration/rdma: Don't use imaginary transfers,
Juan Quintela <=
- [PATCH 12/21] migration: Add a trace for migration_transferred_bytes, Juan Quintela, 2023/05/08
- [PATCH 13/21] migration: Use migration_transferred_bytes() to calculate rate_limit, Juan Quintela, 2023/05/08
- [PATCH 19/21] migration: Remove unused qemu_file_credit_transfer(), Juan Quintela, 2023/05/08
- [PATCH 16/21] migration/RDMA: It is accounting for zero/normal pages in two places, Juan Quintela, 2023/05/08
- [PATCH 17/21] migration/rdma: Remove QEMUFile parameter when not used, Juan Quintela, 2023/05/08
- [PATCH 14/21] migration: We don't need the field rate_limit_used anymore, Juan Quintela, 2023/05/08
- [PATCH 20/21] migration/rdma: Simplify the function that saves a page, Juan Quintela, 2023/05/08