From nobody Sun Oct 5 01:50:04 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