From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646049; cv=none; d=zohomail.com; s=zohoarc; b=E6vURh6CBe7Xyww3kaiHTzDpxURESIIBpw4xs1HywCJSwabWGmOO41Cq7EZ4MgQYCFMLPiOPe5rS0mFUpsRQceikYw+h7pnAcnWDlD+0ziTVq0yE0eJ9iHDSQwqlqCGKEQ3A99HiaUNQD3l06QMvE9bWjqIQ2f+IZ0Qsp+Oqd7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646049; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=erj6fh2blo3eTYtdCD9jJPjzh2QC1oc997I/a9+yzHA=; b=PlYxGb7Mzc6ZEJ4Ij0MmKoJj+vMkpFDIUTUyZJM5pIhcXyJypJ6/LbkQGKV8taS2HCGNTFVR/pJcYC5SlSg9fRG47ldmwoCS0nyCUu6m2VEs3o5VZ0zgLVG7RatWAzORbRJFabL7ggosdwUIGb/vXwS3/VbUJP+qScDhro16HRg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646048998503.11589554232387; Fri, 24 Jul 2020 20:00:48 -0700 (PDT) Received: from localhost ([::1]:42818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQZ-0003qz-J2 for importer@patchew.org; Fri, 24 Jul 2020 23:00:47 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 late= r. + * See the COPYING file in the top-level directory. + */ + +#include "dirtyrate.h" + +static uint64_t sample_pages_per_gigabytes =3D DIRTYRATE_DEFAULT_SAMPLE_PA= GES; +static uint64_t dirty_rate; /* MB/s */ +CalculatingDirtyRateStage calculating_dirty_rate_stage =3D 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 =3D 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 =3D ratestage; +} + +void *get_dirtyrate_thread(void *arg) +{ + struct dirtyrate_config config =3D *(struct dirtyrate_config *)arg; + uint64_t dirty_rate; + uint64_t hash_dirty_rate; + bool query_succ; + int64_t msec =3D 0; +=20 + set_dirty_rate_stage(CAL_DIRTY_RATE_ING); + + query_succ =3D calculate_dirtyrate(config, &hash_dirty_rate, msec); + if (!query_succ) { + dirty_rate =3D 0; + } else { + dirty_rate =3D 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 lat= er. + * 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 =3D 0, + CAL_DIRTY_RATE_ING =3D 1, + CAL_DIRTY_RATE_END =3D 2, +} CalculatingDirtyRateStage; + +void *get_dirtyrate_thread(void *arg); +#endif + --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646052; cv=none; d=zohomail.com; s=zohoarc; b=CFI7ehmKoJqrIiyWijD9bEQ0xWRN6GLMFD8Xl14udHGRXggKtwK14pUz5fNTrrx8EaH3zsIkA1jC4I1nLwX/4HklP6Vv9vGi42GwL373W7q687ti7k8tpmFJ7O8ydwYVuL3zkUPU2kzPk0xo1+akM094EWA1TO9Ga90HQ40NFAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646052; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x4Bae0ZtOdKzt3N8cBS+XmFX3MkTtHiwmKeAPAaeGHY=; b=m5cdb579YdbBMNSef3Mb/ZwJrgjB0k2x1bM6ryp3T6TPbA0WUvUuWSa6WFNEMtgzdBeU1TsGPu+ZDCt4lKrog/L9JmUI6F0mGHzVRCkzWKAm6gVqeqMtP2scuNe7NvHmIEJBcxKzFPsWqTWJhYTAPMxHrPtkEaYzrL/rE1fgyfw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646052361574.5830086272111; Fri, 24 Jul 2020 20:00:52 -0700 (PDT) Received: from localhost ([::1]:43154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQd-00040L-6w for importer@patchew.org; Fri, 24 Jul 2020 23:00:51 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D 2, } CalculatingDirtyRateStage; =20 +/*=20 + * 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 =20 --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646051; cv=none; d=zohomail.com; s=zohoarc; b=nstBWD6g5USBx+nE1eJmLcNOOAPsMEPldFwEDifPWYVi0vTB3AgDO/32LEQwqC9wUkSUlhI2vSgx2znuyxtim9ib4MbFCGo3XfbYIm2yPWkVZcEvGMIMrGknvn78tDwe8iNJfiirxUIp5aZfNii0+QNk0Mx5kqAa9/qnE6wDQqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646051; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UDw1UQknc+rKqrZbT0P/fgBeS7DotRYDG5DRTw0n32Y=; b=BHziQQgmgSTKx2m86u0Lwp95yHc1wF5HgnW1T9WcRL5cQ29QjTUgtzjIjUzyL9T3WZs0rTEeghc1W1CSl1y+tzKoMdB6KcEHYNuuAnhImV36G4upOBQyCfOEX8Znk5Oob0JbZVcvkqU+URpC9AvJAhr+xvwnu30BsS6aOBApRsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646051539398.76110136666705; Fri, 24 Jul 2020 20:00:51 -0700 (PDT) Received: from localhost ([::1]:42942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAQc-0003uu-3B for importer@patchew.org; Fri, 24 Jul 2020 23:00:50 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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" =20 static uint64_t sample_pages_per_gigabytes =3D DIRTYRATE_DEFAULT_SAMPLE_PA= GES; -static uint64_t dirty_rate; /* MB/s */ +static struct dirtyrate_statistics dirty_stat; CalculatingDirtyRateStage calculating_dirty_rate_stage =3D CAL_DIRTY_RATE_= INIT; =20 -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 =3D 0; + dirty_stat.total_sample_count =3D 0; + dirty_stat.total_block_mem_MB =3D 0; + dirty_stat.dirty_rate =3D 0; +} + +static void update_dirtyrate_stat(struct block_dirty_info *info) +{ + dirty_stat.total_dirty_samples +=3D info->sample_dirty_count; + dirty_stat.total_sample_count +=3D info->sample_pages_count; + dirty_stat.total_block_mem_MB +=3D (info->block_pages << DIRTYRATE_PAG= E_SIZE_SHIFT) >> PAGE_SIZE_SHIFT; } =20 -static void set_dirty_rate(uint64_t drate) +static void update_dirtyrate(int64_t msec) { - dirty_rate =3D drate; + uint64_t dirty_rate; + unsigned int total_dirty_samples =3D dirty_stat.total_dirty_samples; + unsigned int total_sample_count =3D dirty_stat.total_sample_count; + unsigned long total_block_mem_MB =3D dirty_stat.total_block_mem_MB; + + dirty_rate =3D total_dirty_samples * total_block_mem_MB * + 1000 / (total_sample_count * msec); + + dirty_stat.dirty_rate =3D dirty_rate; +} + + +static void calculate_dirtyrate(struct dirtyrate_config config, int64_t ti= me) +{ + /* todo */ } =20 /* @@ -42,21 +64,12 @@ static void set_dirty_rate_stage(CalculatingDirtyRateSt= age ratestage) void *get_dirtyrate_thread(void *arg) { struct dirtyrate_config config =3D *(struct dirtyrate_config *)arg; - uint64_t dirty_rate; - uint64_t hash_dirty_rate; - bool query_succ; int64_t msec =3D 0; =20 set_dirty_rate_stage(CAL_DIRTY_RATE_ING); =20 - query_succ =3D calculate_dirtyrate(config, &hash_dirty_rate, msec); - if (!query_succ) { - dirty_rate =3D 0; - } else { - dirty_rate =3D hash_dirty_rate; - } + calculate_dirtyrate(config, msec); =20 - set_dirty_rate(dirty_rate); set_dirty_rate_stage(CAL_DIRTY_RATE_END); =20 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 @@ =20 /* 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 =20 struct dirtyrate_config { uint64_t sample_pages_per_gigabytes; @@ -33,6 +36,14 @@ typedef enum { CAL_DIRTY_RATE_END =3D 2, } CalculatingDirtyRateStage; =20 +struct dirtyrate_statistics { + unsigned int total_dirty_samples; + unsigned int total_sample_count; + unsigned long total_block_mem_MB; + int64_t dirty_rate; +}; + + /*=20 * Store dirtypage info for each block. */ --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646149; cv=none; d=zohomail.com; s=zohoarc; b=RRFNWOUaP2sbPkgHmuWNw5p1TnWVsLgtx9hZNF55tAWbjrccOUEO2peuEcMN5yxtzW+Vx4PKAJC35IpywSKp+2oheh++gE7GKwK3njTuTXWNwWwpkCKtNwl/LGHwbxcTbJaHrD7/vsBvyz/ZMEP5gmVAqKx7Gwk/oYIVZfrtO6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646149; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7JcCNYjKyZo2haAqkQ78RJcqBH8jpsxx4n/sAxVKr3c=; b=RmAmO2zYW/EsFwhOrvjm78FXQLwDUG1wYImZC4s10XNPYCQpq778bFEqXj0MXNbSfJQ8lmp5jttibSb/+LRWxkHk1aICJkLl0EgR6FAz/jqroIEP8yIsd49vxJa/KaUxYzlQnDvTnmGl1FCItnwJbTBAtV40+MxB6KSsDYI/oUM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646149272408.39105724617207; Fri, 24 Jul 2020 20:02:29 -0700 (PDT) Received: from localhost ([::1]:50454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzASB-00072V-UN for importer@patchew.org; Fri, 24 Jul 2020 23:02:27 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. */ =20 +#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" =20 static uint64_t sample_pages_per_gigabytes =3D DIRTYRATE_DEFAULT_SAMPLE_PA= GES; static struct dirtyrate_statistics dirty_stat; CalculatingDirtyRateStage calculating_dirty_rate_stage =3D CAL_DIRTY_RATE_= INIT; =20 +#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 =3D 0; @@ -44,6 +59,148 @@ static void update_dirtyrate(int64_t msec) dirty_stat.dirty_rate =3D dirty_rate; } =20 +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 =3D 0; + int nkey =3D 1; + + iov_array.iov_base =3D info->block_addr + + vfn * DIRTYRATE_SAMPLE_PAGE_SIZE; + iov_array.iov_len =3D DIRTYRATE_SAMPLE_PAGE_SIZE; + + if (qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_MD5, + &iov_array, nkey, + md, hash_len, NULL) < 0) { + ret =3D -1; + } + + return ret; +} + +static int save_block_hash(struct block_dirty_info *info) +{ + unsigned long *rand_buf =3D NULL; + unsigned int sample_pages_count; + uint8_t *md =3D NULL; + size_t hash_len; + int i; + int ret =3D -1; + + sample_pages_count =3D info->sample_pages_count; + /* block size less than one page, return success to skip this block */ + if (unlikely(info->block_pages =3D=3D 0 || sample_pages_count =3D=3D 0= )) { + ret =3D 0; + goto out; + } + + /* use random bytes to pick sample page vfn */ + rand_buf =3D 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 =3D qcrypto_random_bytes((unsigned char *)rand_buf, + sample_pages_count * sizeof(unsigned long), + NULL); + if (ret) { + ret =3D -1; + goto out; + } + + hash_len =3D qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_MD5); + info->hash_result =3D g_malloc0_n(sample_pages_count, sizeof(uint8_t) = * hash_len); + info->sample_page_vfn =3D g_malloc0_n(sample_pages_count, sizeof(unsig= ned long)); + + for (i =3D 0; i < sample_pages_count; i++) { + md =3D info->hash_result + i * hash_len; + info->sample_page_vfn[i] =3D rand_buf[i] % info->block_pages; + ret =3D get_block_vfn_hash(info, info->sample_page_vfn[i], &md, &h= ash_len); + if (ret < 0) { + goto out; + } + } + ret =3D 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 =3D config->sample_pages_per_gigab= ytes; + + /* Right shift 30 bits to calc block size in GB */ + info->sample_pages_count =3D (qemu_ram_get_used_length(block) * sample= _pages_per_gigabytes) >> 30; + + info->block_pages =3D qemu_ram_get_used_length(block) >> DIRTYRATE_PAG= E_SIZE_SHIFT; + info->block_addr =3D 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 =3D NULL; + int index =3D *block_index; + + if (!block_dinfo) { + block_dinfo =3D g_new(struct block_dirty_info, 1); + index =3D 0; + } else { + block_dinfo =3D g_realloc(block_dinfo, (index + 1) * + sizeof(struct block_dirty_info)); + index++; + } + info =3D &block_dinfo[index]; + memset(info, 0, sizeof(struct block_dirty_info)); + + *block_index =3D 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, i= nt *block_index) +{ + struct block_dirty_info *info =3D NULL; + struct block_dirty_info *dinfo =3D NULL; + RAMBlock *block =3D NULL; + int index =3D 0; + + RAMBLOCK_FOREACH_MIGRATABLE(block) { + if (ram_block_skip(block) < 0) { + continue; + } + dinfo =3D alloc_block_dirty_info(&index, dinfo); + info =3D &dinfo[index]; + get_block_dirty_info(block, info, &config); + if (save_block_hash(info) < 0) { + *block_dinfo =3D dinfo; + *block_index =3D index; + return -1; + } + } + + *block_dinfo =3D dinfo; + *block_index =3D index; + + return 0; +} =20 static void calculate_dirtyrate(struct dirtyrate_config config, int64_t ti= me) { 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 @@ =20 /* 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 --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646145; cv=none; d=zohomail.com; s=zohoarc; b=KCIX8TZGkHB8XuhqQk+o5LgtmkeZmAxZXeDyRptNfm4/6GM+nnYDAO2KCPWGz9ztX9jYvNpHqlKJGFZMctzqd9f5gFYlAzKWF2pAmSfrysjEyQFx08CBdtH+j4jBp/alq+7tEAsgpuoNIXdjEgKRw2knkg/CdmijWecfoREp1jM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646145; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Yv11wnLAaqc4rzUTBahOJKhdqoyUrE0AFa4FT5PQRwM=; b=btFbv9lvl1ykQrGlEXkPeFebxoDX1de9zqKW89bJiO1OVnlYbG5GjvSr9mVf3uPw2upuH0Ive2H9TH7F+TuEAKITtveKptd6pSVLxU5aGWz3US9wbX36vcPQVDNvcMo0Rt/2HPySF3TRWHQCoCFG0E+g2riWjwCLhpADCqzUEE0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646145952633.6036502645085; Fri, 24 Jul 2020 20:02:25 -0700 (PDT) Received: from localhost ([::1]:50216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzAS8-0006wT-OO for importer@patchew.org; Fri, 24 Jul 2020 23:02:24 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_con= fig config, return 0; } =20 +static int cal_block_dirty_rate(struct block_dirty_info *info) +{ + uint8_t *md =3D NULL; + size_t hash_len; + int i; + int ret =3D 0; + + hash_len =3D qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_MD5); + md =3D g_new0(uint8_t, hash_len); + + for (i =3D 0; i < info->sample_pages_count; i++) { + ret =3D get_block_vfn_hash(info, info->sample_page_vfn[i], &md, &h= ash_len); + if (ret < 0) { + goto out; + } + + if (memcmp(md, info->hash_result + i * hash_len, hash_len) !=3D 0)= { + info->sample_dirty_count++; + } + } + +out: + g_free(md); + return ret; +} + +static bool find_block_matched(RAMBlock *block, struct block_dirty_info *i= nfos, + int count, struct block_dirty_info **matche= d) +{ + int i; + + for (i =3D 0; i < count; i++) { + if (!strcmp(infos[i].idstr, qemu_ram_get_idstr(block))) { + break; + } + } + + if (i =3D=3D count) { + return false; + } + + if (infos[i].block_addr !=3D qemu_ram_get_host_addr(block) || + infos[i].block_pages !=3D + (qemu_ram_get_used_length(block) >> DIRTYRATE_PAGE_SIZE_SHIFT)= ) { + return false; + } + + *matched =3D &infos[i]; + return true; +} + +static int compare_block_hash_info(struct block_dirty_info *info, int bloc= k_index) +{ + struct block_dirty_info *block_dinfo =3D NULL; + RAMBlock *block =3D NULL; + + RAMBLOCK_FOREACH_MIGRATABLE(block) { + if (ram_block_skip(block) < 0) { + continue; + } + block_dinfo =3D 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 ti= me) { /* todo */ --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646225; cv=none; d=zohomail.com; s=zohoarc; b=mhRtm8VTIlcQFUz/wjmz70qUrrcZL1v5fhKqN+P1LLGrZorGn4SGecEQSXI++lxRHVAyqjI10J8w4aNP0QytGNSaB3w2Tmmm8LIJk27hP/v3WjNyAkFfpRI/YOhnyHfTAUbkZPVWkF37l3bcQJCVcSmqAZSgQwTVJxQu8RLL4/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646225; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g3w+5f3a8Yu6x3PO1wOa79xE4unEKHHEb/sqakGcKec=; b=fmKv0RS6P2G27V4OEbE4pFNc/nqxyivfIEV34B9RTYHlRRedF79nnu8KzX86sv1WgQ2WY7z9uUGCCs3V93ARrHj83OVJ4+7vBHBHz0ED3ruVRYQepoL/PqxJoJHVyRKHO2DRxeGAFOwfDflOCFjYmehougMMzF3x+R4ExzJ0FV8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646225081634.0089152739247; Fri, 24 Jul 2020 20:03:45 -0700 (PDT) Received: from localhost ([::1]:56800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzATP-000197-R0 for importer@patchew.org; Fri, 24 Jul 2020 23:03:43 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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(CalculatingDirtyRate= Stage ratestage) calculating_dirty_rate_stage =3D ratestage; } =20 +static int64_t block_sample_gap_period(int64_t msec, int64_t initial_time) +{ + int64_t current_time; + + current_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + if ((current_time - initial_time) >=3D msec) { + msec =3D 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 =3D config.sample_period_seconds * 1000; + if (msec <=3D MIN_FETCH_DIRTYRATE_TIME_MSEC || msec > MAX_FETCH_DIRTYR= ATE_TIME_MSEC) { + msec =3D DEFAULT_FETCH_DIRTYRATE_TIME_MSEC; + } + return msec; +} + void *get_dirtyrate_thread(void *arg) { struct dirtyrate_config config =3D *(struct dirtyrate_config *)arg; int64_t msec =3D 0; + + /* max period is 60 seconds */ + msec =3D get_sample_gap_period(config); =20 set_dirty_rate_stage(CAL_DIRTY_RATE_ING); =20 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 =20 /* 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 =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; --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646221; cv=none; d=zohomail.com; s=zohoarc; b=J0PyPqdCIogYZMfn7KTiIMCJJEyFu7EwzmG33Uft1oGuuqFjggnipOqu18J81oTIEfgd5R1BzWfjdfdzFbRPrYhpJNMHzhb4yzcFEKuXqotJh3NISWNS06jiQ5kf1RP/PwIE5taMwKn+voKeqSuYgSt295nSgLOrnfQ2sMKmdj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646221; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1PMqN3cxjdiJgEWhlNXFytkYNYEiEzmjUGden2zcMtI=; b=oD9VUOg5jCCGQl5hqqOAMQynpnojiiluyQCMII68QmkNRjNDJsWcOB10ymSSK7GdDaVKasH8YdR0Mk9ttDxLp5ZiANQQbqMo+3lMjWg13uS636M3WnNLBuzDnXX+ATRLYGdvuR6ORcbahInf2xTFdGOP6n/cTMCLL9Qx2/zNnNc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646221547173.51515393510363; Fri, 24 Jul 2020 20:03:41 -0700 (PDT) Received: from localhost ([::1]:56506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzATM-00011x-Ay for importer@patchew.org; Fri, 24 Jul 2020 23:03:40 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; } =20 +static void free_block_dirty_info(struct block_dirty_info *infos, int coun= t) +{ + int i; + + if (!infos) { + return; + } + + for (i =3D 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; } =20 - -static void calculate_dirtyrate(struct dirtyrate_config config, int64_t ti= me) -{ - /* 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; } =20 +static void calculate_dirtyrate(struct dirtyrate_config config, int64_t ti= me) +{ + struct block_dirty_info *block_dinfo =3D NULL; + int block_index =3D 0; + int64_t msec =3D time; + int64_t initial_time; + + rcu_register_thread(); + reset_dirtyrate_stat(); + initial_time =3D 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 =3D 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 =3D *(struct dirtyrate_config *)arg; --=20 1.8.3.1 From nobody Sat Nov 15 17:17:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595646149; cv=none; d=zohomail.com; s=zohoarc; b=isHHg+Agg5LnHMrLc5ECz77H4KlfbfPvDnG5cTw5Jrcy6w35DmeuEH4lhVOBMdZ0UVwPWt85B5VlJMewxtmOc1e/WQ2Fu0o3nPvuBJCdSR6daFmVo1Y55SzsiT7GtGuyxGKNkAsdpiEk9SpezYtyeldvFVjGj1g3JKS4L2yVVXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595646149; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jgcdjEwk8C0216PI4yyjei5fHK2UR7n5spmfc53NVC4=; b=DBOHeTLBryUeGqaAlmycG/mQaMSSM7cQkAysI5PFgmLEIEm3sRpmHk/bOhI1G3CM858yOQ3lAqTvGyglNf8rlpPSWSkQswcoOJ+auP3hf1eosaTgNMO8jGSM/YEaszs49Uk+nFvq8CyGJT+Yw648oAWIyg0rYm/PlwXcm/QzLR4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595646149433818.6964308972592; Fri, 24 Jul 2020 20:02:29 -0700 (PDT) Received: from localhost ([::1]:50476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzASC-000734-4j for importer@patchew.org; Fri, 24 Jul 2020 23:02:28 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 +=3D qemu-file.o global_state.o common-obj-y +=3D qemu-file-channel.o common-obj-y +=3D xbzrle.o postcopy-ram.o common-obj-y +=3D qjson.o +common-obj-y +=3D dirtyrate.o common-obj-y +=3D block-dirty-bitmap.o common-obj-y +=3D multifd.o common-obj-y +=3D 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 = =3D CAL_DIRTY_RATE_INIT; INTERNAL_RAMBLOCK_FOREACH(block) \ if (!qemu_ram_is_migratable(block)) {} else =20 +static int64_t get_dirty_rate_info(void) +{ + int64_t dirty_rate =3D 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 =3D=3D CAL_DIRTY_RATE_END) { + calculating_dirty_rate_stage =3D CAL_DIRTY_RATE_INIT; + return dirty_rate; + } else { + return -1; + } +} + static void reset_dirtyrate_stat(void) { dirty_stat.total_dirty_samples =3D 0; @@ -377,3 +392,33 @@ void *get_dirtyrate_thread(void *arg) =20 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 sta= tus. + */ + if (calculating_dirty_rate_stage =3D=3D CAL_DIRTY_RATE_ING) { + return; + } + + /* + * If we get CAL_DIRTY_RATE_END here, libvirtd may be restarted at las= t round, + * we need to initial it. + */ + if (calculating_dirty_rate_stage =3D=3D CAL_DIRTY_RATE_END) + calculating_dirty_rate_stage =3D CAL_DIRTY_RATE_INIT; + + dirtyrate_config.sample_period_seconds =3D value; + dirtyrate_config.sample_pages_per_gigabytes =3D sample_pages_per_gigab= ytes; + 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-osp= m-status 'CpuInfoMIPS', # PC, visible through query-cpu --=20 1.8.3.1