From nobody Sun Oct 5 00:12:05 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 1758590631851401.99605980297986; Mon, 22 Sep 2025 18:23:51 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BDB2E41B9B; Mon, 22 Sep 2025 21:23:50 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 68EAA43EAE; Mon, 22 Sep 2025 21:16:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 56AE8419D7; Mon, 22 Sep 2025 21:16:36 -0400 (EDT) Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011038.outbound.protection.outlook.com [40.93.194.38]) (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 040A741A29 for ; Mon, 22 Sep 2025 21:16:12 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SJ2PR12MB7917.namprd12.prod.outlook.com (2603:10b6:a03:4c7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.16; Tue, 23 Sep 2025 01:16:04 +0000 Received: from PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb]) by PH7PR12MB6834.namprd12.prod.outlook.com ([fe80::f432:162b:b94e:d2cb%6]) with mapi id 15.20.9137.018; Tue, 23 Sep 2025 01:16:04 +0000 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ARC_SIGNED,ARC_VALID, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BEPtCvY9x6x3SCt3ZbmdZJzHFEiGmNZ8W/0+lC9vZvrE2jvbXeWGUdP9Liwi3xfVDFLjdil3uWeqNYJn0Lvf386vo7ZDRtDEeuhvzW91JHIqrXCYkOUOPwukxMUAPaNsmC57jgYPVBnBGdmfpBLQixI8ZwbA/JkBu0gMuyYtiMVyKcwosPacA8Pk22i+W0hXo9hWbnjyBk94+quv9ta4Xs3d4yfnAxs6GehlgEdJcvpdvaz9VknJw/2I0p05o+9m7uSnpEelFVF1D06Rn7wBvbfwe2SgqxnL8udZLA9cqFb1HIDmop+M4eHBCBC+9jQQ3C7eH4NUUGVProJIBFtU5A== 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=hITjc9oQ8s6U/Qs1HwS8uk37gSTjQjMd10UIOQkNzbU=; b=usXEWiD4ALm9LOOSAqRFzSmyR3HYbxolnQt5l6QhdZOqEGqsGifuazclWnzPlWeJ3fqxB9JCrZ9lT6fQ50QLRT3aoM7i3dYk3rVoe4VIrKMuzhdG5+JAR37CssUGJbjhAnJlXnRcqmEnO0Uq8SbGqd3VXcsqh5KYn3oUWPO4Et5Il3fwzfo6XxMBF/ctN51T8iUFhNvHPdrCqEULAVnIZ5gXNrDzInL39a0iEsppuE0LOCPPT5QN+FZfQsB3AHxG5dE8+k3wq+quKGvnnX+qrOIH68UZnID1jVPGbFitklWLtHM71hKHg/ASw0R3ikQvbJLPQlcmSOgTVvVTxB2OrQ== 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=hITjc9oQ8s6U/Qs1HwS8uk37gSTjQjMd10UIOQkNzbU=; b=qk3DjtRdU10OKzGkn9SZLwLMN1YwoUQufujw2T/5QUzGGI4HMg8IxYSU0UlwaVxcQd4FFQ2Yo+8Qgj8UmqadK0AD4QyjAOlZQWKnd/FvFU0kOUHaBKARPdi21yhPjwa16sYf8Wp3f572AazlOdBxRybBGsM+5eNlFOx2o77V9NSpof0tij/dLB3EXh91d9jVGCbm07oWGiLPQhSB5VAj713+StGd0ettos1CG/D5aOptRgQHOyJWF+aEeGIdzIJMsgsvcnFAxaZyhUTXeCIhoFpkdA0FTljvTvHf8Fvv/qNjeGKAbevelaye/fS2yjvh1zQZBsfc+ue1iEONAqxqmg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [RFC PATCH 1/7] qemu: add IOMMU model smmuv3Dev Date: Mon, 22 Sep 2025 18:15:54 -0700 Message-ID: <20250923011600.3229388-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923011600.3229388-1-nathanc@nvidia.com> References: <20250923011600.3229388-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY5PR20CA0009.namprd20.prod.outlook.com (2603:10b6:a03:1f4::22) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SJ2PR12MB7917:EE_ X-MS-Office365-Filtering-Correlation-Id: ed512050-01ab-4e2b-f7d0-08ddfa3ec455 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?YtG6n9+CpB4Bs0gJlOOAJ2vt4MylZI+OS5r/5HLrl5HbuVwK4sTXAhVKmgq5?= =?us-ascii?Q?dhvooptYYcFO2r1izydRrYTfWjhar8El1TJr5rLTtA8fVc8OAEJa5heEOesj?= =?us-ascii?Q?0ma36thEkRszbAjevd6yGBC4KMgo2EOl2X/qp1l+KH8Urjth9K3Q16nhOZRg?= =?us-ascii?Q?Qq++87u7UGB5BOC4/tYnlo7XgKCuuRb7nJgt1moCJjnUlJWsUd/kJkCLOAZq?= =?us-ascii?Q?RQRypYv22VPo79mCBXmcFeNG6DTr3Wkq1aaeF207BGKd4RqM23i1Al13yeaI?= =?us-ascii?Q?9U4FaK3WIF8sdseXJL6vJ+pZ+pgsGwFcO21Fge4GAkcT/IPv9+GxmTitPQEb?= =?us-ascii?Q?oCOrRIlcdMcPwRDLDNCwyxrUVaE4kJ9s1PXF5cwEbzmTJF7hnogwhzCWDBDA?= =?us-ascii?Q?4Be1KbzZNV/COV5+z+SEr/TxPOpLg6vIfNDppoPwMcumSL/5ynms4PHjG/Qc?= =?us-ascii?Q?xAPtosMWqS1BrKPKK9tA684z0KL79hesY6nwsfWCQEnjVSF5GWZ6l2U5hmpn?= =?us-ascii?Q?GiuDkj1qpiBv9v3yV5QvaTaNAu6FIYLDojWCBOyFdlV0MvIL9mf5FRpEQT2k?= =?us-ascii?Q?H7l1u5psQyMMehW+YfCkuW6SCe9dBHe9PXlPUXaWrVlYTsgz1oMVb7HSMkpx?= =?us-ascii?Q?a+tZQzilqsXm+qLt7mOuWCdz2Y6kRYojYsdw33yX+ZflFjLxaR/6IpoQD4gB?= =?us-ascii?Q?c9RhTa02KClDU2zbHeD9hTQW+HMRPd/DxmJQ4XddL6vs7T3FxtleWl8UTbUx?= =?us-ascii?Q?S/rSV+BQnqogbgpP1oDVBF5Nqcy/KeAZe29ZVgdfhOMHv1R/lkZvHaMFdgLh?= =?us-ascii?Q?pvGZeMi+7lZAMxez5brOOtXxuTTqpVSeRfvSQnuoYWzgi01X3jB6AP56XUxT?= =?us-ascii?Q?DX7cYersMbScQIk0+JYnlpGsVOiFlfm8pkOSHy4+YDGK1wFf3I9rEwsjkRzC?= =?us-ascii?Q?CiQTkDMYk2uEGlPY2uvkOa1iq3WUL6+rv58l8wnkhGnlKyoZhkjM8VdYSfMe?= =?us-ascii?Q?AZ3ZmnOpXVYAflFPUUB5mRKt5JXfQv8ayN/3pvOYPAj0UZrQhH6cAaikUhId?= =?us-ascii?Q?6yMRY9yni3b/lUTAxWEzl0FJCkcQkoLicrOplTJobSghuTY5FcK3wjeQsUDa?= =?us-ascii?Q?AUS5XdCgMCxsBhF8pwu8kSNbRPcwp8xWoXRv5f0wW+ugYQsGf5GX5t/BeDwY?= =?us-ascii?Q?Dp63adm4s9AVPw5hPNJn09D6wfXKl77t4AkcXxgePjXVpz6HpM1kPp5GPa3V?= =?us-ascii?Q?oFtcUsjESkmbKprYo715msjZC5nzjIZ4U5prqmt5HbXIJy8rddhJgquBbwzY?= =?us-ascii?Q?bUnqr1ARzR6nNkxcVb364k9LkP2odnaz7shf+S5b0edFArQ782bn2RFMhApq?= =?us-ascii?Q?etfp2hy2cE6XTaRGMRyhFrpJrW0KgRtc5ouTkn6VSvhrGpawBr+XVt9oWmle?= =?us-ascii?Q?AXM9YF2ulSo=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?H8O5c96wyJyB4HGjaLN4+b+HdezTwpSg60Q19XyvQmOUqzqA/r4VGGIr9KPz?= =?us-ascii?Q?5qNizbZjI30UYn0W0TKKiNFJX/gLbgfxhMugUFRfCIbnCu1hxeqjVmH/59o5?= =?us-ascii?Q?SsDGK0EQ99A3sRNPvMId18gcxQ/OF0s8ho4YZSFNJCQoI4DXSqRcwrWF6uRu?= =?us-ascii?Q?p9/crMafwjAVNiDEOvnOkdsCsr7VPY1dNOA7lULi/1iLzRkQlBEbwUFwhw6B?= =?us-ascii?Q?qimCCpSB85wbSuHYP0256uLAJofvEG7qpteGi7XgciiSmub69VH5ND7oaDqj?= =?us-ascii?Q?DQGS+TFiwFU/WulWM/dFxfDNoY3Ke9xPt3LmoU085tj16NZgOTNWq1fDIJj6?= =?us-ascii?Q?dujbW42+NSJi3V4A59g6otQs3PQqzKpiftEfrWqoIX9Xw7CpZyMTP1u/eiRY?= =?us-ascii?Q?mU+jW1U/f6vy+wl6FW9bo4KH6uqq1/5//CXX1vTr/Cp5X6/CPG3S4MPdCz1N?= =?us-ascii?Q?q2ze4hf8jqRdq6HDyokrsR9E5NdPj5bpMUtfA/liL1GGYRiwvbU15booJPZh?= =?us-ascii?Q?AItZymL5XiLkdO6MaAh8u2EsxfknrF4FkdtpXtcMUFKTse5zWVS6OlI2VXgU?= =?us-ascii?Q?w9/meYhIt3YL2h/Fq44x/u4aRaL46sMfxqtuLx3ZxWaFofW7WKWDbODJcKz6?= =?us-ascii?Q?ISz7tSJYcAXRN3ksnm1pw7Go5S5eLadQS+Lwpl/n+lmkaQrThQ5FVEP21KNC?= =?us-ascii?Q?sm2SV+FRs+RCnWESY58IfKxW+Dunzrb/NnTsgCg+pIBDbOKr1Shv5Qjl2Vpu?= =?us-ascii?Q?C7tCPMWxtsuM/a22J1+pv2jMRAGq/WdkydymbQgY00Xa1aSA6ssKbYq6lnUC?= =?us-ascii?Q?pKivYnDG9CCAyijByhelsnYWbMx0uEiw2rjTMKNeFCScUH+QgiDVxG6z9k1a?= =?us-ascii?Q?2OLlu28slPhWkJ+fwPKXwfvT9b10XAv1gayMlIuOpufJMv5kysyZRNcOxgpn?= =?us-ascii?Q?xaA31giK/TGM4yit1b+zUEER4kGFWwlx/mUFg9cme0R85ybhPyYd08+Oat2b?= =?us-ascii?Q?3f1KrQu64K3JrkKh9ofwBdjt50oxmYwn01MKG9N5qKb5lMJ79ZU8LcocCKN9?= =?us-ascii?Q?7pg8wM43pLSvUsK9qIZwrJ0au2odFumlCMkPvrDbI5pjx3xZVMLHIx6yS7B3?= =?us-ascii?Q?KW4CvPKdUqwOZPa2/JE3OgO15cUgEsBkY9no/yN1Lej9gZJTKY5QACENlJs7?= =?us-ascii?Q?mALiy4V5afTSEKom6jDNirRQ3YpNt1Ksk5nvQGGQksw6voi9JaNcoTTEIy/y?= =?us-ascii?Q?+2VJ8fmTYgSZdDi1BXh8dUKnzcMSmneA6IRZV4Vjo3P5uPcX+yF4KIA8KTjR?= =?us-ascii?Q?pBNKsUI5SOtzK23cHwRGdVjxajYADUQU3iFGOIp6RsTcwQln707MG4iZJ1Qd?= =?us-ascii?Q?t01z9eBNG9I6PNjGe4413/bt/i4t50HxaddU24BsIxY26XMHLaJE/0Wl2frH?= =?us-ascii?Q?rkzBi5Xhp4vPghV9zP+Gusw6T272lTpXYjH1Yngp9MDDNsze5tRdWMNM66+6?= =?us-ascii?Q?buAHaM3AOnAVYor35fOZFUzDEJRfRIeNnYYbaH/BRykyBxBO58JlGPN6z88g?= =?us-ascii?Q?IZPShb1uOSlYvKVmP+eOM8SjGJrgSxfv5o/EFZVC?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed512050-01ab-4e2b-f7d0-08ddfa3ec455 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:16:04.6982 (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: 6aFkgu8hFTZE4oiqxG8QVpthtZhuAL4wGkhtwPCD+vO4+JMjhXPyDx1jFEIDGbEixD/H2CRrMBa/Tbb5wI7PyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7917 Message-ID-Hash: OOAFLBQDC4ICNFWJQJ3GUDJ5M3SGK7TU X-Message-ID-Hash: OOAFLBQDC4ICNFWJQJ3GUDJ5M3SGK7TU 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: 1758590633909116600 Content-Type: text/plain; charset="utf-8" Introduce support for "smmuv3Dev" IOMMU model and "parentIdx" and "accel" IOMMU device attributes. The former indicates the index of the controller that a smmuv3Dev IOMMU device is attached to, while the latter indicates whether hardware accelerated SMMUv3 support is to be enabled. Signed-off-by: Nathan Chen --- docs/formatdomain.rst | 13 +++++- src/conf/domain_conf.c | 35 +++++++++++++++ src/conf/domain_conf.h | 3 ++ src/conf/domain_validate.c | 26 +++++++++-- src/conf/schemas/domaincommon.rng | 11 +++++ src/qemu/qemu_command.c | 73 +++++++++++++++++++++++++++++-- src/qemu/qemu_domain_address.c | 2 + src/qemu/qemu_validate.c | 16 +++++++ 8 files changed, 170 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f50dce477f..2f1e06ba0e 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9161,8 +9161,17 @@ 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. + +``accel`` + The ``accel`` attribute with possible values ``on`` and ``off`` can be = used + to enable hardware acceleration support for smmuv3Dev IOMMU devices. =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..42b2a5c74f 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,14 @@ 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 (virXMLPropTristateSwitch(node, "accel", VIR_XML_PROP_NONE, + &iommu->accel) < 0) + return NULL; + if ((driver =3D virXPathNode("./driver", ctxt))) { if (virXMLPropTristateSwitch(driver, "intremap", VIR_XML_PROP_NONE, &iommu->intremap) < 0) @@ -22092,6 +22103,18 @@ 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->accel !=3D dst->accel) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device accel value '%1$d' do= es not match source '%2$d'"), + dst->accel, src->accel); + 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 +28440,18 @@ 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); + } + + if (iommu->model =3D=3D VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV) { + if (iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&attrBuf, " accel=3D'%s'", + virTristateSwitchTypeToString(iommu->accel)); + } + } + virXMLFormatElement(buf, "iommu", &attrBuf, &childBuf); } =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 39807b5fe3..c4541589d3 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,10 +3051,12 @@ struct _virDomainIOMMUDef { virTristateSwitch eim; virTristateSwitch iotlb; unsigned int aw_bits; + int parent_idx; virDomainDeviceInfo info; virTristateSwitch dma_translation; virTristateSwitch xtsup; virTristateSwitch pt; + virTristateSwitch accel; }; =20 typedef enum { diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 93a2bc9b01..ba12ea706d 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -3108,7 +3108,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits !=3D 0 || - iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support additiona= l attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3120,7 +3121,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) if (iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits !=3D 0 || - iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3130,7 +3132,24 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *i= ommu) =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: if (iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT || - iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT) { + iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->accel !=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_SMMUV3_DEV: + if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->eim !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->iotlb !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->aw_bits !=3D 0 || + iommu->dma_translation !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->xtsup !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pt !=3D VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3155,6 +3174,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) =20 case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_AMD: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: case VIR_DOMAIN_IOMMU_MODEL_LAST: break; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index b9230a35b4..1aaa1a3180 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6266,8 +6266,19 @@ smmuv3 virtio amd + smmuv3Dev + + + + + + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 031f09b7a5..53088f8d8f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6294,6 +6294,63 @@ 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, + "b:accel", (iommu->accel =3D=3D VIR_TRISTATE= _SWITCH_ON), + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); +} + + static int qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, @@ -6342,7 +6399,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 +6429,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 +7270,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 +10925,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:12:05 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 1758590829667340.0556090652075; Mon, 22 Sep 2025 18:27:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id AAC9D43E17; Mon, 22 Sep 2025 21:27:08 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EC01343ED5; Mon, 22 Sep 2025 21:19:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B7BB941A4E; Mon, 22 Sep 2025 21:19:24 -0400 (EDT) Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012050.outbound.protection.outlook.com [40.107.209.50]) (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 56E9543E19 for ; Mon, 22 Sep 2025 21:16:16 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SJ2PR12MB7917.namprd12.prod.outlook.com (2603:10b6:a03:4c7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.16; Tue, 23 Sep 2025 01:16:06 +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:16:06 +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=iHj4SVQSl+PFgdSWnTGY3HSUskWRCluLrW5/eYW2fF7bUVHjtxx0bH39jdMY34wfKQg2NDXdOe1FvXQf3Por3DjBC4vBQFclFEl+cuavNgJaEs+HU03QM/cglwo5g2rBb80FD5p44fCtFgqO/jpVY31vf6esmWgstCJVm96qMD9Kx6izy8setxa/xzgYUgHTigY0FpMhdI7MkQyshVaEwsCe+SuiErlfzUqCQ0jCrMKLaCBOcN+gDCWgu8qv6H7v5616cVBP5WAKwl65FdpQBESyDcpstAkrtc+LFOP1OFoIZ859QB83+LMl6WInx9TdT5yQrdLrsFjNdNAKSZP9ng== 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=rTHomGsNTGTpGLSOELax0QO0Np1FqNAn2+euvN8yWnE=; b=SHN5xszA0g6X+R2Hqg2XZvTb8Qx5+oyKH4H7oVmXpaiQr3JGfU5a/IYlkjLxYcDh5on7x/C0aZzcA5p7+LjFKAOnZ8mH2afq0TfYE1OwGPyiTPe56pbh5VrT8pI+tWTmRD/dlXBfkf+PQGNL8pFqcK+RaT5mRx0OyGwvqzqmOSnSqEpNOAZrCB3UpAgOBi07IohhEv3y1MTnPj7O8pucG5rVxF418iEwmFyWQ1jll0IIcv11FVO51RJvd/73J+B0VxAR0Wo33dmGBWCO3exS20hZtCRblu0jOAgkFBfnGggs7Jbo8iOoXiaM6XQt9aa9/v5Jk+89qKbrnkKCR+udiA== 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=rTHomGsNTGTpGLSOELax0QO0Np1FqNAn2+euvN8yWnE=; b=DRrS7E7Y9Y6eTpH9vz61nejPQe5uuS8R3xm+ovFUNgm9D5q4KDiNlufBhPJxQdRDT6riV2YyS5OVrEHHfh7ved3BzFpWhgy9UXVEVWlWxP6+JxRCDvK6lQHeuV5hALRXU8D3j0sqo7hnsNyqXHJZ23tXnL4vOPrSgQy0ZH4gQxPrUeb9BFTBQb2uqvQ2wzH7MGjEIFmRXP0CGGrAmF9kQ+3iZaMMjWwxzBiPO8UUjuvYC67iro7cFfhQRyTaoFZmGojkk5h/WH5yFHQmg/4BDRt7KsTTTSOywl8Z+F+yOuzwqiY/oZtJUJCO4kUD2mMVPh3sk85jhl8J6V43es4brg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [RFC PATCH 2/7] conf: Support multiple smmuv3Dev IOMMU devices Date: Mon, 22 Sep 2025 18:15:55 -0700 Message-ID: <20250923011600.3229388-3-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923011600.3229388-1-nathanc@nvidia.com> References: <20250923011600.3229388-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0094.namprd05.prod.outlook.com (2603:10b6:a03:334::9) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SJ2PR12MB7917:EE_ X-MS-Office365-Filtering-Correlation-Id: cf971523-2461-4314-1ca9-08ddfa3ec577 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?D1BaWHoj6tenczz6SAtsweoLYc1KMsgGB5WrEpDSfg7j0WgeCQr9lvWdJ7XU?= =?us-ascii?Q?TCNxyCAjcb0chYLlYO4369EtOWNQtkUsDl+BkzsqlRPAE0HtsKmmaLfZxL9/?= =?us-ascii?Q?L5kIR3No9vCp6g3hRjd4zXijBnM8rWaXCTFYywWN62bR0Bl9La/1jQlCJ8xo?= =?us-ascii?Q?wi8zmknSdOwoP/+636angkP9fHrQF1DTueDBJRDJD6qA67oBW36ahPJBaVsC?= =?us-ascii?Q?4eZ87HfPweZ6DfpyWuEvVU8iRuLpVi6NsKuMaJFoxnqu7zQrXnybYPaefK5v?= =?us-ascii?Q?9YlfsdL2+ETHgTIqXjaOFSnCFnq5AodkM7mgZJCZ3W9HTn215c1UkA161ClP?= =?us-ascii?Q?jQJJb4GaHPo395TkYccDjdsYDIx4F44Mcpp9wlLjc4e8X9mrIJO/IxX6MfoW?= =?us-ascii?Q?8rsNy/u+A0mAbFdptlF8Vrm7298LPfrytnBJQ6WdQe5cjpQ/u/bq8vvhj2HG?= =?us-ascii?Q?JJI3N1a7D95CD6+mfAMiDyS8Oqmsn98vff0G1/uCF9Jk9MGsIwmy8X5QpzoG?= =?us-ascii?Q?gfIydSEik8XcNiAPobEx2IzSbd9uAYWpDLVI083hfJvrhndOFd6oh9vU8oXp?= =?us-ascii?Q?sv2TqiNsPKneNZpkERbny1hCb0kkvrR+92uqfzG6YeP4yO0qJz4dgpY8PC8y?= =?us-ascii?Q?UUzEgA64ye7gdYx0HBGUEj64nELqoy11nLVip5aTaHynr30XEAPgRYcMqsst?= =?us-ascii?Q?vS8feRleDSVXUmvm97wa/iXkzeNLV37bBoawvXA4lHFr4VsMj8VjEu0lfKcP?= =?us-ascii?Q?t9oWbRSv3yslL7U5rdMYDx17/KZjK0rlEsQD9TVyoDcv0Zixdzd6kIGpLyFB?= =?us-ascii?Q?vTRo4be3YodM0JZQza0U8Gx+QewpQg8TIw+i9nIl+T4/jlI/12+W/oaqzDAm?= =?us-ascii?Q?e2hSRAv5xrMWERQlHel5wvQgQH/JdqS0kTOq2PXHcp4XcP2jWyxKccX/8MGR?= =?us-ascii?Q?LkjOGxidc0OGIZHALIdZucVrIS+uUToq1s9S60EZrWU2wCX7Eyj4TA+TJ6Ij?= =?us-ascii?Q?Wjq5mclVUSSNlpF/pJw6pxNhEtcz0bJDlhTZsC7H5MMWkM/J3ZGaoiimsYsW?= =?us-ascii?Q?T5o7KxfmLQEal0zonhJXDB12Bl/VZw+mTjlYFURbj5AFcdkAamrNwnW1quD6?= =?us-ascii?Q?0vv6ILuNeKw1VIZ3R4oS4RvKbq+WkGbtrVhBw7vMg5KgRhMVfAaEf66q48CA?= =?us-ascii?Q?567pwfQhpKkjz24Wnrl9rwODW7PsONpxPLqeYc+vxsglc66a+VygMPEC+cUV?= =?us-ascii?Q?sgNEPi+Yn+7S8DR5D5z/YdKFuo9X3rUviXu0hhqICqXlAMk+ZsaWl+AI6d/5?= =?us-ascii?Q?DzmKqRqMyCwI/FPDjYZN9Lvy64NO8m1+ZT7ZMTsjnnVWPIDIATKGdFVamGwk?= =?us-ascii?Q?xmu4XU8bqPeYXiP61+ar9lzon2xyiQZF9WR66LewWREsaxhXfr3NGGkkyJUd?= =?us-ascii?Q?IwGgFYwR5Rg=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?Iw+ESXq11rBwqP60qTlJuiDwlb2cciR3+v3D0Ix8G+1IeVdLVoZ1izjSyeqi?= =?us-ascii?Q?TUT5F5+Zn2nzbWCp0uvjEKdXg0119EcrzcmtJkIvrIwnoO5JnXonloAnBGZc?= =?us-ascii?Q?3sc6Ap1gZFtTbgC0IDPLUxHqr2c+aHtafU9YfBtvbb1SRm6H72g8NySV+9Xf?= =?us-ascii?Q?UeMdFS9ZLccisnrU5MsjN2mknrK57GE4zWdNoUsQF0Et0l100Hpuu90/s1Wh?= =?us-ascii?Q?+4b3dJFEzwvUAizQuM8QkLZavGE2lHzE+q2Hpao9nZzzQRcT+iTq08XIfDT3?= =?us-ascii?Q?DxSNI2hiZD6ZX/RHhK396vQr/Tk94sQ+N4zAZ2BGVba0tqwxBVq8v2q3KUE1?= =?us-ascii?Q?bxb6FB6fB808BcCHQKIGo82nmz2+MPDul1LkbTjU1sMhZgzSGd03kzZgn+od?= =?us-ascii?Q?DCGl92OV4owzwIb3rnoK+sz+iSpq5jBgdTjeh3sOprPesp9ZAnXKHQIh5IiN?= =?us-ascii?Q?oytLDwhJ9I2FEiZRE+J0XhJsJMEEfj1j4BM6T4nzDlHpXfsbo51sZsO3effK?= =?us-ascii?Q?CQ+SGYkLurMiaGenbPAVrsHyckwd6H/4cGK1j3wT3lhlmWKNmT53dn92UndC?= =?us-ascii?Q?enCzdgk+DqPrUyYDmTR6u4b0T34fk+ccxWHwhoKjZL2zxoNk42JOSZvukltI?= =?us-ascii?Q?fhQrE0s7Yw0wGXBPgPR/OtozyTAeYZhjYAPoDX/FHSZ1c4XHYoFy8EZZgK17?= =?us-ascii?Q?Td3PUxMiP/H7k+hclNF33+Ucon+xkrtuaTRVJBypysBVFI3qJUuX5d9jwivB?= =?us-ascii?Q?v42xTSpq3WEcj6lS5P0gMtfq9c02MwfOBzYMTr5ktdC9aXGrKt3OwvMHLrN5?= =?us-ascii?Q?cmJ6nFjPec6iUN5T+5AaDPfjRRF3It/dOo2wuK7rAQQeurifGuBWrYkibbA7?= =?us-ascii?Q?qLLDO6MTEzisxxa2SZKzr1uZbFaUnQd7r3EWfZn2oFGXTcsR2o+3P7cWRqcB?= =?us-ascii?Q?HPAPxwxbN72GxwREIVuN0/dZv/aQ6vYax3ABj4pEyG4Kigi5VT3th+G6kw3B?= =?us-ascii?Q?Lzdmq4wb1tmqz39m4CgCEaXAgU9jQDGEC3lTKjkfRwr+1WUe1auwb93hXAk1?= =?us-ascii?Q?rP2l0g+1shQJFYuJCoVlH02r7V0cRWfkTnVsv1ARSSmmkObxpvJIINvTSoCQ?= =?us-ascii?Q?4OL3lmH1i5u0DycrXxSbjIMzEvm4u8APabqhcIMfgvnchpaoaxTLwbnzdRH5?= =?us-ascii?Q?RlRFMYsVWcxGaDJsMd66e6PGA2R+db1Qy7LEOg3KbutdMadreoq3k+/1c8OM?= =?us-ascii?Q?mvrnMH9oXEy0s8QWyZ2C9Z35TxUdIyuD4SoOw7vg91xrx6b2QxQtgXRSelHj?= =?us-ascii?Q?T1jU6V+A82UzwOhjFG1A/ivQY4Jrb+HLbMk+lh6oN4WIB4FDcRjSJ23XxxYl?= =?us-ascii?Q?qNKrTBIbenaz5KxiRAdsJSOeBmNUN3/IOadG7j21ELpNLAu+Dyj04v8gYVj0?= =?us-ascii?Q?wmf4O7gLHsdWGZq/cqYzm2ZMP6r3urq272tcw3wD0dbN2oR2tVnXHz8sfv5i?= =?us-ascii?Q?hHB8WBa7KZNAGHCk8UiS3TK9xJTPfxcu0mvm6f8CFEeZBqt2OoW2og6fu2vU?= =?us-ascii?Q?y2IPvkw9uJLZsqQAv+hYr7I5P73FcTZVkDNqjvtF?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf971523-2461-4314-1ca9-08ddfa3ec577 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:16:06.5911 (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: +vzzZGIWKSUE0ylxypTucnwmOBUXtDAR67FnsZ4udyvMIe3buBnYVToLE0m6a7YHQOdQw1DGaBXo4cen/q+wPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7917 Message-ID-Hash: VAU2GBVVCVNAPD4RVG234CB5QRCAPIXS X-Message-ID-Hash: VAU2GBVVCVNAPD4RVG234CB5QRCAPIXS 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: 1758590832253116600 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 | 85 +++++++++++++---- 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, 216 insertions(+), 133 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 42b2a5c74f..ffb75c0503 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 @@ -16491,6 +16492,44 @@ 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->accel !=3D b->accel || + 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) @@ -20158,19 +20197,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 @@ -22629,15 +22677,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", @@ -29482,8 +29532,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 c4541589d3..dc8c5f35e2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3298,6 +3298,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; @@ -3307,7 +3310,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4312,6 +4314,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 ba12ea706d..3cc8413a27 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 1aaa1a3180..4a1ef0c060 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6964,9 +6964,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 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 53088f8d8f..fc6d4ae706 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, "b:accel", (iommu->accel =3D=3D VIR_TRISTATE= _SWITCH_ON), NULL) < 0) return NULL; @@ -6356,91 +6361,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; @@ -7261,8 +7267,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; @@ -7276,7 +7282,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:12:05 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 1758591194099391.5899184484258; Mon, 22 Sep 2025 18:33:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0309A43E6D; Mon, 22 Sep 2025 21:33:12 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 096E243F9F; Mon, 22 Sep 2025 21:19:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id DB235419BE; Mon, 22 Sep 2025 21:19:25 -0400 (EDT) Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012050.outbound.protection.outlook.com [40.107.209.50]) (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 9863443E12 for ; Mon, 22 Sep 2025 21:16:16 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by SJ2PR12MB7917.namprd12.prod.outlook.com (2603:10b6:a03:4c7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.16; Tue, 23 Sep 2025 01:16:09 +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:16:09 +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=ylmg4ZRtwf34Pi9NtkCeb+Zye6tfeTKdJ/JyjMrEnJTb+FU7xRMDd9zJ6PrZU4injeKmcNuy/juJFhCb8v4uCf9AiVzulvZLyw2v74MF8fIurvJXn8WRiYvF1EcC0ET+uRjMbJAOEY5H47zubnMKV8VaNa0DrI1tHuiYKU7pA2b36wnq0AUQ5inRSzqUd6bh9yErip00BlbsCA14Baef9HfgI64KodB3bn3qIb9MQCKeRvrmY649BqxG186aZQvRQNoj6RvgS6QK4WvJy36T8Xz0Y9+IfVCvr+hqHbG/iHXmecJtYPTLaP5Zy2jn/qHBHattxhJpjnPEpJRZqyVG6A== 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=wiocILBf+lJozLq0DafvVmrUh/LLl3iJqjFFYwVF7S8=; b=SgllcfPAG73uVDZXtdM8L4TxL8uVKnPMIrBd8usMY8mGdpZJ3c1HBfH3PHizU1+BklVUr7DL7hgK8IOP+AhWrc5J0jzUAhWipDsL37g7aeNlkWdvXLz97gdauMhDLkEFg6hx211acrpPtUyMB+xyBk1RI94mHlnjEPb9Dx/l08IAWEBYUNP1nbT4gii2UxgbL2xBN7J6mLicL30Cfywo62936qAS6C51t45WYUOgBPieFJJRa6tILIjWfUPsSYjiWXiHKHVTvwANQuVd2VsIVJvUlWaODHuvhQw8cUMMj65vmVFkm06LebEl6flKdnHkznNcrA56TUf/jpbiFC/OXA== 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=wiocILBf+lJozLq0DafvVmrUh/LLl3iJqjFFYwVF7S8=; b=nM00ozCkrZ6iCPpg9OmK2SCNsx6VoF1UBtROUruyYjixuuA3OYKOCjJculOcPOloFFSwmC67MfG++suDDCFFZmBxHt5zvZgYu0Cwk6DhyqoKH2x7GhfJElwxpPZ0n3cI/7gX7k+Do9u70kN2ediK39yhtLcl7xFOI1tn2thMzkE0lXNlwsImqVlGYAUNxWIrbYhEE19Ds7jhSpzavjz3EfmtCPjWcozXXcGkrTihXcdrR8Q0zRWH5j+JN9iIeprIvG2DG1eMLZfmPvFl4K7wCmOu7IpiUQr4GZgG3+MuVDqxqJ67th2J1V/Z1JaQUTRgVUl1v9CvTbhSPLh0m8jbCA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [RFC PATCH 3/7] tests: qemuxmlconfdata: provide smmuv3Dev sample XML and CLI args Date: Mon, 22 Sep 2025 18:15:56 -0700 Message-ID: <20250923011600.3229388-4-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250923011600.3229388-1-nathanc@nvidia.com> References: <20250923011600.3229388-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY5PR04CA0001.namprd04.prod.outlook.com (2603:10b6:a03:1d0::11) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|SJ2PR12MB7917:EE_ X-MS-Office365-Filtering-Correlation-Id: 7aea6dd7-6061-41d9-9ff5-08ddfa3ec734 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?IrOWgxtxGvmUG4lHfDwhB9uuq4f8ScGiTtHAUqy6clEgqEY3SXdSnK832mJD?= =?us-ascii?Q?X3rM/v5Lc+PhC4v2yO32GuA5WIcdkyybzAXVXLHx4S57Dr9DjojZxzXLzn99?= =?us-ascii?Q?MPWuPMLfmiYx6Jzw7jvNTKhDLqsE0kno8M2MxakRfUeQz7qeJ5QYPr0fETT4?= =?us-ascii?Q?hAGATwipCwppZ2iPS5IYachQ0lhXLo50o6PtvYCFWcabbRH2OmNA7vGOsKCo?= =?us-ascii?Q?XggMekL0xAsOeryotx/A2bPSE9cTjnHcJbbTvr1au88EC5xnxTf2k0Mw/kn5?= =?us-ascii?Q?X/HTPxei4FNJNhHx11R/fgtwIeWR8daVl+9fncrfupgaF/NUHCfcqXMoTyYD?= =?us-ascii?Q?tqS0dW090W6ZkYkOQp5f6IoiWRkrnY3GbGhDrIEkvYk+/lKZshGfryRiUpoO?= =?us-ascii?Q?hpb2TXTPIyMc2ojg4Sxxb35Snik5xrWIhbLI7nIOFUs6FJIB3U08cR2Ohob5?= =?us-ascii?Q?bVWbYTM7NnE89H0jE+AZcG98DL5ETL9w2IxGkBtdGdngrR9RAE5ZN0ZHqHVI?= =?us-ascii?Q?XQIwS6aUlfsQ7tPyqpHavFbybk07gAHJZf2vTqrrlLlI9zbWXVofCnmSd0JJ?= =?us-ascii?Q?k+MqNGOyREOYrqqp8ANp+/+YVdd+Stiz9saFpe6eveai2FyUlXXh2CNIVve7?= =?us-ascii?Q?sTD4tCR4LpgHuJ2aK0hyh3YW2l9lmdiH2vDoocSZ7QKXqsbNM8e0Z7OzFaNo?= =?us-ascii?Q?kYwO3YiKIV0XBShJyNY/6r73L41IpG6sS89lhmtZugIGEo2qqPkMBCAcWL/2?= =?us-ascii?Q?uAW9j8LnQXykWK/GPdIvQEmpfCPRK1qYT5cNp2G/OXDmc6mgvg1ujp9WDpz9?= =?us-ascii?Q?3oHiy9+HQ92Lk2rT7PS1RH9iyu7cXmG7FMXaBTnXWkt5nH7b4o+8GAxqFeSh?= =?us-ascii?Q?UbcgnK1pHeKOuwJL5yCU/G8+lnxx9N/jEXwDZwqULPC5zpRrNPsxkh2JRBgQ?= =?us-ascii?Q?cQVJuZePQGUpwrnB438Z6hL61Y77vkqz1blxH/nZsffLVQ1U60v4GutKGLm3?= =?us-ascii?Q?0bxQymYBiEL+nHVaQcSpWxEpk/iroJS0BXjNbbClJSDshuE9MwVHCPU66DFE?= =?us-ascii?Q?5e4on3VjaryhVZByaz3ZlBB4c6YDLUJKIivIfG/VWI1eELXoDTonKL8+iXHX?= =?us-ascii?Q?McrOmf0s1GNxVebOntedMCD2P5/CVbEXAp8eZwORH0stPIkPJeoyb6QEz5T4?= =?us-ascii?Q?OnKEuLW530hpMLm+c1OQxWLlfmsEmmYyKLuvFwmDIP0Zg0GyQtVctYqoRULk?= =?us-ascii?Q?GT7Kj/YgEEg9fU+UbRQie9DFWGkzFO4bVKuokV4wPovUJ1ODG04JFHZdGC1c?= =?us-ascii?Q?96raLc1NgLpOJFhCC+ASJig5TCm7S3ml9C3KItdqJZHEaLALgD1JL41KmE0t?= =?us-ascii?Q?ijsN1a14XX2DRfMT675zj/WoopIE2yHLI3jSWH3hCxXfKhZbRb2iFGd7snqY?= =?us-ascii?Q?SH49Fw/BjwU=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?oXHqKJLyMyP4lukQFGAP9JTMzIlG86yQU0J9NQhnDDOgoGlt/wXgPmBW3Njt?= =?us-ascii?Q?jGj9gF2rDzzf6mumU+J+drJvpjIewuaqZw/M+tJhHJL4GmaM0LQI5JxR2RJj?= =?us-ascii?Q?lFsEtDGGnAJMEt1tiBA4wtodj9Su3WI6ELvsXAvgodKmzcRV+pinP4ONVURZ?= =?us-ascii?Q?6PXdkssU+2PzD92Dzxr6mJS5itUiKic7NW9Q6iIhjBDiUGETkrjFJHzBoZCq?= =?us-ascii?Q?aI1esctzeMxxNuhW3lDFaoGMGKHnfqqzDriUk74i3hB5kylXncZ+5ibviMlF?= =?us-ascii?Q?L004dm3C8NJ5foWc/wi3aHwrSJA+19MXqTsLoC35q01g6oW5R8KFXPbAmWOO?= =?us-ascii?Q?bNCjG64SaTbMliSZBKlTTuo2TyCQMcl7fovPTKtfyyypiZy5m1wc6DW/PZZm?= =?us-ascii?Q?Z3wLX0UsybZSiQG631CJqbgskUCQmD5MaQYfOUR8PBR8o+b8IXqjY/1qqbYx?= =?us-ascii?Q?otzFHcxSEfhGVkK/tmgu4eKmlIUsIaFd+oIdHdvWFHMVimOhYga2MT6ugW6s?= =?us-ascii?Q?mDsafHR8p83QlUfl9IHgoWxyTTaAML8SCcziDfMy8d1OFnRX53DfQu51mmKO?= =?us-ascii?Q?lHIfBrHUYGEbyvOphoKuVuUzeGm6VZDfweKZSpNVL8EuF5Jn7F34/9DENIhl?= =?us-ascii?Q?uG7w4WDYC2HoC0vbnrxUAdQ/239CdAP+vlOOCMtbAewhHAYVtkOhDUuLo8+8?= =?us-ascii?Q?Tj7YaFcLEPw6DN+wlhmUgZqFlELMxFuIVoA3jCRSvoUtOIlbAm6WHGPwl/h3?= =?us-ascii?Q?f6cZmkvuEPh0OWIKciYWIktb/qVaMmeNkA0PMrfSZpV4eTVU/tCoWuRg8hGf?= =?us-ascii?Q?SZMjMTPwdUL3RsI04JohGs0UrZZ1yisZmyVp83KFWqtPC95vfVWRUq1A0Xpc?= =?us-ascii?Q?YZpwTjbGbaxLZ5JGmrBIKttTE7oB0zQO+MdEzohBx68MFwqxoFFrbgxweyjy?= =?us-ascii?Q?jSUR7ogec0cbpnzSxQBB0pxq+O37i1yjq6tXWx9k0A32J/70uHIeGqbKhpqA?= =?us-ascii?Q?Tc+dhovYWRTchrusZfZ3SzozwLZ5ykMHWxL+RTlwzjbHlqRxEKUeYncv4rkX?= =?us-ascii?Q?7ID0vebVucpFw0V18KRY5D2Oe5u8yBj70h3ygFm9wfEUKd8nVvdVqcHIucur?= =?us-ascii?Q?YUeizcYcrOynQkj8dhh8fjmKcyReLqdVbzd1eYoCCBUIRD0FSLu0HqdiZ43e?= =?us-ascii?Q?lE8G7mtJrwxJa+Pw+8vXW84IJutv0Rb0xVwIQeMs/zUcW3OAs9HNeU93XtLI?= =?us-ascii?Q?ln/DZDSGD8VlC62dK+Wrk2kxMYyGmjjv0G4GejE1Qqlt6s6fnFjj72eRJQHX?= =?us-ascii?Q?Bx/XL76tEegtGaPzLWMNrg93HegSae2MXp57alHpkOcSUaYixoceolIpASvX?= =?us-ascii?Q?6M52Erql+RTxWA3Tm74MPR4It0KZbt1pVZXdA8Vxbrj1kpLxnC0ptG1ExaFf?= =?us-ascii?Q?W91Nfy/6lcXISEnhH8ZaT5s/dGC6SAr3Ao8WzjYRbc8iXThiNd8okkVCiUPI?= =?us-ascii?Q?sfO4P3ufqUNZwLLXuR87AwlhvslmKEhv3qbLyG4vt7w5vDMapYelBExtmT05?= =?us-ascii?Q?6LXN8PWC1q+aTJ7aZTYexaedWHoATrEBP8x950wo?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7aea6dd7-6061-41d9-9ff5-08ddfa3ec734 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:16:09.4880 (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: TpEvAq86jvcvjRWXsVNM8iHS5hUoUHJz2TqWaKzcZJUWO6jh2ZuNHCoG22a8WFIYo/lnvMKuapHaGb9uOGiZaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7917 Message-ID-Hash: 3VQ3OUCBGTE3EAVYGKJGOMCQZSIRHTNP X-Message-ID-Hash: 3VQ3OUCBGTE3EAVYGKJGOMCQZSIRHTNP 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: 1758591195720116600 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..d0b5b754ac --- /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","acc= el":true}' \ +-device '{"driver":"arm-smmuv3","primary-bus":"pci.2","id":"smmuv3.1","acc= el":true}' \ +-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..c2c9552586 --- /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 + + + + + +
+ + + + +
+ + + + +
+ + + + +
+ +