Implement calculate_dirtyrate() function. Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> Signed-off-by: YanYing Zhuang <ann.zhuangyanying@huawei.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> Message-Id: <1600237327-33618-11-git-send-email-zhengchuan@huawei.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
84 lines
2.3 KiB
Diff
84 lines
2.3 KiB
Diff
From 18102266fb18c4bfcdd4760e7111ca03a7520588 Mon Sep 17 00:00:00 2001
|
|
From: Chuan Zheng <zhengchuan@huawei.com>
|
|
Date: Wed, 16 Sep 2020 14:22:05 +0800
|
|
Subject: [PATCH] migration/dirtyrate: Implement calculate_dirtyrate() function
|
|
|
|
Implement calculate_dirtyrate() function.
|
|
|
|
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
|
|
Signed-off-by: YanYing Zhuang <ann.zhuangyanying@huawei.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Li Qiang <liq3ea@gmail.com>
|
|
Message-Id: <1600237327-33618-11-git-send-email-zhengchuan@huawei.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
---
|
|
migration/dirtyrate.c | 45 +++++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 43 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
|
|
index 485d6467c9..c7a389a527 100644
|
|
--- a/migration/dirtyrate.c
|
|
+++ b/migration/dirtyrate.c
|
|
@@ -162,6 +162,21 @@ static void get_ramblock_dirty_info(RAMBlock *block,
|
|
strcpy(info->idstr, qemu_ram_get_idstr(block));
|
|
}
|
|
|
|
+static void free_ramblock_dirty_info(struct RamblockDirtyInfo *infos, int count)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ if (!infos) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for (i = 0; i < count; i++) {
|
|
+ g_free(infos[i].sample_page_vfn);
|
|
+ g_free(infos[i].hash_result);
|
|
+ }
|
|
+ g_free(infos);
|
|
+}
|
|
+
|
|
static bool skip_sample_ramblock(RAMBlock *block)
|
|
{
|
|
/*
|
|
@@ -287,8 +302,34 @@ static bool compare_page_hash_info(struct RamblockDirtyInfo *info,
|
|
|
|
static void calculate_dirtyrate(struct DirtyRateConfig config)
|
|
{
|
|
- /* todo */
|
|
- return;
|
|
+ struct RamblockDirtyInfo *block_dinfo = NULL;
|
|
+ int block_count = 0;
|
|
+ int64_t msec = 0;
|
|
+ int64_t initial_time;
|
|
+
|
|
+ rcu_register_thread();
|
|
+ reset_dirtyrate_stat();
|
|
+ rcu_read_lock();
|
|
+ initial_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
|
+ if (!record_ramblock_hash_info(&block_dinfo, config, &block_count)) {
|
|
+ goto out;
|
|
+ }
|
|
+ rcu_read_unlock();
|
|
+
|
|
+ msec = config.sample_period_seconds * 1000;
|
|
+ msec = set_sample_page_period(msec, initial_time);
|
|
+
|
|
+ rcu_read_lock();
|
|
+ if (!compare_page_hash_info(block_dinfo, block_count)) {
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ update_dirtyrate(msec);
|
|
+
|
|
+out:
|
|
+ rcu_read_unlock();
|
|
+ free_ramblock_dirty_info(block_dinfo, block_count);
|
|
+ rcu_unregister_thread();
|
|
}
|
|
|
|
void *get_dirtyrate_thread(void *arg)
|
|
--
|
|
2.27.0
|
|
|