46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
From b4f95f541ce2d428956508d8ce874377499c200c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
|
||
|
|
<yong.huang@smartx.com>
|
||
|
|
Date: Wed, 7 Jun 2023 23:32:51 +0800
|
||
|
|
Subject: [PATCH] migration: Refactor auto-converge capability logic
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Check if block migration is running before throttling
|
||
|
|
guest down in auto-converge way.
|
||
|
|
|
||
|
|
Note that this modification is kind of like code clean,
|
||
|
|
because block migration does not depend on auto-converge
|
||
|
|
capability, so the order of checks can be adjusted.
|
||
|
|
|
||
|
|
Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
|
||
|
|
Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
Message-Id: <168618975839.6361.17407633874747688653-5@git.sr.ht>
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
---
|
||
|
|
migration/ram.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
||
|
|
index c245b04cf2..87e551913c 100644
|
||
|
|
--- a/migration/ram.c
|
||
|
|
+++ b/migration/ram.c
|
||
|
|
@@ -1411,7 +1411,11 @@ static void migration_trigger_throttle(RAMState *rs)
|
||
|
|
/* During block migration the auto-converge logic incorrectly detects
|
||
|
|
* that ram migration makes no progress. Avoid this by disabling the
|
||
|
|
* throttling logic during the bulk phase of block migration. */
|
||
|
|
- if (migrate_auto_converge() && !blk_mig_bulk_active()) {
|
||
|
|
+ if (blk_mig_bulk_active()) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (migrate_auto_converge()) {
|
||
|
|
/* The following detection logic can be refined later. For now:
|
||
|
|
Check to see if the ratio between dirtied bytes and the approx.
|
||
|
|
amount of bytes that just got transferred since the last time
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|