From nobody Sun Oct 5 00:14:13 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 175858964154342.0983654118935; Mon, 22 Sep 2025 18:07:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8E68A41CA8; Mon, 22 Sep 2025 21:07:20 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D8C1241A62; Mon, 22 Sep 2025 21:04:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 92D24418BE; Mon, 22 Sep 2025 21:04:28 -0400 (EDT) Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010019.outbound.protection.outlook.com [52.101.56.19]) (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 72045419D4 for ; Mon, 22 Sep 2025 21:04:27 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SA5PPF0EB7D076B.namprd12.prod.outlook.com (2603:10b6:80f:fc04::8c5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Tue, 23 Sep 2025 01:04:24 +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.9137.018; Tue, 23 Sep 2025 01:04:24 +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=vco4tzg7apL/VozPHny2GTykqY+xktUDQk7+BHbQJY8PIIvP72XEnU9HSKccUCBFHHpTud7+FkiE16EY0O5S943qBC0GqYKyLDMP7gy0JcFEbTC7xnI1pLkFlrmUx2MZTq6/vnETCBrv8y8M4JHYX9h2s6Xvn7NhzC60Hriu6xqq/Kx/CRzj9ejpthQC+sfW5BTpLmzBNSZ7p2FLzRF2q7JavE3TYRyXn5ucJm9BMSXzZrcxYtmpzNpDSvFU5MagfOa2qrRpKFk55MWe//A3Hiizv1VLQ2KOtusPF03/hHgIgAJA/Y/6+m17e2C7wy0lvjOLx4IgYZDsEYjRkeuptQ== 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=K/ODUq9KDMkGQb+ESes9whyaxjypqf4901VhPiiDud8=; b=k/af6dymQmVgUsCGplNw8eD5f3gSRFS9fTOcVXuxGYhCzNYTGmUHVJe245kEIesdkscgVB+s+WxjPE7QG+Uzbfxe8LwOLvsJcfB8w45CYsy+B0MmFm86uI9s35jPieEeZ9X15WWHYYSraLrLPPPwDWaq7euw90Gt3hTjbb+N5lGp95yO9aD7xaXGGAeB0ED0sXkdzZeORX+OMIRWdMGCSdjssCnzi8GRWzy6G325HsbhBUsgvyUn/EVbYRNieMvyHeJuJn7Ez0rH7smL3DL74CEOdaWGKiLs/AazGEE9odsvEXr8V1sU8a5wOVuKr/0ZUvUroug2aQd/fk82VKoaFQ== 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=K/ODUq9KDMkGQb+ESes9whyaxjypqf4901VhPiiDud8=; b=JTt32R5uLRCFI/PCxXG5gzArvw/QjhFGYySupiNza1kzoLGNew1OtMEyTU5YM1zQ4LmaU2Qz+HyotdCwfDxo19DfVCm2RpfSBm4jzecAE8oi/YrXYCrO1O6Sa5gA5Is/k/nxRdQWSND+8azj3OnfXucOfS61ga6CPJ3qDo6euVGLaHJGnISFWgABAieVGsxGkIhu5xaRPnFOdbOY0mYtlbsK0sO7rW2ti2sU+0FuhG0XD1FXYcqrhNAOqTPRu4z0e1HfxF48lqFkmjZYiXl3UDkBJWJNF+JJaXc5pscnPqAi98+bBPXUFVy9Z8j5diflmtQS8N9XRGWG/OaAB0jUTg== 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/3] qemu: add IOMMU model smmuv3Dev Date: Mon, 22 Sep 2025 18:04:17 -0700 Message-ID: <20250923010419.3225547-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923010419.3225547-1-nathanc@nvidia.com> References: <20250923010419.3225547-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR07CA0090.namprd07.prod.outlook.com (2603:10b6:a03:12b::31) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SA5PPF0EB7D076B:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c9448f2-d051-4a4a-640f-08ddfa3d22f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?x/XprGnWhCkfJ1nwbWUFAMNl8z7suWK8ulE33XHIl+IiiVqLP9hZ0P6xqr6Q?= =?us-ascii?Q?TnLiY8nMNEEtniaaVDENsjElhnvMUIVU4C0p1gxmuzWXaFXoFBK2u6zUH3XN?= =?us-ascii?Q?WYTI1McsCvattXUkHlGZnkjTdAFPw4oQ0wAWCIvKm/H/h7YaYYn+WdgfeSk/?= =?us-ascii?Q?A4mNDt1nf/k8NA2O9YCkwU7TrxxVRhRemlHlDCiSrH31fKDDHAOrSNLzDoLf?= =?us-ascii?Q?ksn4GtKfzuz01+ZrZaaYtS92H249tZl+UhwIyN3+belrrMQErW/IW35F67Q3?= =?us-ascii?Q?krmIlHYqfiBbGsdeKafExtmQYylPFPXxaM6EU5nKp7EVjMA+A45IfniV/dRz?= =?us-ascii?Q?emLgAZfLbZ8GSydOWSjECwCvwaO7c2gNB7DkZ0oRUxTVJcny/ajBtweym+94?= =?us-ascii?Q?cd1It1C6+/WQcubaBvyrC4Og2VmWNHeLReqlHaHzSbHTY2fU/4K0Q1vP+M0+?= =?us-ascii?Q?5qREUOB7DldXk+egrh/k7aSIQHDArA15IMVmPP+1YK7RuuFIkOUHErNpu846?= =?us-ascii?Q?BQ2/5Qip65n0NhlysXi8pJoTcYtA59BUJ7KV8HoLwljoOiv4wEZUwsX1CcnE?= =?us-ascii?Q?FwCUQobJGoTz8yXgGgtAmGd7I8tTH8RWODTjtpVcWKa69egiMRBSYA3fBAmJ?= =?us-ascii?Q?G6UoXjTr5qbkV8jPfTx0rF1rL/NBWYJglUmdY/ynZ0xcxieod2Y5hP/Wln2x?= =?us-ascii?Q?lDIF4TxzjInBqPehb2/9NhXJpmx9uIbaVScopO89iAGulxyQjKu2y6aG9/k7?= =?us-ascii?Q?JctTSkuEHbcwP7B2aQ6b1T9QfydS2Y0qmK42Mw2aq5uFXpy0ahkTDB9fkz+8?= =?us-ascii?Q?YFXHe57GXAi0FUr3JvhAa3bA5tLux4yvFDjEQ6hYSLiDrajehC2Xg0+37PMJ?= =?us-ascii?Q?4LUizRkBRqAI2B9TgXr/LLtjNkkYf3Cvf8Q5+xqDwKri4QgnYCVzckeYHJ3g?= =?us-ascii?Q?wof6mFFG+tbveaYNYd4ysfn/8qvE61C0ZFzG1pxFOC3B1IvRXZV7jWS7sfi5?= =?us-ascii?Q?+MbaXiEXZlnzd42eHU+msJGsM4SyXbpAshceqZyqMTZePQzYFW0EYc84tTnq?= =?us-ascii?Q?NBT+hu4rRQ+ROfOn6yh1uPEqFx9/Qj8oJrd456F0Ae8KZpSKwfQmdFBOQkYF?= =?us-ascii?Q?485oe15V4sPx5bCBqG49yC4c4ibnXofdpX6PDNdlpcqtWzwBYLOV8MnpmlgO?= =?us-ascii?Q?nHNK3PdzxY0IVNm/XdpX6mJZNQ90x0ot48oAFlJRC4ddAVTmvA5B/lSBnFS0?= =?us-ascii?Q?owFSkHMAsyQMBbnS/J+cxXb+2SnEI6/JkeNPSGyXQO8So1QIt09vuGcu6ko3?= =?us-ascii?Q?/tPLYnTBDkUKQcLpmykVeGdHvEq0Bk1dCcUZcKc58dH8fNesRgCsl7/2hB2z?= =?us-ascii?Q?yVt7qEZ7L2QVpXbhd5yYH/YLJGXJSutSuwa7LJSn7MfhPeVUXjyewbrbkAAE?= =?us-ascii?Q?ywxNDEdY7tM=3D?= 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)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dKOeQP/MSCfYfgIiTU8ljlQm4j5HMKTF0AfRJOU3pKwlmlmPIVQIFZzTWiHW?= =?us-ascii?Q?TMqWh5zIi2E9nwQw+KKInI1viqkPovUnkVrtErEzFLhFhxp8TGlzi+3NgkRX?= =?us-ascii?Q?BzHMlGWxePuUKVNnD55wFl2hnKuFl25Wh3KbccCkxqRr2KZ3eJ6My0BSvox/?= =?us-ascii?Q?DvGBOqIMCNUppHaMTcuh/8y9GSg6JXt8IhkN3vc467Ky+b+r5+0ssZkMgQ8v?= =?us-ascii?Q?xmSby/NCj6ghbudvSxbOap7W47zCU4QB0MvDVZ3dWq2LqflA7YXaH3Nmh/tx?= =?us-ascii?Q?f/LIjlI8EPJeGJDLsET7UNk6PyYG5mlgVTI0yGPm7kk3jxO4DtecOFo4l+bQ?= =?us-ascii?Q?F2lBabo4yTra5TZ+v7t3rQcqIjP//nI9jbgwTzN2L6pleYM3NjzR20UmZ4bb?= =?us-ascii?Q?AJIL0a7dcqWMcTm9rVzXm2y8gv51ewDq3TXVyBNvUkzMoUqJvJHaj9HwI/5u?= =?us-ascii?Q?0xx6dgoa14WMjKf4GJq9HM9yZ3qG9qOKwHjrqWvAXRcXNarJ3WO+zOaksoId?= =?us-ascii?Q?oLrZ9LD3rpTuoAXN9aoWPJIiT/CWQNXcXRdynPVR3LRGAIQvUwrSa5RiKOJF?= =?us-ascii?Q?hAiiCQIeo8Z1HMAmOOmmQKOx7edjFk2EAwtC/TIj3E01djkbibhdl5FsB/Lp?= =?us-ascii?Q?+U86BF3Etyf1ghka+es9IX4xf83LSfQFiCFL+zKtXaPJ3WsmLVnzFAzJ14Pz?= =?us-ascii?Q?+y7ksDygH4YnQcvn/nsS5GJJQ6w1lajoYmQgm3eSzTeawAv7avXyMgk+B8qc?= =?us-ascii?Q?wM5s80F5unNQfy3bNQBQYNsHa6gFuDow178EI49XmNFj5dSFKd898LT4Z6y7?= =?us-ascii?Q?4WG/tC4YjuYy0fITzFxNeer88JXPb9XIEnrHg4w2oJCy2gDaug7tAjxPi6wD?= =?us-ascii?Q?Drt0RfkflxICmOtR6X5cwnS2Pg6UVayK4zTQoPmsreL/BRXTvLqUmmPdtAoq?= =?us-ascii?Q?D0Ab8XXSPiorvMBRlt0B8NXUHem/565uXwfuiFz7FCheUWsFBLqI4P9mfEJM?= =?us-ascii?Q?/nZyVvD2CC5BFxJjaunwXtcC1gOsT8apjNUe6VeRnVfZXe8Olq/GHOUJX+HA?= =?us-ascii?Q?XYn8TUfY7Vi2wo5vA4Up/TKyJekRog3HkoVbeaKJmdafecPQUr8UOWtYaWdP?= =?us-ascii?Q?TaolQSJ4cc2GDPC7F8Kr/WoMmvFj7jiKoBJjAGqB0oaNKk5zjUrPwRsMq3o4?= =?us-ascii?Q?vVI7/ZPyFWKY8PVTSHlvJDxaQRi9LObcn2GyjdkPPa10Sqg7TQ0hiC0dczwh?= =?us-ascii?Q?6OMwAUGwwHe8gibuaGZvdaAFvG2QMamsOQ3se2efU5Tj1Pg+PoxnPikEK1PN?= =?us-ascii?Q?LOhdj552gDPohUnEKai4GUwOOWvvYiPle4beSDehcCVUXOkNAQr2G1DHYihU?= =?us-ascii?Q?I5mv2xDTr8w4ShWZRY1qDaq6TAQAoi43/1yNKO+A2p6bUdkjyBAMyTE+AS4s?= =?us-ascii?Q?9DAJ+PbaCphcJN4kkYoAE1OSx23ldzT3mXtuFsa+nijiRV4rfBiSqRB2W//3?= =?us-ascii?Q?LFbNXhFp30dTXRD1uQowqTl84hpsaX09xPNZcWeSZU+qi5mbwDhpqAfQURCO?= =?us-ascii?Q?ghuLFw+6gl3AV14JsMnIdVCQSLchn9XKQNwIewSB?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c9448f2-d051-4a4a-640f-08ddfa3d22f8 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2025 01:04:24.5677 (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: LShTww2WG2f2LoAEYXypC3Iqvz5eYugrzTSboXmvnKDxUVOSN9Mrrxv8/52RwifJnkD0wlqKNdo8KsoDy1Z/NQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA5PPF0EB7D076B Message-ID-Hash: SRAM6VW6CI6ZSDJIFMZIZ33FMK2LIATU X-Message-ID-Hash: SRAM6VW6CI6ZSDJIFMZIZ33FMK2LIATU 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: 1758589643786116600 Content-Type: text/plain; charset="utf-8" Introduce support for "smmuv3Dev" IOMMU model and "parentIdx" IOMMU device 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 | 18 ++++++++ src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 17 ++++++++ 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, 136 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f50dce477f..25bdcfccc1 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9161,8 +9161,13 @@ 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). + +``parentIdx`` + The ``parentIdx`` attribute notes the index of the controller that a + smmuv3Dev IOMMU device is attached to. =20 ``driver`` The ``driver`` subelement can be used to configure additional options, = some diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281846dfbe..152a672899 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 @@ -14407,6 +14410,10 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlo= pt, VIR_XML_PROP_REQUIRED, &iommu->model) < 0) return NULL; =20 + if (virXMLPropInt(node, "parentIdx", 10, VIR_XML_PROP_NONE, + &iommu->parent_idx, -1) < 0) + return NULL; + if ((driver =3D virXPathNode("./driver", ctxt))) { if (virXMLPropTristateSwitch(driver, "intremap", VIR_XML_PROP_NONE, &iommu->intremap) < 0) @@ -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'"), @@ -28417,6 +28430,11 @@ virDomainIOMMUDefFormat(virBuffer *buf, virBufferAsprintf(&attrBuf, " model=3D'%s'", virDomainIOMMUModelTypeToString(iommu->model)); =20 + if (iommu->parent_idx >=3D 0 && iommu->model =3D=3D VIR_DOMAIN_IOMMU_M= ODEL_SMMUV3_DEV) { + virBufferAsprintf(&attrBuf, " parentIdx=3D'%d'", + iommu->parent_idx); + } + virXMLFormatElement(buf, "iommu", &attrBuf, &childBuf); } =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..038ed8db86 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -3138,6 +3138,22 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *i= ommu) } break; =20 + 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)); + return -1; + } + break; + case VIR_DOMAIN_IOMMU_MODEL_LAST: break; } @@ -3155,6 +3171,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..bb9cba727c 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6266,8 +6266,14 @@ smmuv3 virtio amd + smmuv3Dev + + + + + 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:13 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 1758589930992621.1729445266084; Mon, 22 Sep 2025 18:12:10 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0F15041A01; Mon, 22 Sep 2025 21:12:09 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5DFB743E00; Mon, 22 Sep 2025 21:05:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C82F943E00; Mon, 22 Sep 2025 21:04:43 -0400 (EDT) Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012058.outbound.protection.outlook.com [52.101.43.58]) (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 C4F3A419D4 for ; Mon, 22 Sep 2025 21:04:33 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SJ2PR12MB8956.namprd12.prod.outlook.com (2603:10b6:a03:53a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.19; Tue, 23 Sep 2025 01:04:26 +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.9137.018; Tue, 23 Sep 2025 01:04:26 +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=nEr8kUyvmO2CrdhYVEaomN8nRr0tQbo3ZyQ8FGXxwuOupIX7GVmXXVhdRLYp+KuNdBIrFQrOtTeD0hfcGbecxhwbImVs91myB5EQaxd0V4sytGAtdWxmYTGgZwteFp8IQ9P5LKcdsqVNVBkSSdiDTx/4pojAXfmFHBmERtyYK4rDqFo8j/ifQ+1/5l8AasPfX+Qp8pOeDyGh3+tgl0hTpc+LOGBIG0P+m7wWQqKzFh7y/AzkL0aTw6NQAWR0J/hwLJj0IX7Uu/3Vb/A48X92HYjbw8UoNVe9jnLoOES/RH7p6AE7JeUVl85hHccMP5vBI9bks0fZMroy2KXkJVqRFg== 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=bEXpenkLV16e6yCryXylNK36l5oeYsYDp2GmwlasCp8=; b=iMm5aDZO7omQgQsWJWqwx1m7qZcblu5ROpvJmAlGF0Xea26/93PN38jGSAD+v/X872tBLV+dbW812ZvJ8O6cl8feRIP4euF5pG+zgAbacsc+AyuM+66YbBKpv4g+qS/jzSUO8BpYCjFHZ28J6bzQehfshDLs+asMMoKWCHAdxDA5r3lQo7GNBw93za8skxSliIAKi0RTp0wF1lt1lugXXLW6jUFihL5NElNxp/t8eqguak7Idmgs/VxSMwq+rBEVvAj34tEukfIFuu7/ciQK6LHQuRjtM0CFLTNdgO61FvJzqBnuh5QFx+D4Bvday+1gZPwmvBI/hFbEOaseT5NHtw== 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=bEXpenkLV16e6yCryXylNK36l5oeYsYDp2GmwlasCp8=; b=BF8J/4mQ9A/fFcyqMrXcuODjUdHie6Mr3G5305lcCA2/QhcInO7CIss/QjHkWfJi1JQbHCE7BYWucw2kwiD5kQvdGGDky6s9Rh3G6KF4DUkLiLxJ4hyoLM3Rt5GVtAdWr8QH8idUgJaPlCKgixg4jP+7Bw3UvyzBY8GBKDsrwMEfxcFXhDenlKkdupWDqJHU2t5T2Vb4qwXN6QEEfmxnfKmelow34st6O7Rpco2cGdlsuhx4gWF4CR+FchO7A+4/p5EQJEHBVSQKwPijiAEY/WUj9gfAWNonQaKowJYkQM87YunaTL/qUyw0Anz0M2NhQMWSRiVZbOaiTPaWmOv7sg== 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 2/3] conf: Support multiple smmuv3Dev IOMMU devices Date: Mon, 22 Sep 2025 18:04:18 -0700 Message-ID: <20250923010419.3225547-3-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923010419.3225547-1-nathanc@nvidia.com> References: <20250923010419.3225547-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR07CA0088.namprd07.prod.outlook.com (2603:10b6:a03:12b::29) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SJ2PR12MB8956:EE_ X-MS-Office365-Filtering-Correlation-Id: fe7b8b38-cc09-4d85-1785-08ddfa3d2410 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?w/pKQgo0SW/DgtVBxwVr8DMDlFtjrGR1mvWl+pLNeMaAWVW4jj0e3VlIah02?= =?us-ascii?Q?8VOHgek7AQ42WjBIR96asoUGwnIermRroioSUurZJ4CBW1I//1xxqw4qqatW?= =?us-ascii?Q?WK65Z82mEgnVJw+PhaO1X6vRoGYllkihN99umU0HN0GZaAWgJdw3nxsTJJmX?= =?us-ascii?Q?Pz0VPzoiM3krxRVSDMFHk1w5RtZ0Bovmz6rY3rz2Nzmp585KmZz2njbe9GXk?= =?us-ascii?Q?G77m/78bJYPn1JFzRpgK5uG0a0FToHCAN6NsIlAoJMjCcBi79eLu35DKXY21?= =?us-ascii?Q?tciPlDwyVQgHmUny6gMiDV3jGyED+2b++GpDnszJdg3ioeX737sdCnfzD8fe?= =?us-ascii?Q?rVkEWCw9kmO7/nx9+UmKLZQgcKZGtWt9/d8aMPtos1brV4gDi05SRMgKZsYn?= =?us-ascii?Q?Qo96qjJlf0BtRRJhUBYbkJZjBzySsegZvK/wX8vILuB6Fmy1FZG4lO/sLSS4?= =?us-ascii?Q?kA9M9C4plBCjTH0Q66odtUPY1zdmzr6E/cwZhRTpmog5Hbhh1qP+ENeEcG/w?= =?us-ascii?Q?pFIXzOxI92eNdHExxkWAJxTThdWbf6ZGH2/paLpI3sZAXsQXGYwt2B+dp50c?= =?us-ascii?Q?KNcAtqaa/T2GrbDNi9/aZuRCTQuRu3BbMyF/QnYjpw1RL74Ar5lnf/hrU7+L?= =?us-ascii?Q?GBy48dQIgbxPMTPYuis2omj4QG6dwPm3J5kLCN1NDlz7zXOAgr7GoaIPx9bB?= =?us-ascii?Q?995OQPFrdvtfB1gsoQ5C8zxuwHvyYG2xIsfiK061uGGax8BS9TrUFpdXmGiB?= =?us-ascii?Q?sty0kQxKi1K8Ngr3xiMrR5hjammoUHwokKzFEiTf5GvCZGCh97v9i2LWw8as?= =?us-ascii?Q?t2Q0qhSL4OTm3MTsvvHieSYwHSfFQhu6u04kKBA7pfYursHQTwPXag7UMQeW?= =?us-ascii?Q?xUzALPSJh4gJXEToFxUQnHI0xgdMklinb7dK1mswnURYMOxpUZUu1If9bP1S?= =?us-ascii?Q?M/BofDC4UI5nBGjSe5Qxq2Ju8lU+lOSbA+VxvIQycUWOw7vOF7fsTfKEqSJH?= =?us-ascii?Q?6PR/tanD/gH9w6RR7CJusQ3LpQ9f+ykbkXaScnU7J37sScTLY1S5nzZJ4IhD?= =?us-ascii?Q?Bf7OoLp9o+b/FFUFKdgPaRkCs08BM//s+HnHI6+02bALNeF7Gd/oEp9e7dEH?= =?us-ascii?Q?U1m4OUSvDvWjOY6CO5aCsT9sqaB0emCNbGgHCqZfVgGIJjLr0XA8s+24DLec?= =?us-ascii?Q?7AFvJRMg/lhP0w73OyvzEYEKdonpmToqAG39ql4It0flM6hBd4OmBuafYVJZ?= =?us-ascii?Q?gy00o4BOfc6ohwa0z/JnL1vECtMXk5txstqcDG+ToTu05OWxH7hQn7VxdXgj?= =?us-ascii?Q?98KFnwaz77Kdi/72TTDR+uU4cQ3Lb35GYsrlmLvvZbKaMtM6nTnCJ2vDr2R4?= =?us-ascii?Q?3ojdJez/wcLvRD6hgJcJM3cE/prkIghtBTWFwnr1yMB658/3PHjI5r/2Xoz8?= =?us-ascii?Q?8ipcUOcSs2k=3D?= 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)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UCRjpmVMcsBvTtVpXe00jpbxsvFkqLZn+x+aN/tAsenZe+jOzqnFB6o3p1BL?= =?us-ascii?Q?tbAokep+fRlXq4voMYt+ALIHADbCdWm6t1+i2bSwTdoZOss+l8DbUcbx1u/y?= =?us-ascii?Q?fGu0+20guJFR/Z+0aFAoCoD6zjWdm49rVia5zutWg3RqdMOAlU7XBP7xD2om?= =?us-ascii?Q?TyCNpAYaqLjmcvC1t3rlUBgcA3lJVIckVUKPfDCN1o/wXi4WARsN3v9GHD/+?= =?us-ascii?Q?4SjAXXq2VbZtIPTjT9DMgkp7U4AI15cmtx/Q1T118E4n5Vy7mHUnnY4NgAfj?= =?us-ascii?Q?hxYi7v+s9eWLZ6GjkAejAi4U0Nm3e42z0dZUDNZ0YzjTKtMP1shgSlVQROu0?= =?us-ascii?Q?Jo/XZCLIQcllq/L+nbuYOMnugUDsuXiaWrlYoZlZFOL4wswpEwVb4c12iJ7A?= =?us-ascii?Q?LWG+n0QSVQqGbgg3qAJo/LA2NCBtJCICrj9Kp84pVIWIcjdFsyFWXfUpnQsX?= =?us-ascii?Q?wMd6h+rprGLarYZK7mPelIaIdwJwqJ7rd8DtHYV6yntTLKVR26w4+C8sO1IG?= =?us-ascii?Q?dVC93aVjxl7cVQ4pUgYjVrxcS3vzAruTcYU6w4fLmgJalRAJ50sRi7d2TXfL?= =?us-ascii?Q?5oOWvG3wsraejC0Yvkexzkjv+JQmcJm8zdq31uUEA2PO84NPiitcqms82vS6?= =?us-ascii?Q?I1YrRSu2uqtbz97/VGWj8qPZJdTdo5wOSn3KV6xHp30wgEIrGypU/Fy3hmId?= =?us-ascii?Q?8Vg9VolVs2Q0FM6ZpzB2qQ+rf1fUVNxznfZqJExGaQsKyKZaYIHRlgf5p/D3?= =?us-ascii?Q?CVyO2DpjPakv0HcnMBFeu2ntrIahDcqweB3mQQEBJDpBcHM1oQ8ndQgoMd5c?= =?us-ascii?Q?ht2pluBeo6AtRTY9625ae6BmlyXUcP81aXm9wPnbg6C3JGVgvz/ZTo2M3lPq?= =?us-ascii?Q?NLRqvFz56X2mqwDr9tm16JiCNQurcp0WT1svplWTvsHcHT3+zxj3irfiFZQd?= =?us-ascii?Q?HrmwN87nsfFrQ3+VrOZSsllSUbCsArzgFZlATpkO9vyDT/9Q4fQwqvMenMWP?= =?us-ascii?Q?+hjdXd2eixphwwW+4frk4Ue/4SADfYMmdD2TH0CIeMnWyC/92dbDV7TjrE8c?= =?us-ascii?Q?R/Gm+VUMF8NQljzKmYnT+sTBEq+MSjllWHQGiQJSra0FmVsqSNQzDcveGBDj?= =?us-ascii?Q?SpKdhQRCPJXDX5W/k6ZC5zgCZrckaipjrT5CkPxrU5vVvWc7uQ3qTbDOc3j4?= =?us-ascii?Q?Ax6hIF2E8/dh7QWm5stU2yK65d8RGczUR8OjgZ/UOkGIt6yPJ4QWjfAFfAhH?= =?us-ascii?Q?HwV4itJrBKXZdqbz6sngMd+LgVKyRLsJEgi8VIolacKeBfNriwbYhEbZR4nw?= =?us-ascii?Q?FzjfOO8RQmjCTCkDuZR2imDMbJZiN0xWP7J9vDS/fHBXtpTDdVlJ/RwRiBn4?= =?us-ascii?Q?NnrIhTHupZa7H0GIHXZeU4EhrYNwS8ZiuWrtVfRem4yrGZnrTfJ1ljDgHDrD?= =?us-ascii?Q?x+fx93qCivPT8hpmsnxhHvGVJnRXl4cq00XAFrdHEi/Ef2S0cflEA1xvXs/o?= =?us-ascii?Q?r92q/gbnviDkvUlCtlPOjbdvx/jajf9o6w7Kd1wn2s42MUUfj1a8m5PQUSVH?= =?us-ascii?Q?ySnXIwwkihU4VQlNvv4xhaXIulUoH+5dWzdVVwyv?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe7b8b38-cc09-4d85-1785-08ddfa3d2410 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2025 01:04:26.3114 (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: zzBo6/tziF9vDdLjT1/vSFOxTrugPPmiopvWPvjY3SZPXcso7lfunyk6zQ3pQh1flWQDNf0LyycQaB+FAsyzpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8956 Message-ID-Hash: QUXBVVIWECBDEYDWU6N2AJRZ4Q3AEO4C X-Message-ID-Hash: QUXBVVIWECBDEYDWU6N2AJRZ4Q3AEO4C 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: 1758589932672116600 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 152a672899..8f5ac686af 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", @@ -29465,8 +29514,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 038ed8db86..5a4cd9d4f1 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 bb9cba727c..1745771f5c 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:13 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 1758589762945104.94677767368171; Mon, 22 Sep 2025 18:09:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id ED347419D4; Mon, 22 Sep 2025 21:09:21 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7D55143E83; Mon, 22 Sep 2025 21:04:55 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E005443DE7; Mon, 22 Sep 2025 21:04:41 -0400 (EDT) Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012058.outbound.protection.outlook.com [52.101.43.58]) (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 74CEB419EF for ; Mon, 22 Sep 2025 21:04:33 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SJ2PR12MB8956.namprd12.prod.outlook.com (2603:10b6:a03:53a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.19; Tue, 23 Sep 2025 01:04:28 +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.9137.018; Tue, 23 Sep 2025 01:04:28 +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=VjUzPzFd/fFEKTvfNpm8nkyJlaidHGC+5y5EPvnaoKsrgLQT8GTNvxumTjqxL8MInvDdd/w7ECkOfI4HAAN+VNweIRLgdSh1vePZcqp4jrEDmztJz2hzHLTW8XBd15mndIZrKCC8NTyuZ/FPxAzX/RL2hpSPFavz6/M4OA600JFnGKMe8FKdhpadMx7Uj2f3YX2C+FeL9hoSQtxUn1c9IRtOZvsDG0OOKNt55Peq4peQZPtTjiyfn6ijrLf8hNIoquxF3iWBq+Ai1Mj06esOoHhc7vAJUeMk+MFICruTqGmN0QNPRanwE1X5pIUZf64hj9qgsyh16w6SHr3742V9lA== 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=vIKpUtAnWGQ4AXBKlBw63pgwx0eSbatWd0Aun3mklj4=; b=fxDI6iHPqRFmfCYveG+MOm82W1CbNeKV6vJ8lsOderY7IcxaTwmgN/99U1uKtT0DOVAEa7na4klV9CnlGOMxHypo8Ivm3F0Bdte10D66hRWW5kipcmsN3Kb/JxaIlvm6VSiGPv/SrTDbJPuT0tpFrgkp6Zp0IRkP9EVJkKBzhacOzvwCLuw8Fc2kLEYKa240YLTac0B+FiWRtxA1if8DdLE8YG5O8rEErrpgjBZH4upJZxyq3RKjNAtLMM4lZ79tylWMsD5PYsKOTZ9SMKsSthgQ/K7f1IL5AxrWVD1Dqgso1CbVk9dd7Jpg5IDorodlgfX0UrNi37RZgAHbreVmlg== 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=vIKpUtAnWGQ4AXBKlBw63pgwx0eSbatWd0Aun3mklj4=; b=MEaEDXXpNhT10d0K5tkAqKffSP89v3k0lTka4eB0CfwkGmrU1nZNM97dgFndvDduL4W11pxYLMrRVBkWso9eTiIqn0ytkBBCHW3eii4J+SqvKYaS0a6n1O4HzUIfhQP1VeJ3AU/vCOyW3ADTjUqTR96uZ2AyEqpNi5g7V+rqZtKhWnFMnzCKvto7Mlrdqax/DSgnIISCAzl4Y1hPhbgQ/C7L6kXV0a7eG8ucBZkd4fYaOZKyUDmfm4xly8AkkyHaSxzAagjMU2gGq5RsV8/MoPuQqlQ9u2Ie0bM2YQmzFrSgi1VCC8cg1i9Ae9idAeMeawaS3jYJwpcnTYLaXbxNMQ== 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 3/3] tests: qemuxmlconfdata: provide smmuv3Dev sample XML and CLI args Date: Mon, 22 Sep 2025 18:04:19 -0700 Message-ID: <20250923010419.3225547-4-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923010419.3225547-1-nathanc@nvidia.com> References: <20250923010419.3225547-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR04CA0024.namprd04.prod.outlook.com (2603:10b6:a03:40::37) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SJ2PR12MB8956:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ef2d25a-0cdd-40b2-84a5-08ddfa3d2558 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SmHf4vrusjreqgUPuWkj2mxtCciQzdh/sL1yVbWo7hlAheku2TLdjRFPlvvK?= =?us-ascii?Q?gAqWDXni4ROI0tRZHlt1lgVMu9bVNXdk2LhdwHL95KtkKyvieNyZfK8Q0c9B?= =?us-ascii?Q?FQ54hjzDY2qy3/Lg9EZAJcB0T5b7GB0WnR82rQtkDfwNEQGqd7L/11feEsgJ?= =?us-ascii?Q?oSO8X7pOTjQMnywA4OKOV3RuQ/fUMqZKtPawSUTFbRte8eVJ5NndrIwxtdPA?= =?us-ascii?Q?xt/zRQnbCnP+YreCKMgmT0G4jSB3HIHT9uN/NMA9dya6WFb3cxsCXse4F13p?= =?us-ascii?Q?jtmHKWmufTaktuMThWNghlHQnwM5FfE7gO/0CnGDjTz23fMj40cdkqpI0sXs?= =?us-ascii?Q?ZRDg+hhdzTeBJ/QhCrfwv46KoY/Wcnuz2DR8/TN2BrWfDs42qhPoZqZFlBd5?= =?us-ascii?Q?fpPyfGHs/4jgyypzrZHmhWzh6B7L7JDsgzTUSceQeWjNXH/+JIjrkKk1MZkn?= =?us-ascii?Q?+7r8PvYQ/oLKRd2FgIiVLQENWcXu1WfmCPHSCDrJ0gOYcM2AyKs05dyK3+B7?= =?us-ascii?Q?6khDbYQNNSL/kVMPnZA/qgX4xksh0rsokVlmzEe5scgN3RhQB7A2I8Wr73cK?= =?us-ascii?Q?9FERxtTnF+/Albf87QBV7lTXv7PihFO5gVvS024zIj6JT+eFKXlOgyUaaTmF?= =?us-ascii?Q?NtQOqf3wr+lAaXzJJihBRRR2tj+ObuBkupuuAB6H1/Hf47xBTnSTlhjARPof?= =?us-ascii?Q?f99bfJq7WlcOOPXXeS8mmPIfznl8QErEIblVuCnxEdU0mspNqC+gFOzJUC40?= =?us-ascii?Q?7pS5tATyakhMIxD7sw0eFTRujKTdBGutOtTXn4egtBjialbmGuIpyUS93rsZ?= =?us-ascii?Q?EpDPILQ/MuLSg1bMH4xIMoLPLcIGSkzaLzI2yCBkOzoeHCMlI9G6Uy9JlDDo?= =?us-ascii?Q?IPMNUKfgonn3j82LLppBiYAmUND9rb+WmZI7UcRf/z79VQR0yUYFS2u28K6P?= =?us-ascii?Q?FAljtBqGKN2GDeBiUovpBuAWEqdWC0sfBAcY/49jwS5f0bAzx8YslGSStPWX?= =?us-ascii?Q?ognWqwWld1pccUbm8z2DAreubEmQxRXvggcHPJM5AHpjOBSo890S1CQlRQd6?= =?us-ascii?Q?meJnKo6XtjoJbKssCMOT5WRc9NBmGMp2C2f69BezrGTbEfPcCrmWbi0V9CGU?= =?us-ascii?Q?iHqi8rbvLUF/nmruUlUAbo3N7em8mDE277S9iPecI0HmjFPnlSl5000IqF/9?= =?us-ascii?Q?H0TG91AEdBBgtklWzAHgPwj2BSE18DVIzcS2b3Hz6ik4fww5Kx9IPko4FdFI?= =?us-ascii?Q?YbxdrLNdW4SmmgjMzdaQWuYjKAAukNKcZZCZS31IUzUjA4tHbGuZ7uEgxyVf?= =?us-ascii?Q?1DoDxdicsSc6qELufWaJTbOaP9MqWF1z2rI6TLWDUULVi7aDfNwx43ElnEpV?= =?us-ascii?Q?X+AgdhpuGGxFnxSKzEtoHD3jvG90+CxqqBf9eMmvi/82Z9edGH3pQcz1IyHd?= =?us-ascii?Q?T172v67790Q=3D?= 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)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IhVZfRTsDJaEILv4rVq784JDNHXBFV+8YOAYRqnexLbX6uLh9TKc+mzj+G/L?= =?us-ascii?Q?FR/+JDoqsREIg7owo6euV6dYwhf+wPYqgbtrkxEuUHA1MHMn9tfqhZblM4u9?= =?us-ascii?Q?lKeUrFSUPKUHgBzlXHayA+UCutCRkmNJstfjzp4vi8+iUkA3tXVf/HzlsN4K?= =?us-ascii?Q?4vlNgF0mig+4qlhGagCoSdT8QmLV+/zouPByTTVjEuYQtqLpKPo2iplxgFm+?= =?us-ascii?Q?uqfU2bhxlwgUqNlCros2GbHgueTnZS4awD7c9pDaDB/hFL8H5WdiQhtUMD88?= =?us-ascii?Q?zbpjS8iLGg4n9AU0e7lRedjYsrnVGsBTcsVbwToZxJcw5e3/1r5rIYbblRTP?= =?us-ascii?Q?0uwvrJL6nzabGNFR+E5PkHBNSPEuX4/fcAfJFNo/S91w7UzELv0XaSeAHejO?= =?us-ascii?Q?BtpP7cIBSba9zoux8OSx8QEKZJknkXsWFGMA+6mOWECjZRQQHJmXof6Szf9V?= =?us-ascii?Q?3KxgGRLiRjOsFqk3PVJD9qcJshgeuGLJuDTSKRYDy+JZ36dX4fCgRJ27gh/S?= =?us-ascii?Q?WXbwvgD3C9BPmoTq6F3xIdb0ZuCNWGmLG/eCoNFf4P3cWLzh3nbbPadVUKNM?= =?us-ascii?Q?bcNueD/PZ9qhxS0aC2ss7FfBh+d/assEE2F3w5xMovlAGaZW14fa6Qsy5JRo?= =?us-ascii?Q?FetEa8efJ4sr5Lk/YKoE2fRwCa1jBVDQzWvZK0UnpDtqWWebCRB6aPKpYJO3?= =?us-ascii?Q?E/UbC3h3xMsXMG2elrOWnRrIPGO+I084SDT2tfDdulDdVOmEMxuzv2FnIQ/0?= =?us-ascii?Q?A7CQPaGqmlcPwE6SgGf+KHs2at7AsyZj47+XYIlkMS/rzoMe+BeBNDx5MSsO?= =?us-ascii?Q?agdhBNkkC6ql33ve8Cf8RKrz4LP9ey9Gfo5KDStXhf9rR5avONCu1Tdv29DO?= =?us-ascii?Q?8LKRKbz0yg5GFVYV1ZgTZmApAJpPkmuuvxzI0OeRprJVQxlxuNX5XHhQQnYv?= =?us-ascii?Q?UcCbSJrjwCRJQhPfjStLdmL1e7MLWdwMrVJUtX0ffoGwlE5ULxisp00kHIpZ?= =?us-ascii?Q?b1fDjYXmbdzYZBNsm1K4De0bNrbwLI6/F9oM4lagjYEIbORY2F02NKVA3lAR?= =?us-ascii?Q?fVvExFwiSpQ8thQfrfN/s7FPqqHpnhD/7D3cpuRONKtGXMQCC28P8371GkBN?= =?us-ascii?Q?EtnPktnWHHZpKGegc2dyBZx8WU9tNOqcDj0EIroJG9VWsnvi2n0FAgSgeTTR?= =?us-ascii?Q?fEDaagCs82DH6zG/mPu4cE+OqAdNhbUeWvjGT+ZuBYsxZAVXCd0up+JYnYTs?= =?us-ascii?Q?RGCRUmuSacrqgi/v47/V2jOy9WIA5X+ABw5X5CFMaddZpy67LwGIMPE2gwtI?= =?us-ascii?Q?6mqGtoUUtuTgcq3nHVcd1gGlNYF9/GyIBskrWoTh2IJVp9UciHqzAfNXHP2m?= =?us-ascii?Q?UMM3fAcArdF+jxRp2Ao25kx2dyL6qX255wShR9kGXZ8mtN+o4oew+Mb6V07m?= =?us-ascii?Q?n3dmTHNrBeJjGSCoff04sx5XiRIGog9+Ibk0fVK1lUNNpNzpFo9u523pkjtZ?= =?us-ascii?Q?eykl8zOEvb0jtrxc7IU5xXsZgyvBs1DnAvGZ/ycTu/ZdpR47XWJJgRdoG6HT?= =?us-ascii?Q?vPE0Ny48Cv301PZw5SIbWZ3pNHSxoPGQ3GfNZBEx?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ef2d25a-0cdd-40b2-84a5-08ddfa3d2558 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2025 01:04:28.4502 (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: fNklLmvE6ENOaXWUmVR1bIyEGMhBFmlSJW8cuhko5h0/ieNFLpysNxNgujr+e59kRDqvLZcgB7NWT/V0LrMODQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8956 Message-ID-Hash: 6TM7X35S65N7O5KNGKDXYRCBUY7E3Y3Z X-Message-ID-Hash: 6TM7X35S65N7O5KNGKDXYRCBUY7E3Y3Z 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: 1758589764638116600 Content-Type: text/plain; charset="utf-8" Provide sample XML and CLI args for the smmuv3Dev XML schema for pc, q35, and virt machine types. Signed-off-by: Nathan Chen --- .../iommu-smmuv3Dev.aarch64-latest.args | 39 ++++++++++++ .../iommu-smmuv3Dev.aarch64-latest.xml | 62 +++++++++++++++++++ tests/qemuxmlconfdata/iommu-smmuv3Dev.xml | 49 +++++++++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 151 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..ff81e584c3 --- /dev/null +++ b/tests/qemuxmlconfdata/iommu-smmuv3Dev.aarch64-latest.args @@ -0,0 +1,39 @@ +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"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":= "pci.3","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","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..8c8d0e0296 --- /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 + + + + + +
+ + + + +
+ + + + +
+ + + + +
+ +