From nobody Fri Nov 21 10:09:38 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 1763603425794912.8610275313251; Wed, 19 Nov 2025 17:50:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id CC94143DC1; Wed, 19 Nov 2025 20:50:24 -0500 (EST) Received: from [172.19.199.50] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5EAFC441ED; Wed, 19 Nov 2025 20:46:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id E36CE41ADB; Wed, 19 Nov 2025 20:42:53 -0500 (EST) Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012008.outbound.protection.outlook.com [40.107.209.8]) (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 BAE6D43FC7 for ; Wed, 19 Nov 2025 20:42:51 -0500 (EST) Received: from SN7SPRMB0025.namprd12.prod.outlook.com (2603:10b6:806:32f::22) by DS0PR12MB7826.namprd12.prod.outlook.com (2603:10b6:8:148::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9343.10; Thu, 20 Nov 2025 01:42:46 +0000 Received: from SN7SPRMB0025.namprd12.prod.outlook.com ([fe80::eec4:cde6:1a24:ccdd]) by SN7SPRMB0025.namprd12.prod.outlook.com ([fe80::eec4:cde6:1a24:ccdd%6]) with mapi id 15.20.9343.009; Thu, 20 Nov 2025 01:42:46 +0000 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=ARC_SIGNED,ARC_VALID,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 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mfXHu9ABw5liuoY9TaLeGHMW96JXAiTpk2JAoM9f7p8nM95XZ2n24vgR/9COXKYpcGKTzfw//C5wZRD5HNjVceeZznQgB+93XdJLekgd09fhiZKTmd7I14aN9gZNJ5nhkMkpdc2pzC37hztKCnrDvhjluLvuDNuvVCNEWA1fEAE2JaeGEEoGGGT2o3W7JZozY7L9zuJLrc7bJNnnwu7Cx/X0UT/QA8Z9cMeHYHfeSBxtSOkn2xc6kcTC4kYp4W9KqvN/E/5qfD3qbYxkEmAZCsshnqOw+jtP2HML+4lgXp0mSzh+ajcaQw5hcusurZsyCLFKoJsdVyFAZ2ZUJCTe7g== 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=4BRWhxETsuk781WWcgcm2Yl8ZrRc2reFD4RmZ4buxiE=; b=NjxRBT5KCB0xd3winddyUUGLttTIAWHksc5zxZITOV+bvxgG55vbuvt9UBRydYA4LQT87qUJyHFr0OAQ1P6gJXA6ZDWIKuIa6/jdPG9INRRUuhJKMrwb5F1uz225DNhREix7It9F5prcL96SMAIK1gzZVybed5nfh3acMokHZKDK2AjAJdTKZvWdEAD+8DPl4HTi7lo7qQP+W0ErmG0dj7lsNPMKbyQhiTotZHXR/OQ0vGgCYzvCWuhTW9MJh7zb448WUfbaoj7u1pNsRwNx5Eay8iGJlwLa9X2MFmCu405zl9NyrtYMEwQ52qWA670qUG6PRVMF+MMP29YT/HV+8A== 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=4BRWhxETsuk781WWcgcm2Yl8ZrRc2reFD4RmZ4buxiE=; b=QtQU6YECH7Xf5NsyoWZVV/Wnj2vN5CB7ygNZa8AQFYKNVdvOM6swr50aMoQ5B08qje2Mzi1wZfqSroDHG3iTznYJK1uqYebPakLRNudhOUVLni49i+5x1jWAKibvtpUKqR8EqY3xdW3ilDzK6mceq1hEUIrP2VPmFvF/Bhx2vfIjiRgR0szG3MKzTtce7zYprFq7tzdvRFi1WQIrfcHjKY52efas6yz3GqqRZzqolCsrWiw8ZB+KkrLWGsqep1wAr1zN1UnaPjrhjZ4nmus3nGIHAWgTg3U2lXdwugKPebAD6zqwPH51qO2y+0gYedYK+j+342g3BA84dlCjsje2rw== 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 1/4] conf: Support multiple device-pluggable smmuv3 IOMMUs Date: Wed, 19 Nov 2025 17:42:40 -0800 Message-ID: <20251120014243.2678797-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251120014243.2678797-1-nathanc@nvidia.com> References: <20251120014243.2678797-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0P220CA0021.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::8) To SN7SPRMB0025.namprd12.prod.outlook.com (2603:10b6:806:32f::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7SPRMB0025:EE_|DS0PR12MB7826:EE_ X-MS-Office365-Filtering-Correlation-Id: 398f7700-c6f5-499e-c283-08de27d61ad3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?om/8VRoFJ6asvfm4k2xrlaXxuk3nfEkP5qU2rsIab5cYoXK3DznRh3sVk9GH?= =?us-ascii?Q?LAlDyefeLYE9DHInlvaDwNaSn+JIyEr+DwvueQWhiC8g8WELMVtwjxAv64sV?= =?us-ascii?Q?9WwbMzPzTM1hOWnQ6gnqCBojKvPwx5xS8RVlY5KgeG7ReTOkelV2kS+CW4W/?= =?us-ascii?Q?6LDr2AwlspVBk60uPjwPhAgq7HUODLs9ASNKccBoVWe+ibACIsBArFEef6tv?= =?us-ascii?Q?9wvBYPgV79/RK9hXrbiQkOa2swtbu7BqNXG443Km8wzpnvv6DsPw77bTbxHK?= =?us-ascii?Q?f0kjYy3RJfW/Pdi2qw61Pgd9NoIjFip5XS2Ig067yl1oZOS1nFlv5Q6e3lo7?= =?us-ascii?Q?MrPaqXmTFTft1RuPavPYFuuIhmyckbd0wv+lQIOR9F4H7ngszQJC15l7lIDX?= =?us-ascii?Q?DRnv7GLskp0jqfnj04w/EAPnG+0dJQH48MFlFWOAceYoe0zKCPYA39ujvn9l?= =?us-ascii?Q?LilVdn8UtAB3FiLaa6Dbt4HU27Hnuv2Dqszif/unXpWy8xXcyPAuY4T8TisS?= =?us-ascii?Q?ejSKNt93x7B1PQ/cYs9swkED6AuvMeK3KCBaMr7RQ8jSmlV8kQ1bIKkBr8dN?= =?us-ascii?Q?9EvHEa2fTHn7USOCiEqpc2gbLcsW4+eSv9E0O/cUbHjyJo/Ry5DuBVxMGRNN?= =?us-ascii?Q?Mi8N1p5LIG+CZgzAf6VY8hTPfkj6eJ/11TOwO6qw3QzYNVAhcC5fYO4jntXO?= =?us-ascii?Q?/P8rxmj3CDBnkYjaXiY47QnW9Ts3tIxAcXp3SrgqgXDr+mvkBrB7taczVut5?= =?us-ascii?Q?8yMMdt0UTGVZusdKxdo8EU/6fXyIZTNE9Za7BBapguhrBk0HLDAYulL561lP?= =?us-ascii?Q?lQXKHfGWj0XePoRFWM99yGPZOEUmRY/W3ahn8cqY+a39FniXGdkjpdHTgNbn?= =?us-ascii?Q?62+9Jp9s1u3HNcP2/mSlJzkolMMXI0zcLQgIRUHIpyeS/eoSijMJ/ytd0LEi?= =?us-ascii?Q?VNsUaaEymoEXaXzYzJItyQhulhoULUuXf1Mx5z5OzZwYo4GoRGE+1E1NS46d?= =?us-ascii?Q?Kj1nePN77nxkqRh3bCh689g/8a9gCviPu2dRag9hziD7//gqmn/kM8riZouT?= =?us-ascii?Q?ibzwcsbyDJQHc8ocOZd9Nkckm6PpjWfjtFjuDSRUFQ4k+eJE7pbYjBT4GT5D?= =?us-ascii?Q?pb7W1pYN1YVA53TPyqDy1ote4nFidqx/IBxCHZv/OL9GnG8FVOjR0mb3u7nb?= =?us-ascii?Q?JZu2HQ8F0xSGSji2FtoVeVuTSxLyyMXd5Jnjl18tXWpQTCMM8eRo4Y6UUtNB?= =?us-ascii?Q?6Y5TsnlOpNIV6P2TEo6ovEJ7Dgmdq3pk8xyme+NRBMOsdtO/5AuY7JQz2LOu?= =?us-ascii?Q?vJziNKupNkxoNoI3K1+0VwMHOFRKeKMqMXc4M4JEIn16+rwcCdEtk/OOHRkh?= =?us-ascii?Q?5No8lg6NHX6DqF4DXMaO8lfbtTKhMKNkqRbaeRzAP6BJi5biYrceG0KMgPUC?= =?us-ascii?Q?ZSMZTFatovRJmXvYHRF3ZnVSD53nT6ZA?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN7SPRMB0025.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HUjG3goWP7cZbsueHFjpvG2yoe6MSQ1iRawngifjaZJt4lPp2SI78TGevp0E?= =?us-ascii?Q?AQ2okAAJTuA1SaZSN41CP4emnT1YdVNkWUc/amW01rW7r51vd7lsEIo+MtF1?= =?us-ascii?Q?qxsh6pfuVbE1WEgLV70wxfl0slScio2U38L8BmHNlh6OUXBqlbNdYO7y//k6?= =?us-ascii?Q?TOQlv0i314SCBoHXdMLBQ4zIK2gVMtlTy5Nq34hr2Q6TudKcvHlsmffWUWUD?= =?us-ascii?Q?lzT+HFWxZHGyC4u461VpIW6+9CivOtAPrfstpr2HDcNtlfFpwcl9iMILTLXb?= =?us-ascii?Q?9EAZA9xkBuewiC7Ur/4m4mOlCEVdI9Ak8DToajCCU3jBeMjqheWANbywzaLx?= =?us-ascii?Q?7g1ee2ar2+sHJrn5YIdgAa9p6ldMSO+svKphM4NmdmQl/AScAL+JaGO8GxxS?= =?us-ascii?Q?amVULnqpulB0+SmF6jjBS3y17kMA9Wd0r442vxLfcZ6rBNE0M78KmsTTDkAu?= =?us-ascii?Q?fXyCYy6zKxTW9zLWaMQsToTC99UsOgH5bXNSzWoru8X8kMSg3kdAmOprMTQb?= =?us-ascii?Q?0VA67WV3CEnCC+Pm84nz1MRfmd30wT/lBlNptLEonS0Alw9rqVO6fS10fC+4?= =?us-ascii?Q?sSVQUUdedpMVBhUji6sdHeT+IhxEnmr3G6uwJeEI8oNHkwRvCljKnIpvNKW2?= =?us-ascii?Q?qxhyMqMWIsvVMcaw43gFdw/aF+ZErTG0Atpu4EcWsCCI95ZymyDOpqUiB3xP?= =?us-ascii?Q?igMTyauAv0LnMSrp7SfsDh5zRzZXT/yZg1Aeb9E9+MgZ5u9O5sOA8+l2T5OZ?= =?us-ascii?Q?Auu909SUuAk0d5DaySQc9kjTj/8u4hxhYLoazbNJTjSiC4pWALYgywM13S51?= =?us-ascii?Q?UjgSlL1a+Dx6XdVaG4zXa8PiVjeWGwefMzjeGe19h8A/L2BII7GDCCExrX3x?= =?us-ascii?Q?ezcU6vVlevwaoPXfBTqmQEk3BgiRqzK1Za3WXtJdgH2uvWqjfRxqp/pB+D/j?= =?us-ascii?Q?mKK0cKNilfPAZJzN0WNe8SMd0HTiWGQ+ernjyWV0MusTJTGPRa3KSW5wgDKb?= =?us-ascii?Q?6Ln87NcpAYJTMA6eJKKmdOa20eSUEeYTCEFnqqWZRcjEjRCL8hEaUvCBLe3M?= =?us-ascii?Q?wPSCQ3oSWOC7XB6oNPXnc2rzKjN+IVumwaXS8QSVDSSopIyweYJiTepQoKJU?= =?us-ascii?Q?s546orDD9Tlb7s1wP3CMKkp3kyWZ+HMxR4o5Bk69SvEaguL5QFqUm9/qYhcI?= =?us-ascii?Q?YqLSAap14vwGs1bl92JFxFbaDYiYnQyq2VeADCHOgAKEI4g4R3j0V3SPDp4v?= =?us-ascii?Q?MDqpLwR8DNO+7mXEByTJ6UF38JeBesF+NQFJyBFeVJJj9vYAyUqTFqDWmDaf?= =?us-ascii?Q?XiiRBqFqMwTVL1Yl5RNRGBhOclGyUMYPPGG+lK50/hnL6uHPo+ZKmae6rMLE?= =?us-ascii?Q?EQ6Vg4zyPpdFUGL1q/4QXldm0HTPFVGshNqaQ+VoW/MR2Z12riwb7QlNDtPu?= =?us-ascii?Q?CaqxJFuUFWiTaLVXdgHWUgFeJ8sdPJRxRbZAYotcsrx2z3NxURUsxndVEa1s?= =?us-ascii?Q?ceayzYCtEmJwB52YLi3jPkWAtq2Zp0zro1v9l3VyiFWgo2ViblUBnEMX9iAL?= =?us-ascii?Q?igF/mvldTS2/MmAOtM+Tqp+GYAo3f7KOCOIe2G3y?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 398f7700-c6f5-499e-c283-08de27d61ad3 X-MS-Exchange-CrossTenant-AuthSource: SN7SPRMB0025.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2025 01:42:46.0794 (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: 0/jbiD3l51cXxInquVs4G3Gh6N95Bl0ocoMoSNxWf4XJX7UlnOrYWvMAS8Hp8OxWyjKKP5Du+/4Z1+dBfjKOSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7826 Message-ID-Hash: HNWIFJU46PBSMANPW4SCHQHVMBQY6C36 X-Message-ID-Hash: HNWIFJU46PBSMANPW4SCHQHVMBQY6C36 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: skolothumtho@nvidia.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: 1763603427934019100 Content-Type: text/plain; charset="utf-8" Add support for parsing multiple IOMMU devices from the VM definition when "smmuv3" is the IOMMU model. Signed-off-by: Nathan Chen Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 84 +++++++++++++++----- src/conf/domain_conf.h | 9 ++- src/conf/domain_validate.c | 33 +++++--- src/conf/schemas/domaincommon.rng | 4 +- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 15 ++-- src/qemu/qemu_command.c | 128 +++++++++++++++--------------- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 5 +- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 9 ++- src/qemu/qemu_validate.c | 2 +- 12 files changed, 182 insertions(+), 119 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d2dea6952e..0c7a32b03c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4141,7 +4141,9 @@ 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->iommus[i]); + g_free(def->iommus); =20 virDomainPstoreDefFree(def->pstore); =20 @@ -5013,9 +5015,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->iommus[i]; + if ((rc =3D cb(def, &device, &def->iommus[i]->info, opaque)) !=3D = 0) return rc; } =20 @@ -16536,6 +16538,42 @@ 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->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->iommus[i])) + return i; + } + + return -1; +} + + bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) @@ -20205,19 +20243,22 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, } VIR_FREE(nodes); =20 + /* Parsing iommu device definitions */ if ((n =3D virXPathNodeSet("./devices/iommu", ctxt, &nodes)) < 0) return NULL; =20 - if (n > 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only a single IOMMU device is supported")); - return NULL; - } + if (n > 0) + def->iommus =3D g_new0(virDomainIOMMUDef *, n); =20 - if (n > 0) { - if (!(def->iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[0], - ctxt, flags))) + for (i =3D 0; i < n; i++) { + virDomainIOMMUDef *iommu; + + iommu =3D virDomainIOMMUDefParseXML(xmlopt, nodes[i], ctxt, flags); + + if (!iommu) return NULL; + + def->iommus[def->niommus++] =3D iommu; } VIR_FREE(nodes); =20 @@ -22696,15 +22737,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->iommus[i], dst->iommu= s[i])) + goto error; + } =20 if (!!src->vsock !=3D !!dst->vsock) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -29560,8 +29603,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->iommus[n]); =20 if (def->vsock) virDomainVsockDefFormat(buf, def->vsock); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 11eb46ae53..6aa716b907 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3303,6 +3303,9 @@ struct _virDomainDef { size_t nwatchdogs; virDomainWatchdogDef **watchdogs; =20 + size_t niommus; + virDomainIOMMUDef **iommus; + /* At maximum 2 TPMs on the domain if a TPM Proxy is present. */ size_t ntpms; virDomainTPMDef **tpms; @@ -3312,7 +3315,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4320,6 +4322,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 8085d782c5..3339fc83e0 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1844,21 +1844,28 @@ virDomainDefCputuneValidate(const virDomainDef *def) static int virDomainDefIOMMUValidate(const virDomainDef *def) { - if (!def->iommu) - return 0; + size_t i; =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->iommus[i]; + if (def->niommus > 1 && iommu->model !=3D VIR_DOMAIN_IOMMU_MODEL_S= MMUV3) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("IOMMU model smmuv3 must be specified for mul= tiple 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 75b5124c33..ae3fa95904 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6964,9 +6964,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb482fff40..4e57e4a8f6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -495,6 +495,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 b0bc057bd1..400ce73283 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -650,10 +650,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 @@ -769,8 +773,9 @@ qemuAssignDeviceAliases(virDomainDef *def) if (def->vsock) { qemuAssignDeviceVsockAlias(def->vsock); } - if (def->iommu) - qemuAssignDeviceIOMMUAlias(def->iommu); + if (def->niommus > 0) { + qemuAssignDeviceIOMMUAlias(def, def->iommus); + } 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 c56c321a6e..9c8330645b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6244,84 +6244,82 @@ 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) - 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->iommus[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; + break; + 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; + break; + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + /* There is no -device for SMMUv3, so nothing to be done here = */ + break; =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: - /* There is no -device for SMMUv3, so nothing to be done here */ - 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; + break; =20 - 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; @@ -7158,8 +7156,8 @@ qemuBuildMachineCommandLine(virCommand *cmd, if (qemuAppendDomainFeaturesMachineParam(&buf, def, qemuCaps) < 0) return -1; =20 - if (def->iommu) { - switch (def->iommu->model) { + if (def->niommus =3D=3D 1) { + switch (def->iommus[0]->model) { case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: virBufferAddLit(&buf, ",iommu=3Dsmmuv3"); break; @@ -7172,7 +7170,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, =20 case VIR_DOMAIN_IOMMU_MODEL_LAST: default: - virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); + virReportEnumRangeError(virDomainIOMMUModel, def->iommus[0]->m= odel); return -1; } } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0ac9ae0658..ac56fc7cb4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8371,7 +8371,7 @@ qemuDomainGetMemLockLimitBytes(virDomainDef *def) int factor =3D nvdpa + nnvme; =20 if (nvfio) { - if (def->iommu) + if (def->niommus > 0) factor +=3D nvfio; else factor +=3D 1; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 6d5c4785e8..7233df888c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2396,9 +2396,8 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* Nada - none are PCI based (yet) */ } =20 - if (def->iommu) { - virDomainIOMMUDef *iommu =3D def->iommu; - + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommus[i]; switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_AMD: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1f7e587f61..1e0289b35d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6902,12 +6902,12 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, break; =20 case VIR_DOMAIN_DEVICE_IOMMU: - if (vmdef->iommu) { + if (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->iommus, vmdef->niommus, dev->data.iommu); break; =20 case VIR_DOMAIN_DEVICE_VIDEO: @@ -7121,12 +7121,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->iommus, 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 fd27f8be27..dc5ade829a 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1470,7 +1470,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } } =20 - if (addIOMMU && !def->iommu && + if (addIOMMU && !def->iommus && 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)) { @@ -1482,7 +1482,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->iommus =3D g_new0(virDomainIOMMUDef *, 1); + def->iommus[def->niommus++] =3D g_steal_pointer(&iommu); } =20 if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0) @@ -1558,8 +1559,8 @@ 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 || + if (def->iommus && def->niommus =3D=3D 1 && + (def->iommus[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 5008391707..da08fd17cd 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -907,7 +907,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->iommus || def->iommus[0]->eim !=3D VIR_TRISTATE_SWITCH_O= N) { 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