From nobody Sun Oct 5 01:49:26 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 1759365731219725.7729314526939; Wed, 1 Oct 2025 17:42:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1696744218; Wed, 1 Oct 2025 20:42:10 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7D5AF4422A; Wed, 1 Oct 2025 20:39:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5EF1243E2F; Wed, 1 Oct 2025 20:38:55 -0400 (EDT) Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012011.outbound.protection.outlook.com [40.93.195.11]) (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 4653C43E51 for ; Wed, 1 Oct 2025 20:38:54 -0400 (EDT) Received: from PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) by IA1PR12MB8224.namprd12.prod.outlook.com (2603:10b6:208:3f9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.17; Thu, 2 Oct 2025 00:38:46 +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.9160.015; Thu, 2 Oct 2025 00:38:46 +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=c5YvqY7AIVegx6yCzzO8zIG617+bElxYZX4+I6vdJeqbd1xfE9eCyGd77ucAWDt7aC8B8wSGmUcz0Oed88V1306iUuJsBBp/6jrdLx3J3akEJkEyJDypdyMIySbDd7ilL3fp9gYOPFoDqtqTvXTG0ubmogR1mPNX9inBVbyDvV4CnZkoo/0rw9y4g3cJzb7dOdQ29nliU6zddolHqUatMX30P1OLygAB7Z8EEBVbXYgqNI1dSSZN/swE4EIfYC6lWAkiJf0V8a2SVFtJ3RFygwDyzLPunHiddSVKn0pT8JTk9OE4J2TKze/Gb2Q+krk8lmyxuaoXav3eNqmcBmhKYA== 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=RetOjh5YInWxLQZ9nDrbvKwyrgDhvfPuE5QEMp09wB0=; b=lK37cOzdQkSqotIv/Fej8nDV0XOIMSC0biDnFzgjXNCj/SYgYd86d6XX9Qf6lROlcyr2so2Hj0/ZZH51kuOCO+WwHXw/E76/Vmc2ficGgtCRSAoFzre+LjF3gKFiKIt3cs4gHrw9hBbwP+VwexgaP9Cr6guN6TYkJOWHaC5q1EMhWc3shEVFeZeE6ExNfZK9S5MCSA82W4JFtUh8TEI3hGUSjeAjzvG+h76FHdeTqGEcMbiMcRVgBPCocwX9lthLDpn7iNPsqFk26YE9kXTaPGZ4cDBsy266+GO346Aw1dhXm2R80PxhTd6o8etBdJx95aqdkFEBtO7E6Sl1Sw2ZTg== 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=RetOjh5YInWxLQZ9nDrbvKwyrgDhvfPuE5QEMp09wB0=; b=BZ0/gpyEYW/159CDF5/Ouzxepn0aGg5SlHSaYcnG9g8zH7YtDhjWr0mZOm9aHhUgqLzDl0g6pMgAjpGKeN9KUhYNKNBqthrwNq/AyPQ5auXR0r8qxuxitJ+jweF8KcmoK1MFn5Grzzo0ESDLteFTyukvbjBIsGBxlPLnzl7+fIKlJee6IzG22zpiaLxjymlOyQppDG0bJU6FUqMgQbqQyJ4kONX7V9M4QjeO7OyWEg/V1eInF/slbTXC1ykjNwN2BZlsAm3MgpgPCtuHTj0AUm19CMjrsX0OS/oYyifv/gCe9IdTxq3COAh3HPdUrq/tNO0dI7g+7TJgVKaxTFcwHw== 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 v5 1/7] qemu: add IOMMU model smmuv3Dev Date: Wed, 1 Oct 2025 17:38:31 -0700 Message-ID: <20251002003837.1546646-2-nathanc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251002003837.1546646-1-nathanc@nvidia.com> References: <20251002003837.1546646-1-nathanc@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR03CA0048.namprd03.prod.outlook.com (2603:10b6:a03:33e::23) To PH7PR12MB6834.namprd12.prod.outlook.com (2603:10b6:510:1b4::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB6834:EE_|IA1PR12MB8224:EE_ X-MS-Office365-Filtering-Correlation-Id: 84f13dc2-b45d-476a-f072-08de014c0bd0 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?LSl/JlX85TIwBouvCIvTkYUuMH9vC4teLnS+eA8CoyRYf6kT8pfsWSOD3lhG?= =?us-ascii?Q?B6cqoZIefSL40poWLmiIlFiDnlUTlGWARxGDj8QH+ecLr2IZ9c8IEDIDYTQI?= =?us-ascii?Q?UnnCzBLejlgrdEXCvzY+1m7vF4XbPd1Dzmx9uGbsiy4tvGX3WChUKSdrjOUZ?= =?us-ascii?Q?a5X570WdS/OnPl6JdNIXBay1agtyMr/hXxh+9qgDfszSpATGE69UgyAF3LsF?= =?us-ascii?Q?hEdSthIonLLdbrIu7VMDg/QaIebRbPzLP1SH75f14hBh8iYYk98Ekdx/LPVP?= =?us-ascii?Q?yEo5N+jtI01sLMF+2v+e0dbm4iphP5Rtx7qWQx2YoPJ4AJTQUquDIGQ5ZwXw?= =?us-ascii?Q?HLh4R5CMR6OXUYtwZMfO1ers1PMbRxbauF7VHJgpJ8g18mFR1mP6W6PF56n/?= =?us-ascii?Q?8svbhDytg1wid77tLNxXhfDAqJYA3FGb81RuH3lB42F6D2o2s+JKp9/VOKLz?= =?us-ascii?Q?MUsfpu4h0aSbiMdr/D0v6Ylz+W6hBHNAJUK7hgobGp4TwHO2RuOBEOsbaYhO?= =?us-ascii?Q?XkHM5HXuipKy6CKqbjzxuhsqlF3Vbib3IR9Gj3pwp8h5Awog1JlXPtMa1q3Y?= =?us-ascii?Q?G5/T5TRRbSw810NDa/fT8Vux1A8NgFECKuvrC9OcEpRBoXsHDBnYVb5hcfdj?= =?us-ascii?Q?XJ/2iRPzoIs1fwgylC3GljrOqvawtNP43UzgH/dP2My7oqo3YGgHisFLGOu5?= =?us-ascii?Q?gD09lecPPrw+O6xsNXIOWpAE1Wuia2H23lKAoedrJUtRbGPG4UW0qgY89CVm?= =?us-ascii?Q?eODplvd42rMdw1vcxKsoXsaG3yOZl/LAV0+dXtakPFOAkb/OKW+sqYmu15iK?= =?us-ascii?Q?eXd6ua11YvAfInkZiRntxSE/M0kq6KJrHoSje1TVt3+zcnFB3f7x04N81CJC?= =?us-ascii?Q?PJzHsbUJPGzLJrqDVgjmiE4LCjJ0136v787H25XwVM3R5un6kV57d/QV68Zd?= =?us-ascii?Q?SsyozFR0npEzWHcnY319oTRVXJFXk7NqDIav6JCKzPI5JyfBsgve/c+SHIx7?= =?us-ascii?Q?9wbmTcTmiVGFExbQJnu0Oa8xx8GJ2Mttd024KXRH5zHMdEyehPpIAxycHxY8?= =?us-ascii?Q?gtvq4EW3zEe1GCkUkYMmaDbe9/8zJ3piei9kWqOywNCmt9WWmuecSjyHhqsQ?= =?us-ascii?Q?OpZA5s3kRSA30ey41pwHfc47JwKY9KFPI2l2dwyfwwmDMajs45TqiuddDxbl?= =?us-ascii?Q?Z3uxmoNsr6g0A86XhoVDPJKPhtSKrv/i1KbYq81Lza59soEb3UAegjEYihk9?= =?us-ascii?Q?W8gk1H4uxR0H6M1npTZCNXQTjzFS0czjTRHQCoUhyWjnbhV+hvFEusEXmhIn?= =?us-ascii?Q?ah3fLtR7tPCnQqeUnqBDORH6tPmhhwjsnENXrON0FiY0KvepbkZqozXh2kf3?= =?us-ascii?Q?wNhyxZV8KfLfgFxeWYsJQeRI+oOLJcVQfCOMxLkDC062QQQhopJOu484qCe7?= =?us-ascii?Q?ELoZYAMFv32oWA7EGLtc9vq3X+wIzoKA?= 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)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Eq5P552ZgaGxgB17fFyEytps81JqPJQBsk+arGgVD/D4HwELUmQm7wP6d9xm?= =?us-ascii?Q?+/PQ3zeN+2aXD26ieQnM+zlAF+J4qXnYzh+LNTjFYSjGWsXfa67ZRw2XbP43?= =?us-ascii?Q?OViCxA8w+XR6xEheb6wgMxZYvgUsvY2+8upWbS5pisPWgGUoMEEoQ7LkiHVx?= =?us-ascii?Q?wOXY3ujidMFeKf5obvw18aKnjsYuLp8OsghPu5uyi3Xf7sJIKkto7Qn2vTvx?= =?us-ascii?Q?9DdI0tBd5h2uvzW8PPMlBTWhCcNnn+vH+DYYPO8NyoKk54SkFwr11MRlGRNf?= =?us-ascii?Q?XCSADJrU7gk38wVF9KbFHDd1LkWDTdcfwguhVmCyVWrwgxVrK1e24oKN6ezS?= =?us-ascii?Q?8JR6xe/ZixtMFXBn1A6A8pcX4eTbNXGkT4KIOhsf+oHR+mvH18FzXjDlJeh0?= =?us-ascii?Q?45xCA2JwtfcaeV0oe/VB1U+hHtsUCaJa9ZpYFHbIYlTxoo9xW110TZUsMAJI?= =?us-ascii?Q?xW5OKRgnjDYda1cqmbQ8WIxCDCp0YgGYbFUpNAg7P6Cy7k6Sc+h46aSWQdlQ?= =?us-ascii?Q?d7o5f1do04UM+jPlx6MWa1nEwWdwVWZkOeOmCBxF+q50ffORMsG7eS6L+P1x?= =?us-ascii?Q?mrbqB8qKfvl84XJmGyVZXP67cMkt9UyOaCT47SlfoOEw5RrEPssL65fioVsV?= =?us-ascii?Q?rQhT1MCd4tkUlm1iAMsl8PF0xG9PYIniWjt8tJNf6oORccNaGpEH4l+31d27?= =?us-ascii?Q?tff5ZMXV0W4J+8HGqw1dxOEuUpy9q5YmgbrpmP0VOFLf7y0hMosKRqzwALuu?= =?us-ascii?Q?z1XiRJEzzJRA3ZmZViMV9c0B1dkL9lyX6cjXmvn4FT/bOtzkxKlYQkGOVDbx?= =?us-ascii?Q?ra+H0vvEOv1PwT8Us9fJTEFhWHZiQntrnYH3XJ3dH+wP5oP5C9cCWdUrAtr+?= =?us-ascii?Q?DPs29b7v9jsq4P7daoohCaSbHHon+7yIbC/NWTLHYcixgSdV+pQZVh7xNdrL?= =?us-ascii?Q?ujKH4Cp2qOJ+pDOOv9w9RtOQcPWXyECQKYtIPrv5gxU1OXZB5dfwiMFmTqq/?= =?us-ascii?Q?RnBoeogDTA4c52rWE7ied5li0hYLdku+FUgpCSIL+TGR+BKMv5v58dhTl0Zi?= =?us-ascii?Q?PDOp4h2h+CnHk34dDEAWYlmDfe8K8aY9LMy4Nh4VryFPQbS34iFC6HnlpToQ?= =?us-ascii?Q?ftaL/3/4GaGtV7JG+lqFbQy6TJIGSCu1PKWW8Uek/9VCJWqPYd5mXNhh6zy2?= =?us-ascii?Q?RFHDvDQFfsvIu7psrrwNFPjjK9LWYNZ+B8V1VBo1fGx1eQO5kj+4xOhd77FN?= =?us-ascii?Q?74A8FK3zcRsYh5exIcskieVmjRCZqMwdTUuBPhmCjuj5EfGt/0oroQPTJosW?= =?us-ascii?Q?d1+0iwDBmzYxiJyPFBCu4ntWO5j2HIbEpEajh0Hf85hVFU7Z3Di9OYFnINmc?= =?us-ascii?Q?4jsa/4vcOBF7/LZcIb6WCaU6fMPywEligy2QqLXiEZ22GLl/NRwPRR0sWHl2?= =?us-ascii?Q?AlKuzpEjkl5RB3IAPP0Sf+OG+RglfkhBVw2noNIg0Om3xOWTSnbKU23qA1pz?= =?us-ascii?Q?I35h9ljYrWnviJ/oCgeMeEGgr4Dv4nNzebL/q8Z+ccKJ8pnS17jbEY041YaG?= =?us-ascii?Q?2DxP9+42cgvkbD9/IQOQRjPGKIfunSECrJzaQ1MC?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84f13dc2-b45d-476a-f072-08de014c0bd0 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6834.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2025 00:38:46.2908 (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: GcUSKp2NycyGX7A8aaDRmNNSAmh1ZQwx8PsrDh9PRhZInuJzAdyxtb8JebUVADYIiuzizG3bRQvzGXzZD1ARCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8224 Message-ID-Hash: MJBV5OAFRO4NH3RXACVZW5Q67LIKL2FD X-Message-ID-Hash: MJBV5OAFRO4NH3RXACVZW5Q67LIKL2FD 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: 1759365732978116600 Content-Type: text/plain; charset="utf-8" Introduce support for "smmuv3Dev" IOMMU model and its driver attributes "parentIdx", "accel", "ats", "ril", "pasid", and "oas". Signed-off-by: Nathan Chen --- docs/formatdomain.rst | 36 ++++++++++++- src/conf/domain_conf.c | 88 +++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 7 +++ src/conf/domain_validate.c | 41 ++++++++++++-- src/conf/schemas/domaincommon.rng | 31 +++++++++++ src/qemu/qemu_command.c | 83 +++++++++++++++++++++++++++-- src/qemu/qemu_domain_address.c | 2 + src/qemu/qemu_validate.c | 16 ++++++ 8 files changed, 295 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f50dce477f..972493e62c 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -9161,8 +9161,9 @@ 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). =20 ``driver`` The ``driver`` subelement can be used to configure additional options, = some @@ -9212,6 +9213,37 @@ Example: Enable x2APIC mode. Useful for higher number of guest CPUs. :since:`Since 11.5.0` (QEMU/KVM and ``amd`` model only) =20 + ``parentIdx`` + The ``parentIdx`` attribute notes the index of the controller that an + IOMMU device is attached to. (QEMU/KVM and ``smmuv3Dev`` model only) + + ``accel`` + The ``accel`` attribute with possible values ``on`` and ``off`` can = be used + to enable hardware acceleration support for smmuv3Dev IOMMU devices. + (QEMU/KVM and ``smmuv3Dev`` model only) + + ``ats`` + The ``ats`` attribute with possible values ``on`` and ``off`` can be= used + to enable reporting Address Translation Services capability to the g= uest + for smmuv3Dev IOMMU devices with ``accel`` set to ``on``, if the host + SMMUv3 supports ATS and the associated passthrough device supports A= TS. + (QEMU/KVM and ``smmuv3Dev`` model only) + + ``ril`` + The ``ril`` attribute with possible values ``on`` and ``off`` can be= used + to report whether Range Invalidation for smmuv3Dev IOMMU devices with + ``accel`` set to ``on`` is compatible with host SMMUv3 support. + (QEMU/KVM and ``smmuv3Dev`` model only) + + ``pasid`` + The ``pasid`` attribute with possible values ``on`` and ``off`` can = be + used to enable Process Address Space ID support for smmuv3Dev IOMMU = devices + with ``accel`` set to ``on``. (QEMU/KVM and ``smmuv3Dev`` model only) + + ``oas`` + The ``oas`` attribute sets the output address size in units of bits. + (QEMU/KVM and ``smmuv3Dev`` model only) + The ``virtio`` IOMMU devices can further have ``address`` element as descr= ibed in `Device addresses`_ (address has to by type of ``pci``). =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281846dfbe..b9a1c29b73 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,7 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlop= t, VIR_XML_PROP_REQUIRED, &iommu->model) < 0) return NULL; =20 + if ((driver =3D virXPathNode("./driver", ctxt))) { if (virXMLPropTristateSwitch(driver, "intremap", VIR_XML_PROP_NONE, &iommu->intremap) < 0) @@ -14439,6 +14443,30 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlo= pt, if (virXMLPropTristateSwitch(driver, "passthrough", VIR_XML_PROP_N= ONE, &iommu->pt) < 0) return NULL; + + if (virXMLPropInt(driver, "parentIdx", 10, VIR_XML_PROP_NONE, + &iommu->parent_idx, -1) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "accel", VIR_XML_PROP_NONE, + &iommu->accel) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "ats", VIR_XML_PROP_NONE, + &iommu->ats) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "ril", VIR_XML_PROP_NONE, + &iommu->ril) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "pasid", VIR_XML_PROP_NONE, + &iommu->pasid) < 0) + return NULL; + + if (virXMLPropUInt(driver, "oas", 10, VIR_XML_PROP_NONE, + &iommu->oas) < 0) + return NULL; } =20 if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, @@ -22113,6 +22141,42 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUD= ef *src, virTristateSwitchTypeToString(src->xtsup)); 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->ats !=3D dst->ats) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device ATS value '%1$d' does= not match source '%2$d'"), + dst->ats, src->ats); + return false; + } + if (src->ril !=3D dst->ril) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device ril value '%1$d' does= not match source '%2$d'"), + dst->ril, src->ril); + return false; + } + if (src->pasid !=3D dst->pasid) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device pasid value '%1$d' do= es not match source '%2$d'"), + dst->pasid, src->pasid); + return false; + } + if (src->oas !=3D dst->oas) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain IOMMU device oas value '%1$d' does= not match source '%2$d'"), + dst->oas, src->oas); + return false; + } =20 return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); } @@ -28409,6 +28473,30 @@ virDomainIOMMUDefFormat(virBuffer *buf, virBufferAsprintf(&driverAttrBuf, " xtsup=3D'%s'", virTristateSwitchTypeToString(iommu->xtsup)); } + if (iommu->parent_idx >=3D 0) { + virBufferAsprintf(&driverAttrBuf, " parentIdx=3D'%d'", + iommu->parent_idx); + } + if (iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&driverAttrBuf, " accel=3D'%s'", + virTristateSwitchTypeToString(iommu->accel)); + } + if (iommu->ats !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&driverAttrBuf, " ats=3D'%s'", + virTristateSwitchTypeToString(iommu->ats)); + } + if (iommu->ril !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&driverAttrBuf, " ril=3D'%s'", + virTristateSwitchTypeToString(iommu->ril)); + } + if (iommu->pasid !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&driverAttrBuf, " pasid=3D'%s'", + virTristateSwitchTypeToString(iommu->pasid)); + } + if (iommu->oas > 0) { + virBufferAsprintf(&driverAttrBuf, " oas=3D'%d'", + iommu->oas); + } =20 virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 39807b5fe3..1bc52e1a63 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; @@ -3054,6 +3055,12 @@ struct _virDomainIOMMUDef { virTristateSwitch dma_translation; virTristateSwitch xtsup; virTristateSwitch pt; + int parent_idx; + virTristateSwitch accel; + virTristateSwitch ats; + virTristateSwitch ril; + virTristateSwitch pasid; + unsigned int oas; }; =20 typedef enum { diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 93a2bc9b01..117338b4da 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -3108,7 +3108,13 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *i= ommu) 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->parent_idx !=3D -1 || + iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ats !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ril !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pasid !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->oas !=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support additiona= l attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3120,7 +3126,13 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *i= ommu) 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->parent_idx !=3D -1 || + iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ats !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ril !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pasid !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->oas !=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("iommu model '%1$s' doesn't support some addi= tional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); @@ -3130,7 +3142,29 @@ 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->parent_idx !=3D -1 || + iommu->accel !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ats !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->ril !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->pasid !=3D VIR_TRISTATE_SWITCH_ABSENT || + iommu->oas !=3D 0) { + 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 +3189,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..64fb320ca9 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6266,6 +6266,7 @@ smmuv3 virtio amd + smmuv3Dev @@ -6311,6 +6312,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 031f09b7a5..6ec4801a7e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6294,6 +6294,73 @@ 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), + "b:ats", (iommu->ats =3D=3D VIR_TRISTATE_SWI= TCH_ON), + "b:ril", (iommu->ril =3D=3D VIR_TRISTATE_SWI= TCH_ON), + "b:pasid", (iommu->pasid =3D=3D VIR_TRISTATE= _SWITCH_ON), + NULL) < 0) + return NULL; + + if (iommu->oas > 0) { + if (virJSONValueObjectAdd(&props, + "U:oas", (unsigned long long)iommu->oas, + NULL) < 0) + return NULL; + } + + return g_steal_pointer(&props); +} + + static int qemuBuildIOMMUCommandLine(virCommand *cmd, const virDomainDef *def, @@ -6342,7 +6409,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 +6439,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 +7280,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 +10935,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