From nobody Tue Oct 28 17:50:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1760024658; cv=none; d=zohomail.com; s=zohoarc; b=EyY0aOqNVk8kjLde7nldAlSk8PUFQd2dlPxdUBK/OijphOfJXbMGckD3yWisuR73rmUZygBwtyd6vta/jj27SyPJUK13Ewv+MXzWRJ1KlyZdXcANyO9tGT5pI0lRGBkvxKrfvdsElCz416jWL1733yOEbgVfzXxaUsTTr6FScic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760024658; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=tmdx+VjuC/XiQNUMaG5hlVuz2QXHPN8kV2H1L84Uo7c=; b=kIOW3q6gjRRyroLSwKqb+cqC43iJ1j2hXQoypX86w7uhLs7L0PqkkxNCx6lBtiIjbGN2PxdfAJ+JeQvQ3U6qNqmVf1irFqi5Z5LyfZwLDt1WugNgCGhIhNAERBF2VzS1sGcXbPGDj3J8lw4sUwmItbnHT2xeff53zaCSlHWetNQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1760024658720419.64371143352366; Thu, 9 Oct 2025 08:44:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A25C741C6E; Thu, 9 Oct 2025 11:44:17 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 9996D44ABC; Thu, 9 Oct 2025 11:18:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B64AE41873; Thu, 9 Oct 2025 11:18:14 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7829F43F55 for ; Thu, 9 Oct 2025 11:16:43 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-342-MsOJ-xx2OY6LQyEgNlxHqg-1; Thu, 09 Oct 2025 11:16:41 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D16AC19560AF for ; Thu, 9 Oct 2025 15:16:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.12]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 14BED1955F22 for ; Thu, 9 Oct 2025 15:16:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760023003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tmdx+VjuC/XiQNUMaG5hlVuz2QXHPN8kV2H1L84Uo7c=; b=cT+ZRVxaEFx3XkKisuSjhW/cXIlmIzmojjVjpMyqSuBkxRBPLUERUgOWJS+daHIsQbHmwH 3kcR5ieC/svvBxviG/pT71c5M/DsWAEQ6Gd+Fc94CXDDB2RiAafBA6krKqIRNcfBJZpwKU 9Nz92MGxTmowLGIxgOhISQpp0F6iUdk= X-MC-Unique: MsOJ-xx2OY6LQyEgNlxHqg-1 X-Mimecast-MFC-AGG-ID: MsOJ-xx2OY6LQyEgNlxHqg_1760022999 To: devel@lists.libvirt.org Subject: [RFC PATCH 16/16] qemu: Add support for enabling timed block device statistics collection Date: Thu, 9 Oct 2025 17:16:16 +0200 Message-ID: <1f5536388b7d2640779570fff016183e109a234a.1760022633.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CeUgBpigGJSmqtmunZMbb6BseSQxO4wUDz2gOV0vp5k_1760022999 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CXCW6H222CPTAMJ2OGPFDPM6XP3ZVJYL X-Message-ID-Hash: CXCW6H222CPTAMJ2OGPFDPM6XP3ZVJYL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1760024659306116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Add validation that qemu supports the collection of statistics and enable it on the block device commandline. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 15 +++++ src/qemu/qemu_validate.c | 29 ++++++++++ ...sk-statistics-intervals.x86_64-latest.args | 37 ++++++++++++ ...isk-statistics-intervals.x86_64-latest.xml | 57 +++++++++++++++++++ .../disk-statistics-intervals.xml | 46 +++++++++++++++ tests/qemuxmlconftest.c | 1 + 6 files changed, 185 insertions(+) create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-= latest.args create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-= latest.xml create mode 100644 tests/qemuxmlconfdata/disk-statistics-intervals.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 08e2a5147d..7ed2b43330 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1688,6 +1688,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, const char *alias =3D disk->info.alias; g_autofree char *usbdiskalias =3D NULL; const virDomainDeviceInfo *deviceinfo =3D &disk->info; + g_autoptr(virJSONValue) statistics =3D NULL; virDomainDeviceInfo usbSCSIinfo =3D { .type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE, .addr.drive =3D { .diskbus =3D VIR_DOMAIN_DISK_BUS_USB }, @@ -1895,6 +1896,19 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); + if (disk->statistics) { + size_t i; + + statistics =3D virJSONValueNewArray(); + + for (i =3D 0; disk->statistics[i] > 0; i++) { + g_autoptr(virJSONValue) num =3D virJSONValueNewNumberUint(disk= ->statistics[i]); + + if (virJSONValueArrayAppend(statistics, &num) < 0) + return NULL; + } + } + if (virJSONValueObjectAdd(&props, "S:device_id", scsiVPDDeviceId, "T:share-rw", shareRW, @@ -1919,6 +1933,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, "S:serial", serial, "S:werror", wpolicy, "S:rerror", rpolicy, + "A:stats-intervals", &statistics, NULL) < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7f3ffe8bd5..036b399945 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3358,6 +3358,35 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, if (qemuValidateDomainDeviceDefDiskIOThreads(def, disk, qemuCaps) < 0) return -1; + if (disk->statistics) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_TIMED_STATS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("statistics collection is not supported by th= is QEMU binary")); + return -1; + } + + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_IDE: + case VIR_DOMAIN_DISK_BUS_SATA: + case VIR_DOMAIN_DISK_BUS_VIRTIO: + case VIR_DOMAIN_DISK_BUS_USB: + break; + + case VIR_DOMAIN_DISK_BUS_FDC: + case VIR_DOMAIN_DISK_BUS_NVME: + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_SD: + case VIR_DOMAIN_DISK_BUS_NONE: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("statistics collection is not supported by di= sks on bus '%1$s'"), + NULLSTR(virDomainDiskBusTypeToString(disk->bus)= )); + return -1; + } + } + return 0; } diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args new file mode 100644 index 0000000000..3dd3dee99d --- /dev/null +++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-storage","id":"virtio-disk0","bootindex":1,"stats-intervals":[3,10]= }' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-storage","id":"scsi0-= 0-0-3","stats-intervals":[5,15]}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.= xml b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml new file mode 100644 index 0000000000..4c55c50ef5 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.xml @@ -0,0 +1,57 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 2 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + + +
+ + + + + + + + + + +
+ + +
+ + +
+ + + +
+ + + +