[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/21] migration/rdma: Don't use imaginary transfers
|
From: |
Juan Quintela |
|
Subject: |
[PULL 09/21] migration/rdma: Don't use imaginary transfers |
|
Date: |
Tue, 30 May 2023 20:25:19 +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.
Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-14-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 acc282654a..23a21e2331 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 40b8f9630d..da0dfd7072 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1155,7 +1155,6 @@ static bool control_save_page(PageSearchStatus *pss,
RAMBlock *block,
}
if (bytes_xmit) {
- ram_transferred_add(bytes_xmit);
*pages = 1;
}
--
2.40.1
- [PULL 02/21] migration: never fail in global_state_store(), (continued)
- [PULL 02/21] migration: never fail in global_state_store(), Juan Quintela, 2023/05/30
- [PULL 01/21] runstate: add runstate_get(), Juan Quintela, 2023/05/30
- [PULL 04/21] migration: switch from .vm_was_running to .vm_old_state, Juan Quintela, 2023/05/30
- [PULL 07/21] migration/RDMA: It is accounting for zero/normal pages in two places, Juan Quintela, 2023/05/30
- [PULL 08/21] migration/rdma: Remove QEMUFile parameter when not used, Juan Quintela, 2023/05/30
- [PULL 11/21] migration/rdma: Simplify the function that saves a page, Juan Quintela, 2023/05/30
- [PULL 12/21] migration: Create migrate_rdma(), Juan Quintela, 2023/05/30
- [PULL 14/21] migration/rdma: Unfold ram_control_after_iterate(), Juan Quintela, 2023/05/30
- [PULL 15/21] migration/rdma: Remove all uses of RAM_CONTROL_HOOK, Juan Quintela, 2023/05/30
- [PULL 13/21] migration/rdma: Unfold ram_control_before_iterate(), Juan Quintela, 2023/05/30
- [PULL 09/21] migration/rdma: Don't use imaginary transfers,
Juan Quintela <=
- [PULL 18/21] qemu-file: Remove QEMUFileHooks, Juan Quintela, 2023/05/30
- [PULL 17/21] migration/rdma: Create rdma_control_save_page(), Juan Quintela, 2023/05/30
- [PULL 21/21] migration/rdma: Check sooner if we are in postcopy for save_page(), Juan Quintela, 2023/05/30
- [PULL 19/21] migration/rdma: Move rdma constants from qemu-file.h to rdma.h, Juan Quintela, 2023/05/30
- [PULL 20/21] migration/rdma: Remove qemu_ prefix from exported functions, Juan Quintela, 2023/05/30
- [PULL 16/21] migration/rdma: Unfold hook_ram_load(), Juan Quintela, 2023/05/30
- Re: [PULL 00/21] Migration 20230530 patches, Richard Henderson, 2023/05/30