From nobody Fri Dec 19 15:34:31 2025 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012055.outbound.protection.outlook.com [40.107.200.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 781712727F0; Mon, 13 Oct 2025 00:06:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760313994; cv=fail; b=Zym7S5eCqPQFKqtOeyVCYlxwfYeDDlI53CwwRVTLql4LRTshfYDZ10munqBxYibQlCQqvjBmnTx/igL0g+8L8rD/ln2etwhbX7wnMrh08/vUx8dl26iPfIe6pmZqfhFTKjLRhhrCjWf6Yn/tYS7gMaRwfkyQU632R+dqLbwsfVg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760313994; c=relaxed/simple; bh=FgwwZiwNU7W+qZYi0MUku99qFyZUSBrgrvxmPv2wvQ0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YrD4MOTplqLOBRu9JGLuq7cIUac+LWE8Gsccm83MNuxvF+8zmzJ2szvlfRwsfzS7tJZzAAgTHp+FZPIhb9HCgBK8/9fnBE7UNTGoL15J4gH92uYdK0n1ywNCKDwb3w4srJj04VifnoWno6azyIVGkYAxPuKbtdHmXkfOiZDb4XQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=DARN0Kp/; arc=fail smtp.client-ip=40.107.200.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="DARN0Kp/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cuObUzX1Ap8GAGoI7ETUZxx5NoXZf4poI7XGQPkGxjHM6m43jnjTACNtkqIsFYeFZAwTqrcCkH/1AejRFONbVZFnb184N51pH9x0TLw522kivCtNSN5AOlqDr/gRN0MKhKEHODEOvdsCfg3HwPuiZAINMlHs35wpRh+p+mbdWHDwlbwAZtoE+K7aLbVVmzO2yPq1T3qAe0QKimZA86lKX0qyQwVUAVdPjBEGYHGVqyuBxIqqQUBgzAroLZZEDR6vpJtNJaWJqz0prUyLIb5Nyu9xVM/YNYlhDNfkUQCmQrhwB1yy9nhjQMeN6UVEDMO5LYb8r7HqEK2VoS3NomST/Q== 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=Jl1maTyuhiJe6X2+dk2lQqxHTVBTrgylMyPt6v84fyo=; b=hdmKX/rTKl5jxkIFFaoA8CTs5hHGebDEENkkQkbQzmF0wh1PZOrjWoRGdnHy1FJAgdeSI8eAHrJCjzfa1ymT0xWVktA5fvjuJUwVl5yOm+AuPz4GC8OXjfcXjMHDUbAdubbD714l3gnYbek4i8Bupdz8qqMjHcRF4LaidRUUqVlVG8x4liZZGIiuNcOhRHJIw44gCm3l2meknnrhkPiE9LoWHVfxnPsDMlOOpb1ZNPWqRFgoUb2tf1HIXjdVDDbATrlvVxc/o+hFynAWv0R4u8FaAItZjBtPWhHkT9NiyQ7TPn9XhDVzuoQAGfixugdbve3gXY/hxq/Yw4P7mExo6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=8bytes.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=Jl1maTyuhiJe6X2+dk2lQqxHTVBTrgylMyPt6v84fyo=; b=DARN0Kp/lCVMmVNFX1MVZWqe+lmMBGAAyhsKPcn76kR9fncJTYuATc7ZXCxD1jPbCz9dCPllgkGlm66hNmsLrFXfFLiWRt5VPkxLy66eVAUc6dhGRahn9nLY7g7OEoP6Y35MySyxPpETaysBZPeI2ZmiKYTS98kisGhSmM1/2wI0l1aOuivtJA7Zgh0qJb7V7YFNye/XARBvcGV/w5Zs3AxrI2YgmGDnox+ctRT4/+NOM02Et25JNtXaTknpz/+E6gKHTghvzgkSkdwYgY1PRaPdyoVsqBMd6qYoyPnyHtqRQ48Egm0Q+IPCOecrQ6f4I2fZEw8YQJVDm0SSV+1CTw== Received: from PH8PR15CA0017.namprd15.prod.outlook.com (2603:10b6:510:2d2::7) by IA1PR12MB6209.namprd12.prod.outlook.com (2603:10b6:208:3e7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9203.11; Mon, 13 Oct 2025 00:06:25 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:510:2d2:cafe::ba) by PH8PR15CA0017.outlook.office365.com (2603:10b6:510:2d2::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9203.12 via Frontend Transport; Mon, 13 Oct 2025 00:06:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.7 via Frontend Transport; Mon, 13 Oct 2025 00:06:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.34; Sun, 12 Oct 2025 17:06:16 -0700 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Sun, 12 Oct 2025 17:06:16 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Sun, 12 Oct 2025 17:06:14 -0700 From: Nicolin Chen To: , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v1 18/20] iommufd/selftest: Implement mock_domain_nop_test Date: Sun, 12 Oct 2025 17:05:15 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3E:EE_|IA1PR12MB6209:EE_ X-MS-Office365-Filtering-Correlation-Id: b7c00cf5-9244-42ad-f1e0-08de09ec5978 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Atn9+JZqR/gfd5qXRmv/klkk8kfv7tmUJ1yv+EiB+EXqWYManpu14vV4AsRl?= =?us-ascii?Q?k6ga4ibYZniwS65xQLWa2jnRBo5DCbnZL6GRtz13r3spIB2kArWP3yFEId3i?= =?us-ascii?Q?2BGzXi/XR/YjUAU4905qnlS1TSjrirnu0YEgDsCeC8lTcIntl44DQ3SX7xMy?= =?us-ascii?Q?HnSOae/AVxQcWrFmsfbJ/m5KsXUn8n4DHNDZWcOvw/k5dW+U4kMfcrPdFIu6?= =?us-ascii?Q?peWoVojv78HjfxdgfUqdihrgmPscDLxsB1ES6TVrk/nN+Y1QAUN1cH21B0j9?= =?us-ascii?Q?cJi1wQGl5a8nA0QX5wmb18gafi0qDfWobN0L6X9JB6Ne8nzzyv26qwAxivGu?= =?us-ascii?Q?eM2+7IO9ZDrr1+/ULnbyNYu2v9mgbUjTceJ8AySwzH0YOJo9CgMxx7DqvWOE?= =?us-ascii?Q?p/sZmaIhbJc74xu27ZV0i0j3k0PvGVwiF8h17roX9KuktW2wL0+unfgzajh4?= =?us-ascii?Q?Txp7TVQsSmNlzF1eRi19CFrz4C5+oTlxZloneNzWIet6GS67iQbzzsbA+q+o?= =?us-ascii?Q?UdG87gDuGg17eiueD6i+FoMQ5OkCNSszBSmy/Cw85/xacjWhpUsYjQfJV/bJ?= =?us-ascii?Q?QDZ4PEq7ZwZ0g3W6fifXiDYdvD9va3Mc2Kx0MTu6vKXNDECPL45AXwfU9HXR?= =?us-ascii?Q?4GU2EA7XlMLfVZrzilOQq75UREpqY+Am/LzEq7REi81/BD4i9e2YImD9Avxq?= =?us-ascii?Q?R7IehFHwCh6qxGZPjOuqXTIhgoJQKj5HHmSzJwrVAmXaxninQpGxd60JzWRe?= =?us-ascii?Q?YLlq8eTsmj1rcvs35g3IUAgifuEo3eILGICIvawR5Gk+Ag5M9q49xpkZwIqd?= =?us-ascii?Q?9vxzeRE2xeKjxc2mB1kAJb81WLHo28bdP923rxFSXKZB6uVKxoJVHaAD2dFz?= =?us-ascii?Q?ImALr+k+MdnV4x0pcP+JTQNid7XQpBdVVbgQLB/LuLAQprWFvTlFlTdT2LKB?= =?us-ascii?Q?Eqa+UKv9CP1eHUU0pFXZlvs8DPDaF98TrRcoEJQzrY/lGtEEIZW80Lpr7uo/?= =?us-ascii?Q?nGEs8pzpEb563DNJk55ruU6NCqL1VPbh+pIE3bAUJxMchSpb68g1jYlzlPbU?= =?us-ascii?Q?uoDbBa/X0YDqrkBx95kM+MRDUfDu17P1cXaHLOQc9IAyON7WQXodUMnNhURK?= =?us-ascii?Q?SCV8k89AXDD9qcC8PHDAHb2qp6LLJyNvikMzGxBteWWH0Juxw7PGjGshuDde?= =?us-ascii?Q?WKKn3NEzpJSciS9MGFcAqyjHlI1kIiHpWBsN5WWiRiHnWUkn/Wn8oWXGxzVl?= =?us-ascii?Q?m2v3T2tFMSZqWaC++Od4YX0G3XWqOBv7YuzbBvHgvhshgi4DVroAFtKwdSmX?= =?us-ascii?Q?v/4tNFgADw5kOx9GdoB4XlVbvpS+hcbF2OKv+mn3SiYLafK19yKFG8Pz+LLf?= =?us-ascii?Q?rNoo53DRUUmSRP8ENSy0BpbSYILfoVHy3oLAuWFabYotU84kZASar8OebmXH?= =?us-ascii?Q?lVPiB8Cy7/nWWiamIvLQ9M3i0a+s/JJmfNJYiaM87U5B0h+hrdQ4hT8hacVn?= =?us-ascii?Q?iRmzs6Yz9krfhr+Nt8AnAwQIKd/gj5wfcnfURkPw4uy5j/hLrO0GLSdT537L?= =?us-ascii?Q?1fZ+35iAVLrFgmMX2kw=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2025 00:06:25.0482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7c00cf5-9244-42ad-f1e0-08de09ec5978 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6209 Content-Type: text/plain; charset="utf-8" Move sanity and compatibility tests from the attach_dev callback to the new test_dev callback function. The IOMMU core makes sure an attach_dev call must be invoked after a successful test_dev call. Signed-off-by: Nicolin Chen --- drivers/iommu/iommufd/selftest.c | 45 +++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selft= est.c index 5661d2da2b679..f9c871a280b03 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -58,6 +58,7 @@ enum { MOCK_PFN_HUGE_IOVA =3D _MOCK_PFN_START << 2, }; =20 +static struct iopf_queue *mock_iommu_iopf_queue; static int mock_dev_enable_iopf(struct device *dev, struct iommu_domain *d= omain); static void mock_dev_disable_iopf(struct device *dev, struct iommu_domain = *domain); =20 @@ -215,6 +216,37 @@ static inline struct selftest_obj *to_selftest_obj(str= uct iommufd_object *obj) return container_of(obj, struct selftest_obj, obj); } =20 +static int mock_domain_nop_test(struct iommu_domain *domain, struct device= *dev, + ioasid_t pasid, struct iommu_domain *old) +{ + struct mock_dev *mdev =3D to_mock_dev(dev); + + if (domain->dirty_ops && (mdev->flags & MOCK_FLAGS_DEVICE_NO_DIRTY)) + return -EINVAL; + + iommu_group_mutex_assert(dev); + if (domain->type =3D=3D IOMMU_DOMAIN_NESTED) { + struct mock_viommu *viommu =3D + to_mock_nested(domain)->mock_viommu; + unsigned long vdev_id =3D 0; + int rc; + + if (viommu) { + rc =3D iommufd_viommu_get_vdev_id(&viommu->core, dev, + &vdev_id); + if (rc) + return rc; + } + } + + if (domain->iopf_handler) { + if (!mock_iommu_iopf_queue) + return -ENODEV; + } + + return 0; +} + static int mock_domain_nop_attach(struct iommu_domain *domain, struct device *dev, struct iommu_domain *old) { @@ -223,16 +255,13 @@ static int mock_domain_nop_attach(struct iommu_domain= *domain, unsigned long vdev_id =3D 0; int rc; =20 - if (domain->dirty_ops && (mdev->flags & MOCK_FLAGS_DEVICE_NO_DIRTY)) - return -EINVAL; - iommu_group_mutex_assert(dev); if (domain->type =3D=3D IOMMU_DOMAIN_NESTED) { new_viommu =3D to_mock_nested(domain)->mock_viommu; if (new_viommu) { rc =3D iommufd_viommu_get_vdev_id(&new_viommu->core, dev, &vdev_id); - if (rc) + if (WARN_ON(rc)) return rc; } } @@ -296,6 +325,7 @@ static int mock_domain_set_dev_pasid_nop(struct iommu_d= omain *domain, } =20 static const struct iommu_domain_ops mock_blocking_ops =3D { + .test_dev =3D mock_domain_nop_test, .attach_dev =3D mock_domain_nop_attach, .set_dev_pasid =3D mock_domain_set_dev_pasid_nop }; @@ -630,8 +660,6 @@ static bool mock_domain_capable(struct device *dev, enu= m iommu_cap cap) return false; } =20 -static struct iopf_queue *mock_iommu_iopf_queue; - static struct mock_iommu_device { struct iommu_device iommu_dev; struct completion complete; @@ -658,9 +686,6 @@ static int mock_dev_enable_iopf(struct device *dev, str= uct iommu_domain *domain) if (!domain || !domain->iopf_handler) return 0; =20 - if (!mock_iommu_iopf_queue) - return -ENODEV; - if (mdev->iopf_refcount) { mdev->iopf_refcount++; return 0; @@ -958,6 +983,7 @@ static const struct iommu_ops mock_ops =3D { .default_domain_ops =3D &(struct iommu_domain_ops){ .free =3D mock_domain_free, + .test_dev =3D mock_domain_nop_test, .attach_dev =3D mock_domain_nop_attach, .map_pages =3D mock_domain_map_pages, .unmap_pages =3D mock_domain_unmap_pages, @@ -1021,6 +1047,7 @@ mock_domain_cache_invalidate_user(struct iommu_domain= *domain, =20 static struct iommu_domain_ops domain_nested_ops =3D { .free =3D mock_domain_free_nested, + .test_dev =3D mock_domain_nop_test, .attach_dev =3D mock_domain_nop_attach, .cache_invalidate_user =3D mock_domain_cache_invalidate_user, .set_dev_pasid =3D mock_domain_set_dev_pasid_nop, --=20 2.43.0