From nobody Fri May 17 18:10:12 2024 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=1601350451; cv=none; d=zohomail.com; s=zohoarc; b=cXr1VmqRht27nt0M+UMWNL4ySdp5rRTP5ajZZ5vFn4MiSBOi2VVJ1+87OOxcmJRQu8LZSWfRdaffxo9iJoYy2L+ns8VgPDtV4+E/zX+HHFckH+yxljOaLuQ0hz67raxlhjExNdCB+FIF8B3O0atwUOHGoAg+atwMkoySiyVO5iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601350451; 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=KWIBjpyPzJq/Hb1NA7xIV9TAhQxBDD59R7cDfFyCT1g=; b=UQI1pdMZelu+1tgZiYM58SbxfvaBK38Y8qWQPSBOJK9PuPSybOrBr6xFmv4QEvSDU2E9GlsYsJGCkxR4LDIyGyv/cMH2Hjf6UdgavgytEKsor+R1gcSb6LD9rXozNMUupOHDezh2rbi8AqUeq7uRTsddJZu8YF1zZhWb/dXaDGg= 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 1601350451755802.6311142624759; Mon, 28 Sep 2020 20:34:11 -0700 (PDT) Received: from localhost ([::1]:57138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kN6P4-0006F8-FB for importer@patchew.org; Mon, 28 Sep 2020 23:34:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kN6N9-0004SS-St for qemu-devel@nongnu.org; Mon, 28 Sep 2020 23:32:11 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:5152 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 1kN6N7-0001h1-JR for qemu-devel@nongnu.org; Mon, 28 Sep 2020 23:32:11 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id F3CB7CB6FDBEFCDFBD6E; Tue, 29 Sep 2020 11:32:04 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Tue, 29 Sep 2020 11:31:56 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v2 1/2] migration/dirtyrate: record start_time and calc_time while at the measuring state Date: Tue, 29 Sep 2020 11:42:17 +0800 Message-ID: <1601350938-128320-2-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1601350938-128320-1-git-send-email-zhengchuan@huawei.com> References: <1601350938-128320-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/09/28 23:32:05 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.001, RCVD_IN_MSPIKE_WL=0.001, 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: alex.chen@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, david.edmondson@oracle.com, wanghao232@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" Querying could include both the start-time and the calc-time while at the m= easuring state, allowing a caller to determine when they should expect to come back = looking for a result. Signed-off-by: Chuan Zheng Reviewed-by: David Edmondson --- migration/dirtyrate.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 68577ef..40e41e7 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -83,14 +83,14 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) return info; } =20 -static void reset_dirtyrate_stat(void) +static void init_dirtyrate_stat(int64_t start_time, int64_t calc_time) { DirtyStat.total_dirty_samples =3D 0; DirtyStat.total_sample_count =3D 0; DirtyStat.total_block_mem_MB =3D 0; DirtyStat.dirty_rate =3D -1; - DirtyStat.start_time =3D 0; - DirtyStat.calc_time =3D 0; + DirtyStat.start_time =3D start_time; + DirtyStat.calc_time =3D calc_time; } =20 static void update_dirtyrate_stat(struct RamblockDirtyInfo *info) @@ -335,7 +335,6 @@ static void calculate_dirtyrate(struct DirtyRateConfig = config) int64_t initial_time; =20 rcu_register_thread(); - reset_dirtyrate_stat(); rcu_read_lock(); initial_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); if (!record_ramblock_hash_info(&block_dinfo, config, &block_count)) { @@ -365,6 +364,8 @@ void *get_dirtyrate_thread(void *arg) { struct DirtyRateConfig config =3D *(struct DirtyRateConfig *)arg; int ret; + int64_t start_time; + int64_t calc_time; =20 ret =3D dirtyrate_set_state(&CalculatingState, DIRTY_RATE_STATUS_UNSTA= RTED, DIRTY_RATE_STATUS_MEASURING); @@ -373,6 +374,10 @@ void *get_dirtyrate_thread(void *arg) return NULL; } =20 + start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME) / 1000; + calc_time =3D config.sample_period_seconds; + init_dirtyrate_stat(start_time, calc_time); + calculate_dirtyrate(config); =20 ret =3D dirtyrate_set_state(&CalculatingState, DIRTY_RATE_STATUS_MEASU= RING, --=20 1.8.3.1 From nobody Fri May 17 18:10:12 2024 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=1601350451; cv=none; d=zohomail.com; s=zohoarc; b=g87lB4M3AkGr1fFgcaybI/uUdGFfG/4kTQX/RSqIeHR11aQf5MEf43KIh/RqCYdypsOyAhsc6xxBKMmPfH7hg2Acu1cxo13ExAXy7fCmezbKWt1U2qzHzG3QL1bzweI5thnUDim4mKPc87q0Jwnspe2TBxpPQvBUy3dty7hGyPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601350451; 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=j+gD7PCExZU41a4DGdD6NOHI420+pE8kBpmYJp0v4VQ=; b=mC9QdB6TaBdGZbv0ASPQmMNChufiO8ZR5WddbwspirlVB84QctUIfIeWFAzY/e2Nuq9OAlO3z/6MB7eNmJOKSMaDNRBhscCvQCUgOaJJ3g6DdPAKJEDykJZl5D9vmi8wN90UtmAc2fim4S0YbEzE/PdHpdILwfYV8yyfhTDrHTI= 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 16013504512341019.9151969898921; Mon, 28 Sep 2020 20:34:11 -0700 (PDT) Received: from localhost ([::1]:57114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kN6P3-0006Ee-Tv for importer@patchew.org; Mon, 28 Sep 2020 23:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kN6N9-0004S9-ML for qemu-devel@nongnu.org; Mon, 28 Sep 2020 23:32:11 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:5153 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 1kN6N7-0001gz-C9 for qemu-devel@nongnu.org; Mon, 28 Sep 2020 23:32:11 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 0A41F46028A857E4E8CB; Tue, 29 Sep 2020 11:32:05 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Tue, 29 Sep 2020 11:31:57 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v2 2/2] migration/dirtyrate: present dirty rate only when querying the rate has completed Date: Tue, 29 Sep 2020 11:42:18 +0800 Message-ID: <1601350938-128320-3-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1601350938-128320-1-git-send-email-zhengchuan@huawei.com> References: <1601350938-128320-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/09/28 23:32:05 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.001, RCVD_IN_MSPIKE_WL=0.001, 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: alex.chen@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, david.edmondson@oracle.com, wanghao232@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" Make dirty_rate field optional, present dirty rate only when querying the rate has completed. The qmp results is shown as follow: @unstarted: {"return":{"status":"unstarted","start-time":0,"calc-time":0},"id":"libvirt= -12"} @measuring: {"return":{"status":"measuring","start-time":102931,"calc-time":1},"id":"li= bvirt-85"} @measured: {"return":{"status":"measured","dirty-rate":4,"start-time":150146,"calc-tim= e":1},"id":"libvirt-15"} Signed-off-by: Chuan Zheng Reviewed-by: David Edmondson Reviewed-by: Eric Blake --- migration/dirtyrate.c | 3 +-- qapi/migration.json | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 40e41e7..ab9e130 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -69,9 +69,8 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) struct DirtyRateInfo *info =3D g_malloc0(sizeof(DirtyRateInfo)); =20 if (qatomic_read(&CalculatingState) =3D=3D DIRTY_RATE_STATUS_MEASURED)= { + info->has_dirty_rate =3D true; info->dirty_rate =3D dirty_rate; - } else { - info->dirty_rate =3D -1; } =20 info->status =3D CalculatingState; diff --git a/qapi/migration.json b/qapi/migration.json index ce2216c..715c210 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1743,10 +1743,8 @@ # # Information about current dirty page rate of vm. # -# @dirty-rate: @dirtyrate describing the dirty page rate of vm -# in units of MB/s. -# If this field returns '-1', it means querying has not -# yet started or completed. +# @dirty-rate: an estimate of the dirty page rate of the VM in units of +# MB/s, present only when estimating the rate has completed. # # @status: status containing dirtyrate query status includes # 'unstarted' or 'measuring' or 'measured' @@ -1759,7 +1757,7 @@ # ## { 'struct': 'DirtyRateInfo', - 'data': {'dirty-rate': 'int64', + 'data': {'*dirty-rate': 'int64', 'status': 'DirtyRateStatus', 'start-time': 'int64', 'calc-time': 'int64'} } --=20 1.8.3.1