From nobody Mon Feb 2 07:31:17 2026 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; 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=1769013028; cv=none; d=zohomail.com; s=zohoarc; b=bmInPbOjfTakXsNZ81Y9DxfpNEGA/eQ7k6ASli+68A9AwwecdlaoS54m3REuvlwYlT5rk49LdOOfVfiyt+35Vsmn/BFYTTOT1PQwAQ8V6sa26xPygxXHnBII88vV9oGIIoHDqiYtWj0yxSCC6bmOJvJD3WGUA1HkTwN9USjMOxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769013028; 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=5TIE11rTObr94rcodQQvkaUb4DKf6Zt5rN8paR4Sdns=; b=YHRDeerODTDU6Z7Y8zaNQVxxl5vHzsZCHOBD9Se+nabCY7LTyvbq/LQtrI97z/Gh1E7PG8xHj141HDWEvZL86dqts4hbuF+Bp+VDXXbqUyn0PLsfJc5zTSMew0ezMKRkKKoumnvw9+dq1okd2BjoryY6KPnctNlfLoLj/tJ6dlM= 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 1769013028715732.1526884616982; Wed, 21 Jan 2026 08:30:28 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1A25143DD7; Wed, 21 Jan 2026 11:30:28 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 3A91F43E7E; Wed, 21 Jan 2026 11:27:37 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 229F9419A9; Wed, 21 Jan 2026 11:27:30 -0500 (EST) 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)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B353941A0D for ; Wed, 21 Jan 2026 11:27:29 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-nj1qjpJZMnW8uhEbhNdyjA-1; Wed, 21 Jan 2026 11:27:28 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87C1918002CB for ; Wed, 21 Jan 2026 16:27:27 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E1B7819560A7 for ; Wed, 21 Jan 2026 16:27:26 +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=-5.0 required=5.0 tests=BAYES_00,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=1769012849; 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=5TIE11rTObr94rcodQQvkaUb4DKf6Zt5rN8paR4Sdns=; b=e4Znok0MAuuCGL+E+jmGERF1HKbSdMwBsLhNR+8bScMsfp08gnPBKPxhuMynOGOpl79WXU V7DOj5XTFI7mbk/Trqnh2t5fARNuCrkTgTIUE6NdGDYUIrL4RZAAtOqnCY55d+aUzIVCZ3 6+W2WQ9f4VBDuX3+XRKkI9dhrGswEMc= X-MC-Unique: nj1qjpJZMnW8uhEbhNdyjA-1 X-Mimecast-MFC-AGG-ID: nj1qjpJZMnW8uhEbhNdyjA_1769012847 To: devel@lists.libvirt.org Subject: [PATCH 2/6] conf: Allow aw_bits for virtio-iommu Date: Wed, 21 Jan 2026 17:27:18 +0100 Message-ID: <3d82a26bf9828203e898184eb6b118fa5b93ca13.1769012588.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FyvuM9rLdJwUcvVUNIQ2pYVpxfyaB0nWEkydrt-fv34_1769012847 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: D6MP347S6X7XQE64Y2KLWXN7LTRSIX6B X-Message-ID-Hash: D6MP347S6X7XQE64Y2KLWXN7LTRSIX6B X-MailFrom: mprivozn@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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1769013030871154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Introduced in QEMU commit of v9.0.0-rc0~9^2~7 the virtio-iommu device is also capable of using different addres width. The corresponding attribute is also called 'aw-bits', just like in case of intel-iommu. Wire up the missing pieces. Signed-off-by: Michal Privoznik --- docs/formatdomain.rst | 2 +- src/conf/domain_validate.c | 9 +++++++-- src/qemu/qemu_validate.c | 7 +++++-- .../virtio-iommu-aarch64.aarch64-latest.xml | 1 + tests/qemuxmlconfdata/virtio-iommu-aarch64.xml | 4 +++- .../virtio-iommu-dma-translation.x86_64-latest.err | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 04ef319a73..4b34a8a963 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9243,7 +9243,7 @@ Example: ``aw_bits`` The ``aw_bits`` attribute can be used to set the address width to al= low mapping larger iova addresses in the guest. :since:`Since 6.5.0` (QE= MU/KVM - and ``intel`` model only) + and ``intel`` or ``virtio`` models only) =20 ``dma_translation`` The ``dma_translation`` attribute with possible values ``on`` and ``= off`` can diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 4482203087..440f23d726 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -3206,14 +3206,19 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *= iommu) iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT || - iommu->aw_bits !=3D 0 || iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->pci_bus >=3D 0) { virReportError(VIR_ERR_XML_ERROR, - _("iommu model '%1$s' doesn't support additiona= l attributes"), + _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); return -1; } + + if (iommu->aw_bits !=3D 0 && (iommu->aw_bits < 32 || iommu->aw_bit= s > 64)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("aw-bits must be within [32,64]")); + return -1; + } break; =20 case VIR_DOMAIN_IOMMU_MODEL_AMD: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 184c23d307..ab8a1938c1 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -5551,6 +5551,8 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMMU= Def *iommu, const virDomainDef *def, virQEMUCaps *qemuCaps) { + bool aw_bits_supported =3D false; + switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: if (!qemuDomainIsQ35(def)) { @@ -5565,6 +5567,7 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMMU= Def *iommu, virDomainIOMMUModelTypeToString(iommu->model)); return -1; } + aw_bits_supported =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOM= MU_AW_BITS); break; =20 case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: @@ -5610,6 +5613,7 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMMU= Def *iommu, virDomainIOMMUModelTypeToString(iommu->model)); return -1; } + aw_bits_supported =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_IO= MMU_AW_BITS); break; =20 case VIR_DOMAIN_IOMMU_MODEL_AMD: @@ -5669,8 +5673,7 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMMU= Def *iommu, _("iommu: device IOTLB is not supported with this Q= EMU binary")); return -1; } - if (iommu->aw_bits > 0 && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_AW_BITS)) { + if (iommu->aw_bits > 0 && !aw_bits_supported) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("iommu: aw_bits is not supported with this QEMU b= inary")); return -1; diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml = b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml index 3cb794cbc9..4ae628ab5a 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.xml @@ -29,6 +29,7 @@