From patchwork Sat Jul 25 03:11:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 277456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAC05C433E1 for ; Sat, 25 Jul 2020 03:00:43 +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 B1B76206EB for ; Sat, 25 Jul 2020 03:00:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1B76206EB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQU-0003qz-Ti for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 23:00:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzAPU-00024n-Vq for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:40 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:33212 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-0000k7-M8 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 22:59:40 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 3691A90B99F7B96B7017; 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:20 +0800 From: Chuan Zheng To: , Subject: [RFC PATCH 1/8] migration/dirtyrate: Add get_dirtyrate_thread() function Date: Sat, 25 Jul 2020 11:11:02 +0800 Message-ID: <1595646669-109310-2-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zheng Chuan Add get_dirtyrate_thread() functions Signed-off-by: Zheng Chuan Signed-off-by: YanYing Zhang --- migration/dirtyrate.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ migration/dirtyrate.h | 38 +++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 migration/dirtyrate.c create mode 100644 migration/dirtyrate.h diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c new file mode 100644 index 0000000..fc652fb --- /dev/null +++ b/migration/dirtyrate.c @@ -0,0 +1,63 @@ +/* + * Dirtyrate implement code + * + * Copyright (c) 2017-2020 HUAWEI TECHNOLOGIES CO.,LTD. + * + * Authors: + * Chuan Zheng + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "dirtyrate.h" + +static uint64_t sample_pages_per_gigabytes = DIRTYRATE_DEFAULT_SAMPLE_PAGES; +static uint64_t dirty_rate; /* MB/s */ +CalculatingDirtyRateStage calculating_dirty_rate_stage = CAL_DIRTY_RATE_INIT; + +static bool calculate_dirtyrate(struct dirtyrate_config config, + uint64_t *dirty_rate, int64_t time) +{ + /* todo */ + return true; +} + +static void set_dirty_rate(uint64_t drate) +{ + dirty_rate = drate; +} + +/* + * There are multithread will write/read *calculating_dirty_rate_stage*, + * we can protect only one thread write/read it by libvirt api. + * So we don't add mutex_lock to protect it here, but we must calculate + * dirty_rate by libvirt api. + */ +static void set_dirty_rate_stage(CalculatingDirtyRateStage ratestage) +{ + calculating_dirty_rate_stage = 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; + } + + 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 new file mode 100644 index 0000000..9a5c228 --- /dev/null +++ b/migration/dirtyrate.h @@ -0,0 +1,38 @@ +/* + * Dirtyrate common functions + * + * Copyright (c) 2020 HUAWEI TECHNOLOGIES CO., LTD. + * + * Authors: + * Chuan Zheng + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_MIGRATION_DIRTYRATE_H +#define QEMU_MIGRATION_DIRTYRATE_H + +/* take 256 pages per GB for cal dirty rate */ +#define DIRTYRATE_DEFAULT_SAMPLE_PAGES 256 + +struct dirtyrate_config { + uint64_t sample_pages_per_gigabytes; + int64_t sample_period_seconds; +}; + +/* + * To record calculate dirty_rate status: + * 0: initial status, calculating thread is not be created here. + * 1: calculating thread is created. + * 2: calculating thread is end, we can get result. + */ +typedef enum { + CAL_DIRTY_RATE_INIT = 0, + CAL_DIRTY_RATE_ING = 1, + CAL_DIRTY_RATE_END = 2, +} CalculatingDirtyRateStage; + +void *get_dirtyrate_thread(void *arg); +#endif + 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: 277452 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE245C433E3 for ; Sat, 25 Jul 2020 03:00:47 +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 9754A206EB for ; Sat, 25 Jul 2020 03:00:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9754A206EB 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+qemu-devel=archiver.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 1jzAQY-00040L-Po for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 23:00:46 -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+qemu-devel=archiver.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: 277455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4608DC433E4 for ; Sat, 25 Jul 2020 03:00:46 +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 1E542206EB for ; Sat, 25 Jul 2020 03:00:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E542206EB 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+qemu-devel=archiver.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 1jzAQX-0003uu-7k for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 23:00:45 -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+qemu-devel=archiver.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: 277454 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D285C433E0 for ; Sat, 25 Jul 2020 03:02:25 +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 D8AC2206EB for ; Sat, 25 Jul 2020 03:02:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8AC2206EB 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+qemu-devel=archiver.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 1jzAS8-00072V-1g for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 23:02:24 -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+qemu-devel=archiver.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: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: 277453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A42AC433DF for ; Sat, 25 Jul 2020 03:03:37 +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 4B275206EB for ; Sat, 25 Jul 2020 03:03:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B275206EB 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+qemu-devel=archiver.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 1jzATI-00011x-F7 for qemu-devel@archiver.kernel.org; Fri, 24 Jul 2020 23:03:36 -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+qemu-devel=archiver.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;