From nobody Sun Oct 5 00:14:15 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; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1759364863987560.2830172150669; Wed, 1 Oct 2025 17:27:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id DC657440CB; Wed, 1 Oct 2025 20:27:42 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 262B0441FA; Wed, 1 Oct 2025 20:25:30 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1861641A52; Wed, 1 Oct 2025 20:24:06 -0400 (EDT) Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010008.outbound.protection.outlook.com [40.93.198.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B41AD41B06 for ; Wed, 1 Oct 2025 20:24:04 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by DM4PR12MB6232.namprd12.prod.outlook.com (2603:10b6:8:a5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Thu, 2 Oct 2025 00:24:00 +0000 Received: from PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb]) by PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb%6]) with mapi id 15.20.9160.015; Thu, 2 Oct 2025 00:24:00 +0000 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=ARC_SIGNED,ARC_VALID, 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 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oM0DYja63/jwcG8c3ELgeXQSq2+ovy8KpkNSYrfXPbXEzTqtzMeP3A4TP5LixiOU2RHhhMHzd6epbrEz9FbIoFRu494rchgW0BvBfmFL5aam62CzvtiuqBK122zA/CsNweobuz3aGGkHumGMpWHE3T4wimMsYrMDgBAg4inSqd3je6bToopKnGH4V1zEaE4Suz/Rn/sv11/sp3JA6B+X5S0hZkic5xfbx9wmuJJIJ7QjsQTrcGnEzhsBd0r6zl6xnIWepxSeeHKqO+sEy2C1GYpbO7DsNfO6AZd86HZchRd0440oEVmashwmGMpa1AWzkXgS6P69rUJW7zWfHa+iNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pcH/sLMzFkc6DMRq8Z90U08Oy1Jg/IV8RpAU8U7MzEI=; b=lH7SY6DX2V5Qyqja3lzc1xfC+zzJ4SWJJg26tcc6FJCXB+AWBzVCeyvZi/uLbTHmvmgiQuM4lnGIMkERpNK1FLBy/Ar1OYpfnN/WkbpFttVq1aDS0edSijeo0190v8rpy+P79stS01sOzwJUF8aJ2HTVyIQU8h5hTwV1MkO04grzOBGuSg9VvbzI7Ge/CIZgchRBglUhm3qRo0dcIv3RQPiXntGsJa34EehfHyiV262COmbX8W1r2f9ul9sWUyesT+AEkn4aipE3LVNqHgjhCr9mfVHS3ES1DyBCg80eWOr12ysvoZFZiUO2q3IYZKpEEnkciXzhwwyTQeOBd11ZIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pcH/sLMzFkc6DMRq8Z90U08Oy1Jg/IV8RpAU8U7MzEI=; b=dQ6FaUqTbOUPevk828j5HB4CxNeXQX0dgoj2rrYMOLkKiQP/cTLEcWwru1TuxEShgxKZWa+/ZeyTw5QzBbtyf0lD0q5e9SOJTanHxHnFh94lE3PtZsXZhZP3fZ4KZ4tia7wSEdhlQSUqSVKm0iSeb63p7AC5dbBj/M0JU2vIbL/hBKgg5GjLymgNgIE8B2sFcPS4/+cV/BeR++DGHhdyVrUw7/mMKzyEhx1m9eATEfHUukDbVWo+V5PhZwYbFhJUEFcX4iYJPSlgxYKYzdEafWW8jW3kz9DcVCj0Y9MiaOfw46OBZrK9G2KS4WhsQnWnZFjldnhsswipU9vtU6CXYg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v2 1/3] qemu: add IOMMU model smmuv3Dev Date: Wed, 1 Oct 2025 17:23:46 -0700 Message-ID: <20251002002348.1536936-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251002002348.1536936-1-nathanc@nvidia.com> References: <20251002002348.1536936-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0037.namprd05.prod.outlook.com (2603:10b6:a03:33f::12) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|DM4PR12MB6232:EE_ X-MS-Office365-Filtering-Correlation-Id: e64e3c4a-04b3-4d06-fe24-08de0149fbea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0fF0lLDLqXFCeSWgLSI64zDlPz+gsE4GaqSgzVJ0FemWHzI75AqBdsOQc0vA?= =?us-ascii?Q?X1hLCP/Mu+CnXS4ZWTQSZlSePIfIrWDm2nXcf9GmHOquITDu4R/6NHB77TAI?= =?us-ascii?Q?Ebhor2bQ20pjFKSVi3ki5HaOP0gBUrcj3u18hX+jmw9q6IEGrzQ1/yXZjBt0?= =?us-ascii?Q?C0cHoYyFj5F9cBuyV38ddeaP/pt22yv523bf5p0SV30y8KpTMua03rwqihaD?= =?us-ascii?Q?PQJ7aNtMwJlmOjWSIVSoVg9Y8H7DKEU/11ybi4Yf0t0WsaV3Em4N0Z2ti8L3?= =?us-ascii?Q?Y1zWn+QMZEJ6bQvqmaCFINTaPb4LqK8GmenpVSCiWsXNLdiNbHTnZPbtaeHC?= =?us-ascii?Q?dnq7arO+aHtc/B7NFKCrSRAL4AOuIHYe3FDoiBnDpXk14HNuEBwnNiW0J/Cn?= =?us-ascii?Q?EUBe4thXa1R5VPynSxjtOEG/lDKnLZF6BA7MeqWU6VctbAQhy9R6vSJHwq2E?= =?us-ascii?Q?L3UMpBL0ixE68n1lpv/gw/ZVa16u9BtejsLVKVX4MoCwKl+hOvt09VJvdfW5?= =?us-ascii?Q?8y1LZA0NLCCpxwuPPrUDJiZl+O7wDOKOxNrVtS+RCcQyGcB3A4v2UVGwPNAC?= =?us-ascii?Q?4yY3pW3CEzUDRW0+bwt1rQda6lwr7IYuNXbpW8VSNwOXzh5+swUWCFbvu/tQ?= =?us-ascii?Q?8q8lplcIb9CirGp4kFoi/Anm4r2V9eZYgJiA925S2vBW53X5vHgAF65UguJO?= =?us-ascii?Q?N1AA8XClvVmGbETE5xUaFXKrrzHIEf6RMYvzEg9DEtodEb3UrjARE4dqN4VU?= =?us-ascii?Q?YsuUxkOqK6ezlR2PkaxQ6HdawVrnMzFmoj4Fy4p6eLWcbYXyYur9rXhyJ+4J?= =?us-ascii?Q?x7Vv19B2q/pZ/y7AXyC73yWSgZJH2+aMgdQsynPSGWRW+h44M01jjdIpkMqQ?= =?us-ascii?Q?G3ctmCZfuRtGd2hJ/oaLzlnk2VS1Dn3BrotNR0R4uDLZHdqPLRPFQ8TJa3xC?= =?us-ascii?Q?U/1ZmQO0ath9q4j9SXWZmn5DjERbhHm9UJz7U0jVSe8pdKydXLo8i/TtaEWW?= =?us-ascii?Q?QW5Dokj6Fmqr5cndL/KJZ6GOZBhSmyGreud6NdRWvjlLhDH8bhBSLECJOQJZ?= =?us-ascii?Q?3n3YTPhFQGVMMEZCJJztCSKExdG1aKfo/kES/uUKUfnNnif165W4JjIQvJKj?= =?us-ascii?Q?vHNFxoz0Ls01pYB9FvU8L7dCODe6i/WuUZYiqX3JzDD42556ml1hxJgmX2Nk?= =?us-ascii?Q?CiR9v5Y4hcL3ZfgVlxh7vjd7d8LXcAlhtUoGHbicYcjqIa2j2d3vHR85ddgb?= =?us-ascii?Q?HYFzLLFRji8+UZDYWzGN4CA5OiyQruE45b6+BrKpErqrsbnvuTgV3vGUbOTB?= =?us-ascii?Q?q7cNE5q832zpL5YRr5UpyMREx/66pYRRc0PsumgWQWnFEVfKPX7aez+82Ilh?= =?us-ascii?Q?GBuQs0bE4M/jzlUKvg30uQvxMIFjPDdjFF/EUEMI+TIQEFzxl8zxU9uLMTN3?= =?us-ascii?Q?GacELFJavbn4S4lBypOP2n5jYHRHGvnI?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR12MB6834.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?I8r5AgZgLmL2fG6r0U1IwaY7kERji5a9jymB1TrHHJOyv2pjfft55pIl8LiM?= =?us-ascii?Q?rHievLabrgjIcFVyL/ulMJjc8RRyi/F9WA4MfzsopdECXkaok7kOSvHS0EFe?= =?us-ascii?Q?23kJkJdhz5wLLdWwrWFWBYs4BHmxvYyzjVktmMv38zIYH1sRTW8SDKGtQlWv?= =?us-ascii?Q?bykInMhMc+fOCCuTm7OFC4ReAxgz0pruX0o/wa1kTitu+ELAdLW4iaUCYtpy?= =?us-ascii?Q?TYIRgeV1tB5em1LiDBQB1bW4ZsE8md55tYN2C/U1eypGygJZ6LO15v/97zPm?= =?us-ascii?Q?7omLuzSCwIZpR16luW8H30AcMrFCdMi0xNaMxeVwl7EBHFx7Yrze/lOaZCVR?= =?us-ascii?Q?EVtjMoLZXKOmZAxb2dmVTZ1Q4LX6e/v9iP9QIbfiPavr2239DB5gtkOQcKZj?= =?us-ascii?Q?t0Be69t5UbCUyVqWQX98hBf0wWKPojejhDRzX02VNKKFrSQg2LshtljBtwJ6?= =?us-ascii?Q?FDspPloVdGpqtAKtZSIdTvmsZd0ChjJETdx5CDtOd27JhDdAU5XNPh3SdoVR?= =?us-ascii?Q?B2rGV2d0ZK2+pdAjSZdFizdvzVrvrpJ1S3su5ZsJOS++ZrHGiuGVLUAMZtut?= =?us-ascii?Q?M2SzDx5I9GQm/L0cf5L6SsZALIDlB7u/aOybTJAVVVlTygS/paK3RBUW3EKs?= =?us-ascii?Q?e0aGMehrvMYAAuBxeYstxkTTi5Rjf6l956jQtvLvsCEDJIFfPgimU90AprUR?= =?us-ascii?Q?BObk57lzJ69sKf0u6QJZQg2J/++dGBazeerH4lEi9byqhWel5Z+KriBly+Ho?= =?us-ascii?Q?UFPXKM4avdTZwHvjiAotTY6Z4CSBDp0LOHFDO0WLLmzr1ESPHAwWEzYW6XDA?= =?us-ascii?Q?pfj8hiWwrffGEebsStZ0khssCUBR8sj5w3t4fWYooR5eSCTNcNfIaY7kMgr7?= =?us-ascii?Q?OqLMne53d+A3tN48LruPc+hYNeYx67Tbes2oZ9a0Qwufz6erAcVGTptjukoF?= =?us-ascii?Q?qCE8SlpNRIIPvwQaHT4L+yweNKVO4GlHEZsoPB9X9OAwiIiZv3XWmR54eh4f?= =?us-ascii?Q?byYpiCeOLSsiVpGuD3sjLOVmX4eHFUGYEJH3dkmc3V4jqIvDqeNP1YNUGcFh?= =?us-ascii?Q?Nl2F7HTOkN0r7zGPK6bQBnYKEGbxG/j31c4k8ujmjEMcikYRLhRQXOaPlekv?= =?us-ascii?Q?Vs/R1jJpcbfnQfEUzMF56LGEsxuc3oscr+9OuphYyDBOX8Tsv8gqEabK+qov?= =?us-ascii?Q?0H0ACphrNs0c5JuMN1hRVMDY4ltClxPeqla6FBBD+iS+AJqZDRsQVtV/kEbZ?= =?us-ascii?Q?pjK13ihLWudeM7+QUKrPKnNJc4223a+OaslHFsLgb/r0B67m9OaMNy9QKVOz?= =?us-ascii?Q?vKhh/52s7P0MrFuFh4kddbSsdUrPMwFV1B8onviWlzyU01hKLjEUR7TXejsZ?= =?us-ascii?Q?qP4Qrwc8Y0Lz5sOYufyJ+v6j324aJupM9/ZqdPgylb13covJChv6aWJlEJQi?= =?us-ascii?Q?GV96Dj/STb0QgSWaY4OLTpw3UvB+acLTp3O9t0B5c5O7v7IX0rrnitXgHKHd?= =?us-ascii?Q?Y5mBzT9NJxP3i86OOFGAZNQTh+94eti8VXWfoF5Q8Xk93tBi4GD1wxMos4t2?= =?us-ascii?Q?FIe7o9i53ubJTDhVmoWi6qTOFVNLEJLDGUFQVB5U?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e64e3c4a-04b3-4d06-fe24-08de0149fbea X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2025 00:24:00.5444 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: phb9bqefYakOKkDkinN2yAU/hagVYBhvAL0KnVYygUxw2ic+IRWdxofLY6ko2ALmeeSJLChNJ/igMkaDqpcZtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6232 Message-ID-Hash: TBWNV62QNRSCYZO7ZAFI25YC3PBOVRNJ X-Message-ID-Hash: TBWNV62QNRSCYZO7ZAFI25YC3PBOVRNJ X-MailFrom: nathanc@nvidia.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 CC: shameerali.kolothum.thodi@huawei.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com 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: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1759364865986116600 Content-Type: text/plain; charset="utf-8" Introduce support for "smmuv3Dev" IOMMU model and its "parentIdx" driver attribute. The "parentIdx" attribute indicates the index of the controller that a smmuv3Dev IOMMU device is attached to. Signed-off-by: Nathan Chen --- docs/formatdomain.rst | 9 +++- src/conf/domain_conf.c | 17 ++++++++ src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 26 +++++++++-- src/conf/schemas/domaincommon.rng | 6 +++ src/qemu/qemu_command.c | 72 +++++++++++++++++++++++++++++-- src/qemu/qemu_domain_address.c | 2 + src/qemu/qemu_validate.c | 16 +++++++ 8 files changed, 141 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f50dce477f..6a62291600 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9161,8 +9161,9 @@ Example: ``model`` Supported values are ``intel`` (for Q35 guests) ``smmuv3`` (:since:`since 5.5.0`, for ARM virt guests), ``virtio`` - (:since:`since 8.3.0`, for Q35 and ARM virt guests) and - ``amd`` (:since:`since 11.5.0`). + (:since:`since 8.3.0`, for Q35 and ARM virt guests), + ``amd`` (:since:`since 11.5.0`), and ``smmuv3Dev`` (for + ARM virt guests). =20 ``driver`` The ``driver`` subelement can be used to configure additional options, = some @@ -9212,6 +9213,10 @@ Example: Enable x2APIC mode. Useful for higher number of guest CPUs. :since:`Since 11.5.0` (QEMU/KVM and ``amd`` model only) =20 + ``parentIdx`` + The ``parentIdx`` attribute notes the index of the controller that an + IOMMU device is attached to. (QEMU/KVM and ``smmuv3Dev`` model only) + The ``virtio`` IOMMU devices can further have ``address`` element as descr= ibed in `Device addresses`_ (address has to by type of ``pci``). =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281846dfbe..6d1adb831d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1353,6 +1353,7 @@ VIR_ENUM_IMPL(virDomainIOMMUModel, "smmuv3", "virtio", "amd", + "smmuv3Dev", ); =20 VIR_ENUM_IMPL(virDomainVsockModel, @@ -2813,6 +2814,8 @@ virDomainIOMMUDefNew(void) =20 iommu =3D g_new0(virDomainIOMMUDef, 1); =20 + iommu->parent_idx =3D -1; + return g_steal_pointer(&iommu); } =20 @@ -14439,6 +14442,10 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlo= pt, if (virXMLPropTristateSwitch(driver, "passthrough", VIR_XML_PROP_N= ONE, &iommu->pt) < 0) return NULL; + + if (virXMLPropInt(driver, "parentIdx", 10, VIR_XML_PROP_NONE, + &iommu->parent_idx, -1) < 0) + return NULL; } =20 if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, @@ -22092,6 +22099,12 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUD= ef *src, dst->aw_bits, src->aw_bits); return false; } + if (src->parent_idx !=3D dst->parent_idx) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device parent_idx value '%1$= d' does not match source '%2$d'"), + dst->parent_idx, src->parent_idx); + return false; + } if (src->dma_translation !=3D dst->dma_translation) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain IOMMU device dma translation '%1$s= ' does not match source '%2$s'"), @@ -28409,6 +28422,10 @@ virDomainIOMMUDefFormat(virBuffer *buf, virBufferAsprintf(&driverAttrBuf, " xtsup=3D'%s'", virTristateSwitchTypeToString(iommu->xtsup)); } + if (iommu->parent_idx >=3D 0) { + virBufferAsprintf(&driverAttrBuf, " parentIdx=3D'%d'", + iommu->parent_idx); + } =20 virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 39807b5fe3..1d0c94a00a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3039,6 +3039,7 @@ typedef enum { VIR_DOMAIN_IOMMU_MODEL_SMMUV3, VIR_DOMAIN_IOMMU_MODEL_VIRTIO, VIR_DOMAIN_IOMMU_MODEL_AMD, + VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV, =20 VIR_DOMAIN_IOMMU_MODEL_LAST } virDomainIOMMUModel; @@ -3050,6 +3051,7 @@ struct _virDomainIOMMUDef { virTristateSwitch eim; virTristateSwitch iotlb; unsigned int aw_bits; + int parent_idx; virDomainDeviceInfo info; virTristateSwitch dma_translation; virTristateSwitch xtsup; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 93a2bc9b01..8a599fdbc6 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -3108,7 +3108,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) 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->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->parent_idx !=3D -1) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support additiona= l attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3120,7 +3121,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) if (iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits !=3D 0 || - iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->parent_idx !=3D -1) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3130,7 +3132,24 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *i= ommu) =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: if (iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT || - iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->parent_idx !=3D -1) { + virReportError(VIR_ERR_XML_ERROR, + _("iommu model '%1$s' doesn't support some addi= tional attributes"), + virDomainIOMMUModelTypeToString(iommu->model)); + return -1; + } + break; + + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT || + 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->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3155,6 +3174,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) =20 case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_AMD: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: case VIR_DOMAIN_IOMMU_MODEL_LAST: break; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index b9230a35b4..26880b6db2 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6266,6 +6266,7 @@ smmuv3 virtio amd + smmuv3Dev @@ -6311,6 +6312,11 @@ + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 031f09b7a5..e789e8cf2c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6294,6 +6294,62 @@ qemuBuildBootCommandLine(virCommand *cmd, } =20 =20 +static virJSONValue * +qemuBuildPCISmmuv3DevDevProps(const virDomainDef *def, + const virDomainIOMMUDef *iommu) +{ + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *bus =3D NULL; + size_t i; + bool contIsPHB =3D false; + + for (i =3D 0; i < def->ncontrollers; i++) { + virDomainControllerDef *cont =3D def->controllers[i]; + if (cont->idx =3D=3D iommu->parent_idx) { + if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + const char *alias =3D cont->info.alias; + contIsPHB =3D virDomainControllerIsPSeriesPHB(cont); + + if (!alias) + return NULL; + + if (virDomainDeviceAliasIsUserAlias(alias)) { + if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI= _ROOT && + iommu->parent_idx <=3D 0) { + if (qemuDomainSupportsPCIMultibus(def)) + bus =3D g_strdup("pci.0"); + else + bus =3D g_strdup("pci"); + } else if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MO= DEL_PCIE_ROOT) { + bus =3D g_strdup("pcie.0"); + } + } else { + bus =3D g_strdup(alias); + } + break; + } + } + } + + if (!bus) + return NULL; + + if (contIsPHB && iommu->parent_idx > 0) { + char *temp_bus =3D g_strdup_printf("%s.0", bus); + g_free(bus); + bus =3D temp_bus; + } + + if (virJSONValueObjectAdd(&props, + "s:driver", "arm-smmuv3", + "s:primary-bus", bus, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); +} + + static int qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, @@ -6342,7 +6398,6 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, return 0; =20 case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - /* There is no -device for SMMUv3, so nothing to be done here */ return 0; =20 case VIR_DOMAIN_IOMMU_MODEL_AMD: @@ -6373,6 +6428,14 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, =20 return 0; =20 + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + if (!(props =3D qemuBuildPCISmmuv3DevDevProps(def, iommu))) + return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) + return -1; + + return 0; + case VIR_DOMAIN_IOMMU_MODEL_LAST: default: virReportEnumRangeError(virDomainIOMMUModel, iommu->model); @@ -7206,6 +7269,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, case VIR_DOMAIN_IOMMU_MODEL_INTEL: case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_AMD: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */ break; =20 @@ -10860,15 +10924,15 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildBootCommandLine(cmd, def) < 0) return NULL; =20 - if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) - return NULL; - if (qemuBuildGlobalControllerCommandLine(cmd, def) < 0) return NULL; =20 if (qemuBuildControllersCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 + if (qemuBuildIOMMUCommandLine(cmd, def, qemuCaps) < 0) + return NULL; + if (qemuBuildMemoryDeviceCommandLine(cmd, cfg, def, priv) < 0) return NULL; =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 96a9ca9b14..06bf4fab32 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -952,6 +952,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: case VIR_DOMAIN_IOMMU_MODEL_LAST: /* These are not PCI devices */ return 0; @@ -2378,6 +2379,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: case VIR_DOMAIN_IOMMU_MODEL_LAST: /* These are not PCI devices */ break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c7ecb467a3..aac004c544 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -5414,6 +5414,22 @@ qemuValidateDomainDeviceDefIOMMU(const virDomainIOMM= UDef *iommu, } break; =20 + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + if (!qemuDomainIsARMVirt(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("IOMMU device: '%1$s' is only supported with = ARM Virt machines"), + virDomainIOMMUModelTypeToString(iommu->model)); + return -1; + } + // TODO: Check for pluggable device SMMUv3 qemu capability + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VIRT_IOMMU)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("IOMMU device: '%1$s' is not supported with t= his QEMU binary"), + virDomainIOMMUModelTypeToString(iommu->model)); + return -1; + } + break; + case VIR_DOMAIN_IOMMU_MODEL_LAST: default: virReportEnumRangeError(virDomainIOMMUModel, iommu->model); --=20 2.43.0 From nobody Sun Oct 5 00:14:15 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; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1759365009344657.4418381625383; Wed, 1 Oct 2025 17:30:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3F260440BC; Wed, 1 Oct 2025 20:30:08 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id F34A544241; Wed, 1 Oct 2025 20:27:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F071441B06; Wed, 1 Oct 2025 20:24:09 -0400 (EDT) Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010026.outbound.protection.outlook.com [40.93.198.26]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9268341A52 for ; Wed, 1 Oct 2025 20:24:08 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by DM4PR12MB6232.namprd12.prod.outlook.com (2603:10b6:8:a5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Thu, 2 Oct 2025 00:24:02 +0000 Received: from PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb]) by PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb%6]) with mapi id 15.20.9160.015; Thu, 2 Oct 2025 00:24:02 +0000 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=ARC_SIGNED,ARC_VALID, 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 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qmp6S1pMfrIdjNH1FMrZoLo96PFsYdCzcwRGp0wNhOKICa+Qdcu+WoQ8413XpCYcTaTCyTyh6cKcS5CH8xIgS/QPgcWVGBdOsjJJQ1I5lrm0/yMUNMxxGFLWklc0zAbnADE/VqOciFBUsKTUX/oGxRMpJyuMhhSumX/kTiv1wIqIDJufUAhlUEfrIDLEKUkhCH6+LUGrZGlIeesc5+nn1LUSbALRQI6FTvkL/o9NkXMlIHHXvP9CnBPDod4Xtc9MN89n7KiKPDFUqG0JyhjPRiO1Ocx/MuEh0mO6x1hqKW5L27z+KwaBHvBwIUbnSrKW5RppJpyUZjXy3G6vSkRUXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8ijdlPvuOd3/dcUZd6cHXhVhzqZiIa3wN7nTRwNw+yA=; b=ECsagJ+eFZMySmS0JUARiXF5QR7IHwFUo0Frd26UB1I9+P4a1oZbwAFJTwf5nZSpE2idvXBMuFV8rXQAbh1hHuifKWdpVw/IIgh60m+AggqllOsdqBj5ML4c83BmhCbX/SevjiGlU+vPvhGQT5nivDSWKHs67wuaXkcpCS9acTsXratdEpUoiooEwKaG7M6FGOJkRTKD0Db9MWeF1EeJ3DoW5aklK4RtWvtrw9tNZBSwueoqykQFukhRstFyx/ZyAorMEpUlf0kiHH/twaJJEiCo7PTbJCLvmXCmYNQxwy9W90FLrMSh5bLqeoWMUbmGsKCzdVjdT6XIpA9lHlrEaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8ijdlPvuOd3/dcUZd6cHXhVhzqZiIa3wN7nTRwNw+yA=; b=L2FZRCXGFhsIImZzFqqUOicxyNf7NEkvKczc+gjmxLNl+VM1+O8FXpKKVBJVrkN02bh9ciwtGDU/qISl5gtH8m+Gv3qG+pCN9EU2rxO2iJdScl6ubAp1yLQvBU5NRv05Y4zSKBGHtLhD179j8dAL/G8Z1UQnDsvKEz/xiva5NVZDvj1SuYgN3jt8PP5ZpHHW6QFjVQJWnrKmkeyMHQIwhrWk+vKVfxI6wDXGgRitqGagOxRkGMBALw9+XRnzXTw9zxN1VSYoQBLpQGf68YWNFQ6m5oBRaRb+CEeOrSd3uJYwnyGSh1gjNai40ow/v/oEPBMeGnpaRCzRYr8fKyV7cA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v2 2/3] conf: Support multiple smmuv3Dev IOMMU devices Date: Wed, 1 Oct 2025 17:23:47 -0700 Message-ID: <20251002002348.1536936-3-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251002002348.1536936-1-nathanc@nvidia.com> References: <20251002002348.1536936-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0033.namprd05.prod.outlook.com (2603:10b6:a03:33f::8) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|DM4PR12MB6232:EE_ X-MS-Office365-Filtering-Correlation-Id: 98d02af0-095c-427c-7520-08de0149fd27 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SGcVpXnz3Vn1h0U0PnZHTNMn+vcB3JtgbISymVB+/vYb+iLurkUwu3a8NN28?= =?us-ascii?Q?+SrbBz8McQRDYXe4vlKLRJf198ZTNzaNV+idZueMJCKDiayd05shU+oxSZbJ?= =?us-ascii?Q?Z7va77jFs6L7o8H/RKSU6FMiLVeI2UNSJDTv7n+eI+LeVSvKIoyA3+/loRuV?= =?us-ascii?Q?Lkp59HzdTZV3NpBMIaKFF40DGjthjoj/bQAE36SeM67OUhH4iz1vb0j00K5V?= =?us-ascii?Q?T6Heypplboyyk74oNeUc5Al2U7AlE8zk9gwrM4RASnInb5SQMxJFzUYM9eq9?= =?us-ascii?Q?MLAClOCXTHvi550k9QmPQwxOe9NJSYtWSBCID5W2s4yXOMi9l+eov4mi58a4?= =?us-ascii?Q?7/Xy3AlUUfQX5kclIbrHW79wmdZdafoZKP6jsg4npWeHaOZv7EPPHWS5OgvB?= =?us-ascii?Q?eN/07AYEVCi5tFExhZEcR9uEyR/vzGWI180zJTnJ2Rn1t0jKmFzFuoWdagDi?= =?us-ascii?Q?JK5Xw1C26hJtiANZGyT4WAZcluCnd94ia4RRVNQs/bYf49/I7KLotMkCd+wA?= =?us-ascii?Q?m6SUYE4GCnZxYDRD79yPedT0/wYMMR+xIceHfD85NdhAtl5EBtYgB8Xa7804?= =?us-ascii?Q?Aa7NY9QExpuvFDJUwuYiUC/sURKyK/1n7TLVpEJUYuFh47jOI/SnlDoUT3VZ?= =?us-ascii?Q?uNE8i2drZO7yg7feCGhWIxuQMcywM3M3ESAJE58EWunqtgUWNBoWjiz3p7PI?= =?us-ascii?Q?SF9IU8UBeA2Mu3JeiWItZjelzUssAhPE3/dp+Sz96xF+BlCjLJ59wIZoj8K4?= =?us-ascii?Q?btiS0j3KKQS9+6klStTmx4W+hlO4j3BK3w2FzOf2eI60k1XNEvTGjbllm9OB?= =?us-ascii?Q?WaGtqjiRWdWvg+KhjlgmKyQNEpfS3WeGwvEgs2A+kDNyAAMiX9fm6b4p7gGB?= =?us-ascii?Q?AHDjgOMwCeM/VE3caQc5zct8CD+NDCcen0DELr4GjtJ5Pqt+zABnBNCuNL0D?= =?us-ascii?Q?IHNMdMuuocu3DOQ98JwFss52UVdDab04ITFpxfJQIKPX83U81DAeLloXMmDs?= =?us-ascii?Q?aUIoMl1/i1H1kItwaYo6deVKPePhMyH+pKzt5eJ39U6JdiTFUsXzeTVwYBa0?= =?us-ascii?Q?U75aoulTteF42S9chdMlIqPMmUM/vrx9rnFZG8KqBOVLnPSg09HwCJ3KleX+?= =?us-ascii?Q?ngRN8wHib5k99QKua4itRwFpUUG6Nz5kgJKwANsNF5JGUTbiJGfJA5ygrFdo?= =?us-ascii?Q?eHH4sQwrIqMyWELD9T3agW2VJweo15SjY3mEloYHn37NFpGDii6HKUQGekWg?= =?us-ascii?Q?Ve0hq03ge5Fnm3LzUBR7rgspTf6mdaEX7k/bwHlqrtN4OXzrUtz4FoEw2w7b?= =?us-ascii?Q?IixJ6fqchjhHC/tW+fC8zrMChervPeOL8aBS8LS7TiMJADg90v2c1vs3lvJY?= =?us-ascii?Q?aRKJ/o+S/b/npvQHuhQdGv4qpuPhxIFXfe2IUGuH9hCNn5o1I4k3qYZDu7iZ?= =?us-ascii?Q?56sqJQv9e8/KWl0gettHL7cl+LttSefn?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR12MB6834.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?clm9P2rMt9EQgtU0yKjGZYEZ8AyZttYGZb2i3EQekdFyhkfWPic9j4PqK67g?= =?us-ascii?Q?9oJXlGc4luAQGlTeleNwx1djnXvcc6IpX0zVAULCppteiS5Xtfifh7HsydSa?= =?us-ascii?Q?DfuS7y8WnUfhJovlZBFT5MRb01eMiSajZPNtl72sc/+Y2FEfHPYWU6f2pb/d?= =?us-ascii?Q?0KTXrWmlJOsHVrM6lWwgnmhVNmXQkR6BqfbeqJJbr82ofphZzIMiYRjHGe7s?= =?us-ascii?Q?UF2Ky0hd57Bn841zv7kXhmBt3kToNisfkUSWH/OJt/CWce+rG7kPOmwI5tTN?= =?us-ascii?Q?OsR31DlIwtsedxZN4CQL1/GMoXYXomMHsIzV+IUVcUg3habLT6QCTA5ens1r?= =?us-ascii?Q?MJ2gwV0EANt6AyiUEEQzlalt5ByU0/dyGqUaFtgscFaDX8fMrrOIlrvb6EOm?= =?us-ascii?Q?DDvA1K19hS5Xn/OA/Jou2vwtcAq2ITBK64s8PAXOsRL5eBCBII8+Oal3z85T?= =?us-ascii?Q?ZOy+fLbeBDaLPeCCMv+cTAkaknix9shOehd7JELksVzfRx8nkQgeP4PUgC5s?= =?us-ascii?Q?vnNH9Z7nNraf/4eBjQZxOnLsuI8OGd7gmNGMpmsaiNMJH0SWlCv7t4JYbvfm?= =?us-ascii?Q?sgwot01LOfTQ0DE/jE/JsX3sym1p3kr3kGL5NvIDYqIZc1+7OLmC7KAYw5Ir?= =?us-ascii?Q?oQLQETe0lpwzdGuj3wmeFHd3Py3daaJ50k7CjbjGcHE8ZgGmzzirOTX56a6m?= =?us-ascii?Q?oxjcfruPQn62iTpt9t8WvnaoliBl4zmQeOyWFbGdIS4eXXtVYmhH3UGAbNI2?= =?us-ascii?Q?j/GROfpwZRDpHQoEpJVLNyt1bB0FcKodtZygoTfzDnzaFvS5RNUN9kwGk7Qk?= =?us-ascii?Q?93xTzSs2LQvriQlADtpI1m6l4tSPeC5elkKFmTiMG9IdXtQCepKaHPN/Cvs2?= =?us-ascii?Q?cfsMlV2a8wNWDHof/+O9qF75A+bypoQJhH2vwElw7SXZCkt2ZWwYb78YKjar?= =?us-ascii?Q?Dbjesg2/94jQd1QlR2PYWqhEt9PD0NhJjITzkN3J3SkKWSFam+U81nwhzqwE?= =?us-ascii?Q?5EJhLolLifgRNMlrCtCK7+c2ASj+heAMlMi38uJy9SrFUTi6eVg87yNE89Cq?= =?us-ascii?Q?3KFnR77+s1bw0acGMSDMfx2hQ3DM3Ch7iTp+R63G/yVflHMQj3g128Mz+07y?= =?us-ascii?Q?AZ84PAPLrQ0IhlAbgGMPt6cu6ruYwhRBFN8ZDyOisy3H08j2NzdOTJcdulok?= =?us-ascii?Q?TqSzA1/i6NwMCodHe7KNU4YEFf4XcE5A/vRgWBLZZkTIehPYuoKLCQ6/LbMh?= =?us-ascii?Q?QjbXW5+WWeyc7aY7efAuw8WWh1pf8BIAKRkjfPqFhFnnZP1WFVsrk8tcme2P?= =?us-ascii?Q?cs3MlqzoIi0NeMqPqWkj4ZJSvEDVt7YTg9RspOvyi6GTFBwudJlGZk/zb4r3?= =?us-ascii?Q?Ub8RGbNTC756NyArLKEToG2LXUfYmmubHkL/Ynx2xVAVF2JPVNVh7oeGYv4X?= =?us-ascii?Q?9UM1LGUkisZZiPQWvyJduwnjF3K0N69+Bj+zg9htyVl0ZFFWzeDpwmNFUdyQ?= =?us-ascii?Q?xO9Ucy7ioRlqyHgxUGLF3DxYZUJ2fRF9Y7DEk+lr/SJNOd9emyZcwirFvBxR?= =?us-ascii?Q?uLuZavj5iuDcYFcTD4HrtlXvbFvEU3fT9NeafB00?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98d02af0-095c-427c-7520-08de0149fd27 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2025 00:24:02.6220 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F4/ZMNCWFRvu22BnAVgwILIq5w9VHdyyhkSy48VRW6RvIm/c8I8Z/NRiP4LD5XSkNfGtk/dfFZWEkVSP62nBdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6232 Message-ID-Hash: NAMAAPUGEF6ZB2DKVI52C7WGEXL4OWSS X-Message-ID-Hash: NAMAAPUGEF6ZB2DKVI52C7WGEXL4OWSS X-MailFrom: nathanc@nvidia.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 CC: shameerali.kolothum.thodi@huawei.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com 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: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1759365012138116600 Content-Type: text/plain; charset="utf-8" Add support for parsing multiple IOMMU devices from the VM definition when "smmuv3Dev" is the IOMMU model. Signed-off-by: Nathan Chen --- src/conf/domain_conf.c | 84 +++++++++++++---- src/conf/domain_conf.h | 9 +- src/conf/domain_validate.c | 32 ++++--- src/conf/schemas/domaincommon.rng | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 15 ++- src/qemu/qemu_command.c | 146 ++++++++++++++++-------------- src/qemu/qemu_domain_address.c | 35 +++---- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 11 ++- src/qemu/qemu_validate.c | 2 +- 11 files changed, 215 insertions(+), 133 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d1adb831d..1c2cf9a2d9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4134,7 +4134,8 @@ void virDomainDefFree(virDomainDef *def) virDomainCryptoDefFree(def->cryptos[i]); g_free(def->cryptos); =20 - virDomainIOMMUDefFree(def->iommu); + for (i =3D 0; i < def->niommus; i++) + virDomainIOMMUDefFree(def->iommu[i]); =20 virDomainPstoreDefFree(def->pstore); =20 @@ -5006,9 +5007,9 @@ virDomainDeviceInfoIterateFlags(virDomainDef *def, } =20 device.type =3D VIR_DOMAIN_DEVICE_IOMMU; - if (def->iommu) { - device.data.iommu =3D def->iommu; - if ((rc =3D cb(def, &device, &def->iommu->info, opaque)) !=3D 0) + for (i =3D 0; i < def->niommus; i++) { + device.data.iommu =3D def->iommu[i]; + if ((rc =3D cb(def, &device, &def->iommu[i]->info, opaque)) !=3D 0) return rc; } =20 @@ -16487,6 +16488,43 @@ virDomainInputDefFind(const virDomainDef *def, } =20 =20 +bool +virDomainIOMMUDefEquals(const virDomainIOMMUDef *a, + const virDomainIOMMUDef *b) +{ + if (a->model !=3D b->model || + a->intremap !=3D b->intremap || + a->caching_mode !=3D b->caching_mode || + a->eim !=3D b->eim || + a->iotlb !=3D b->iotlb || + a->aw_bits !=3D b->aw_bits || + a->parent_idx !=3D b->parent_idx || + a->dma_translation !=3D b->dma_translation) + return false; + + if (a->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info)) + return false; + + return true; +} + + +ssize_t +virDomainIOMMUDefFind(const virDomainDef *def, + const virDomainIOMMUDef *iommu) +{ + size_t i; + + for (i =3D 0; i < def->niommus; i++) { + if (virDomainIOMMUDefEquals(iommu, def->iommu[i])) + return i; + } + + return -1; +} + + bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) @@ -20154,19 +20192,28 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, } VIR_FREE(nodes); =20 + /* analysis of iommu devices */ if ((n =3D virXPathNodeSet("./devices/iommu", ctxt, &nodes)) < 0) return NULL; =20 - if (n > 1) { + if (n > 1 && !virXPathBoolean("./devices/iommu/@model =3D 'smmuv3Dev'"= , ctxt)) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("only a single IOMMU device is supported")); + _("multiple IOMMU devices are only supported with m= odel smmuv3Dev")); return NULL; } =20 - if (n > 0) { - if (!(def->iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[0], - ctxt, flags))) + if (n > 0) + def->iommu =3D g_new0(virDomainIOMMUDef *, n); + + for (i =3D 0; i < n; i++) { + virDomainIOMMUDef *iommu; + + iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[i], ctxt, flags); + + if (!iommu) return NULL; + + def->iommu[def->niommus++] =3D iommu; } VIR_FREE(nodes); =20 @@ -22619,15 +22666,17 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *= src, goto error; } =20 - if (!!src->iommu !=3D !!dst->iommu) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Target domain IOMMU device count does not match = source")); + if (src->niommus !=3D dst->niommus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device count %1$zu does not = match source %2$zu"), + dst->niommus, src->niommus); goto error; } =20 - if (src->iommu && - !virDomainIOMMUDefCheckABIStability(src->iommu, dst->iommu)) - goto error; + for (i =3D 0; i < src->niommus; i++) { + if (!virDomainIOMMUDefCheckABIStability(src->iommu[i], dst->iommu[= i])) + goto error; + } =20 if (!!src->vsock !=3D !!dst->vsock) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -29464,8 +29513,9 @@ virDomainDefFormatInternalSetRootName(virDomainDef = *def, for (n =3D 0; n < def->ncryptos; n++) { virDomainCryptoDefFormat(buf, def->cryptos[n], flags); } - if (def->iommu) - virDomainIOMMUDefFormat(buf, def->iommu); + + for (n =3D 0; n < def->niommus; n++) + virDomainIOMMUDefFormat(buf, def->iommu[n]); =20 if (def->vsock) virDomainVsockDefFormat(buf, def->vsock); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1d0c94a00a..f830fe5226 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3297,6 +3297,9 @@ struct _virDomainDef { size_t nwatchdogs; virDomainWatchdogDef **watchdogs; =20 + size_t niommus; + virDomainIOMMUDef **iommu; + /* At maximum 2 TPMs on the domain if a TPM Proxy is present. */ size_t ntpms; virDomainTPMDef **tpms; @@ -3306,7 +3309,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4311,6 +4313,11 @@ virDomainShmemDef *virDomainShmemDefRemove(virDomain= Def *def, size_t idx) ssize_t virDomainInputDefFind(const virDomainDef *def, const virDomainInputDef *input) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +bool virDomainIOMMUDefEquals(const virDomainIOMMUDef *a, + const virDomainIOMMUDef *b); +ssize_t virDomainIOMMUDefFind(const virDomainDef *def, + const virDomainIOMMUDef *iommu) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 8a599fdbc6..588ecdaa20 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1851,21 +1851,31 @@ virDomainDefCputuneValidate(const virDomainDef *def) static int virDomainDefIOMMUValidate(const virDomainDef *def) { + size_t i; + if (!def->iommu) return 0; =20 - if (def->iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON && - def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPIC_QE= MU) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOMMU interrupt remapping requires split I/O API= C (ioapic driver=3D'qemu')")); - return -1; - } + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommu[i]; + if (def->niommus > 1 && iommu->model !=3D VIR_DOMAIN_IOMMU_MODEL_S= MMUV3_DEV) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("IOMMU model smmuv3Dev must be specified for = multiple IOMMU definitions")); + } =20 - if (def->iommu->eim =3D=3D VIR_TRISTATE_SWITCH_ON && - def->iommu->intremap !=3D VIR_TRISTATE_SWITCH_ON) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOMMU eim requires interrupt remapping to be ena= bled")); - return -1; + if (iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON && + def->features[VIR_DOMAIN_FEATURE_IOAPIC] !=3D VIR_DOMAIN_IOAPI= C_QEMU) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOMMU interrupt remapping requires split I/O= APIC (ioapic driver=3D'qemu')")); + return -1; + } + + if (iommu->eim =3D=3D VIR_TRISTATE_SWITCH_ON && + iommu->intremap !=3D VIR_TRISTATE_SWITCH_ON) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOMMU eim requires interrupt remapping to be= enabled")); + return -1; + } } =20 return 0; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 26880b6db2..b9c00e98a5 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6959,9 +6959,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fe72402527..34d9c263d4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -491,6 +491,8 @@ virDomainInputSourceGrabToggleTypeToString; virDomainInputSourceGrabTypeFromString; virDomainInputSourceGrabTypeToString; virDomainInputTypeToString; +virDomainIOMMUDefEquals; +virDomainIOMMUDefFind; virDomainIOMMUDefFree; virDomainIOMMUDefNew; virDomainIOMMUModelTypeFromString; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a27c688d79..5f2b11b9a6 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -647,10 +647,14 @@ qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock) =20 =20 static void -qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu) +qemuAssignDeviceIOMMUAlias(virDomainDef *def, + virDomainIOMMUDef **iommu) { - if (!iommu->info.alias) - iommu->info.alias =3D g_strdup("iommu0"); + size_t i; + for (i =3D 0; i < def->niommus; i++) { + if (!iommu[i]->info.alias) + iommu[i]->info.alias =3D g_strdup_printf("iommu%zu", i); + } } =20 =20 @@ -766,8 +770,9 @@ qemuAssignDeviceAliases(virDomainDef *def) if (def->vsock) { qemuAssignDeviceVsockAlias(def->vsock); } - if (def->iommu) - qemuAssignDeviceIOMMUAlias(def->iommu); + if (def->iommu && def->niommus > 0) { + qemuAssignDeviceIOMMUAlias(def, def->iommu); + } for (i =3D 0; i < def->ncryptos; i++) { qemuAssignDeviceCryptoAlias(def, def->cryptos[i]); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e789e8cf2c..15ae919047 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6296,10 +6296,12 @@ qemuBuildBootCommandLine(virCommand *cmd, =20 static virJSONValue * qemuBuildPCISmmuv3DevDevProps(const virDomainDef *def, - const virDomainIOMMUDef *iommu) + const virDomainIOMMUDef *iommu, + size_t id) { g_autoptr(virJSONValue) props =3D NULL; g_autofree char *bus =3D NULL; + g_autofree char *smmuv3_id =3D NULL; size_t i; bool contIsPHB =3D false; =20 @@ -6340,9 +6342,12 @@ qemuBuildPCISmmuv3DevDevProps(const virDomainDef *de= f, bus =3D temp_bus; } =20 + smmuv3_id =3D g_strdup_printf("smmuv3.%zu", id); + if (virJSONValueObjectAdd(&props, "s:driver", "arm-smmuv3", "s:primary-bus", bus, + "s:id", smmuv3_id, NULL) < 0) return NULL; =20 @@ -6355,91 +6360,92 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, virQEMUCaps *qemuCaps) { + size_t i; g_autoptr(virJSONValue) props =3D NULL; g_autoptr(virJSONValue) wrapperProps =3D NULL; - const virDomainIOMMUDef *iommu =3D def->iommu; - - if (!iommu) + if (!def->iommu || def->niommus <=3D 0) return 0; =20 - switch (iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_INTEL: - if (virJSONValueObjectAdd(&props, - "s:driver", "intel-iommu", - "s:id", iommu->info.alias, - "S:intremap", qemuOnOffAuto(iommu->intre= map), - "T:caching-mode", iommu->caching_mode, - "S:eim", qemuOnOffAuto(iommu->eim), - "T:device-iotlb", iommu->iotlb, - "z:aw-bits", iommu->aw_bits, - "T:dma-translation", iommu->dma_translat= ion, - NULL) < 0) - return -1; + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommu[i]; + switch (iommu->model) { + case VIR_DOMAIN_IOMMU_MODEL_INTEL: + if (virJSONValueObjectAdd(&props, + "s:driver", "intel-iommu", + "s:id", iommu->info.alias, + "S:intremap", qemuOnOffAuto(iommu->i= ntremap), + "T:caching-mode", iommu->caching_mod= e, + "S:eim", qemuOnOffAuto(iommu->eim), + "T:device-iotlb", iommu->iotlb, + "z:aw-bits", iommu->aw_bits, + "T:dma-translation", iommu->dma_tran= slation, + NULL) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - return 0; + return 0; + case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: + if (virJSONValueObjectAdd(&props, + "s:driver", "virtio-iommu", + "s:id", iommu->info.alias, + NULL) < 0) { + return -1; + } =20 - case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: - if (virJSONValueObjectAdd(&props, - "s:driver", "virtio-iommu", - "s:id", iommu->info.alias, - NULL) < 0) { - return -1; - } + if (qemuBuildDeviceAddressProps(props, def, &iommu->info) < 0) + return -1; =20 - if (qemuBuildDeviceAddressProps(props, def, &iommu->info) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + return 0; + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + /* There is no -device for SMMUv3, so nothing to be done here = */ + return 0; =20 - return 0; + case VIR_DOMAIN_IOMMU_MODEL_AMD: + if (virJSONValueObjectAdd(&wrapperProps, + "s:driver", "AMDVI-PCI", + "s:id", iommu->info.alias, + NULL) < 0) + return -1; =20 - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - return 0; + if (qemuBuildDeviceAddressProps(wrapperProps, def, &iommu->inf= o) < 0) + return -1; =20 - case VIR_DOMAIN_IOMMU_MODEL_AMD: - if (virJSONValueObjectAdd(&wrapperProps, - "s:driver", "AMDVI-PCI", - "s:id", iommu->info.alias, - NULL) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, wrapperProps, def,= qemuCaps) < 0) + return -1; =20 - if (qemuBuildDeviceAddressProps(wrapperProps, def, &iommu->info) <= 0) - return -1; + if (virJSONValueObjectAdd(&props, + "s:driver", "amd-iommu", + "s:pci-id", iommu->info.alias, + "S:intremap", qemuOnOffAuto(iommu->i= ntremap), + "T:pt", iommu->pt, + "T:xtsup", iommu->xtsup, + "T:device-iotlb", iommu->iotlb, + NULL) < 0) + return -1; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, wrapperProps, def, qem= uCaps) < 0) - return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - if (virJSONValueObjectAdd(&props, - "s:driver", "amd-iommu", - "s:pci-id", iommu->info.alias, - "S:intremap", qemuOnOffAuto(iommu->intre= map), - "T:pt", iommu->pt, - "T:xtsup", iommu->xtsup, - "T:device-iotlb", iommu->iotlb, - NULL) < 0) - return -1; + return 0; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + if (!(props =3D qemuBuildPCISmmuv3DevDevProps(def, iommu, i))) + return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; + break; =20 - return 0; =20 - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: - if (!(props =3D qemuBuildPCISmmuv3DevDevProps(def, iommu))) - return -1; - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) + case VIR_DOMAIN_IOMMU_MODEL_LAST: + default: + virReportEnumRangeError(virDomainIOMMUModel, iommu->model); return -1; - - return 0; - - case VIR_DOMAIN_IOMMU_MODEL_LAST: - default: - virReportEnumRangeError(virDomainIOMMUModel, iommu->model); - return -1; + } } =20 return 0; @@ -7260,8 +7266,8 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (qemuAppendDomainFeaturesMachineParam(&buf, def, qemuCaps) < 0) return -1; =20 - if (def->iommu) { - switch (def->iommu->model) { + if (def->iommu && def->niommus =3D=3D 1) { + switch (def->iommu[0]->model) { case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: virBufferAddLit(&buf, ",iommu=3Dsmmuv3"); break; @@ -7275,7 +7281,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, =20 case VIR_DOMAIN_IOMMU_MODEL_LAST: default: - virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); + virReportEnumRangeError(virDomainIOMMUModel, def->iommu[0]->mo= del); return -1; } } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 06bf4fab32..2ddc629304 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2365,24 +2365,25 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* Nada - none are PCI based (yet) */ } =20 - if (def->iommu) { - virDomainIOMMUDef *iommu =3D def->iommu; - - switch (iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: - case VIR_DOMAIN_IOMMU_MODEL_AMD: - if (virDeviceInfoPCIAddressIsWanted(&iommu->info) && - qemuDomainPCIAddressReserveNextAddr(addrs, &iommu->info) <= 0) { - return -1; - } - break; + if (def->iommu && def->niommus > 0) { + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommu[i]; + switch (iommu->model) { + case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: + case VIR_DOMAIN_IOMMU_MODEL_AMD: + if (virDeviceInfoPCIAddressIsWanted(&iommu->info) && + qemuDomainPCIAddressReserveNextAddr(addrs, &iommu->inf= o) < 0) { + return -1; + } + break; =20 - case VIR_DOMAIN_IOMMU_MODEL_INTEL: - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: - case VIR_DOMAIN_IOMMU_MODEL_LAST: - /* These are not PCI devices */ - break; + case VIR_DOMAIN_IOMMU_MODEL_INTEL: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + case VIR_DOMAIN_IOMMU_MODEL_LAST: + /* These are not PCI devices */ + break; + } } } =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ac72ea5cb0..3d65f78c9e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6894,12 +6894,12 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_IOMMU: - if (vmdef->iommu) { + if (vmdef->iommu && vmdef->niommus > 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain already has an iommu device")); return -1; } - vmdef->iommu =3D g_steal_pointer(&dev->data.iommu); + VIR_APPEND_ELEMENT(vmdef->iommu, vmdef->niommus, dev->data.iommu); break; =20 case VIR_DOMAIN_DEVICE_VIDEO: @@ -7113,12 +7113,12 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_IOMMU: - if (!vmdef->iommu) { + if ((idx =3D virDomainIOMMUDefFind(vmdef, dev->data.iommu)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("matching iommu device not found")); return -1; } - g_clear_pointer(&vmdef->iommu, virDomainIOMMUDefFree); + VIR_DELETE_ELEMENT(vmdef->iommu, idx, vmdef->niommus); break; =20 case VIR_DOMAIN_DEVICE_VIDEO: diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 9c2427970d..e2744a4a61 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1503,7 +1503,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } } =20 - if (addIOMMU && !def->iommu && + if (addIOMMU && !def->iommu && def->niommus =3D=3D 0 && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_INTREMAP) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_INTEL_IOMMU_EIM)) { @@ -1515,7 +1515,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, iommu->intremap =3D VIR_TRISTATE_SWITCH_ON; iommu->eim =3D VIR_TRISTATE_SWITCH_ON; =20 - def->iommu =3D g_steal_pointer(&iommu); + def->iommu =3D g_new0(virDomainIOMMUDef *, 1); + def->iommu[def->niommus++] =3D g_steal_pointer(&iommu); } =20 if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0) @@ -1591,9 +1592,9 @@ qemuDomainDefEnableDefaultFeatures(virDomainDef *def, * domain already has IOMMU without inremap. This will be fixed in * qemuDomainIOMMUDefPostParse() but there domain definition can't be * modified so change it now. */ - if (def->iommu && - (def->iommu->intremap =3D=3D VIR_TRISTATE_SWITCH_ON || - qemuDomainNeedsIOMMUWithEIM(def)) && + if (def->iommu && def->niommus =3D=3D 1 && + (def->iommu[0]->intremap =3D=3D VIR_TRISTATE_SWITCH_ON || + qemuDomainNeedsIOMMUWithEIM(def)) && def->features[VIR_DOMAIN_FEATURE_IOAPIC] =3D=3D VIR_DOMAIN_IOAPIC_= NONE) { def->features[VIR_DOMAIN_FEATURE_IOAPIC] =3D VIR_DOMAIN_IOAPIC_QEM= U; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index aac004c544..bdaeefe976 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -851,7 +851,7 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def,= virQEMUCaps *qemuCaps) QEMU_MAX_VCPUS_WITHOUT_EIM); return -1; } - if (!def->iommu || def->iommu->eim !=3D VIR_TRISTATE_SWITCH_ON) { + if (!def->iommu || def->iommu[0]->eim !=3D VIR_TRISTATE_SWITCH_ON)= { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("more than %1$d vCPUs require extended interr= upt mode enabled on the iommu device"), QEMU_MAX_VCPUS_WITHOUT_EIM); --=20 2.43.0 From nobody Sun Oct 5 00:14:15 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; arc=fail (Bad Signature); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1759364929179939.579502427728; Wed, 1 Oct 2025 17:28:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D7DCE41A09; Wed, 1 Oct 2025 20:28:47 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 296CA440C1; Wed, 1 Oct 2025 20:26:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9E71C41A52; Wed, 1 Oct 2025 20:24:07 -0400 (EDT) Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010006.outbound.protection.outlook.com [40.93.198.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C1DB141B06 for ; Wed, 1 Oct 2025 20:24:06 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by DM4PR12MB6232.namprd12.prod.outlook.com (2603:10b6:8:a5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Thu, 2 Oct 2025 00:24:04 +0000 Received: from PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb]) by PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb%6]) with mapi id 15.20.9160.015; Thu, 2 Oct 2025 00:24:04 +0000 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=ARC_SIGNED,ARC_VALID, 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 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qjurC/OiqW4rcEZ4R2F66vZrLoA69bxK08WMms0iQ0XIw87H8xSHyFT5cUGNe+kC1NxKIl5PtguYes/0IMdFDhBLVUs6PP0etJ2HjdVDJA4/yA2eQmvuvei96bj/bXXainUd9moAX4Ixp6mx8N8FbVX28N95LNlq7Rl7ghHwKLv0pTEi2bQckc7IQIGrU/QH0Rys7+yJkqBRcjfp/9IuqD6+094l4w1Kfx7S0yyEVh1LTH+z48AsQZQTtI6FllriwgYs8MHcdwSsp7dGdizq7Xm93P0L59g9CQ5WJ/dlud+TorveES1Fgi4ZvN/ZhPrhdcBnKaqE0U60sMSQB0trbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a/NZ9cAD3Aqj6tEySMeYUwZ/WvXk1ofo7m/smdEyAcE=; b=e6u0l1R7PR5JRenmh51An+cooy3DeiyVnE9UAD1WMHNB27KR8Tk4AFcaQP8CU8kO+kjs1EzVjDyypdjt0fHELgdaBgGvMKfpBcoNDCe7WBmAK+fiyjAEL2FEJgEvYsPhNBjKKRWz2W4oOx/g66IiV7aGZWov0ENHSecTAeMicUTd9DDHT/078zFs9cVxwhtMBib2H4edRDyrtzPF9MPl9cUb3jkD7BrYbXxImVnrRt1mrVHuk35vCza58Qg8MFnSf5twDY5CxVOJcxtXPEmeiG3Ue5QkrOeLYAkIZBUoDsCoq2JSRTLWGNub/bpuwP0Xw8qwlGKzdxUtwdA0gv4yFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a/NZ9cAD3Aqj6tEySMeYUwZ/WvXk1ofo7m/smdEyAcE=; b=W0jLNClHr9W5GJ0QAx/CeKUnp7L9LM5k/RSt9RT8lfh1zcuA7wMuFR6MZYzqDf7IX0NhUiwP1xNzNPuNwQaD+Z/ds+nP1QBgeOG7xxl/0X9S6kjXQimNbPBkMBX/xEkKnKj+aYZYIGO3Aud7mBS8pTaJsq4A9T0dbV5ZARgXn18CkiHystSqh44D3HWKnZPE4A+KDS8BtvG/ajahv5jI7ttt1Lxue/wUj1Le/VaZZYW5zk5iWFfDBss5rCYuKygpny/TocLbv3EEL1GXAECVmXx5L4SVj6xxPuyQaY9ez/EsUfpGfPldC5QUf4Dk80yoMVjQddazzzQZd0zEOMJG0g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH v2 3/3] tests: qemuxmlconfdata: provide smmuv3Dev sample XML and CLI args Date: Wed, 1 Oct 2025 17:23:48 -0700 Message-ID: <20251002002348.1536936-4-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251002002348.1536936-1-nathanc@nvidia.com> References: <20251002002348.1536936-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0040.namprd05.prod.outlook.com (2603:10b6:a03:33f::15) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|DM4PR12MB6232:EE_ X-MS-Office365-Filtering-Correlation-Id: 210ad4fd-54fa-4b9b-0c1c-08de0149fe1c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?C06KbN3yIbnUOjFHdjyHRwm0eI0lR8iTnIzmcypDOnOvh53Zq5bTAqm4QvEN?= =?us-ascii?Q?NJXpWVRpqxOgQzKpLU4bIaHyUtD+gqRuSeCpjfj35oCnhV4+MKcaoH4ffUMw?= =?us-ascii?Q?MRx8oWsfTdqOyzCoFUarmkLtw0tHXbHI0Xi5rs4NSVs7xgX+2SwbfnVnTiwE?= =?us-ascii?Q?5FdSyh62LOa606/CJet/bh1OflEfp2F5M79bw6qm4B0ECYMeUfIY61uLN2dO?= =?us-ascii?Q?n+He9xnIAfsaUFqMgjXc+QXRV/sXdLbWri5WEgwDBOQ3b2FkkxmnF3AQYpk4?= =?us-ascii?Q?/12w3HhGpkEqGXNx0PX/veILMsH4LrwdkUk0DyX1LvXXNNmJJqxHCpMith0C?= =?us-ascii?Q?8lBhZpRyVgsEVUSEdZlv0LHCWhixePB88EwsFgS3vYBU/qlCukT/TrvArMLw?= =?us-ascii?Q?T0cckILF/Urp2NlP1P7cbUiG3yxsRYhEh5DU2NWh7M8z+BT3kqFpKESESyp0?= =?us-ascii?Q?rnZziMpB+GsNuvxJQ3DbSCM/frzp1diuHxWNGlm1atyZ7d+MGBtln0Rpy9cf?= =?us-ascii?Q?+1tm+GkvHteL6ShGN3W8zGFiNhxAS/uTfMRizrbMvOp0oe8njSsF01sY9JQx?= =?us-ascii?Q?9EfcQs4Ph28AY7cE8XcIulKysAVUu0dg3S+76EHGYoWBsVkIMq/DstsvPzBr?= =?us-ascii?Q?+PvoYBpp7T8gElqEtcQZe63N0Y1YEA8/4y0GzNAuwPzQHH/Lz6Oug3Cpc5bG?= =?us-ascii?Q?nWgitZg0sBCNkJKn2esTHTBRcRbG5S/h7VdR6MmcShw3mf3UW6McwKh4jPp+?= =?us-ascii?Q?ByndalCI7N2fm7veiyzsTfiqmAnNpFHg89+x3KX6UuMZWssjV8f9ztrkr6FD?= =?us-ascii?Q?7vJ6k4xuQCOr329dS5LOBJujNqr59TCrXC0gYY60lCY9zmKZRI8DyuU8BW5h?= =?us-ascii?Q?lNWO6tLMYCSTfcgC8mut+uE7757GW2PcnmxOYVinAbOxFaoB4csIRhTy8NVC?= =?us-ascii?Q?gXNmW1uuu/glVtxd0IkaQ95jFLlskrYXR/Ol4aIjiro4OJ53uApNBgkGIMPG?= =?us-ascii?Q?0v6VF2Q/9a3Tt0HMGWJxQArXmDidxg+J0UEveYJlIca+44kfXZJBAPjk80eo?= =?us-ascii?Q?BxFohQK+8lcQNDeY8E+GIo270wToL6+olLH1yeKU+GYFCxlAHNc64SNSCABa?= =?us-ascii?Q?hooR7/5YQjPzGUiMsOq7PwOPLZxK4jdZryzoTBEIDolESB2KAFw9yZeCtlvN?= =?us-ascii?Q?avNT8j+P+3jWUgv9sN6CB+0XKJT0CLcZpO7dwKjEj3cYxLLf/iwGlAu6mviU?= =?us-ascii?Q?6qJEtlvRQKWqQ8SPs6ryfod4bgaPu2W5LSI3d+VIX8RBpOUUaRLilmkK6yf7?= =?us-ascii?Q?nCY6ihzhKFOBhQzRP3w+d/IP1VD6eBPYbPxhyY5Q1BdSdqc+yC4dQrZRqH5h?= =?us-ascii?Q?/sWQjSOpW3H9whp+W/mO7OfW59DvFNo4fIVo87lYsVm+idnLcxNzfYt5IeuM?= =?us-ascii?Q?q1Fm2Wn/1/Y7JjhdkqcShDOetgH136Sb?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR12MB6834.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3Vm4tigDmj/OYYUroocBJx3m3TSgCOEyxe8GmwjPZEY3IpOEQZ/SoiqcY3aB?= =?us-ascii?Q?jY5CZoiyFLc1yLfNeT49+wz+szPz1B9KDsqwjYzNfK4kpvYWox9ik5kBXomX?= =?us-ascii?Q?6Mg3l1/5vMsRDsajNvyG3RyDsgcw9ppcWeENZ15t4zM/sWd9s5FCIgIpmlv3?= =?us-ascii?Q?K+LrFdFp0lLg4Wj4Q/tAD1qsmcnm5Jr/quNHvrcmJWVGNvOvHuaR/DTUtnu3?= =?us-ascii?Q?cZUUA8h3ccjQWeeMXmvMO2sx5n5jmlhafn8R7f6FRONNZaQzh+FojdvvTxUv?= =?us-ascii?Q?xtXQWQ9w76jehYkOnE11sLxC/nDfDjb9sS9a0ZLLYhCHvXb7O61ebBBS8zDi?= =?us-ascii?Q?xaDjLgE+g7X4Tg03gOuzwPuRN9q5mhzYF0GzfWXNmsjvIK9gp31UFITYEcP0?= =?us-ascii?Q?Xdt3zb1Mp/p7mCfRlHrYXYRjveSXtrN/YixWQIHRau/RhN4gN/1EW+XNJZI/?= =?us-ascii?Q?c0i4puMyzt2729VKecDTVI67EPD/D16lARN4Ux7F3MbctqhGqY3u0Od3yQlu?= =?us-ascii?Q?lp2cbpgfTfWVD/AyIXQKo87Us03SczRHegz8DPbSdTkXjocx+YSFkv9n4rsr?= =?us-ascii?Q?bXC1Xron/mho8gL+HfGmTqu5jS+t6V4SFxbrVDzLaC7gKwrQOxnnc+LuRS4g?= =?us-ascii?Q?PysksdLUxi77esFAZZ5U7IFpInRorJ0g3rW/KzyGHoUpaEcQRAJupBlKdJ4i?= =?us-ascii?Q?D8h+wNreAZrTeuweIO+THxOwaXAa55k8bMfKsQs2Y9U2vTCHqmUDnvpb68z8?= =?us-ascii?Q?h3FomgrYerpoQBJPHmjftHTVqCkEDBigt+xF6WjsxsHssze8zJ9cKwoKL1Md?= =?us-ascii?Q?cZabQ23g09f4wTg6eJPfCpwvOTDuut0RvkffWvHW5X4y+IYlzj71nOzD/3H9?= =?us-ascii?Q?PiXQ71bZMB2hUeJutlXT7d0e/raYiOs/daPV5SGiLk6WRm+CNa7Rx9/XskfT?= =?us-ascii?Q?xabTwonHtXo1NTM/E3D75m5MxAi14H5vbKmVnOY/oN6BoBDms00v3jnpJexw?= =?us-ascii?Q?APeSBxmMJNRC1raWKJvvAXkb+AetTZJPeGDDg5T7BBdfTzuo8qtbrp+C14F/?= =?us-ascii?Q?gKlajYZ+RV2iMcomkIk0pYnNE78ZWCyh0wdVprk0vzBDbzEgxMnxCtpV+a/h?= =?us-ascii?Q?Yg00UOC/w/6Gbp9uhVszWhWxsFlAIcmg/YmFXK7u/qZ7jAQ+WRIJC3jmHWDv?= =?us-ascii?Q?gAcNWvrbJ5zDSZhw4xO1EIIPKR2XKs87HRASvGDHdVVK2tI4RZcftkTw3nkm?= =?us-ascii?Q?Y05qiaZhP6skviM1qPEwaGtI/cgbsQm+5/l11nqZnYvwcGrwWwd7157QVfYD?= =?us-ascii?Q?IuovjtMbzq9dEtbAtUwBa+urHchzpXU6oYi2rTC9PueJokfzTIknNW9BU/h4?= =?us-ascii?Q?fpQLe5D/DmR8pBueMQ00teTZ7Ihnx/zaDE4skj+aX5wanBimY1YqIHANt0dv?= =?us-ascii?Q?PkyusTppBdhr0mQUlXVvooBBRDX4AQN6WW5B+fgkrwqUzHdfXFcTAwdSqH5C?= =?us-ascii?Q?sywiBUrwINStSsSPPIgT54JVpd30FsUcU5kX6u1LGGorjqcG4RBhGytlBP/p?= =?us-ascii?Q?fpldqX9go/Llp36Ua//AyDZlNGc2Li7zImbrf5UM?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 210ad4fd-54fa-4b9b-0c1c-08de0149fe1c X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2025 00:24:04.1835 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UW70PnJCtIDJekHgERoQblWi57yH2z5hcomIWaLzPkVfkKo9gbmA1udMLjpXT24eZRCvZXqqiE6Q7fjj/3hIXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6232 Message-ID-Hash: RADQBRGK2GLR5K2ALCMQ6V4CS4IRKKMR X-Message-ID-Hash: RADQBRGK2GLR5K2ALCMQ6V4CS4IRKKMR X-MailFrom: nathanc@nvidia.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 CC: shameerali.kolothum.thodi@huawei.com, nicolinc@nvidia.com, nathanc@nvidia.com, mochs@nvidia.com 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: Nathan Chen via Devel Reply-To: Nathan Chen X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1759364930825116600 Content-Type: text/plain; charset="utf-8" Provide sample XML and CLI args for the smmuv3Dev XML schema for virt machine type. Signed-off-by: Nathan Chen --- .../iommu-smmuv3Dev.aarch64-latest.args | 41 ++++++++++++ .../iommu-smmuv3Dev.aarch64-latest.xml | 62 +++++++++++++++++++ tests/qemuxmlconfdata/iommu-smmuv3Dev.xml | 49 +++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 153 insertions(+) create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.ar= gs create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3Dev.xml diff --git a/tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.args b/te= sts/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.args new file mode 100644 index 0000000000..092fcf4623 --- /dev/null +++ b/tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.args @@ -0,0 +1,41 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,acpi=3Doff \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"pxb-pcie","bus_nr":252,"id":"pci.1","bus":"pcie.0","ad= dr":"0x1"}' \ +-device '{"driver":"pxb-pcie","bus_nr":248,"id":"pci.2","bus":"pcie.0","ad= dr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":0,"chassis":21,"id":"pci.3","bu= s":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":168,"chassis":22,"id":"pci.4","= bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"arm-smmuv3","primary-bus":"pci.1","id":"smmuv3.0"}' \ +-device '{"driver":"arm-smmuv3","primary-bus":"pci.2","id":"smmuv3.1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .3","addr":"0x0"}' \ +-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/urandom"= }' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci= .4","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.xml b/tes= ts/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.xml new file mode 100644 index 0000000000..dec29c245f --- /dev/null +++ b/tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.xml @@ -0,0 +1,62 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 1048576 + 1048576 + 1 + + hvm + + + + + + + cortex-a15 + + + destroy + restart + destroy + + /usr/bin/qemu-system-aarch64 + + + + + +
+ + + + +
+ + + + +
+ + + + +
+ +