From nobody Mon Feb 9 16:53:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1645363753306447.96101912670906; Sun, 20 Feb 2022 05:29:13 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-d5e2draNPGq8wjjxTbtj7A-1; Sun, 20 Feb 2022 08:29:08 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E46321853028; Sun, 20 Feb 2022 13:29:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0A5F7C0FC; Sun, 20 Feb 2022 13:29:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 931FA4A7CD; Sun, 20 Feb 2022 13:29:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21KDSj9f010792 for ; Sun, 20 Feb 2022 08:28:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id D962F1121318; Sun, 20 Feb 2022 13:28:45 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D42DE1121315 for ; Sun, 20 Feb 2022 13:28:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5AE78811E76 for ; Sun, 20 Feb 2022 13:28:42 +0000 (UTC) Received: from chinatelecom.cn (prt-mail.chinatelecom.cn [42.123.76.222]) by relay.mimecast.com with ESMTP id us-mta-609-BpaR7RQsOLqZzjoTLdsV_w-1; Sun, 20 Feb 2022 08:28:38 -0500 Received: from clientip-171.223.98.228 (unknown [172.18.0.218]) by chinatelecom.cn (HERMES) with SMTP id E230F28009A; Sun, 20 Feb 2022 21:28:33 +0800 (CST) Received: from ([172.18.0.218]) by app0025 with ESMTP id 940ae6b0dec74ae89390ad734696133e for libvir-list@redhat.com; Sun, 20 Feb 2022 21:28:34 CST X-MC-Unique: d5e2draNPGq8wjjxTbtj7A-1 X-MC-Unique: BpaR7RQsOLqZzjoTLdsV_w-1 HMM_SOURCE_IP: 172.18.0.218:51386.365509885 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 940ae6b0dec74ae89390ad734696133e X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.218 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: libvir-list@redhat.com Subject: [PATCH v6 8/8] qemu_driver: Add calc_mode for dirtyrate statistics Date: Sun, 20 Feb 2022 21:28:15 +0800 Message-Id: <2953fea8899e76117ad8590800dca3a07ebdcd50.1645363342.git.huangy81@chinatelecom.cn> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 21KDSj9f010792 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= , huangy81@chinatelecom.cn X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1645363754180100003 From: Hyman Huang(=E9=BB=84=E5=8B=87) Add calc_mode for dirtyrate statistics retured by virsh domstats --dirtyrate api, also add vcpu dirtyrate if dirty-ring mode was used in last measurement. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- src/libvirt-domain.c | 6 +++++ src/qemu/qemu_driver.c | 22 +++++++++++++++--- src/qemu/qemu_monitor.h | 10 +++++++++ src/qemu/qemu_monitor_json.c | 53 ++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7be4e02..a197618 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11980,6 +11980,12 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "dirtyrate.megabytes_per_second" - the calculated memory dirty rate= in * MiB/s as long long. It is produc= ed * only if the calc_status is measu= red. + * "dirtyrate.calc_mode" - the calculation mode used last measurement,= either + * of these 3 'page-sampling,dirty-bitmap,dirt= y-ring' + * values returned. + * "dirtyrate.vcpu..megabytes_per_second" - the calculated memory= dirty + * rate for a virtual cp= u as + * unsigned long long. * * Note that entire stats groups or individual stat fields may be missing = from * the output in case they are not supported by the given hypervisor, are = not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3297513..de2fdf7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18556,11 +18556,27 @@ qemuDomainGetStatsDirtyRate(virQEMUDriver *driver, "dirtyrate.calc_period") < 0) return -1; =20 - if ((info.status =3D=3D VIR_DOMAIN_DIRTYRATE_MEASURED) && - virTypedParamListAddLLong(params, info.dirtyRate, - "dirtyrate.megabytes_per_second") < 0) + if (virTypedParamListAddString(params, + qemuMonitorDirtyRateCalcModeTypeToStrin= g(info.mode), + "dirtyrate.calc_mode") < 0) return -1; =20 + if (info.status =3D=3D VIR_DOMAIN_DIRTYRATE_MEASURED) { + if (virTypedParamListAddLLong(params, info.dirtyRate, + "dirtyrate.megabytes_per_second") < = 0) + return -1; + + if (info.mode =3D=3D QEMU_MONITOR_DIRTYRATE_CALC_MODE_DIRTY_RING) { + int i; + for (i =3D 0; i < info.nvcpus; i++) { + if (virTypedParamListAddULLong(params, info.rates[i].value, + "dirtyrate.vcpu.%d.megabyte= s_per_second", + info.rates[i].index) < 0) + return -1; + } + } + } + return 0; } =20 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 053479b..2c0eed5 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1553,6 +1553,12 @@ qemuMonitorStartDirtyRateCalc(qemuMonitor *mon, int seconds, qemuMonitorDirtyRateCalcMode mode); =20 +typedef struct _qemuMonitorDirtyRateVcpu qemuMonitorDirtyRateVcpu; +struct _qemuMonitorDirtyRateVcpu { + int index; /* virtual cpu index */ + unsigned long long value; /* virtual cpu dirty page rate in MB/s */ +}; + typedef struct _qemuMonitorDirtyRateInfo qemuMonitorDirtyRateInfo; struct _qemuMonitorDirtyRateInfo { int status; /* the status of last dirtyrate calculation, @@ -1560,6 +1566,10 @@ struct _qemuMonitorDirtyRateInfo { int calcTime; /* the period of dirtyrate calculation */ long long startTime; /* the start time of dirtyrate calculation */ long long dirtyRate; /* the dirtyrate in MiB/s */ + qemuMonitorDirtyRateCalcMode mode; /* calculation mode used in + last measurement */ + size_t nvcpus; /* number of virtual cpu */ + qemuMonitorDirtyRateVcpu *rates; /* array of dirty page rate */ }; =20 int diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index da9a4d9..a07f8c9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8782,11 +8782,45 @@ VIR_ENUM_IMPL(qemuMonitorDirtyRateStatus, "measured"); =20 static int +qemuMonitorJSONExtractVcpuDirtyRate(virJSONValue *data, + qemuMonitorDirtyRateInfo *info) +{ + size_t nvcpus; + int i; + + nvcpus =3D virJSONValueArraySize(data); + info->nvcpus =3D nvcpus; + info->rates =3D g_new0(qemuMonitorDirtyRateVcpu, nvcpus); + + for (i =3D 0; i < nvcpus; i++) { + virJSONValue *entry =3D virJSONValueArrayGet(data, i); + if (virJSONValueObjectGetNumberInt(entry, "id", + &info->rates[i].index) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-dirty-rate reply was missing 'id' data= ")); + return -1; + } + + if (virJSONValueObjectGetNumberUlong(entry, "dirty-rate", + &info->rates[i].value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-dirty-rate reply was missing 'dirty-ra= te' data")); + return -1; + } + } + + return 0; +} + +static int qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *data, qemuMonitorDirtyRateInfo *info) { const char *statusstr; + const char *modestr; int status; + int mode; + virJSONValue *rates =3D NULL; =20 if (!(statusstr =3D virJSONValueObjectGetString(data, "status"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -8823,6 +8857,25 @@ qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *da= ta, return -1; } =20 + if ((modestr =3D virJSONValueObjectGetString(data, "mode"))) { + if ((mode =3D qemuMonitorDirtyRateCalcModeTypeFromString(modestr))= < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown dirty page rate calculation mode: %s"), = modestr); + return -1; + } + info->mode =3D mode; + } else { + info->mode =3D QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING; + } + + if ((rates =3D virJSONValueObjectGetArray(data, "vcpu-dirty-rate"))) { + if (qemuMonitorJSONExtractVcpuDirtyRate(rates, info) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-dirty-rate parsing 'vcpu-dirty-rate' in fa= ilure")); + return -1; + } + } + return 0; } =20 --=20 1.8.3.1