From nobody Sun Dec 14 08:04:10 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 (BodyHash is different from the expected one); 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 17473416114241010.2163777692994; Thu, 15 May 2025 13:40:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 561B014F1; Thu, 15 May 2025 16:40:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2EB5114FB; Thu, 15 May 2025 16:37:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CA34C141A; Thu, 15 May 2025 16:37:22 -0400 (EDT) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2066.outbound.protection.outlook.com [40.107.236.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 96166148B for ; Thu, 15 May 2025 16:37:06 -0400 (EDT) Received: from SN7PR12MB6838.namprd12.prod.outlook.com (2603:10b6:806:266::18) by SJ2PR12MB8135.namprd12.prod.outlook.com (2603:10b6:a03:4f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.32; Thu, 15 May 2025 20:36:59 +0000 Received: from SN7PR12MB6838.namprd12.prod.outlook.com ([fe80::529d:478:bc5d:b400]) by SN7PR12MB6838.namprd12.prod.outlook.com ([fe80::529d:478:bc5d:b400%3]) with mapi id 15.20.8722.027; Thu, 15 May 2025 20:36:59 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FORGED_SPF_HELO,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XpWtY3FFk2WQOncgkArTU5oHP0F6+sQ/XfaxbX9x3WY/OVc7K0/HkeHufn/+v0gcb9tK+XIRwEJVU+00+ImRFwL8Wwu/vc2Hrdu/TMMAR9g5tS1QP+18Nlw9PkW78xerRhBWIklmmmPZAc9aFqsPywbXW987Mju6WCk/xW10bvwjfJNJSMtkvdPjWKLzBCGQzWVjv292Kn03pemwn8txw7O1gFjyjbkXpRTiBpGxrSTs+8cDXzp8fysxZBEV7BTSmJvtlXholLP/fuqdjQBzVMYI5AqEnZhoDtgF/gPVUS0BP+gINb6kNJgj9i2HpCLb8mnkH8ailsxYQob9yj8l+w== 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=+iX9IITHN4B+BrPmBMhfrrp4FBxUI7VB6oAl0+L+2qk=; b=Ij9A297FdBgu+5Usn1TPMl2auKx4mQfMpjT0erbpxzPpnSGRhVsUWZwPxD78rGgonuIm6l5plGocLWiaJtlTAAYNpRuxzMYubmmK0afOuUpwtMBI9/t9VHCtWRRnkKBrfHvK+08hUsK2sr/dGX6sodQxTacfGezIzhdlsn2vuWHq0yV5tYk1aIO0tB0iHKj+oCBwr7mUPXyUuJzk5Eh2OjUgOUZRwcekyRcrwlygza9Ldsq68zpKlk08v0e3cmdIqFjYp94DJA8jrEu3zcberi2Qmh2b+Ma1LQjAYfmVzzGYurNQF3c+KrNXjhY9nsALAZuN8qnwk0X2QMKt7f5TwA== 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=+iX9IITHN4B+BrPmBMhfrrp4FBxUI7VB6oAl0+L+2qk=; b=FXF8QfwDlEouqitexf5LE2ZCNcdpb+F7txuCDzvzqvhiGIT0fELH7nbw4lp7JETjVsHdxXgbRQz664Uy2Hmy9FgBiE2lwP6jv4mQq4Ww15WxH5G9cpijGys+Jsw88V3f5enJgAlkYK78/QJBC7rNL5y9Ovio2HN4lWC3sJm9BWYeMF1HEHWwLljGKvrqpwiwMH4iuDeihlfvyM5DiuwUuSpNiJHIT/iPun9MEY0uSsOASrX0gCmzzpgv7hTeO6297HUWQuasMkx33WEx6Es1Potq34lo7YfMU8OLgsHfYptBzegix2X9yYg1RqdOgUoWkE2AisUi+9lIasWV1mCC/A== 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/5] conf: Support multiple smmuv3Dev IOMMU devices Date: Thu, 15 May 2025 13:36:39 -0700 Message-ID: <20250515203643.21109-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515203643.21109-1-nathanc@nvidia.com> References: <20250515203643.21109-1-nathanc@nvidia.com> X-ClientProxiedBy: SJ0P220CA0028.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::11) To SN7PR12MB6838.namprd12.prod.outlook.com (2603:10b6:806:266::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR12MB6838:EE_|SJ2PR12MB8135:EE_ X-MS-Office365-Filtering-Correlation-Id: e853a566-099a-4d97-8cbc-08dd93f03d97 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SbTTgfS3K9SRzLOc8TdCSVjsa5fQtf3cONOZny1ys7Fpr3o/BPXknvFPK7Sc?= =?us-ascii?Q?6cNsvvIJbi1oRSZtvCKAOvInQGlof5u+ueLDgiD5VqXuAQifbrfeXJYH3biw?= =?us-ascii?Q?xEArH1DZBWo0IrRLjL7mlYt4SfKvBXiewMk4+9F69n/11bvlJEynqOvRhSuv?= =?us-ascii?Q?J5EGfCfeR/maY92/cvGTDCkx2KzAnnjmM9CwDgLQcoarF82EL/+84lEZ14+X?= =?us-ascii?Q?MA0TsfHq2JLhrr8SGdae7b2oawF3bE+uEo/ceamGyzUSeLmv1idwDYPKTafE?= =?us-ascii?Q?afv22DGRuwQ8QSEsR9cwjSQG7tt+1p7ZD47AoTVRRPfsikgfvMYg91ti0zFX?= =?us-ascii?Q?M+iPwePHKl5sF/pWCPComFI7qIzcKS5AAIbOf+wK7GokxwWR0VI7Z30XEFR+?= =?us-ascii?Q?Zk+q7GmMw5b6aU4453pLCr0vnswxlcspLl1hvC69Q0DysrnfrJSHceqzhO8N?= =?us-ascii?Q?ajoVOehc6vqK9bkSPgg56JRHpklap7YQhWi74+Zzj/4xn1PNphl9vg0/7q7V?= =?us-ascii?Q?oxTkMcdmYabeAMZyJLRc/0EXZse6iSijSNASazmknYYIBIkYmD6ghrnBUwX7?= =?us-ascii?Q?s1vX/X9/qRo81Gk0XJqydk7NrEdwiEfo3tI9UlqSid6G0jztHLDkdS/yRFVv?= =?us-ascii?Q?+eFWu2zIAaYgBljval0xNDslrkKdvQRuiiBGYpHWNYYDLD7OfSRxjjZ30E/i?= =?us-ascii?Q?y2FRfQ8xsl8angOcs5M3ThjshEYbA4s0FqkSOoGr+FchCmeP0nCMOXVQC4Nr?= =?us-ascii?Q?VJj/8xNjLmKlc872ABqjB7FoucYZUYfaMFY9D98GRkB20rIi8fnT3iLV7sqQ?= =?us-ascii?Q?cK01edsb3ZtccwQ+UiAMrFu92xNRLKE80YJiR117jdXe9Q20coZfZHbDUbAK?= =?us-ascii?Q?gAW4aoh4riLfirHt/TdolUHnjLwDgUwko4+Wj2hNP7pTZkVsIdi1vgNMXOis?= =?us-ascii?Q?6i+sQsE6sdNnEv7EJglPkzOtupMrwHgI5oMEOVi8Ps/hH8KPPNjV7pJI4qAi?= =?us-ascii?Q?PX58TxemyU6SmHbG73Swu9CIZDyjbeYNZdNKe0/Vq2msGy+2gGm1WdsXHOi4?= =?us-ascii?Q?XcUxgm1sJhOcZhODTFnJNd16xjVgRoa/dpRFuLjr4Xh8WHAK5sDcG87ePnJG?= =?us-ascii?Q?f7HPH4zZa1y1THs3JF6kCyK9+cRZ+KiA8/NSrB0thsszz1Y4FacOYSXrqQvE?= =?us-ascii?Q?BPaTCziITDx0+lNbXhpS/3qoOTM1V9zJVPVPulI84uoBDhE3plxjmMX6SLXQ?= =?us-ascii?Q?TsROZgKtPRG3LUkHTM+NnEYd1ANJzhcyKkR9Magd36zNQoCfSKxdACpUBQsi?= =?us-ascii?Q?NnSqsSeGA9WIx6Rh+30ki6+jQ6i+0kY+1kdGQNS9fTE09/nfpZuH3RhzXd3n?= =?us-ascii?Q?cNJCaCBchE8e/jfkknaLKeOfMPGRlh+ddM/tfQKj6hEDLoUJD7343w+hSBra?= =?us-ascii?Q?c928NusdzZs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN7PR12MB6838.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?l4NQQwt8n0ar4n/qWHgUPb3q3zAs8Gf0xELt1pQDYFVzV5bqDbHYQZ6fmdIk?= =?us-ascii?Q?t09jhoI17DiWHFzOr5+OnfLc/g6REDC3xYe9LGiBBhBGx7pcfDKi1u0smN+m?= =?us-ascii?Q?cg7R76O7Oz/ju/yaZha+mPGVLzliBuxofe9n5wnx9d43sUoC3vBLgHRJwPyt?= =?us-ascii?Q?2nWptj/YCr4AquglgMZjXPD6v6017E/WSL24pw8vq1+g/f/QpTqpMlBGJF6N?= =?us-ascii?Q?c4ZAJtQ2UAl7jxJUGFceiQd2ohLyjc4vSyNBmgd+hO2oVMThq0Lc1dT1USLR?= =?us-ascii?Q?/Si/wv2VXRQv9Q4K5eGOiU2XeFW1XQY3HMXmLUpOggzKTAP0h0vKmtaoJF+o?= =?us-ascii?Q?wVd6tqen1hOmhKbKEJ8c/+cQdAeaaRtF2xRIFe10qqZ/6yLGBXQXLGIlwsoQ?= =?us-ascii?Q?wnNw9O8bDFHeRZJAFaJS1YdytHmOMqA4cb/EeScy+uKm4mkdwf8v5gxtOU0t?= =?us-ascii?Q?zvp1tqAzNNMvNtDRGAQt9yIpYtOnCVBnoUoaJXpZObuKgJq3zNa6mqCkh7pH?= =?us-ascii?Q?yTKNxIo26ZB5Bvj9idhgfS7VEu+WjiLhd944AVzTft+b/JaHyKFt3+wiXLPg?= =?us-ascii?Q?RXuaLV7CblHBoiLYp9ENxx97ckGYokobJnkLHLEoDG+9sV+t/Tr5ioBE+e1E?= =?us-ascii?Q?dGWMDFvEyQqFKyh9YY5x3HEerWR4VGzSqSmyE7Y9Fa0xpMQO1U8Lb3s/kcdI?= =?us-ascii?Q?R0j3JNsOKc7WjQdm7EMjJqt5YRbpwSzKjQAFpJOto+uVeKL8jRQSonqRapyi?= =?us-ascii?Q?JNxBtB3gkUiUPZOgunqUKp9Pmz5e94G+4jahsgjoG5m/SlTnpeLIjpY9oMV8?= =?us-ascii?Q?xtGIIXbPA0rtjj1VpJELyhlWAEuka89kPSICpOfv+K8wiY+jBUMlwySDdrz5?= =?us-ascii?Q?OCxXIsFx8AeMwE/W0WMyMvQ67z9dxbreZzlfjuaDVWCnxt7ec6JkqtVEYjT9?= =?us-ascii?Q?yiOdjd+rYx/kJK9dEcVlDXnmI/uwA58hv/QO8RNlurLDUjjEDU4sD1IjbvQO?= =?us-ascii?Q?yRGxTRcrMvbsy681Zh6/BOcA2bX7yfg4cNbNhVIqZwhGRPlhVATNFk4EIQ34?= =?us-ascii?Q?WU/CuOwFs0gTPHelGhsg63/V3CR4yT5I/XkRdpWG/69vTWBtwG6ssGjamPRg?= =?us-ascii?Q?qW4YmB0Z8TFyFBvEHx07ai5EVz9Ld96NUD+hnU6MzWVXv+vagKV54teVz+4m?= =?us-ascii?Q?DfDH6kSfjrYWfwJhx2sh6flJQJu77QxiWthoVfSSBCnbxSVQt1KB/qvfUf0J?= =?us-ascii?Q?MnBHQG61H6G6EZNGpnz3swA28qNc7nLEY4++dSljaRF3FYAhwLp5eCFVXcs/?= =?us-ascii?Q?5eZdYEALxfb0R8hN26WfuUu0DSnYvN3FEx8dlufw5gNZe/DPwkUcs8Wfwtxb?= =?us-ascii?Q?zxeXN/Q0DnINUM6el5MLonlvrOxTOVzbqHsJZKmNMET2d1+abPGQpmec9cbE?= =?us-ascii?Q?7z9bWQupGJxRmuB0KlX3l0NXgZI2q29ba2uYd+b2DeMn3RJh5H7R9MbOmWPH?= =?us-ascii?Q?aCUspVO1h27aHPOw/0NGcpHwQxbO86zKyrDP1sxYWzQ68DVylDBJGl2ApTwM?= =?us-ascii?Q?NpLNCkKlufbD8cM6sZDpaxAMD4sH28FNnim6RTry?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e853a566-099a-4d97-8cbc-08dd93f03d97 X-MS-Exchange-CrossTenant-AuthSource: SN7PR12MB6838.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2025 20:36:59.3113 (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: +AJNDc0VyOxXJ7TC4oHT9a7fShSjRmu1pdeyovx9+Lj236c6CZhbeqz4Ei8mmrLB7R1d80TZ5t+ek3hMLZPFIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8135 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5G27YDK3SUZJ4V3ONDILLUL75APA34S5 X-Message-ID-Hash: 5G27YDK3SUZJ4V3ONDILLUL75APA34S5 X-MailFrom: nathanc@nvidia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: shameerali.kolothum.thodi@huawei.com, nicolinc@nvidia.com, Nathan Chen X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1747341612217116600 Content-Type: text/plain; charset="utf-8" Add support for "smmuv3Dev" IOMMU model, and add support for parsing multiple IOMMU devices from the VM definition when "smmuv3Dev" is the IOMMU model. Enable plugging smmuv3Dev into pcie-root and pcie-expander-bus. Signed-off-by: Nathan Chen --- docs/formatdomain.rst | 5 +- src/conf/domain_addr.c | 12 ++- src/conf/domain_addr.h | 4 +- src/conf/domain_conf.c | 153 ++++++++++++++++++++++++++---- src/conf/domain_conf.h | 11 ++- src/conf/domain_validate.c | 38 +++++--- src/conf/schemas/domaincommon.rng | 8 +- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 15 ++- src/qemu/qemu_command.c | 135 +++++++++++++++++--------- src/qemu/qemu_domain_address.c | 33 ++++--- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_postparse.c | 11 ++- src/qemu/qemu_validate.c | 22 ++++- 14 files changed, 342 insertions(+), 115 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c7c75ae219..f9b835da7d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9043,8 +9043,9 @@ Example: ... =20 ``model`` - Supported values are ``intel`` (for Q35 guests) ``smmuv3`` - (:since:`since 5.5.0`, for ARM virt guests), and ``virtio`` + Supported values are ``intel`` (for Q35 guests), ``smmuv3`` + (:since:`since 5.5.0`, for ARM virt guests), ``smmuv3Dev`` + (for ARM virt guests), and ``virtio`` (:since:`since 8.3.0`, for Q35 and ARM virt guests). =20 ``driver`` diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8dfa8feca0..6a75a7aee1 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -386,6 +386,8 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress = *addr, connectStr =3D "pcie-expander-bus"; } else if (devFlags & VIR_PCI_CONNECT_TYPE_PCI_BRIDGE) { connectStr =3D "pci-bridge"; + } else if (devFlags & VIR_PCI_CONNECT_TYPE_SMMUV3_DEV) { + connectStr =3D "arm-smmuv3-dev"; } else { /* this should never happen. If it does, there is a * bug in the code that sets the flag bits for devices. @@ -517,7 +519,8 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBus *= bus, bus->flags =3D (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT | VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE | - VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS); + VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS | + VIR_PCI_CONNECT_TYPE_SMMUV3_DEV); bus->minSlot =3D 1; bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; break; @@ -561,11 +564,12 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBus= *bus, bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - /* 32 slots, no hotplug, only accepts pcie-root-port or - * dmi-to-pci-bridge + /* 32 slots, no hotplug, only accepts pcie-root-port, + * dmi-to-pci-bridge, or arm-smmuv3-dev */ bus->flags =3D (VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT | - VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE); + VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE | + VIR_PCI_CONNECT_TYPE_SMMUV3_DEV); bus->minSlot =3D 0; bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; break; diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index e72fb48847..906ba9a52d 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -57,6 +57,7 @@ typedef enum { VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS =3D 1 << 11, VIR_PCI_CONNECT_TYPE_PCI_BRIDGE =3D 1 << 12, VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE =3D 1 << 13, + VIR_PCI_CONNECT_TYPE_SMMUV3_DEV =3D 1 << 14, } virDomainPCIConnectFlags; =20 /* a combination of all bits that describe the type of connections @@ -71,7 +72,8 @@ typedef enum { VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS | \ VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS | \ VIR_PCI_CONNECT_TYPE_PCI_BRIDGE | \ - VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE) + VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE | \ + VIR_PCI_CONNECT_TYPE_SMMUV3_DEV) =20 /* combination of all bits that could be used to connect a normal * endpoint device (i.e. excluding the connection possible between an diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b3b0bd7329..c8d481eb5c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1350,6 +1350,7 @@ VIR_ENUM_IMPL(virDomainIOMMUModel, "intel", "smmuv3", "virtio", + "smmuv3Dev", ); =20 VIR_ENUM_IMPL(virDomainVsockModel, @@ -4113,7 +4114,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 @@ -4985,9 +4987,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 @@ -16369,6 +16371,110 @@ virDomainInputDefFind(const virDomainDef *def, } =20 =20 +bool +virDomainIOMMUDefEquals(const virDomainIOMMUDef *a, + const virDomainIOMMUDef *b) +{ + if (a->model !=3D b->model || + a->intremap !=3D b->intremap || + a->caching_mode !=3D b->caching_mode || + a->eim !=3D b->eim || + a->iotlb !=3D b->iotlb || + a->aw_bits !=3D b->aw_bits || + a->dma_translation !=3D b->dma_translation) + return false; + + switch (a->info.type) { + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: + if (a->info.addr.pci.domain !=3D b->info.addr.pci.domain || + a->info.addr.pci.bus !=3D b->info.addr.pci.bus || + a->info.addr.pci.slot !=3D b->info.addr.pci.slot || + a->info.addr.pci.function !=3D b->info.addr.pci.function) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + if (a->info.addr.drive.controller !=3D b->info.addr.drive.controll= er || + a->info.addr.drive.bus !=3D b->info.addr.drive.bus || + a->info.addr.drive.unit !=3D b->info.addr.drive.unit) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + if (a->info.addr.vioserial.controller !=3D b->info.addr.vioserial.= controller || + a->info.addr.vioserial.bus !=3D b->info.addr.vioserial.bus || + a->info.addr.vioserial.port !=3D b->info.addr.vioserial.port) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + if (a->info.addr.ccid.controller !=3D b->info.addr.ccid.controller= || + a->info.addr.ccid.slot !=3D b->info.addr.ccid.slot) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + if (a->info.addr.isa.iobase !=3D b->info.addr.isa.iobase || + a->info.addr.isa.irq !=3D b->info.addr.isa.irq) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + if (a->info.addr.dimm.slot !=3D b->info.addr.dimm.slot) { + return false; + } + + if (a->info.addr.dimm.base !=3D b->info.addr.dimm.base) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + if (a->info.addr.ccw.cssid !=3D b->info.addr.ccw.cssid || + a->info.addr.ccw.ssid !=3D b->info.addr.ccw.ssid || + a->info.addr.ccw.devno !=3D b->info.addr.ccw.devno) { + return false; + } + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + break; + } + + if (a->info.acpiIndex !=3D b->info.acpiIndex) { + 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) @@ -19375,6 +19481,7 @@ virDomainDefControllersParse(virDomainDef *def, return 0; } =20 + static virDomainDef * virDomainDefParseXML(xmlXPathContextPtr ctxt, virDomainXMLOption *xmlopt, @@ -20021,19 +20128,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 @@ -22455,15 +22571,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", @@ -29222,8 +29340,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 58b97a2b54..75568ff50a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3005,6 +3005,7 @@ typedef enum { VIR_DOMAIN_IOMMU_MODEL_INTEL, VIR_DOMAIN_IOMMU_MODEL_SMMUV3, VIR_DOMAIN_IOMMU_MODEL_VIRTIO, + VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV, =20 VIR_DOMAIN_IOMMU_MODEL_LAST } virDomainIOMMUModel; @@ -3258,6 +3259,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; @@ -3267,7 +3271,6 @@ struct _virDomainDef { virDomainNVRAMDef *nvram; virCPUDef *cpu; virDomainRedirFilterDef *redirfilter; - virDomainIOMMUDef *iommu; virDomainVsockDef *vsock; virDomainPstoreDef *pstore; =20 @@ -4269,6 +4272,12 @@ 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 d0d4bc0bf4..4861b1c002 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1838,21 +1838,32 @@ virDomainDefCputuneValidate(const virDomainDef *def) static int virDomainDefIOMMUValidate(const virDomainDef *def) { + size_t i; + if (!def->iommu) - return 0; + 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]; =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 (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")); + } + + 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; @@ -3066,6 +3077,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) { switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: if (iommu->intremap !=3D VIR_TRISTATE_SWITCH_ABSENT || iommu->caching_mode !=3D VIR_TRISTATE_SWITCH_ABSENT || @@ -3095,6 +3107,8 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *io= mmu) return -1; } break; + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + break; =20 case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: case VIR_DOMAIN_IOMMU_MODEL_LAST: diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 5597d5a66b..8d1768b24f 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6190,6 +6190,7 @@ intel smmuv3 virtio + smmuv3Dev @@ -6233,9 +6234,6 @@ - - - @@ -6867,9 +6865,9 @@ - + - + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a8ebf9efd8..143d3af8f3 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 3e6bced4a8..d635eb0178 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -631,10 +631,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 @@ -750,8 +754,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 bf03561fde..9deafefaad 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6128,60 +6128,106 @@ qemuBuildBootCommandLine(virCommand *cmd, } =20 =20 +static virJSONValue * +qemuBuildPCISmmuv3DevDevProps(const virDomainDef *def, + virDomainIOMMUDef *iommu) +{ + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *pciaddr =3D NULL; + g_autofree char *bus =3D qemuBuildDeviceAddressPCIGetBus(def, &iommu->= info); + + if (!bus) + return NULL; + + if (iommu->info.addr.pci.function !=3D 0) { + pciaddr =3D g_strdup_printf("0x%x.0x%x", iommu->info.addr.pci.slot, + iommu->info.addr.pci.function); + } else { + pciaddr =3D g_strdup_printf("0x%x", iommu->info.addr.pci.slot); + } + if (virJSONValueObjectAdd(&props, + "s:driver", "arm-smmuv3-accel", + "s:bus", bus, + NULL) < 0) + return NULL; + + return g_steal_pointer(&props); +} + + static int qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, virQEMUCaps *qemuCaps) { + size_t i; g_autoptr(virJSONValue) props =3D NULL; - const virDomainIOMMUDef *iommu =3D def->iommu; =20 - 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_SMMUV3_DEV: + /* Ignore unassigned devices */ + if (iommu->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNA= SSIGNED) + continue; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + if (qemuCommandAddExtDevice(cmd, &iommu->info, def, qemuCaps) = < 0) + return -1; =20 - return 0; + if (!(props =3D qemuBuildPCISmmuv3DevDevProps(def, iommu))) + 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 (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - if (qemuBuildDeviceAddressProps(props, def, &iommu->info) < 0) - return -1; + break; =20 - if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCaps) = < 0) - return -1; + 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 - return 0; + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 0) + return -1; =20 - case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: - /* There is no -device for SMMUv3, so nothing to be done here */ - return 0; + return 0; =20 - case VIR_DOMAIN_IOMMU_MODEL_LAST: - default: - virReportEnumRangeError(virDomainIOMMUModel, iommu->model); - return -1; + 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; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, qemuCa= ps) < 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; + + case VIR_DOMAIN_IOMMU_MODEL_LAST: + default: + virReportEnumRangeError(virDomainIOMMUModel, iommu->model); + return -1; + } } =20 return 0; @@ -7001,8 +7047,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; @@ -7011,10 +7057,11 @@ qemuBuildMachineCommandLine(virCommand *cmd, case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */ break; - + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + break; case VIR_DOMAIN_IOMMU_MODEL_LAST: default: - virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model= ); + virReportEnumRangeError(virDomainIOMMUModel, def->iommu[0]->mo= del); return -1; } } @@ -10598,15 +10645,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 e89cdee487..aeacdbc9db 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -943,6 +943,8 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, =20 case VIR_DOMAIN_IOMMU_MODEL_INTEL: case VIR_DOMAIN_IOMMU_MODEL_SMMUV3: + case VIR_DOMAIN_IOMMU_MODEL_SMMUV3_DEV: + return VIR_PCI_CONNECT_TYPE_SMMUV3_DEV; case VIR_DOMAIN_IOMMU_MODEL_LAST: /* These are not PCI devices */ return 0; @@ -2354,22 +2356,25 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, /* Nada - none are PCI based (yet) */ } =20 - if (def->iommu) { - virDomainIOMMUDef *iommu =3D def->iommu; + if (def->iommu && def->niommus > 0) { + for (i =3D 0; i < def->niommus; i++) { + virDomainIOMMUDef *iommu =3D def->iommu[i]; =20 - switch (iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: - if (virDeviceInfoPCIAddressIsWanted(&iommu->info) && - qemuDomainPCIAddressReserveNextAddr(addrs, &iommu->info) <= 0) { - return -1; - } - break; + switch (iommu->model) { + case VIR_DOMAIN_IOMMU_MODEL_VIRTIO: + 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_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 a34d6f1437..8599761137 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 ed4af9ca8e..f2df3cba73 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1450,7 +1450,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)) { @@ -1462,7 +1462,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) @@ -1538,9 +1539,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 b2c3c9e2f6..f4431f1b2a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -851,7 +851,12 @@ 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->niommus =3D=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("iommu device not found. more than %1$d vCPUs= require extended interrupt mode enabled on the iommu device"), + QEMU_MAX_VCPUS_WITHOUT_EIM); + return -1; + } else if (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); @@ -5225,6 +5230,21 @@ 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; + } + 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