|
 |
1bdc94 |
From 4d7902d7277992139d575552f09c2ff6827e9794 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Date: Thu, 21 Jun 2018 09:45:26 +0200
|
|
|
1bdc94 |
Subject: [PATCH 14/89] migration: calculate expected_downtime with
|
|
|
1bdc94 |
ram_bytes_remaining()
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180621094526.5714-1-lvivier@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80931
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH] migration: calculate expected_downtime with ram_bytes_remaining()
|
|
|
1bdc94 |
Bugzilla: 1564576
|
|
|
1bdc94 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Balamuruhan S <bala24@linux.vnet.ibm.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
expected_downtime value is not accurate with dirty_pages_rate * page_size,
|
|
|
1bdc94 |
using ram_bytes_remaining() would yeild it resonable.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
consider to read the remaining ram just after having updated the dirty
|
|
|
1bdc94 |
pages count later migration_bitmap_sync_range() in migration_bitmap_sync()
|
|
|
1bdc94 |
and reuse the `remaining` field in ram_counters to hold ram_bytes_remaining()
|
|
|
1bdc94 |
for calculating expected_downtime.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
1bdc94 |
Signed-off-by: Balamuruhan S <bala24@linux.vnet.ibm.com>
|
|
|
1bdc94 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Message-Id: <20180612085009.17594-2-bala24@linux.vnet.ibm.com>
|
|
|
1bdc94 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 650af8907bd567db914b7ce3a7e9df4c323f4619)
|
|
|
1bdc94 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
migration/migration.c | 3 +--
|
|
|
1bdc94 |
migration/ram.c | 1 +
|
|
|
1bdc94 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/migration/migration.c b/migration/migration.c
|
|
|
1bdc94 |
index ef4bb42..43d8a64 100644
|
|
|
1bdc94 |
--- a/migration/migration.c
|
|
|
1bdc94 |
+++ b/migration/migration.c
|
|
|
1bdc94 |
@@ -2239,8 +2239,7 @@ static void migration_update_counters(MigrationState *s,
|
|
|
1bdc94 |
* recalculate. 10000 is a small enough number for our purposes
|
|
|
1bdc94 |
*/
|
|
|
1bdc94 |
if (ram_counters.dirty_pages_rate && transferred > 10000) {
|
|
|
1bdc94 |
- s->expected_downtime = ram_counters.dirty_pages_rate *
|
|
|
1bdc94 |
- qemu_target_page_size() / bandwidth;
|
|
|
1bdc94 |
+ s->expected_downtime = ram_counters.remaining / bandwidth;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
qemu_file_reset_rate_limit(s->to_dst_file);
|
|
|
1bdc94 |
diff --git a/migration/ram.c b/migration/ram.c
|
|
|
1bdc94 |
index 0e90efa..00c06b5 100644
|
|
|
1bdc94 |
--- a/migration/ram.c
|
|
|
1bdc94 |
+++ b/migration/ram.c
|
|
|
1bdc94 |
@@ -852,6 +852,7 @@ static void migration_bitmap_sync(RAMState *rs)
|
|
|
1bdc94 |
RAMBLOCK_FOREACH(block) {
|
|
|
1bdc94 |
migration_bitmap_sync_range(rs, block, 0, block->used_length);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
+ ram_counters.remaining = ram_bytes_remaining();
|
|
|
1bdc94 |
rcu_read_unlock();
|
|
|
1bdc94 |
qemu_mutex_unlock(&rs->bitmap_mutex);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|