From patchwork Thu Feb 20 01:31:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13983196 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7D07C021AA for ; Thu, 20 Feb 2025 01:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wYz6ypHlJXMgFK72LsNye3N/Wjn3Y2DI+S220aephPE=; b=20+lRJ8v3GEkHDQBSsqovVW/9/ 6CxCgRXfTXeaa+dabQeOUOBQ/m0bHuhScvVtrSWaMQOr2LOgJMYL/UqsxhwPnRNTwF2w7u0fnXigU NSLZQ7Cr9k4vXtK0m97+iew2UlTG39c13MmDmUyuTSJ6miBxPV/9Mj5P1ve4cqnOByaezoW9RdMGH VKuvLOi8oIZQEtiAR58xnuUYYpB1aFA3hojKgK47eCjBJ7YM6dyqFR5lSIj3sZtyXMDl+vR7e/fxP xQiB/GSdCNw30yPj8ODtnqBeNSz/1vLWWqeN62+jZhMBHgS+ZBQ7fhcFGLDADsiMpN3KTM4b/qvwI TgxVfFCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkvhF-0000000GCWL-2Noh; Thu, 20 Feb 2025 01:49:49 +0000 Received: from mail-bn7nam10on20622.outbound.protection.outlook.com ([2a01:111:f403:2009::622] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkvR7-0000000G8P3-1YDe for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2025 01:33:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VBJZM4jrDoH+/X8mjINLGEj0NH9ToKa882sbXMCIQ0nGjox7hYH+r6GQoZ8uIexEosAGXGM6eYVdbh6yvQeRxMl7xMAn75nuJYJNS2atOQKMCFQSQj1eKuZkc19ExfGOFM4DOfppxI4JkQ8jdpqz2QSlc1UzoRcOGGmlmvd3GlcCgbOFS0fsuRO4QGUHWEa3X7MXeFhD7goQrTUaiUoQVzcOH1IoWXwaw6LiLPLcoRnxzKKmjI6dnYNW/5diNKPnG39208y2DsJsB3eqLJ0YFBGwyc+/BI5JygdpEsrAt5c2nVhXFedBSbrkVDYX0UTy44GdFi20nmEBEBZZkO/9hQ== 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=wYz6ypHlJXMgFK72LsNye3N/Wjn3Y2DI+S220aephPE=; b=Rc6o7pb3B3JnnHci7bRsThL1DAxUEZ1NF9kiTUpfHn6OE5FTKS0Y4IcnEesq1/axjbCGdJ5faIY5TCLLLK61HDuM8xymOlWqArFnq/R7jUGuPRkNrxhbF2mx0w6RYjRBfBHwxafX5p8at9S/i4I0MejqwfYcm1D98uKJMzqO+QGY9IOxyzojWItpSFPK0RBR+bFKoej9nvHJwoZh1HNDtJ4xT1e4Sg5877/manzoIIJ5j+LrmoUXUXb8WZZTPz4BOBFe9I5qUtNzFuHsBX97xCAIRHkWOlUsYQUQH6WQEmFMO1xtSjjyvxiIf4wROYUnJxBrLjK+KBX1gqvNT4g80Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.com 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=wYz6ypHlJXMgFK72LsNye3N/Wjn3Y2DI+S220aephPE=; b=qdoOPKMD311ub//DIaj3SgNWcYuhT8XQ9pCZ/hLNlvLTnYKpT0mAhB5usZBisqtBQyY6WIsaEh2FU0ZJX/uzXijlJO3a2qM5OExKW0f+rYi9egTsjF1qcgMVVoQMjBHJQx0ZpQR5TtIxSf0Y+j1CrDPVyGL2JrQ4l5zQjD2R2GeW3EIqT2QRsNZdojigjehYds4noKhnQMjfe4sbFuSZMBV9h0P1TKv9YShH4GgIYfsT8TxGZO5F3ENwbOCYG79qxH9Zs1z3TJAtNntZv02bukhnppiSu13ngP37e+dQmeg6VfZJP+Zx4N0OUJzPICj42a8uePE3wn14py3dgK3VLA== Received: from BN9PR03CA0896.namprd03.prod.outlook.com (2603:10b6:408:13c::31) by CH3PR12MB8546.namprd12.prod.outlook.com (2603:10b6:610:15f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.21; Thu, 20 Feb 2025 01:32:46 +0000 Received: from BL6PEPF00022570.namprd02.prod.outlook.com (2603:10b6:408:13c:cafe::3f) by BN9PR03CA0896.outlook.office365.com (2603:10b6:408:13c::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 01:32:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL6PEPF00022570.mail.protection.outlook.com (10.167.249.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Thu, 20 Feb 2025 01:32:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 19 Feb 2025 17:32:34 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1544.14; Wed, 19 Feb 2025 17:32:34 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 19 Feb 2025 17:32:33 -0800 From: Nicolin Chen To: , , , CC: , , , , , , , , , , , , , Subject: [PATCH v2 7/7] iommu: Turn iova_cookie to dma-iommu private pointer Date: Wed, 19 Feb 2025 17:31:42 -0800 Message-ID: <949e28875e01646feac5c4951b63723579d29b36.1740014950.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022570:EE_|CH3PR12MB8546:EE_ X-MS-Office365-Filtering-Correlation-Id: d450ad5b-2e62-4606-f608-08dd514e7aef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: uAN8LJnb13ziq0m6AjIYTQ6hgJ7uabm7HXW/ratGQr2/LCw02t7WteGlxN+cjNydE7ZMJi+w7PXSuE+YXU22W1L+gkeY5paedGki1OEfQB2+t+PCK7525II9AEU3317VFzrpQtrHIV6KxED7RN6SSL/kWloTLwuvBCX05vqqnXoCWdpDVeitZjkep01tQaVnZIBbptQjvocT1GSohPPJyYAWDkAW7HIrUDY9S2tTOxIHg3Bl9oatPDwJ5wsC/kzZsr8Ex3lCrhhxImTRoAMwLUKd274RPDi6ZjpJf1JUMq3M48jSeLesj+wDoKaEVyEISi69fVBrgJZDTCzeVpj+JtHdhVMdGfdvJwLFBWvnspS35AuZVAdfp5w+QVGUpdQ5hwndCpmwP/6LiLPqMWfACguce2xaDMQCWJcFd3DAdK7dmQBV0vPkF3EgvqbjlIm4XVPuYwpyPMk8rkN4DCaq/Hc7EaJB8ICwLvizhj4+hFMlql2JpoAXy8kOPOAwgV0fooygqEnUJffiDeLZgDPjrdjroxq7JyWjKVo1J7IIteTl3PBK5dZVLmbfdmzVfqKDTO0oqQ5J19dcWLsJD0huNivLs1yCYm6dpCKjuX/1YnlyAiaCPaM9wjYIRBUI7pnsGFRtJ+7kmiKQr20g3vZfLZdmPf9DxGSRMAVsPhhyx6U2m1BjCOmH7tevPuKqzCs0B7q1aL3/OQmdb75uuAtmeznj9MDgy8/BJpVuZxtLcWrYZkD7nc0ZW1R2HL0Yh/BUd9pebMZKZZv4ebmz0CtyjywsTeKaBpVj/i8PSVn8bys8bF7Yw8LxMNFyC+MUzko37HbkZngPzV/LlvEmA6bT2YUBB2bF6/MGDbkBZzuQC24jRJG+aggaC+0au5U0QZknMYvw0unQHnv4tLft4faks0N6Ylj5KLTphxSpxTgLOFm9UnhgwfbrAdsMsxGqrOLDew0QfZsD/eu5E2JH4sIiIPD131r0ULJbqCDy1XZX+3AZhjY4l+jVQDYoZ6ZCJT4KHGE9x3BJBqiN2FnHL4yh+HXRB+Zn2w5R05/GjhaOzax2eeCY3iJO32+sZz/zVXcw3RHeRUWVh2eZUYgv7yf6r9D86MXN5fbd8PtXXOZdrzG2WH5Qyj0ehrJ+EiqbrjDHX7paBmV3iXW0YUDlRWplL9+NVVizU7wC23kp+oIgdaBC06E29EKJ06ttoL1MLqVwFITd9wVUZvuL26ykY/Y61WhpBaRWLhmZIbVHbfsdBp7EwZ1dRgm52wpdKE6FeUMVb4YrbMC5+MUZR/Tt0oCWCw8MDfBMc4HM3FlHzvrFUS7jCTwzjufOXxZZ9o0NVLRPt/UuYWbWiJb4bezp9WejrlM44EO+wXeNm+mp2uXCEOLDwTuw1xssF9vlZtOuUlROACphocgicJR5siGHa3ppNX28/GCRNoGlUlq//ypYmEOWtu3GU3aLBQN39ixT17gSBCTH/YPzG6Cx/vnFJuCUscFcd1RCeNePPD7vzbh0ljk= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 01:32:46.6292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d450ad5b-2e62-4606-f608-08dd514e7aef 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00022570.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8546 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250219_173309_404061_F1DB27FF X-CRM114-Status: GOOD ( 13.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that iommufd does not rely on dma-iommu.c for any purpose. We can combine the dma-iommu.c iova_cookie and the iommufd_hwpt under the same union. This union is effectively 'owner data' and can be used by the entity that allocated the domain. Note that legacy vfio type1 flows continue to use dma-iommu.c for sw_msi and still need iova_cookie. Suggested-by: Jason Gunthorpe Signed-off-by: Nicolin Chen Reviewed-by: Jason Gunthorpe --- include/linux/iommu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e93d2e918599..99dd72998cb7 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -216,7 +216,6 @@ struct iommu_domain { const struct iommu_ops *owner; /* Whose domain_alloc we came from */ unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */ struct iommu_domain_geometry geometry; - struct iommu_dma_cookie *iova_cookie; int (*iopf_handler)(struct iopf_group *group); #if IS_ENABLED(CONFIG_IRQ_MSI_IOMMU) @@ -225,6 +224,7 @@ struct iommu_domain { #endif union { /* Pointer usable by owner of the domain */ + struct iommu_dma_cookie *iova_cookie; /* dma-iommu */ struct iommufd_hw_pagetable *iommufd_hwpt; /* iommufd */ }; union { /* Fault handler */