From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Laurent Vivier <lvivier@redhat.com>,
qemu-block@nongnu.org, Thomas Huth <thuth@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Leonardo Bras <leobras@redhat.com>, Fam Zheng <fam@euphon.net>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 11/13] migration/rdma: Don't use imaginary transfers
Date: Mon, 2 Oct 2023 14:20:19 +0200 [thread overview]
Message-ID: <20231002122021.231959-12-quintela@redhat.com> (raw)
In-Reply-To: <20231002122021.231959-1-quintela@redhat.com>
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 19c33c9985..e53ff2dd86 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -332,13 +332,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 f2c5b07919..c6238f7a8b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1197,7 +1197,6 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
}
if (bytes_xmit) {
- ram_transferred_add(bytes_xmit);
*pages = 1;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-02 12:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:20 [PULL 00/13] Migration 20231002 patches Juan Quintela
2023-10-02 12:20 ` [PULL 01/13] migration-test: Create kvm_opts Juan Quintela
2023-10-02 12:20 ` [PULL 02/13] migration-test: bootpath is the same for all tests and for all archs Juan Quintela
2023-10-02 12:20 ` [PULL 03/13] migration-test: Add bootfile_create/delete() functions Juan Quintela
2023-10-02 12:20 ` [PULL 04/13] migration-test: dirtylimit checks for x86_64 arch before Juan Quintela
2023-10-02 12:20 ` [PULL 05/13] migration-test: simplify shmem_opts handling Juan Quintela
2023-10-02 12:20 ` [PULL 06/13] migration: Refactor repeated call of yank_unregister_instance Juan Quintela
2023-10-02 12:20 ` [PULL 07/13] migration: Use qemu_file_transferred_noflush() for block migration Juan Quintela
2023-10-02 12:20 ` [PULL 08/13] migration: Don't abuse qemu_file transferred for RDMA Juan Quintela
2023-10-02 12:20 ` [PULL 09/13] migration/RDMA: It is accounting for zero/normal pages in two places Juan Quintela
2023-10-02 12:20 ` [PULL 10/13] migration/rdma: Remove QEMUFile parameter when not used Juan Quintela
2023-10-02 12:20 ` Juan Quintela [this message]
2023-10-02 12:20 ` [PULL 12/13] migration: Remove unused qemu_file_credit_transfer() Juan Quintela
2023-10-02 12:20 ` [PULL 13/13] migration/rdma: Simplify the function that saves a page Juan Quintela
2023-10-02 21:57 ` [PULL 00/13] Migration 20231002 patches Stefan Hajnoczi
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=20231002122021.231959-12-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=fam@euphon.net \
--cc=leobras@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@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).