From patchwork Sat Jul 25 03:11:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684753 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE939138A for ; Sat, 25 Jul 2020 03:00:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AEEFA206EB for ; Sat, 25 Jul 2020 03:00:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEEFA206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQL-00040L-R6 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:00:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPV-000269-Dv for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:41 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33214 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPQ-0000k8-NK for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:41 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 6A9CB38F33A4A384F404; Sat, 25 Jul 2020 10:59:28 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:21 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 2/8] migration/dirtyrate: Add block_dirty_info to store dirtypage info Date: Sat, 25 Jul 2020 11:11:03 +0800 Message-ID: <1595646669-109310-3-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Add block_dirty_info to store dirtypage info for each ramblock Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h index 9a5c228..342b89f 100644 --- a/migration/dirtyrate.h +++ b/migration/dirtyrate.h @@ -33,6 +33,19 @@ typedef enum { CAL_DIRTY_RATE_END = 2, } CalculatingDirtyRateStage; +/* + * Store dirtypage info for each block. + */ +struct block_dirty_info { + char idstr[BLOCK_INFO_MAX_LEN]; + uint8_t *block_addr; + unsigned long block_pages; + unsigned long *sample_page_vfn; + unsigned int sample_pages_count; + unsigned int sample_dirty_count; + uint8_t *hash_result; +}; + void *get_dirtyrate_thread(void *arg); #endif From patchwork Sat Jul 25 03:11:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684751 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DEAB313A4 for ; Sat, 25 Jul 2020 03:00:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF040206EB for ; Sat, 25 Jul 2020 03:00:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF040206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQJ-0003uu-11 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:00:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPU-00024a-7K for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:40 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33220 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPQ-0000k5-Mn for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:39 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 32288D51536A426CC409; Sat, 25 Jul 2020 10:59:28 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:22 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 3/8] migration/dirtyrate: Add dirtyrate statistics series functions Date: Sat, 25 Jul 2020 11:11:04 +0800 Message-ID: <1595646669-109310-4-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Add dirtyrate statistics to record/update dirtyrate info. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 47 ++++++++++++++++++++++++++++++----------------- migration/dirtyrate.h | 11 +++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index fc652fb..6baf674 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -13,19 +13,41 @@ #include "dirtyrate.h" static uint64_t sample_pages_per_gigabytes = DIRTYRATE_DEFAULT_SAMPLE_PAGES; -static uint64_t dirty_rate; /* MB/s */ +static struct dirtyrate_statistics dirty_stat; CalculatingDirtyRateStage calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; -static bool calculate_dirtyrate(struct dirtyrate_config config, - uint64_t *dirty_rate, int64_t time) +static void reset_dirtyrate_stat(void) { - /* todo */ - return true; + dirty_stat.total_dirty_samples = 0; + dirty_stat.total_sample_count = 0; + dirty_stat.total_block_mem_MB = 0; + dirty_stat.dirty_rate = 0; +} + +static void update_dirtyrate_stat(struct block_dirty_info *info) +{ + dirty_stat.total_dirty_samples += info->sample_dirty_count; + dirty_stat.total_sample_count += info->sample_pages_count; + dirty_stat.total_block_mem_MB += (info->block_pages << DIRTYRATE_PAGE_SIZE_SHIFT) >> PAGE_SIZE_SHIFT; } -static void set_dirty_rate(uint64_t drate) +static void update_dirtyrate(int64_t msec) { - dirty_rate = drate; + uint64_t dirty_rate; + unsigned int total_dirty_samples = dirty_stat.total_dirty_samples; + unsigned int total_sample_count = dirty_stat.total_sample_count; + unsigned long total_block_mem_MB = dirty_stat.total_block_mem_MB; + + dirty_rate = total_dirty_samples * total_block_mem_MB * + 1000 / (total_sample_count * msec); + + dirty_stat.dirty_rate = dirty_rate; +} + + +static void calculate_dirtyrate(struct dirtyrate_config config, int64_t time) +{ + /* todo */ } /* @@ -42,21 +64,12 @@ static void set_dirty_rate_stage(CalculatingDirtyRateStage ratestage) void *get_dirtyrate_thread(void *arg) { struct dirtyrate_config config = *(struct dirtyrate_config *)arg; - uint64_t dirty_rate; - uint64_t hash_dirty_rate; - bool query_succ; int64_t msec = 0; set_dirty_rate_stage(CAL_DIRTY_RATE_ING); - query_succ = calculate_dirtyrate(config, &hash_dirty_rate, msec); - if (!query_succ) { - dirty_rate = 0; - } else { - dirty_rate = hash_dirty_rate; - } + calculate_dirtyrate(config, msec); - set_dirty_rate(dirty_rate); set_dirty_rate_stage(CAL_DIRTY_RATE_END); return NULL; diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h index 342b89f..2994535 100644 --- a/migration/dirtyrate.h +++ b/migration/dirtyrate.h @@ -15,6 +15,9 @@ /* take 256 pages per GB for cal dirty rate */ #define DIRTYRATE_DEFAULT_SAMPLE_PAGES 256 +#define DIRTYRATE_PAGE_SIZE_SHIFT 12 +#define BLOCK_INFO_MAX_LEN 256 +#define PAGE_SIZE_SHIFT 20 struct dirtyrate_config { uint64_t sample_pages_per_gigabytes; @@ -33,6 +36,14 @@ typedef enum { CAL_DIRTY_RATE_END = 2, } CalculatingDirtyRateStage; +struct dirtyrate_statistics { + unsigned int total_dirty_samples; + unsigned int total_sample_count; + unsigned long total_block_mem_MB; + int64_t dirty_rate; +}; + + /* * Store dirtypage info for each block. */ From patchwork Sat Jul 25 03:11:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684757 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71955138A for ; Sat, 25 Jul 2020 03:02:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51F4B2070E for ; Sat, 25 Jul 2020 03:02:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51F4B2070E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzARw-00072V-Gi for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPU-00024h-IA for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:40 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33216 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPQ-0000k4-O9 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:40 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 6460547A05F38BF80556; Sat, 25 Jul 2020 10:59:28 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:22 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 4/8] migration/dirtyrate: Record hash results for each ramblock Date: Sat, 25 Jul 2020 11:11:05 +0800 Message-ID: <1595646669-109310-5-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Record hash results for each ramblock. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++ migration/dirtyrate.h | 1 + 2 files changed, 158 insertions(+) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 6baf674..45cfc91 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -10,12 +10,27 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "crypto/hash.h" +#include "crypto/random.h" +#include "qemu/config-file.h" +#include "exec/memory.h" +#include "exec/ramblock.h" +#include "exec/target_page.h" +#include "qemu/rcu_queue.h" +#include "qapi/qapi-commands-migration.h" +#include "migration.h" #include "dirtyrate.h" static uint64_t sample_pages_per_gigabytes = DIRTYRATE_DEFAULT_SAMPLE_PAGES; static struct dirtyrate_statistics dirty_stat; CalculatingDirtyRateStage calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; +#define RAMBLOCK_FOREACH_MIGRATABLE(block) \ + INTERNAL_RAMBLOCK_FOREACH(block) \ + if (!qemu_ram_is_migratable(block)) {} else + static void reset_dirtyrate_stat(void) { dirty_stat.total_dirty_samples = 0; @@ -44,6 +59,148 @@ static void update_dirtyrate(int64_t msec) dirty_stat.dirty_rate = dirty_rate; } +static int get_block_vfn_hash(struct block_dirty_info *info, unsigned long vfn, + uint8_t **md, size_t *hash_len) +{ + struct iovec iov_array; + int ret = 0; + int nkey = 1; + + iov_array.iov_base = info->block_addr + + vfn * DIRTYRATE_SAMPLE_PAGE_SIZE; + iov_array.iov_len = DIRTYRATE_SAMPLE_PAGE_SIZE; + + if (qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_MD5, + &iov_array, nkey, + md, hash_len, NULL) < 0) { + ret = -1; + } + + return ret; +} + +static int save_block_hash(struct block_dirty_info *info) +{ + unsigned long *rand_buf = NULL; + unsigned int sample_pages_count; + uint8_t *md = NULL; + size_t hash_len; + int i; + int ret = -1; + + sample_pages_count = info->sample_pages_count; + /* block size less than one page, return success to skip this block */ + if (unlikely(info->block_pages == 0 || sample_pages_count == 0)) { + ret = 0; + goto out; + } + + /* use random bytes to pick sample page vfn */ + rand_buf = g_malloc0_n(sample_pages_count, sizeof(unsigned long)); + /* DEFAULT_READ_RANDOM_MAX_LIMIT 32M, + * can support 4T vm 1024 sample_pages_per_gigabytes + */ + ret = qcrypto_random_bytes((unsigned char *)rand_buf, + sample_pages_count * sizeof(unsigned long), + NULL); + if (ret) { + ret = -1; + goto out; + } + + hash_len = qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_MD5); + info->hash_result = g_malloc0_n(sample_pages_count, sizeof(uint8_t) * hash_len); + info->sample_page_vfn = g_malloc0_n(sample_pages_count, sizeof(unsigned long)); + + for (i = 0; i < sample_pages_count; i++) { + md = info->hash_result + i * hash_len; + info->sample_page_vfn[i] = rand_buf[i] % info->block_pages; + ret = get_block_vfn_hash(info, info->sample_page_vfn[i], &md, &hash_len); + if (ret < 0) { + goto out; + } + } + ret = 0; +out: + g_free(rand_buf); + return ret; +} + +static void get_block_dirty_info(RAMBlock *block, struct block_dirty_info *info, + struct dirtyrate_config *config) +{ + uint64_t sample_pages_per_gigabytes = config->sample_pages_per_gigabytes; + + /* Right shift 30 bits to calc block size in GB */ + info->sample_pages_count = (qemu_ram_get_used_length(block) * sample_pages_per_gigabytes) >> 30; + + info->block_pages = qemu_ram_get_used_length(block) >> DIRTYRATE_PAGE_SIZE_SHIFT; + info->block_addr = qemu_ram_get_host_addr(block); + strcpy(info->idstr, qemu_ram_get_idstr(block)); +} + +static struct block_dirty_info * +alloc_block_dirty_info(int *block_index, + struct block_dirty_info *block_dinfo) +{ + struct block_dirty_info *info = NULL; + int index = *block_index; + + if (!block_dinfo) { + block_dinfo = g_new(struct block_dirty_info, 1); + index = 0; + } else { + block_dinfo = g_realloc(block_dinfo, (index + 1) * + sizeof(struct block_dirty_info)); + index++; + } + info = &block_dinfo[index]; + memset(info, 0, sizeof(struct block_dirty_info)); + + *block_index = index; + return block_dinfo; +} + +static int ram_block_skip(RAMBlock *block) +{ + if (!strstr(qemu_ram_get_idstr(block), "ram-node") && + !strstr(qemu_ram_get_idstr(block), "memdimm")) { + if (strcmp(qemu_ram_get_idstr(block), "mach-virt.ram") || + strcmp(block->idstr, "pc.ram")) { + return -1; + } + } + + return 0; +} + +static int record_block_hash_info(struct dirtyrate_config config, + struct block_dirty_info **block_dinfo, int *block_index) +{ + struct block_dirty_info *info = NULL; + struct block_dirty_info *dinfo = NULL; + RAMBlock *block = NULL; + int index = 0; + + RAMBLOCK_FOREACH_MIGRATABLE(block) { + if (ram_block_skip(block) < 0) { + continue; + } + dinfo = alloc_block_dirty_info(&index, dinfo); + info = &dinfo[index]; + get_block_dirty_info(block, info, &config); + if (save_block_hash(info) < 0) { + *block_dinfo = dinfo; + *block_index = index; + return -1; + } + } + + *block_dinfo = dinfo; + *block_index = index; + + return 0; +} static void calculate_dirtyrate(struct dirtyrate_config config, int64_t time) { diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h index 2994535..4d9b3b8 100644 --- a/migration/dirtyrate.h +++ b/migration/dirtyrate.h @@ -15,6 +15,7 @@ /* take 256 pages per GB for cal dirty rate */ #define DIRTYRATE_DEFAULT_SAMPLE_PAGES 256 +#define DIRTYRATE_SAMPLE_PAGE_SIZE 4096 #define DIRTYRATE_PAGE_SIZE_SHIFT 12 #define BLOCK_INFO_MAX_LEN 256 #define PAGE_SIZE_SHIFT 20 From patchwork Sat Jul 25 03:11:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684755 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3D18138A for ; Sat, 25 Jul 2020 03:02:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0AFA206EB for ; Sat, 25 Jul 2020 03:02:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0AFA206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzARs-0006wT-TG for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:02:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPW-00028M-Fq for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:42 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4158 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPR-0000l9-3P for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:42 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 401B5539D792B5385680; Sat, 25 Jul 2020 10:59:33 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:23 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 5/8] migration/dirtyrate: Compare hash results for recorded ramblock Date: Sat, 25 Jul 2020 11:11:06 +0800 Message-ID: <1595646669-109310-6-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Compare hash results for recorded ramblock. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 45cfc91..7badc53 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -202,6 +202,83 @@ static int record_block_hash_info(struct dirtyrate_config config, return 0; } +static int cal_block_dirty_rate(struct block_dirty_info *info) +{ + uint8_t *md = NULL; + size_t hash_len; + int i; + int ret = 0; + + hash_len = qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_MD5); + md = g_new0(uint8_t, hash_len); + + for (i = 0; i < info->sample_pages_count; i++) { + ret = get_block_vfn_hash(info, info->sample_page_vfn[i], &md, &hash_len); + if (ret < 0) { + goto out; + } + + if (memcmp(md, info->hash_result + i * hash_len, hash_len) != 0) { + info->sample_dirty_count++; + } + } + +out: + g_free(md); + return ret; +} + +static bool find_block_matched(RAMBlock *block, struct block_dirty_info *infos, + int count, struct block_dirty_info **matched) +{ + int i; + + for (i = 0; i < count; i++) { + if (!strcmp(infos[i].idstr, qemu_ram_get_idstr(block))) { + break; + } + } + + if (i == count) { + return false; + } + + if (infos[i].block_addr != qemu_ram_get_host_addr(block) || + infos[i].block_pages != + (qemu_ram_get_used_length(block) >> DIRTYRATE_PAGE_SIZE_SHIFT)) { + return false; + } + + *matched = &infos[i]; + return true; +} + +static int compare_block_hash_info(struct block_dirty_info *info, int block_index) +{ + struct block_dirty_info *block_dinfo = NULL; + RAMBlock *block = NULL; + + RAMBLOCK_FOREACH_MIGRATABLE(block) { + if (ram_block_skip(block) < 0) { + continue; + } + block_dinfo = NULL; + if (!find_block_matched(block, info, block_index + 1, &block_dinfo)) { + continue; + } + if (cal_block_dirty_rate(block_dinfo) < 0) { + return -1; + } + update_dirtyrate_stat(block_dinfo); + } + if (!dirty_stat.total_sample_count) { + return -1; + } + + return 0; +} + + static void calculate_dirtyrate(struct dirtyrate_config config, int64_t time) { /* todo */ From patchwork Sat Jul 25 03:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684763 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E02E2138A for ; Sat, 25 Jul 2020 03:03:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C079D206EB for ; Sat, 25 Jul 2020 03:03:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C079D206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzATA-000197-2Y for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:03:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPV-000273-Ra for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:41 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4157 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPQ-0000l7-Sd for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:41 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 495B34E2B397365D759E; Sat, 25 Jul 2020 10:59:33 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:23 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 6/8] migration/dirtyrate: Implement get_sample_gap_period() and block_sample_gap_period() Date: Sat, 25 Jul 2020 11:11:07 +0800 Message-ID: <1595646669-109310-7-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Implement get_sample_gap_period() and block_sample_gap_period() to sleep specific time between sample actions. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 28 ++++++++++++++++++++++++++++ migration/dirtyrate.h | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 7badc53..00abfa7 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -295,10 +295,38 @@ static void set_dirty_rate_stage(CalculatingDirtyRateStage ratestage) calculating_dirty_rate_stage = ratestage; } +static int64_t block_sample_gap_period(int64_t msec, int64_t initial_time) +{ + int64_t current_time; + + current_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + if ((current_time - initial_time) >= msec) { + msec = current_time - initial_time; + } else { + g_usleep((msec + initial_time - current_time) * 1000); + } + + return msec; +} + +static int64_t get_sample_gap_period(struct dirtyrate_config config) +{ + int64_t msec; + + msec = config.sample_period_seconds * 1000; + if (msec <= MIN_FETCH_DIRTYRATE_TIME_MSEC || msec > MAX_FETCH_DIRTYRATE_TIME_MSEC) { + msec = DEFAULT_FETCH_DIRTYRATE_TIME_MSEC; + } + return msec; +} + void *get_dirtyrate_thread(void *arg) { struct dirtyrate_config config = *(struct dirtyrate_config *)arg; int64_t msec = 0; + + /* max period is 60 seconds */ + msec = get_sample_gap_period(config); set_dirty_rate_stage(CAL_DIRTY_RATE_ING); diff --git a/migration/dirtyrate.h b/migration/dirtyrate.h index 4d9b3b8..5aef2d7 100644 --- a/migration/dirtyrate.h +++ b/migration/dirtyrate.h @@ -14,12 +14,16 @@ #define QEMU_MIGRATION_DIRTYRATE_H /* take 256 pages per GB for cal dirty rate */ -#define DIRTYRATE_DEFAULT_SAMPLE_PAGES 256 +#define DIRTYRATE_DEFAULT_SAMPLE_PAGES 256 #define DIRTYRATE_SAMPLE_PAGE_SIZE 4096 #define DIRTYRATE_PAGE_SIZE_SHIFT 12 #define BLOCK_INFO_MAX_LEN 256 #define PAGE_SIZE_SHIFT 20 +#define MIN_FETCH_DIRTYRATE_TIME_MSEC 0 +#define MAX_FETCH_DIRTYRATE_TIME_MSEC 60000 +#define DEFAULT_FETCH_DIRTYRATE_TIME_MSEC 1000 + struct dirtyrate_config { uint64_t sample_pages_per_gigabytes; int64_t sample_period_seconds; From patchwork Sat Jul 25 03:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684761 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1106E138A for ; Sat, 25 Jul 2020 03:03:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4AC5206EB for ; Sat, 25 Jul 2020 03:03:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4AC5206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAT7-00011x-4S for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:03:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPW-00029S-S0 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:42 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33320 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPU-0000m7-Qa for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:42 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 756EF6A0080683C96539; Sat, 25 Jul 2020 10:59:33 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:24 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 7/8] migration/dirtyrate: Implement calculate_dirtyrate() function Date: Sat, 25 Jul 2020 11:11:08 +0800 Message-ID: <1595646669-109310-8-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:28 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Implement calculate_dirtyrate() function. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 53 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 00abfa7..d87e16d 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -161,6 +161,21 @@ alloc_block_dirty_info(int *block_index, return block_dinfo; } +static void free_block_dirty_info(struct block_dirty_info *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 int ram_block_skip(RAMBlock *block) { if (!strstr(qemu_ram_get_idstr(block), "ram-node") && @@ -278,12 +293,6 @@ static int compare_block_hash_info(struct block_dirty_info *info, int block_inde return 0; } - -static void calculate_dirtyrate(struct dirtyrate_config config, int64_t time) -{ - /* todo */ -} - /* * There are multithread will write/read *calculating_dirty_rate_stage*, * we can protect only one thread write/read it by libvirt api. @@ -320,6 +329,38 @@ static int64_t get_sample_gap_period(struct dirtyrate_config config) return msec; } +static void calculate_dirtyrate(struct dirtyrate_config config, int64_t time) +{ + struct block_dirty_info *block_dinfo = NULL; + int block_index = 0; + int64_t msec = time; + int64_t initial_time; + + rcu_register_thread(); + reset_dirtyrate_stat(); + initial_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + rcu_read_lock(); + if (record_block_hash_info(config, &block_dinfo, &block_index) < 0) { + goto out; + } + rcu_read_unlock(); + + msec = block_sample_gap_period(msec, initial_time); + + rcu_read_lock(); + if (compare_block_hash_info(block_dinfo, block_index) < 0) { + goto out; + } + + update_dirtyrate(msec); + +out: + rcu_read_unlock(); + free_block_dirty_info(block_dinfo, block_index + 1); + rcu_unregister_thread(); +} + + void *get_dirtyrate_thread(void *arg) { struct dirtyrate_config config = *(struct dirtyrate_config *)arg; From patchwork Sat Jul 25 03:11:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 11684759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7198613B6 for ; Sat, 25 Jul 2020 03:02:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 519FC206EB for ; Sat, 25 Jul 2020 03:02:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 519FC206EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzARw-000734-ID for patchwork-qemu-devel@patchwork.kernel.org; Fri, 24 Jul 2020 23:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPX-0002Ai-AE for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:43 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4156 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPR-0000l8-4R for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:42 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 44B8CA8698CC032E273A; Sat, 25 Jul 2020 10:59:33 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sat, 25 Jul 2020 10:59:24 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 8/8] migration/dirtyrate: Implement qmp_cal_dirty_rate()/qmp_get_dirty_rate() function Date: Sat, 25 Jul 2020 11:11:09 +0800 Message-ID: <1595646669-109310-9-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> References: <1595646669-109310-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 22:59:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, linyilu@huawei.com, qemu-devel@nongnu.org, alex.chen@huawei.com, ann.zhuangyanying@huawei.com, fangying1@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Implement qmp_cal_dirty_rate()/qmp_get_dirty_rate() function which could be called by libvirt api. Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/Makefile.objs | 1 + migration/dirtyrate.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ qapi/migration.json | 24 ++++++++++++++++++++++++ qapi/pragma.json | 3 ++- 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/migration/Makefile.objs b/migration/Makefile.objs index 0fc619e..12ae98c 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -6,6 +6,7 @@ common-obj-y += qemu-file.o global_state.o common-obj-y += qemu-file-channel.o common-obj-y += xbzrle.o postcopy-ram.o common-obj-y += qjson.o +common-obj-y += dirtyrate.o common-obj-y += block-dirty-bitmap.o common-obj-y += multifd.o common-obj-y += multifd-zlib.o diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index d87e16d..5717521 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -31,6 +31,21 @@ CalculatingDirtyRateStage calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; INTERNAL_RAMBLOCK_FOREACH(block) \ if (!qemu_ram_is_migratable(block)) {} else +static int64_t get_dirty_rate_info(void) +{ + int64_t dirty_rate = dirty_stat.dirty_rate; + /* + * Return dirty_rate only when we get CAL_DIRTY_RATE_END. + * And we must initial calculating_dirty_rate_stage. + */ + if (calculating_dirty_rate_stage == CAL_DIRTY_RATE_END) { + calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; + return dirty_rate; + } else { + return -1; + } +} + static void reset_dirtyrate_stat(void) { dirty_stat.total_dirty_samples = 0; @@ -377,3 +392,33 @@ void *get_dirtyrate_thread(void *arg) return NULL; } + +void qmp_cal_dirty_rate(int64_t value, Error **errp) +{ + static struct dirtyrate_config dirtyrate_config; + QemuThread thread; + + /* + * We don't begin calculating thread only when it's in calculating status. + */ + if (calculating_dirty_rate_stage == CAL_DIRTY_RATE_ING) { + return; + } + + /* + * If we get CAL_DIRTY_RATE_END here, libvirtd may be restarted at last round, + * we need to initial it. + */ + if (calculating_dirty_rate_stage == CAL_DIRTY_RATE_END) + calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; + + dirtyrate_config.sample_period_seconds = value; + dirtyrate_config.sample_pages_per_gigabytes = sample_pages_per_gigabytes; + qemu_thread_create(&thread, "get_dirtyrate", get_dirtyrate_thread, + (void *)&dirtyrate_config, QEMU_THREAD_DETACHED); +} + +int64_t qmp_get_dirty_rate(Error **errp) +{ + return get_dirty_rate_info(); +} diff --git a/qapi/migration.json b/qapi/migration.json index d500055..59f35bb 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1621,3 +1621,27 @@ ## { 'event': 'UNPLUG_PRIMARY', 'data': { 'device-id': 'str' } } + +## +# @cal_dirty_rate: +# +# start calculating dirty rate for vm +# +# @value: time for sample dirty pages +# +# Since: 5.1 +# +# Example: +# {"command": "cal_dirty_rate", "data": {"value": 1} } +# +## +{ 'command': 'cal_dirty_rate', 'data': {'value': 'int64'} } + +## +# @get_dirty_rate: +# +# get dirty rate for vm +# +# Since: 5.1 +## +{ 'command': 'get_dirty_rate', 'returns': 'int64' } diff --git a/qapi/pragma.json b/qapi/pragma.json index cffae27..ecd294b 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json @@ -10,7 +10,8 @@ 'query-migrate-cache-size', 'query-tpm-models', 'query-tpm-types', - 'ringbuf-read' ], + 'ringbuf-read', + 'get_dirty_rate' ], 'name-case-whitelist': [ 'ACPISlotType', # DIMM, visible through query-acpi-ospm-status 'CpuInfoMIPS', # PC, visible through query-cpu