From patchwork Thu Nov 6 20:34:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 1873 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010065.outbound.protection.outlook.com [52.101.56.65]) (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 3FC853314CD; Thu, 6 Nov 2025 20:35:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461309; cv=fail; b=hffg/ANI/gAub4nPYDwi1Ehnwz9193N193pxzdvzxjRJNwM7CeaquDw0u+NklCoW0enMRW6fxnu6/HJ4m+9fcq9cPDTvzXRwotWoVeYLj31V1iY1sUDrcoX04S+DC2KB25dquantRlN4vCL643D1Q9lZpqAFwa1Oms/ja89mWLY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461309; c=relaxed/simple; bh=zyvUJEdGi6r8zUYQaSD3OXiXB16dr0Y4dtvSkbgXwZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=kYZAY51QFuCumSB/mdDTEXuxscQggSjRPbIlh5t+9oWlKyQWseWmKS9s/dksIGNNtT1s3n+XgoeuAQlrtme/ItgHiNoyt+MUNwVFOtGL6MfPd5z+FofCH95xR17EXUdaknUOHXCZnxKCBdU0iRrfrqEPFMz3WJn1enLkAcyk2Zs= 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=ISkdjELM; arc=fail smtp.client-ip=52.101.56.65 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="ISkdjELM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jXFgJIF3/hcq7NVlgQJ/9ctWMZXjJ5IWKh7Y9xxKyXUNULh8wzm0+zdX2+ALQnRVZkZiCSuMFNWcAtsWBmsYLuoxCoLFTvb0w6YyhPG9FGW8xQu0fjvXeeatAuBrFXWOz8GJV92IH34qTpIpgR7cHIObSy8QprWSpLT2l00X+LfVXYKJytxZcvhwyzB/w2VsQFosVc49LpMRSu/X5X4NHkc1mN9TGWmv3MzS7saOOfbjvuiXUTHxYf2rU2NrZ6KqtsVRSVTPzgTFsRmF0CwhOkaJjGJo2dQes24Nljl6RfPUibO64wBZ28HEBB48raVizAJkbvOg6A075viz1MFpgg== 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=My24LlDJyOsjOyX8HI6wIQkfNsPWTSeEWuzPouIkp08=; b=bo6G+8mPiS84Q/xe93yPYWgfFp2CJIS0Qwa9Dup4Pxpba5Y6BZN/ECvd9SkmGQiJvWejHcpl6a77/KfO4JOTOx2Z+qB9ZP+tqRyrMW/2i5RBAXbIaPCK+gj/szRmiLilxaY2xNQaqnKVAFoHkEprRfTNLoZFJangDWjgB4uaNgYMBs5Dv6SYFpW42RFGdS5M+SHRWa663F7J2PWrW0QitqIKZUIBxClNHDfGfWh4eklmJgslE9A20U/+NX2MiyyUmZxGTFNHMqwjtwHzyOJj0M+dWmIKDSD38LQsJ2JMHRkPRUuaOO2Vlb8I3Uc26t5zh0/cZgvXHs/9GNwjDoyN2A== 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=My24LlDJyOsjOyX8HI6wIQkfNsPWTSeEWuzPouIkp08=; b=ISkdjELMiKyC9tG1kaztAzlRNTz7BFKeT2JIEO0f433L4SDd1buprlhdkpoIJzkByS/i+KU9BQW5s96h/LvMZe6xMBJmZmZmNtfL6xhuGRn6GPUGbMGkaZhdEAek/YZcyEyCOlRw66JUNYcZzO1/HO3JV1bhyoV5UZCYMfVfBeTttd3fKKHqk7GgBxIVW1g9+rfnezOKT0r+Zk6qgi+sj5BM9uF+WOaten0/xSzpu8uRYI5iXPeS40dIaVEO9cItkWYPBXjY51tK0Sxy06OSbyJKNUrt/w9keGyWVwjY7GLntNv64b68kvLWUjIwYt+2iULTUGPTEk2NAmQZwX6akQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) by SN7PR12MB7108.namprd12.prod.outlook.com (2603:10b6:806:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9275.13; Thu, 6 Nov 2025 20:35:01 +0000 Received: from MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b]) by MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b%4]) with mapi id 15.20.9298.006; Thu, 6 Nov 2025 20:35:01 +0000 From: Jason Gunthorpe To: AngeloGioacchino Del Regno , Christian Benvenuti , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Joerg Roedel , Leon Romanovsky , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rdma@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Matthias Brugger , Nelson Escobar , Rob Clark , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Chen-Yu Tsai , Will Deacon , Yong Wu Cc: Lu Baolu , patches@lists.linux.dev Subject: [PATCH v2 1/3] RDMA/usnic: Remove iommu_set_fault_handler() Date: Thu, 6 Nov 2025 16:34:57 -0400 Message-ID: <1-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> In-Reply-To: <0-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> References: X-ClientProxiedBy: MN2PR05CA0059.namprd05.prod.outlook.com (2603:10b6:208:236::28) To MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR12MB3613:EE_|SN7PR12MB7108:EE_ X-MS-Office365-Filtering-Correlation-Id: 350bd9b5-babe-4d75-603b-08de1d73f584 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|7416014|1800799024|921020; X-Microsoft-Antispam-Message-Info: /hNNiGNxQVSb1k+oxM3VGNepS8TVQUQyQWfK5qQcnCnAxC46Q8ER5JTDc0SoZ1m+WiwboVmoz+Q6CihwJxZVKOAs9XThRVk6tEOwjaC9KMYzKsG9gCyXRrG4eLNHtz5wpAYex4gDEtdbRVjuLtjgBix4/TnGrxWR+tQi0p7DwQlIZqv8pleM8M8MKOEXS9PCLzl1/NmohrWrJyh16VlgKn885rUFYSApbumhc98qeKaVS50TRwVdqamy8IrxSPg3+lNELZWr6L1yDqxl11JVSeVx5JhnuIA5da0Sr2fApy7ZwGy/U47hSdkO7WB4dBwqsi/VBjr72avLjK/T3NAiIdj6Cmo1ppeDalCG1DvuJu8qV2zkAhfHdL0ssT42WOwlOBfz3TmRr3pIOJ9Fh/9co5/TBew/klBNJiHdpeZ6e9HtAtoNAyN3IRE4bGUhNTWTh9hH1NE7XI7wr63vnpsPD96g6syw/Do2X9hHNWPKTkffYgEFvIlMy5lPGVxJgdGk2SZF8Kkb3fesnVNsPpf63yynGcE7bIJQfa/ozDHIadBUi2BGH1rzMuGPD1Q4VRL2N71e6yzNqLDLt4qyDhzfnr3fa+c4IDzAjU9lPRJyK9QHYHMmfjes3XBPURCX9+ii0wLe95dqzmEgkVkqDEXysB5mFPWlHtVxYdXBevEwqJXFEEncTEzWAJVdCbMJIzovL4iHnnFQJmmYnisu4LHBZUIEu6tyxvwIOl4dRVXESwCerE4vrqRrYApHEQz9ZkVuJ3vZyScN7y1NUuycv+tCpqHDsIHgUZbhYVVovSlgxDkqwgBilzofIukpo0ykk1K+eGIqtzfxMnS2HmGk25DnmmrcGxR9/9pQnpV2H/JuuHkc6eSkGIFBXvL4aVQDZ9JlgPA9TQfFRmg1/mdDUqqpiLZS4Q5AmVYl2NS0AsUnD/axhZoKMOUG9eDRi7lKuNhRq1UhlyYfToyIHrMH90Opy5aIPoAsHfeuymAjafuZPGd6IXpbAtH4MpMIgYtIGppNGv5xJEjnwYU9N82URuyCN83XTXwjpRJdYMoTyYXFxT0snXe+Nv1KQNGhIJNr/uMiD5Nu0kaeqopWVIDv8L+1n4f6pPtk/ynkoyX02rlv+SH0s/6uQpjNDrt62MenA4oO3g1dJ9eZAg8ruWnrakmgt2gVYGmpVXB6FNCkfo9dxo3VHsRx0cnmPkNJA7nFJyZJDcw1tbAyVI1EdREW6GR92gBP5G/g3QkDggo91kpfeqnkYHm5zE0MzkWvEZhmks3BIh4mnZuH5dKx37Z6sWBPq4Asru9qMo/HLi5IkVsnp0OwvK71Nh3J+rpks7uzljgNAm6Q1P1eBpWW7qqR/PXi1iEpfCnL2XdlcuQDXCHkY8ceASSA/PGgKRVw+TElSYFF9E4QuMmI5E+ELOGl6YSi1oclDvVuRckbgZMy2aJx+uFVcf2XV07EUC2XA+1v4cOEMMh/0hDZ4Qz+OZi4IXJGozOKfnfi+VPuizSLZ9ZLPnU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB3613.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(7416014)(1800799024)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NJNZpA6r43uGTdgadsolTzcWYr/wDpET0RpZlNUlehGPvTCZG6UUHPdKEi0p21eSNZDWtQtFjDZS3+5GOfmgMH7WTyBzmGeyu/2A0hhIkO8XfVje7FOe2twMFQ3n9ZMRxQsymyT+UUDMEVXca93qdGM6yb1XGl6TdD8sadcOkeJUMySbiBK4BXwm4jHAtIUzK2aGLxid1LZzz5kVWvd6tVVSn5Ws5FuSU3TQQ2T9tGiTyT8oAoUJRsIhcG0wEmNU+wwog7wH2rqaC/4AqEAUeW+PnJU24m4YZh9S3XzKJQO/ZESlQRYvYFrHPRYgHgBMCZnY7egyeDqTh6SOMH8bRiEauNEvKIhxp9wMAwSpitLcFuOJAUZrkdzQNk7XRqs4UnkL/n6G2Ab8e9N2wVusvrpaovaEbRDUzw7Y3L3Rjtbg0q0XF3s/In/fP3zk2ylZFcgpcBj3zQkH/DSyBu/0mQY3gnG8TiG4KiLK2ewZr4YNgeRcyMuUwg4hgbcMfOj00jxvuKTiaocRm1sweuqjBHWJe1cQID0T+0YgXNAizzo4Od2xSRQTApICcuk/8R53XuBV32WhIdUvETZOZytP08UG7myVA18XC4v6R1Ba/Lcz7gHsDgEWooXtgfcCRX1Qv43tj6iRXKkbXPbUXiMfONyLUXC6XCqdVn2vcSLp7Dd7WTkH3i9uw2HcZnw2vEwg6E8hdq3SVGXXwXrpwenMVH9lQHlbK+2dys7Gb92ndOnSIlqh+vbO0Sv+XFB+73EPFI0LWsdqpPSq+xhg+dY0TBNfKNlhF9l4/XQNgaTT8GhynDGO7RogQoRkGXkb1AX5YXvQE+OxrydvF8EGHA3SWc46EYsgmxcX3c4aNZHvz9Jin6Xj08zuZRR9u83ydd0zTM29PuFwX/nnYIEjFBJSV4z97dT73aMbon+SaU8tAvGqBDZgNS/W2msJzia1VEAA9BJXhhEoclv0NvU7FqhevPX2pm4YzZzeQkxNEhWWJOgoi4CT5naUxD49/ZZZMVAW9Dy/Vrp9IJlvVpJhG6L3k4USgWqvIV1EJ7nt0CavH84PgE12kU1HDZCkbLna2NDjMMS5AROMIC/xssvGucrVYDOVZ5SF03jKXiV8NQIkGXZTqWpgTqevV2o6D5DzDyBf2ynYWDIhP/93qECjPCZAF7Ble2xXtyFQLwfwXCXwyj1dtmUd/e4vEYm/YxdHJkIk7N+3w6DQoX3R7h+rwoR/uG8xeoLtYwbCzdfoFzzWdTazH+gFKQOXVXCpViId3kdyeUgZYqUEEcSChLq52kyMoB+ZTn3punRlwbLALUVmsA/EpuNlzG3pJVua+d+WVMz6HYwHzlvIfde/zH1dMeauzhhQV0Brt8K06ky93DS3oGwCe7RBY6Qhwu8sUlSwiKeFE8BCbOF9EPvIMUBbD4lIfOy+V0WhmtHc/EPG9khTAbqy0PF0gzuQ6pl3eLZhSLVp0pDGZXg+UWXOsN1bAvefhbO3J5JSdsFlPL6GPbYgGPq25J0fXXTvuQfDw/venyQCUjRLqEDTAfLRsCa/Siy3JNvAA9h1um90PPhkpoFAdUs= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 350bd9b5-babe-4d75-603b-08de1d73f584 X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3613.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2025 20:35:01.1506 (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: syDgtu60NZt3FhIKphPz9VczI8/s093USABYwRQaN2GkRv1i6vr/yK0UhysmGCSf X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7108 Status: O The handler in usnic just prints a fault report message, the iommu drivers all do a better job of that these days. Just remove the use of this old API. Acked-by: Jason Gunthorpe Reviewed-by: Lu Baolu Signed-off-by: Jason Gunthorpe --- drivers/infiniband/hw/usnic/usnic_uiom.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 3fbf99757b1148..f7fb6246c83aba 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -51,17 +51,6 @@ ((void *) &((struct usnic_uiom_chunk *) 0)->page_list[1] - \ (void *) &((struct usnic_uiom_chunk *) 0)->page_list[0])) -static int usnic_uiom_dma_fault(struct iommu_domain *domain, - struct device *dev, - unsigned long iova, int flags, - void *token) -{ - usnic_err("Device %s iommu fault domain 0x%p va 0x%lx flags 0x%x\n", - dev_name(dev), - domain, iova, flags); - return -ENOSYS; -} - static void usnic_uiom_put_pages(struct list_head *chunk_list, int dirty) { struct usnic_uiom_chunk *chunk, *tmp; @@ -450,8 +439,6 @@ struct usnic_uiom_pd *usnic_uiom_alloc_pd(struct device *dev) return ERR_CAST(domain); } - iommu_set_fault_handler(pd->domain, usnic_uiom_dma_fault, NULL); - spin_lock_init(&pd->lock); INIT_LIST_HEAD(&pd->devs); From patchwork Thu Nov 6 20:34:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 1874 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010065.outbound.protection.outlook.com [52.101.56.65]) (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 90679322749; Thu, 6 Nov 2025 20:35:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461308; cv=fail; b=ldUB4MtwCCmt5hM96AX48xg3yOyK2Nhy/kmjyU/dwIvIlhpFrn6FrM5UQkjeVO2Eiu0mF4QuAq5xYV4s2rSgKFeUsAYaAO7yWjhIS515C7heDBCB7ctiucdAYstQn4hTk5y5udaPLM30Jux2GpCkyiF2dNFEyh1x2Nv0fiK3IxE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461308; c=relaxed/simple; bh=saViRBSYGQD/H9+MPVKU7BcIMTkHFwK8T+W+wsoDLLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=NHn72g9J9Tp0qPGynAhX9ibab2RYWLmqbuIfX1pk2OzgNyTbi0/S8DGLXZmv9OUPZ5HSfTp1UQRnQ+PPQMTNSntNqQrX2bddK1QdB60+ga3k1vi3QGkkDMtFtYhgNlNiYnXbj+QjJRS3EL7dSsqTKnms/oz7g5aysl+2EK1d4u4= 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=pRdHebZT; arc=fail smtp.client-ip=52.101.56.65 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="pRdHebZT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=siscO6r0nSEmJC+6CtQGVU+UOz5T5b6ZeTLNY2EmVhBgv2PIoOASLXZK8AYC4kxkL/UnJxTT8Y49anHPfmGsRyXmVF4DqPP33eFwic4aIcxYGPKXClXhgUfkTXfuetzonRnLwHHgxgLOs/FIKzoxWttMBZs3YQ7GV3YQLIl/rphrTjcjB3hydF68ClknEbmxrQot0Ib6RCljyycz+19jCogMN6UOnjp2sxmCSw8uqlVB7azrtpSOeb67SrDMDwOGAy74vdajUcgG2mjiPrvEnxMVvYqmjQGl3q449KzxH85UGDj8Vb7zIOGBTI6fTm2nDXjiyQa45bWNOnPeiyRzzw== 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=zhb7BPdH70xcuNod0R5kyK2egKSNweuQW35kisBqYpo=; b=E4/onS6ZN7QqiV6rKylBgR2NIC1+NWQvgGdQrATnTVDKc2Npd/fgwQJlYrrgv9lxG54wssrFVcDs4KIPRhGbA9l7rdhXCdrXu5nQz5+JzNyNRt1w55IAQAMMHz1RyRUAzEDPQtrA18givA3Q4uF++8a9A9mLvv2R5vznVE8Z8vbfT+p8fcqnnufIn445HtGz3JtiIFUq/Qkoou73lHcmVI/LDIeUO5VjjLxswUCPdB3522glzdhfPtvAaUc7GgwZwdh7AiIRmzxHMGfA84WBmD/FWxZDUyY6ojxY+RXihCP21ckn1kVj0cLEvciaLHmE2a137+mGaCoAQ7DtIY3Djg== 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=zhb7BPdH70xcuNod0R5kyK2egKSNweuQW35kisBqYpo=; b=pRdHebZTGv11T7nrM0ZpxhD/b9ojM3x1vLO4bVQCOx+bJi6oNQQqQCYEfdGwsIxgkd/2Mujlkq+fJGlCsSjZtYDgnCcNuxzRfwyEDxC2PBGBXzj5n/ozt2oVND8e+JcDpHGnlNRz0d/KH7Ut3KlSZBR391wilE1eCbFZM7bQv8pJ1soKLKxoTtykUzMK3YVLry3LGE+99CXnsBAAsiXh0402Ve6IjgGmtUtztTCbuValBJ83u2iLjHAjmddOdT+SfCH+xFhCwBJkCXjEkl3Xh9c4dFvE2xpCAJ3I/jPnTsC+qY0kyaHyHlD2ggxsBBB0KVaZUJH2lVFRjLyoW9LvKg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) by SN7PR12MB7108.namprd12.prod.outlook.com (2603:10b6:806:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9275.13; Thu, 6 Nov 2025 20:35:01 +0000 Received: from MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b]) by MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b%4]) with mapi id 15.20.9298.006; Thu, 6 Nov 2025 20:35:01 +0000 From: Jason Gunthorpe To: AngeloGioacchino Del Regno , Christian Benvenuti , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Joerg Roedel , Leon Romanovsky , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rdma@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Matthias Brugger , Nelson Escobar , Rob Clark , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Chen-Yu Tsai , Will Deacon , Yong Wu Cc: Lu Baolu , patches@lists.linux.dev Subject: [PATCH v2 2/3] iommu/amd: Don't call report_iommu_fault() Date: Thu, 6 Nov 2025 16:34:58 -0400 Message-ID: <2-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> In-Reply-To: <0-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> References: X-ClientProxiedBy: BN9PR03CA0741.namprd03.prod.outlook.com (2603:10b6:408:110::26) To MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR12MB3613:EE_|SN7PR12MB7108:EE_ X-MS-Office365-Filtering-Correlation-Id: dd24b312-92a5-4bb1-2ba7-08de1d73f567 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|7416014|1800799024|921020; X-Microsoft-Antispam-Message-Info: lHtfvcZ+BjirXdYATX/pX8iZuZWMUdtgRodlMtGG9ELFOROlRF27ZjJIKZvnA11xVVALtaKAEl6G2Kr9XlAqtL5W9yFCLdlsEP/ig2uNKprmCCttsbL95lBfjL0dxEh2kuLRIqzAtYFB6cqTyl903NbhXVSAx/JQNkCACDV5Neim5yTyNxhJ2cC5bP7imAd7OpVdHhahJgVwJ+YIsoD+jEbiDZo52WMQxkpJhJwDVxbs4DOaLXFmBkwh47GwDLKXjdrOBm5NbSUfrFr78RQzNR3SRoZKfnmIXSPA2c+6HtB+Z9Xqe5ZNaqEKt+8RaKuJUaqkCdfHBIB3QAtbcUQbd+s+oOVSUfWh2SVQpLIt9bdqfyyL/3+sdBIXtH1bXki8x6tIVVBgM4VcUP/A08V5Kj3viq3bUbJn1ahBi/WwzQ0e3/pqydyuIQ0XEyCJTZDI+nlSSe6MPm5IgVc2GiwltMRDCd23CsEY9UPzGFccHZLTsCWZiCiwKT4dndWwcvkXp9z7Fm9Mn/m5ml1XNmQtzFK3f3MOyNuRC/Cr5bzRuvo/+FYiIzOV5ZQ4FfoNJ02tPyX1oFSv2SPMciCVbRSRGajSvoi9fAfOV/BLENCJmYyg6QqxCFdFTqjKst1M+FNakRnQJtJyS1Zknb75MvHscIkIrevWP61oF3uIozz+FXkLwirYK6nEig7Vv59i7l/7fRuCU3ws0oGJ3XasqcIPHChJKSZfwluMaaOCKyzo4JvM8Fm7bfoF1dflUTZNUMcqQNQfXfrAaZ4UcYQ7UXwcyhMVGsCdb7VZAy7bv2jvugqTwWcH0CVzTZHIncnYu1I3ZWCsUDNt3l7w/259DSTsV9KwOEw3tssEWdwxWLYzFdH3Rsa4IMrORL4CPTLbnEkuzq17uheHHaMupNWW8DAR44+xhEXG6sJVQEGlSGvLZV/ULGgC6yHp6jUtm8L4QYkNjCQHf10l0i0DLR64vEjBVwORPFh1UdRegnKkJIwPcIDEI65f+LxNPQk6s+mundvqhVMRFj1U67mQy9MlHxo8Cxp9ecte7ayPccEMIAXygrvu1jhWVszsj7DWcceDv0VEu3LdD7IulH45L3d/IhPlnUe412n+WejQOkvtou3DjmjvZe+edUHiOFRdU5vrXwuxBr5oxb9/VqUThG4z/WtXtciXUsZcekcPKW78eCg9C6vZO7T9dEN+UGUoO72DJDTP8wbXiptbZ3yizOCCRqbITVzWDJwaAS0/aqh7yCzsTuSpmazJGPqDZWnIylSTm9vTcYCUadrg5s7hZes6YiD8ZFatcKJB6BqGPZTgySGrQEsrdWcuzhPh1S+l8ZHDeQ0Xld4+75LmumP6qkIs+6gLgODQvIGY9PzjJrjcs9N54tVcu475U3zIhN0+KM5JNRd0hptywy+OFsMDSdFnJuXvvYR3+7E+z1T+polzqB/nksifkWYIanUUZVZspipQAfcn27NDWG+qlqkWnBH1OHU2fzyxuDgba2kV4EFK69UuFyw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB3613.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(7416014)(1800799024)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /ljrhLXu8VROTxdtfdnGjfphwC7SwksaJIh7sSbXqCQechX88mt+jl8g6jy6htYW4we6rRWhaSIOqf7b3BFc9TFWVKsEj3T7YGadh6AFzkUmOOP6IlfjPbO0T7f3CgE9P3eaqSnfQosnOp6GWe72Yx3ajpRMixcUQeyyFrb+qWRSMCWcsMW398p8MyL7tAmqn3dOn+dEfgz7atzJ/wwNWhMKx3H0J+lcVsqEUrCRl13xjl5PToRZn/FGjISxEx0i8tolXSg2xj4KpB+LDTeL1O5Y8Fi9sf1jF1Kp9IbQwq3i5+cBRL2epRcja8l/yLwVlvYPwpsHnfzRpQ/pS8e6bpmJPkX/cYCiLVYvJsvKNuyfUAcTO79c3RsvKI+YWZxtX/P2sZHcD9/49jFY6QSPVaj+X38nnTLyN538ns8QnL7DhOhr+bZCPG7GDmQJ6tj5FN1JgulkoSbstkCjQ2o8eJm1L2zCMiFHVBiAODYaGy4M22a17KOv4ipdAZbjdfBMLdvJNI86g1rqdrVFKSTQ/Di11ZootBQIKKiGxdPC34Xq4y/tw7GGX20/pnjroPV/45LbPp9OspB42s9ZaXiuhmoFcPQILElJb787gHU9N8Ai6N+sgNnCUbMYd6xy7mlRjbUNGSbiGA0Xr2gKaOkluBlGN/YimNUKkXP76pc8p288r575l/OMonLDlZMIe2Pb28qzp5d+zoSuTWKmCbck7cDArR8OqF14A8vVl0JbM9zEjuMZ/E+VtyJIdEkfzjerc3uICvGMpiqD1MoIqY6Ges+zXzQ0SrA6O/B6f6LtHwIbpHZ9z4dUzXDysCasnjbFCCNZPgD7p+k7LU6ra3i5ZH2vm0EhRQVXTVCIpu5EMOtpzUqZwdDg/jf2C00YxtyN+Ah/BYVbjAecmUR/LUXgTr0LDyHCjBr31IrxhB0KS728cCpdmKnDFU3FhE5oJsxWILeI6DvfbrU2fXtdkivia07Wkkxp+JYTzz2GXIjemRh5Ldgf/A8e07zU9U+iTfJ7nK8ps/3qJYKXcUR26NlhJZHrGh0xhIggK0gHQTwMAhSp8Ja92s34PYn6DvgmhnmyX6ng9Ul1fc/+7neOfbmpDvOAkI4DE7/7fDkMHqeYmvn0kIntAXeVj7jyRDPm9HpuJz7EgWcJ09uAc1+lMTmfnnIsSm979ojnGqDu/IEMS27+liYbaHk9B6dVLLSo16j86Lb8jdAYcAd0VpL322PqJBEecro0H2RZnI7xWqyNb9EDFMpYdGo3dprnuJmQgVPzbzqL5hrEU5O4k1TOWsvSKE0iUUnrUU+yggpMnaoqAIBVU4vWnnKTlCPe87MBg1XzLDS3wqOhRA50kmdjcVSiY/xc3IFlZ9WGrKXSliGI3eFVZpqAKzcSK6rRXCb0eHHywV8Lg+q0gk03EjJNdcIvVs0k2+Jcm3tmj7Srqe+9fQWUty6vbq/EgXl79MGtcUJNr3U/EFJ4AMqowV2BU2uURQBgZxTKoprRPPP5T04NSbeW24x5WuH5CD56gvvV/CZip2fK2zH5dP2UhnS1P6sKzepe5YWHdrYdt2XEUCbMKn4= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd24b312-92a5-4bb1-2ba7-08de1d73f567 X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3613.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2025 20:35:01.0463 (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: 8tNmEd5UcuK1m7o2sA2RKD7UtFEqSHGRKqZscu7iMkiZbF9U1wuxvR6cWhjfFQYV X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7108 Status: O This old style API is only used by drivers/gpu/drm/msm, drivers/remoteproc/omap_remoteproc.c, and drivers/remoteproc/qcom_q6v5_adsp.c none are used on x86 HW. Remove the dead code to discourage new users. Signed-off-by: Jason Gunthorpe --- drivers/iommu/amd/iommu.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 2e1865daa1cee8..d4d9a5dbfa6333 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -854,13 +854,6 @@ static void amd_iommu_report_page_fault(struct amd_iommu *iommu, PCI_FUNC(devid), domain_id); goto out; } - - if (!report_iommu_fault(&dev_data->domain->domain, - &pdev->dev, address, - IS_WRITE_REQUEST(flags) ? - IOMMU_FAULT_WRITE : - IOMMU_FAULT_READ)) - goto out; } if (__ratelimit(&dev_data->rs)) { From patchwork Thu Nov 6 20:34:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 1872 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010065.outbound.protection.outlook.com [52.101.56.65]) (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 DF11E334C25; Thu, 6 Nov 2025 20:35:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461311; cv=fail; b=QsED1Rxneeq46RLO+oOkiGlOf4xP7BzOA41PoMo41gThnJ3mkUNM9BaVXY3SL39lsGbNXCiBHt6GiTS+gTitXlwSP8+Lo/AqgccRqJEPXQ8y6IX0E5FX2BNe1EnxA6OK1PbFsHuOlEavWRvbRmDUwuXc6qmPD4/uWuCjTu/Ajtg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762461311; c=relaxed/simple; bh=/zp5jfVIid89e1t6cQsTsxt+n98wjbO6xxc/yFNvYkk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=V3jzLrPY+9bLjd41p14TQg3UwEJGOEtdNGPXidyILtvlrJbKwuJz3AwK2RS2YzXBcBmssL25ARB9Bf/IpaWrwUVCHHdHL9xWpHNccSFQsTrPXhy/g0SO4fLyO/CdZPwA4sUSzgkySErlOvIhkFaPmfP8TfHK/8LQu4sYGfSycaA= 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=FJLmR9wr; arc=fail smtp.client-ip=52.101.56.65 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="FJLmR9wr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F9zJ8Ut2dYLOxnbryLJJJTn2s0XilS1SD6QmQiyUpav90bJKOMyqN9lSdAdVeHGY6HVcMMSQboaV/5nsnBguC6VwmYXeNN810KHahr2gMrSNh5qjhWgO0POsS85oK9qMUQde8xxhw5C+UHUJbyQNZ9eqKPrM25Rj6UWGlx0HXS3XbjKlq7wdPcVvTCRbjgU51amQVsK9MhIzH+p2RAfkq4CFa2KzIdEQ9rEYjvROjwcpW8jW0RZuF3vyVvjXwrcakWfd7jz/ZcQJ8o43Fqzy7uKh1Vc41KkfoItvhrx3Ffd7E2E0Nvy2itw1Ywf5BqnBoSjH1S46kunPMhsAr2NNdg== 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=ZjGlaHIz69o8hPoDvfMqSpAmwihFcxv4HwAXIJoZdfA=; b=i31JSNNHz0yuXBsBWVDM6iFbJX09r+Pf+AzGr2mpQzsVGcdCVbToPN2i4ji5tnRQHv57N0tLQ+JD62tWpTiHK1Ax/4skyFgazAJQ2l+sAD1hCdV+cm6fxXodsbKHztNCS0l9f4q1BkXyK8hx7m3W/QllOKmWMOgnJI4+1pR6jmeY9lYYHBXzKsW52mDs2XQZn9Tz/GEV19YLbJyRZIYhcBRDKmDXWNDy9iJ0MscMJEMzrZ3hXqFF/SQk4wiIV9uuSk7HOjpOAUeRdq3ikzrkOayIMaQKvbBqtGP00M/Dg5NkDa2JZv+bUelMSy0YPmgQGkbnUt2LWkzLPIIhsHOoqw== 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=ZjGlaHIz69o8hPoDvfMqSpAmwihFcxv4HwAXIJoZdfA=; b=FJLmR9wrfkaeId8YRDKYCIDrSuvzI5wQwMjeWyjdNB+SigZDHUcsdCoBdaoFaTgRfNTasmvYD5U5be8XrC0GPiDtoAr2y3DvuR6iJJ0o/X/gePgHEqpRLT9DMCV2o8uwLqxUl673lYOYm5NfEdMxQkxfA7/F52NqUyXQ3Sds9/Z9b89Yikp2lQzO7TOKf8OzxIOqtw0m77RpjIZLUa9C0sMuTpgGYKdOJaAmMaTJyW+Xa79zE0Gid4XTEg9ei1Hs5nXRJ/V8xcBDeoo+w1e0gIwIQdqpMKeOqn/wSkIgd1hJp1b9Y2o9oMBcZBTZOOhtNxT7hGpgdWKGiWRXOo2cJw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) by SN7PR12MB7108.namprd12.prod.outlook.com (2603:10b6:806:2a3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9275.13; Thu, 6 Nov 2025 20:35:02 +0000 Received: from MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b]) by MN2PR12MB3613.namprd12.prod.outlook.com ([fe80::1b3b:64f5:9211:608b%4]) with mapi id 15.20.9298.006; Thu, 6 Nov 2025 20:35:02 +0000 From: Jason Gunthorpe To: AngeloGioacchino Del Regno , Christian Benvenuti , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Joerg Roedel , Leon Romanovsky , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rdma@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Matthias Brugger , Nelson Escobar , Rob Clark , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Chen-Yu Tsai , Will Deacon , Yong Wu Cc: Lu Baolu , patches@lists.linux.dev Subject: [PATCH v2 3/3] iommu: Allow drivers to say if they use report_iommu_fault() Date: Thu, 6 Nov 2025 16:34:59 -0400 Message-ID: <3-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> In-Reply-To: <0-v2-25fc75484cab+ab-iommu_set_fault_jgg@nvidia.com> References: X-ClientProxiedBy: BN9P222CA0017.NAMP222.PROD.OUTLOOK.COM (2603:10b6:408:10c::22) To MN2PR12MB3613.namprd12.prod.outlook.com (2603:10b6:208:c1::17) Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR12MB3613:EE_|SN7PR12MB7108:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b919955-67cd-45a4-6d0b-08de1d73f596 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|7416014|1800799024|921020; X-Microsoft-Antispam-Message-Info: Auc7sGIIt5n8LnyZiKQpy7WKLHnpLDn6xmPBHv4A4TbnyLQqwCLJBSSAIELNqIok8e83r/pvECkL764znxbmy72fhyqZCipI+SxfAhTFCb5GhJCRsP+hnbnWJ+bob6Y/UDrkP/c+tWfB5wFPTiGcXCNgz9W9LOjN/KEavLJF4x1Z++FSFxmVOOsC2Gr7pPR82plZ3BNNLSxzjT051IpAmEZjA9ggPtW0C2Tt0TLwbcfLGNFyDVmg8Y6K1pIE5XQGHAFF0SzC0spgXQt767suXMT+gn6t+LcNUvjljW38OQa8xm6WSHJAHnZEntiPE7Fp2xxvaR2q3Gz2BdaNdWwZxCvN3tBx067Orz7h7Dt7GuYAY+1DueLpvxnSLLu3pl3bhLrSYSFxvpw4VuHVHvfp7pp1N7I5VxPzDVghGyqTT2L5KFVnZjHBjiDghcYBfXnBLmzV4ZTEGF+QP6hV9FHTKJUzOPvCEEAYzN9TjNYtmTOWnr/s+YkxPaA5OPKbUXjSx9T4aCbcA85t35XGew/v5cYpKTcHiTBeVrHj749Qq/GkuhCCvs/CIuGSW9QP4l0BSLQ1OqsHj0T1dkUZl/fWszFatm0AIrKk0MubC4VtLVtIL6AExTM3VXXYqByC4ChNlHLQgg15HvhLa5qrxl3A9RR9T0dRdHg+GtUQ/Dq8VE9ZY2LlPrb2KJcvffZIafsajm2ox3OFRwzDTWQ0nWQFxtVmhOypU+EjfEmShdK6rIBDbeaBsq1Eqjba29SErtnc9WyfyQ6iHmI5O/njRj8kAL4Q3BYGZ+PjxXf6br7v0avnAhAT1fsNnd1nFgSdwbs8CELOW2cFo+MfBu+1qXd02tVeaX9NB3JSReivOvRXkR+gQubSnOBhaSAfH79E+7O10hESspx8B1RA/dIjw+Q/Z3y2rv33KEeUmhsBUMalT9Bp7puvGvSui2nt2+QVuIgkaHDNvhU4eSd5GB2j4MZ1xWlNISN2xnxIgAqZCap5mLvXhZTIYzBjCUkuJP8FtObsZAZHJvm+1eNZR0sJ9+VwaQWtsHRkKiW8pAk/qF4R+IU6qwrsiaUyp1mGCB5ZdOEKtN5/eHkVLV5GCmK2OvXsHt+Wo8OrWK2HS6GlP0RcIGiB2ETVgC5p5Rvhs1FYYfhLGz93ljEOP5CnlhEIZ09XEhIOn+i0pgBoIOO804rdVskATqns6IbHmguiD2BCTDZg/ZpRBrGXEPqNSycOVOAYL3FMRd5RIsPrP6wmHt2jRSWMzAcqe5HpCpjYecJJqUw75vUZFyDmZPi+Tm/Io/XJsIJghPDBl13OJVue05tp0sJ/RZ3rGhhuKW3D1ojxTyNCrK8+mwITyKKFtn8opUOriJ2aT6g/Krd6/TbOxiz1B7ENyfvHUYvtTrFMEp9IwBXCq0Nga5BMPEBKs4pnHTIzMF6NivZgyqS6+ne78nuJrTf+Dal8WBL5DoBKOhDn2mfhbC4gn5r9d0R0TUyJKgd20/8Vr9yRN8sDIjeqv0IyVUE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB3613.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(7416014)(1800799024)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7+jFhWT5eHxVVTW6nt2bJXv1GKIzovNYohBZBp6Z1M7ovm4nl+UP89U9lVE8NcbHy/7aPPC86PPCBsVIDAefbItahF62pt9xrrmLhdtYs4lckTgacWK4mzvL3lEmV5xPQxZGKakEmvIHZ+aD5TV5Bc/aNGB7/p6l/q1A/fqVOIhQuyDg+fxL48qQeAazFfxFJ9RCR9wHwYShl7Ou76TTSKaeJAUbykuVkw4ewiKe22T/c5Uc9yUOzEdqg28xftrhrrxeKI408q3WIwarsmYf6oLXUeQiS87TQd0lGPB43fMs/NDA5/Kc+M4UFmDab6uLfjA5DTPIjJ940/qBsXE//rxGBDD1TIiOsbVoAbezBkTMITr17KxQ2ELBV1z/pgXFToDnC3ALop98fC4dH8P6Jhc6LNF8MXDW0e6vqKRe1xg0jhdURLxBjBzvGE9fD3Zok7k0TTL6egFB66o0DvdLjdGbyuCUjDPY2h9M/Q7AzMksreb4aoP6+3j/ZkuyO7z1EvVRwpjnbwPdF9c1uCB+1M83z5MAbkmOR/R4L2ZQrnEKI7lPL7dM12A938mAB3PqtGheZfTUs3eUQCQ42YVVK/hLihfSAv0oPjJTiM6i7SYFLSHwY6Xi/lsiyNnDvzNqP+Si6Q9QoefxCjidvc7FoygcRsP5ARuZsbe2gXYmR+AizWxs8/1Zf04BZzvwXQVLNn6j4DAjHc68n+M7JctYrYufYCEd+b4HVXx39wDzRjjQxgxoxF+yOVppaYDWDZJdT9z5hfN1dat4gdJ2HuWcwUXmkmxTd9BvT5pma/UYrh3N6UC/ESjHy3BRprtd3i466SOfbIi8T9J5248QjnUAmw1bGeW2R0AQmfAb7QCemnhqP7vWPPTVQIF3eoyyC9cXBR3SxMyn0gwigJPG+keagRQQPyomiwE0ysq9Z7S6CplrDU8x60ABHbZGMH+gow26YYx0/XzGRx+KVv3yvGcK778bXJKkQzt6nA6q6uUTkyqZT5welzhsiw3ZS4AFRELtuMorvX9QCOBj7sZwQ6ccqPEH5ptU9K6WR1GgQqgixzuVR4Km8Cpzh9pGY30n9pkUc2dZfezV863LXPPdP6IpRtwWwJN1rycY1UTFqs8Bued0u3ygobng38COjSSDT9XEuqnpwUDytbFcPEwZScZq+BrzaFKwN6xI4/Rkmo4651jimzVnE63d5kknTTazCnjOx+iEM9A7WnIuC1a8VLK2ypPo9DogKBmTrzT/w9wNOCXQsrKRBk78tJdzA3xp2bb7RfcQctnne0vd4FB/33nAdEND50tP/1lamMEVQD0VSzJItBO/xNapaD1jIqsgEkYiHiBd+6evYVoYZeFc+7I7+sA4DZS34zYtGkQOz2ccLPT8XC6d7zJJisHpGv+dHK4YLeliIEVtBjf6bVaSHPzY2makpbwgvHTyZKSiBSJsS2e+WPZxWeQm+Bxua7e5VLeeXepqm3W6rmxewSkZuVFeSWWGYLpFto8Hw0jRO/ABulJdRMDckU5cgmewOtnHSwmKUDGkvA9e+XD9hSlKshKDQfGaerltcnWb6foEuv4wpkc= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b919955-67cd-45a4-6d0b-08de1d73f596 X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3613.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2025 20:35:01.4070 (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: ijoR5zFUspLJGictDbbGfdJf1qV7yxezHHkchjfJSkvlDvQs7X3ujChZtRYtkJ4n X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7108 Status: O report_iommu_fault() is an older API that has been superseded by iommu_report_device_fault() which is capable to support PRI. Only two external drivers consume this, drivers/remoteproc and drivers/gpu/drm/msm. Ideally they would move over to the new APIs, but for now protect against accidentally mix and matching the wrong components. The iommu drivers support either the old iommu_set_fault_handler() via the driver calling report_iommu_fault(), or they are newer server focused drivers that call iommu_report_device_fault(). Include a flag in the iommu_ops if the driver calls report_iommu_fault() and block iommu_set_fault_handler() for domain's of iommu drivers that can't support it. Reviewed-by: Lu Baolu Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu/arm-smmu.c | 1 + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 1 + drivers/iommu/iommu.c | 6 +++++- drivers/iommu/ipmmu-vmsa.c | 1 + drivers/iommu/mtk_iommu.c | 1 + drivers/iommu/mtk_iommu_v1.c | 1 + drivers/iommu/omap-iommu.c | 1 + drivers/iommu/rockchip-iommu.c | 1 + drivers/iommu/sun50i-iommu.c | 1 + include/linux/iommu.h | 3 +++ 10 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 4ced4b5bee4df3..f68a0576b9a3a6 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -1643,6 +1643,7 @@ static const struct iommu_ops arm_smmu_ops = { .get_resv_regions = arm_smmu_get_resv_regions, .def_domain_type = arm_smmu_def_domain_type, .owner = THIS_MODULE, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = arm_smmu_attach_dev, .map_pages = arm_smmu_map_pages, diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index c5be95e560317e..173d5957796790 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -597,6 +597,7 @@ static const struct iommu_ops qcom_iommu_ops = { .probe_device = qcom_iommu_probe_device, .device_group = generic_device_group, .of_xlate = qcom_iommu_of_xlate, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = qcom_iommu_attach_dev, .map_pages = qcom_iommu_map, diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 59244c744eabd2..8d9086a37671e1 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2005,6 +2005,9 @@ EXPORT_SYMBOL_GPL(iommu_group_has_isolated_msi); * This function should be used by IOMMU users which want to be notified * whenever an IOMMU fault happens. * + * This is a legacy API not supported by all drivers. New users should look + * to using domain->iopf_handler for the modern API. + * * The fault handler itself should return 0 on success, and an appropriate * error code otherwise. */ @@ -2012,7 +2015,8 @@ void iommu_set_fault_handler(struct iommu_domain *domain, iommu_fault_handler_t handler, void *token) { - if (WARN_ON(!domain || domain->cookie_type != IOMMU_COOKIE_NONE)) + if (WARN_ON(!domain || domain->cookie_type != IOMMU_COOKIE_NONE || + !domain->owner->report_iommu_fault_supported)) return; domain->cookie_type = IOMMU_COOKIE_FAULT_HANDLER; diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index ffa892f6571406..04a5836bf36000 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -884,6 +884,7 @@ static const struct iommu_ops ipmmu_ops = { .device_group = IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_IOMMU_DMA) ? generic_device_group : generic_single_device_group, .of_xlate = ipmmu_of_xlate, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = ipmmu_attach_device, .map_pages = ipmmu_map, diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 0e0285348d2b8e..ccf6fdeb64a261 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -1018,6 +1018,7 @@ static const struct iommu_ops mtk_iommu_ops = { .of_xlate = mtk_iommu_of_xlate, .get_resv_regions = mtk_iommu_get_resv_regions, .owner = THIS_MODULE, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = mtk_iommu_attach_device, .map_pages = mtk_iommu_map, diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 10cc0b1197e801..3dd6222d210921 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -581,6 +581,7 @@ static const struct iommu_ops mtk_iommu_v1_ops = { .release_device = mtk_iommu_v1_release_device, .device_group = generic_device_group, .owner = THIS_MODULE, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = mtk_iommu_v1_attach_device, .map_pages = mtk_iommu_v1_map, diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 5c6f5943f44b1f..7ba67600f32915 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -1723,6 +1723,7 @@ static const struct iommu_ops omap_iommu_ops = { .release_device = omap_iommu_release_device, .device_group = generic_single_device_group, .of_xlate = omap_iommu_of_xlate, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = omap_iommu_attach_dev, .map_pages = omap_iommu_map, diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 0861dd469bd866..932b5a62bac572 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1173,6 +1173,7 @@ static const struct iommu_ops rk_iommu_ops = { .release_device = rk_iommu_release_device, .device_group = generic_single_device_group, .of_xlate = rk_iommu_of_xlate, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = rk_iommu_attach_device, .map_pages = rk_iommu_map, diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c index de10b569d9a940..13c37b1be481d7 100644 --- a/drivers/iommu/sun50i-iommu.c +++ b/drivers/iommu/sun50i-iommu.c @@ -848,6 +848,7 @@ static const struct iommu_ops sun50i_iommu_ops = { .domain_alloc_paging = sun50i_iommu_domain_alloc_paging, .of_xlate = sun50i_iommu_of_xlate, .probe_device = sun50i_iommu_probe_device, + .report_iommu_fault_supported = true, .default_domain_ops = &(const struct iommu_domain_ops) { .attach_dev = sun50i_iommu_attach_device, .flush_iotlb_all = sun50i_iommu_flush_iotlb_all, diff --git a/include/linux/iommu.h b/include/linux/iommu.h index c30d12e16473df..941e4971b05fd3 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -659,6 +659,8 @@ __iommu_copy_struct_to_user(const struct iommu_user_data *dst_data, * no user domain for each PASID and the I/O page faults are * forwarded through the user domain attached to the device * RID. + * @report_iommu_fault_supported: True if the domain supports + * iommu_set_fault_handler() */ struct iommu_ops { bool (*capable)(struct device *dev, enum iommu_cap); @@ -710,6 +712,7 @@ struct iommu_ops { struct iommu_domain *release_domain; struct iommu_domain *default_domain; u8 user_pasid_table:1; + u8 report_iommu_fault_supported:1; }; /**