From nobody Tue Oct 28 17:46:58 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 1761089887255388.1799175988533; Tue, 21 Oct 2025 16:38:07 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3D46343DDF; Tue, 21 Oct 2025 19:38:02 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 837AE43E5F; Tue, 21 Oct 2025 19:35:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E43F541988; Tue, 21 Oct 2025 19:33:17 -0400 (EDT) Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011044.outbound.protection.outlook.com [52.101.62.44]) (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 CCE6F41988 for ; Tue, 21 Oct 2025 19:33:15 -0400 (EDT) Received: from SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) by MW4PR12MB7030.namprd12.prod.outlook.com (2603:10b6:303:20a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.12; Tue, 21 Oct 2025 23:33:11 +0000 Received: from SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2]) by SJ0PR12MB6855.namprd12.prod.outlook.com ([fe80::1924:8e6f:c8f3:83c2%3]) with mapi id 15.20.9253.011; Tue, 21 Oct 2025 23:33:11 +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=F4edSjen41SQkh+FWdTfsYY76bqzq4fxjNkDyAkiVL4nrh4Qtw9Sn9PjIOVt2xMJtpQ60wlohMARAjpqy6YkUkcWwwGfeozulPGpl8yTsrnluUk+fy35fYy2RhJIZL7Sl3MlvIXrG3qM5y1++f0Vqm5wjllpHjRzZLeCTyu53S7FyGX5tHytIdktTS+GplIVT6DUU5Me88T3nIORqZWDSdU8aTu8DzSauN1Y3IF1YCJu+hKovl0Ur5FwmkgIkOEwrLN6HopNZXOMBbDkHNcys86Y3nRu4zEf8/bWeGieH1lwiPko0uSpV1jTXslnZl0Zgc9ju56Up5J0jvpXCdE8AA== 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=5DkzgEQ70D3JM3IdfmNQY+p2ks93eWx9xpe4PLxR83U=; b=YwuIFZJj+X3iWzgS+OWf+FivnsSZ2QUqee4hgEQKEKR2LVk8efqheTBzd4KoI3VS6UBml6PoJgK/B+TCFY/GoNO8TWPKYqtCmkfJas3TetwtxOKNBp5Ar+zLkzdGTSYk1TvXoPmSu3/e4y1xrrnArswwzuJs3zzZKLTIdCDW3nDMpipH0l053938NFHbGyZ/QOe5vd7rp1jfu64fqoWHOxBjBuDVTQuoTHQ+2cNg17D2on9L20OMsHka1ihID3YrNJDPQ/YzQY9KHIFr6FsDKHAeOifVC2+uiFX4NImiHvg3ypqphMCkn2Gva95/p5wPMVGEpc78epITVhkxuauQ5Q== 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=5DkzgEQ70D3JM3IdfmNQY+p2ks93eWx9xpe4PLxR83U=; b=L1CO7E+aMF57GR8iZtQDGWLJYRg7ohPWeONKIXbFrL2/z5xfsvge9PjYBjyYmkmr7j+a/tpqEy/kLXMZfaOPfJwPyy4sA+JpEleriYPfYbDEcwQ0mWrmcr9ocV6TdkXST14Dj0A+FAzQH1vc9psWr1efcrJ/0nZe2t+sJO9Cqv9QwC5d7ZvIH/27vdjMlWtfRCm+PQ1PlVh8pio83zQnPRFyUwoxq10Audv2+j2DKUSKY764U3wZb3fR/5Z38bn9mGVULSx0C+QVr6HIzQ9yNqJHWpuCpmsevM39eT7UAMRjmHBYmr0zkT5kxy3QSDt1u1HwVNGu4vHK5ibByWVjlg== 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 v3 1/3] conf: Support multiple device-pluggable smmuv3 IOMMUs Date: Tue, 21 Oct 2025 16:32:53 -0700 Message-ID: <20251021233255.3474571-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251021233255.3474571-1-nathanc@nvidia.com> References: <20251021233255.3474571-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR03CA0257.namprd03.prod.outlook.com (2603:10b6:a03:3a0::22) To SJ0PR12MB6855.namprd12.prod.outlook.com (2603:10b6:a03:47e::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB6855:EE_|MW4PR12MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: 263f07bb-2a19-42f4-d3dc-08de10fa32b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QFqPAwFkV8NZGvxNHD7PT0TvW6ncKuebnhoS7yYGcZUdDIi6ZmrnrKdMHQ6V?= =?us-ascii?Q?bNtLpUcGkO7bDA/HRdc63HcWN4ZlhpfknsrvC2ms2ljNyqgozr3kI+RaSuVo?= =?us-ascii?Q?dlTj6vkGuPhfsLrLpcsIw/DFt8479Wc7CETlqUKMGXYYTpzCNjyBJcAwYh7T?= =?us-ascii?Q?/ii7Lyhy3L0ZaiI4pgOHPHg16eUw3jtdGahZ4/2msupOehMXBamB5fTc7Elw?= =?us-ascii?Q?nzPwkqkg54GlZF/OFBdZt0wNsa4YImTxieSeAettun27bybXWbC+JfrQCIIr?= =?us-ascii?Q?1tmpc8CWsULqA29j3M5/FGmdbJW8v00R6MpFYQ6mXr2BkyAbdDD4VeZf7ggX?= =?us-ascii?Q?MPvsOGCO8PTqXnMoQcNIDFoyp/MzyW99siDT+3InZyqRglhAZYmtphZw/QA+?= =?us-ascii?Q?y+Y5TYk70SID5pQMr2QbmTOe0Y6JgMJRbsHVJr7GwyMWEcZuyJDe1d5Y3vw5?= =?us-ascii?Q?PgrPLlofNYtJZjhhnU3CGZaZCDP7VsZk/nui90ZYR9pIAg6QtY9WYAMt94xg?= =?us-ascii?Q?vE44dyRO+UbI6rYzNihIf5uc/Eo8LJl+PEvI6IOadWdptbh2WffxqWEZR06u?= =?us-ascii?Q?+PyY3o0uw465lM2J/knEJLkuaFfKeSlsa2qMNYJ515Wo4nWoFXG/2oEYEUgY?= =?us-ascii?Q?hIrqviWZykN3UpEALZhMIEnbULnYSRHWj4Bz9n3XFWEx9Dos6PNjsF3MyKDd?= =?us-ascii?Q?cPtcPYDiBeyR8jvZNJ3IpWZJM55CIKYZidFtyu4dSq6jYGth9rH++8ISnJ0Z?= =?us-ascii?Q?jAavTDpR0BVNcpXtuLi/fdHDBf5sgZwVb8UYA9RonNMCKWv9NDSITpcZhYV2?= =?us-ascii?Q?mbeTbUyG89PhepTbLTiTufElN3uuYkeqIODs+HtzsfvGcxIbpqQvMrQZWa9s?= =?us-ascii?Q?LQZ3aL4lYglFlOUBcqKPvg2+u7SrvEMlWI7iapTGVsH5B2aNrsXC2mIFsmcZ?= =?us-ascii?Q?hLpmg1A/4MvXCttH1UdkdUzW/k5Wt+HLYJK318lynRIiIOSphw4345vQ9X6B?= =?us-ascii?Q?/sWTnpzLqfnUZqDv5N3cWdVPkq/rw5fauuYU3P/orj3wQf2QVZvb4F7MG2B2?= =?us-ascii?Q?KH4SW8WUTUqFLsp4nqx33wq6c81ajEcvB1BpjS8MiGpesSY3hPV08UJBizTl?= =?us-ascii?Q?wU+IhGyhoafczGDkKXaaAtL4RIOJehOm/jdK02Iu8USTD4OhowAAAxsc/dbs?= =?us-ascii?Q?jYrfJTJQ5gUVIy6Bp40LNZcFpOqXLuq9dkOLNPQ2IxQ90oJm+nPnT9mYdbTb?= =?us-ascii?Q?uwfRegNZk+1OsVh9Y9LQGYatBbkqC3B1iXQR85p5ETGGzv89zmi3CQTJVrLv?= =?us-ascii?Q?13OL67lxs8DWAHpE+ZID5QJ6SxIA4JfEPFAYmiLpkRHlhnUwLyDWm+NYZIOt?= =?us-ascii?Q?b3OZM7cQjmPgspXKYsrnozzuo8N1/VPNzqth+PWzhu8977EnAcMuJn1IcreP?= =?us-ascii?Q?r7ku9PU/NXHeARLpSRCWs+eLGr8QkVQw?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR12MB6855.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sX6siXdopkcLRVcgozEwtGc1Qn/AdwiaP+Zama61SWnWLyci021U2pg2Mweh?= =?us-ascii?Q?afr47msS9P/u1MI+333FE7Y+zuLgsPgem+bClDZCdlrjLkNUrtYeXD5dzJvJ?= =?us-ascii?Q?HrbFR0oyYZIMdvNPcFKl7ljBIGvuFCYQo6LtEN1+tnciZfr8P130HKr6zZQc?= =?us-ascii?Q?/+vbipeyv08DWaDwempvEhWzqLwHyIicmkTVjsCEKfHUaLGSg1RPCmeLZ4GJ?= =?us-ascii?Q?Zd3QAcGfr95Jiy+ki7r6lm4q6AgA/M2LGe/aSxkaVZGLD1/rF7coGFctX1RP?= =?us-ascii?Q?LC5kALm7g8diLLnFQY6KZODl/XXk98CTRmIgj18c0Gq3Hwew0DwLl9SZvC4r?= =?us-ascii?Q?nN4j0H1mmOxrKM6GzBXa5d3Rjf4K1dC+SjMWkNjlN+O8beowNqvaN/9prmVx?= =?us-ascii?Q?oPFBsyr/wQJqoqFPO/djkHro1i7byFNNNNOILHnJYT2HfpKMoh+7+ITjf6IX?= =?us-ascii?Q?J1S1kmqN8gP50vdVd3mtPtmgDYdEb0CRTstDzf00x0Md9WEm23h4Uw7pQ9E2?= =?us-ascii?Q?06EuPxmr1AP8D7vKTwRbXr7eHUyfd9hD6aRQhChjWKHhwrwatY/BGID8Ut8j?= =?us-ascii?Q?zefSdHd6e2uiMHQcydUIoUqve/nWaPOG+RRn3YLWAh4KUj/TNr+v5kuqnzgh?= =?us-ascii?Q?iouOlK0/YJZdkzzyi7wb/6UrwmZmPqN6aeyRbjU4TLLQd2xNa1V4smXZmgyj?= =?us-ascii?Q?/qXsr00Ksc59ZzWVaSM52Pfy0/p1mjn2lU+cDMqgBr0GRX9/oMZoP1tdSmPk?= =?us-ascii?Q?WoPekFJDq0O6jXF0zutnMvdMkuHxcGWCQMzdX83IbhR8e0b/xrGx+uh8wuAi?= =?us-ascii?Q?HcnWdx02Tk/9Q2ZBdstiVHiyVyRGCjLTU/QwabhsSTQhjoRjgIFY6I/lMxT6?= =?us-ascii?Q?Udkj7BcCkRXM/Iz5ZfkPKG8+0RM11ppRqrYiONsJ8EdjTJUgdK/f+ZDRNZfK?= =?us-ascii?Q?rXLxVzUuR7VjwaetvjJshkabE0HP/znLp6hUhlCbYuQLU3uqjACYLoKq1LOH?= =?us-ascii?Q?G+hpm+8T3CGRv1EbJHh3MEDwxzV5iEdVAG6xEh4bT0Y9YzNUzLfNEnhjiBDo?= =?us-ascii?Q?bgsAo+zvRa28T/K3NWssDhuj4Gv5yjdMVTtbJNW2/rsBgkYSO8jk/2mgw5L7?= =?us-ascii?Q?QCCNuIagx+M81yaYTJAEBrRD187ahU/89BGcIhhi+hCM5K+TYuWfceaJqq6f?= =?us-ascii?Q?iXqUSXiSgTQC/JainiptJa/aB3VKczIJKMxY+gQg3+i42l4YFL0rMvNYCDY1?= =?us-ascii?Q?PNGmlgGuJLi0M0mNOOpreeWU2OxW+9RK7Js45TH3s6M/OGpEajkij+Q0dfWd?= =?us-ascii?Q?1YunIRBYdTPI5d1amAHyItuxTS3m2MDU4HoB9/LHppBwG+wvBkEaReTYKTzY?= =?us-ascii?Q?JT3K7Q0zpd23F0WdarBeGZ55NtyLKGzecW2JbEio1U37YULHgywbkzvZpTPV?= =?us-ascii?Q?uwvmULnZm7/iJSdsqailSzlAUsak+SJqmtK9l9beYjgTCNmz8FxZfOdgYIfL?= =?us-ascii?Q?XnszwkisT/zrQRIW6aX/TAIRZEA/9hoEXjNnzTW+I4oBng+DMVFfnIlkVRv5?= =?us-ascii?Q?W+FP8D6idhiFoa4lccbiHDP0so8n9VHVQsyCiyX+?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 263f07bb-2a19-42f4-d3dc-08de10fa32b2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR12MB6855.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2025 23:33:11.2923 (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: ZvHzAfTDgReX6u8kOpq+/7ikyzn/PbBwzY3YDGbmv+ZN7StSOPT97+qnnimj0NLgr9oxNbEAWaDYNpL94uzh0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7030 Message-ID-Hash: 32AGU54AENCHEO5IXQS5XV4AM3VQZTI2 X-Message-ID-Hash: 32AGU54AENCHEO5IXQS5XV4AM3VQZTI2 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: 1761089889154158500 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 --- 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 | 127 +++++++++++++++--------------- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 5 +- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 11 +-- src/qemu/qemu_validate.c | 2 +- 12 files changed, 184 insertions(+), 118 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4737594487..6e320713bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4139,7 +4139,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 @@ -5011,9 +5013,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 @@ -16488,6 +16490,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) @@ -20156,19 +20194,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 @@ -22615,15 +22656,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", @@ -29467,8 +29510,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 a63d922853..139bcdc1af 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3299,6 +3299,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; @@ -3308,7 +3311,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4313,6 +4315,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 93a2bc9b01..dd1b491dfe 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1851,21 +1851,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 ace74fee08..98596d4cea 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6953,9 +6953,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26776dff2a..d9a5335003 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -494,6 +494,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 fcf5fc1935..61457c4f7a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6227,84 +6227,85 @@ 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; =20 - if (!iommu) + if (def->niommus =3D=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->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; + 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: - /* 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; + return 0; =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; @@ -7141,8 +7142,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; @@ -7155,7 +7156,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 375e0e441a..9598d754df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8372,7 +8372,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 774541ca06..cb0ee0f655 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2413,9 +2413,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 b0eff443aa..8fb1967b71 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->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: @@ -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->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..3b417ea5d0 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,9 +1559,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->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 3e8fdb2268..b36ea8a3b1 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