From nobody Tue Feb 10 12:43:14 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=weirdnatto.in ARC-Seal: i=1; a=rsa-sha256; t=1657063804; cv=none; d=zohomail.com; s=zohoarc; b=DSVmLbH30kikPf1Lzv3JdUrXvYRevINjvIk9gVWpN+hr1URCyGfDzahtbnys5QFoQBekr/wfgQLtWqI1Kajvuo32lLknOzu/J9ekt7iPy98nWID3fkMdMpvIyE/SyMSr/U/MpLp5R7H/8FD/MtQXNDOeAt947J9aglgi6TVmjgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657063804; h=Content-Type:Content-Transfer-Encoding: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=xCwSesglhI/p1BE9HD33LQwSF1u9u0Zfdn1MXEG6JUU=; b=b5Cd2WQXk1A/PfowXBIfbyYf3/QX0lRmCXrzQJKZpymIxMxs2p6k433kHpwaduJYNS8ijsQsS8z9qsjHF3q0vm6CrlMgeP5IByBMwTmqIn++GGNWMmnTcJIEnQE7QHCdhMl87R0MsTJlFr0PPWgbYId55fphJaZkxheOq4ImbIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) 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 1657063804134293.9600101692796; Tue, 5 Jul 2022 16:30:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-K0qBKS0YP0S_rNCZ_dHWqA-1; Tue, 05 Jul 2022 19:26:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84195802E5C; Tue, 5 Jul 2022 23:26:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A45018EC8; Tue, 5 Jul 2022 23:26:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2C4BE194707E; Tue, 5 Jul 2022 23:26:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E0892194705D for ; Tue, 5 Jul 2022 23:26:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D333A400EA84; Tue, 5 Jul 2022 23:26:46 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CDA904047842 for ; Tue, 5 Jul 2022 23:26:46 +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 B5C26804196 for ; Tue, 5 Jul 2022 23:26:46 +0000 (UTC) Received: from mail.weirdnatto.in (140.238.225.67 [140.238.225.67]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-107-0E52vMBkOjqJivWuydJsYA-1; Tue, 05 Jul 2022 19:26:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657063802; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xCwSesglhI/p1BE9HD33LQwSF1u9u0Zfdn1MXEG6JUU=; b=Bp0/E58BnYbP0LPQig8u/kRZjzc2+aVLLSZxD2eL9eJUWqJiplAyLHZYAduGOdqxxbAtl9 hOtAQ1BhySzUdpcXxktlDnxhFa+zbAxhZwFinjfyU04KI3rlZtshvjlmZPN4tnM1LS9qNw VZQRlxogC8eEZI9qmRQaJCS+vaQ/vU4= X-MC-Unique: K0qBKS0YP0S_rNCZ_dHWqA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 0E52vMBkOjqJivWuydJsYA-1 From: Amneesh Singh To: libvir-list@redhat.com Subject: [PATCH RFC v2 3/3] qemu_driver: use qemuMonitorQueryStats to extract halt poll time Date: Wed, 6 Jul 2022 04:56:28 +0530 Message-Id: <20220705232628.1779286-4-natto@weirdnatto.in> In-Reply-To: <20220705232628.1779286-1-natto@weirdnatto.in> References: <20220705232628.1779286-1-natto@weirdnatto.in> 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.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mkletzan@redhat.com, pbonzini@redhat.com, pkrempa@redhat.com, Amneesh Singh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657063806036100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Related: https://gitlab.com/libvirt/libvirt/-/issues/276 This patch uses qemuMonitorQueryStats to query "halt_poll_success_ns" and "halt_poll_fail_ns" for every vCPU. The respective values for each vCPU are then added together. Signed-off-by: Amneesh Singh --- src/qemu/qemu_driver.c | 70 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97c6ed95..30170d5c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18052,15 +18052,69 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom, } =20 static int -qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, - virTypedParamList *params) +qemuDomainGetStatsCpuHaltPollTime(virQEMUDriver *driver, + virDomainObj *dom, + virTypedParamList *params, + unsigned int privflags) { unsigned long long haltPollSuccess =3D 0; unsigned long long haltPollFail =3D 0; - pid_t pid =3D dom->pid; + qemuDomainObjPrivate *priv =3D dom->privateData; + bool queryStatsCap =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_= STATS); =20 - if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < = 0) - return 0; + if (queryStatsCap && HAVE_JOB(privflags) && virDomainObjIsActive(dom) = && driver->privileged) { + size_t i; + qemuMonitorQueryStatsTargetType target =3D QEMU_MONITOR_QUERY_STAT= S_TARGET_VCPU; + qemuMonitorQueryStatsProvider *provider =3D NULL; + g_autoptr(GPtrArray) providers =3D NULL; + g_autoptr(GPtrArray) queried_stats =3D NULL; + provider =3D qemuMonitorQueryStatsProviderNew( + target, + QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM, + QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS, + QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS, + -1); + + if (!provider) + return 0; + + providers =3D g_ptr_array_new_full(1, (GDestroyNotify) qemuMonitor= QueryStatsProviderFree); + g_ptr_array_add(providers, provider); + + qemuDomainObjEnterMonitor(driver, dom); + queried_stats =3D qemuMonitorQueryStats(priv->mon, target, NULL, p= roviders); + qemuDomainObjExitMonitor(dom); + + if (!queried_stats) + return 0; + + for (i =3D 0; i < queried_stats->len; i++) { + unsigned long long curHaltPollSuccess, curHaltPollFail; + GHashTable *cur_table =3D queried_stats->pdata[i]; + virJSONValue *success_obj, *fail_obj; + const char *success_str =3D qemuMonitorQueryStatsVcpuNameTypeT= oString( + QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS); + const char *fail_str =3D qemuMonitorQueryStatsVcpuNameTypeToSt= ring( + QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS); + + success_obj =3D g_hash_table_lookup(cur_table, success_str); + fail_obj =3D g_hash_table_lookup(cur_table, fail_str); + + if (!(success_obj && fail_obj)) + return 0; + + ignore_value(virJSONValueGetNumberUlong(success_obj, &curHaltP= ollSuccess)); + ignore_value(virJSONValueGetNumberUlong(fail_obj, &curHaltPoll= Fail)); + + haltPollSuccess +=3D curHaltPollSuccess; + haltPollFail +=3D curHaltPollFail; + } + } else { + pid_t pid =3D dom->pid; + + if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail= ) < 0) + return 0; + } =20 if (virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.= success.time") < 0 || virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fai= l.time") < 0) @@ -18073,7 +18127,7 @@ static int qemuDomainGetStatsCpu(virQEMUDriver *driver, virDomainObj *dom, virTypedParamList *params, - unsigned int privflags G_GNUC_UNUSED) + unsigned int privflags) { if (qemuDomainGetStatsCpuCgroup(dom, params) < 0) return -1; @@ -18081,7 +18135,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; =20 - if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0) + if (qemuDomainGetStatsCpuHaltPollTime(driver, dom, params, privflags) = < 0) return -1; =20 return 0; @@ -18915,7 +18969,7 @@ static virQEMUCapsFlags queryDirtyRateRequired[] = =3D { =20 static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] =3D { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, NULL }, - { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, NULL }, + { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, true, NULL }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, NULL }, { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, NULL }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, NULL= }, --=20 2.36.1