From patchwork Tue Feb 25 19:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13990647 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 D2896C021BE for ; Tue, 25 Feb 2025 19:52:15 +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:MIME-Version:Content-Type: Content-Transfer-Encoding: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=1Cs5EsFaIBa+5XCjoIlnH4ZtuXAiKKIXEQ0mSW7vR1A=; b=cMQIj07ZmSxoA8t9GeCe1yw3d2 eqSNLnTIUmYLouAe9y+GuzESaoTUcAu7cEmxL3c19BGbMGehrvOOuieHf/qmxMbcIaQhxL/Oad0ya hXcpKrPWJ/UEUxZJEU32XVVvZCz13Uv97OibBrbbzWQS71SjO9y3YdAZ7+kd5VC6Mm+jCl+pP8rHz sS3plXklIQPqG7sKFLVJxopfwH61KTzIsZpAg7WJGZ9Kh5r1VmqrzEehUAhYE0xOb9l2nlilk6eAD AJoIlxOVOxf7i6L2/D7jmNs3a5rruwNvf+04b8l+qsYWK9pcxWKIJsGy8PKufNXIwkee4klEgF7VG UO/M4FhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tn0yP-00000001FUi-02Yo; Tue, 25 Feb 2025 19:52:09 +0000 Received: from mail-bn8nam12on2060c.outbound.protection.outlook.com ([2a01:111:f403:2418::60c] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tn0mc-00000001Bvm-2SoF; Tue, 25 Feb 2025 19:40:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZGv8chlyEEJSda5RD9F9Wcrsk9NWxNa2pyjnb1uUVswzAnoR6CDHSd0ODVd3or766kGqzDzafZAiYr5H8YPR2do7f4oJ0h5Qzs4Wf13aoDP/talhbFuB+mxsnyVMS45kWZm/EaLDEOBw9K0NisY6d3LPE6RiQL0GYf8Z6kuOgkYtr6UvBqQNO77xYZuG5epGNgGOUr3fE9dDAB3c5XXRt/kr5jyoOddNgpFWe2IZDqhj3qraOyNATV3d39s7qfyn77vlVC2u6xL0W/TX5wyRmf+EBL+YUvZUxfJlzdLyifgX2K0tWxdqxY7ceJYTXclHegCo4Fvg4ICFVjFtfX0WKA== 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=1Cs5EsFaIBa+5XCjoIlnH4ZtuXAiKKIXEQ0mSW7vR1A=; b=i66yCNytbGdt5wK0A/6zC9LiimQ/smk22DPqXLyznmFxwLRFbe1dm3iU740VyGZ2VAftgk6hunxZU+6HGHY5PULJazQQJ3lJlqXT8dith+Lv8beiSREDH3cmqndZMYyEoLApn12PfMgNFab72leZMcO47M9aaZZwxuijQi8dqXaHwqRcwaRt4B04FYwhKeBPKSLEffkudmdGywSkohXDO0yMgWvaXUwIupS4/NbRUP7fUUNSQG5zwmb0NsviHP5IE+wB3g/6ZZIBIMSZhpE3xw2b1h+73JJxKckXozjQW8czTB9j3ZjwrpG7/rnUfE3qaw/yI+94yk70PedQ76znRQ== 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=1Cs5EsFaIBa+5XCjoIlnH4ZtuXAiKKIXEQ0mSW7vR1A=; b=KZj4MpYgUHwCctW6g9hVS3uLaSE3h6AqpG17AlBstlDJl/N9cNxvcgi186nPnhUzzLmVSEGPuGwqSJMj8mz3ritpqaVorz5oppOtFWkpSk8AYT5P/1a4mXnUGU7XxoERnZ+HjXMbazDOLnJnt4roT9CDy8M0l2sEC5+nTK+a3ac+PxBylZcNzJ1GKio/0JrqGOJ6wU7CwNt7J1UdAZ4Awb7ZJudaWRxvDM0ToGcdQ5B/eBPa8vgJAj8JzXXW46Q5VRknCEjwUEnOTKC5k8vpq+rME/lni15UV1r0rDW+ABYBKecOUGcwBC1QbxN70iiXiX9ssNtEoEpWtZDOknEjFw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) by SA1PR12MB5616.namprd12.prod.outlook.com (2603:10b6:806:22a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.18; Tue, 25 Feb 2025 19:39:46 +0000 Received: from CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732]) by CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732%4]) with mapi id 15.20.8466.016; Tue, 25 Feb 2025 19:39:46 +0000 From: Jason Gunthorpe To: Alim Akhtar , Alyssa Rosenzweig , Albert Ou , asahi@lists.linux.dev, Lu Baolu , David Woodhouse , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Jonathan Hunter , Joerg Roedel , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, Marek Szyprowski , Hector Martin , Palmer Dabbelt , Paul Walmsley , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Sven Peter , Thierry Reding , Tomasz Jeznach , Krishna Reddy , Chen-Yu Tsai , Will Deacon Cc: Bagas Sanjaya , Joerg Roedel , Pasha Tatashin , patches@lists.linux.dev, David Rientjes , Matthew Wilcox Subject: [PATCH v3 13/23] iommu/pages: Remove iommu_put_pages_list_old and the _Generic Date: Tue, 25 Feb 2025 15:39:30 -0400 Message-ID: <13-v3-e797f4dc6918+93057-iommu_pages_jgg@nvidia.com> In-Reply-To: <0-v3-e797f4dc6918+93057-iommu_pages_jgg@nvidia.com> References: X-ClientProxiedBy: YQZPR01CA0052.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:88::21) To CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR12MB8659:EE_|SA1PR12MB5616:EE_ X-MS-Office365-Filtering-Correlation-Id: f516dd6e-a489-4d75-55fc-08dd55d426f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024|921020; X-Microsoft-Antispam-Message-Info: P9oHeundMok9KY6RaD7KOkL39kykJN4XrgDSl3TR04gO/mKt7W3KKi+La8frd2mB0Ia3iXvOxxFetOJaRzBhcP2iEFjfyS/y+JL6Z/9qUlzJYO3OiC0NqQMsJg3AGTNcMaCv/Ug2H2haMEB7p4M96/iA8ESjssuFxhYIf7tOiFuXNVHmmfpE9aW8ZZ0+jNn87NibsheBq1BRjP/rNs8SA4Qcu/OCO7L28uvQe+9xOFR8zCNYpaaXQgL5XjgOEOTt+pU+bmb1YnKMdQwSyPEvmKijch5IEZ2tda7KK5GWM6soJC3KSfAj7ydE+IEI1OKWfOfuuYw7pfMhsr5XGv0svX2OTqfc7eKzvQuZ48VeWT+NNiKsJfo6ynAjEiSCyYkcor+5B/XomN0kMYUf9O8IuL0YAQaBri+q98gJu5zA6UgPGwYQKLK2dYuiRVIUp/yeM6ROObv1UR7NLHom4EYotS1W5f7+QcLvaBTC4NyQMVwLmcoYiODDxR0QP6E1hF3fA2Gv4Pml0H5ITI3JHouWp/Ouss8KpDO7hIEm4eFaEo29q7sncTWk9e5ZaCMIAIs/Bh2pw3PFsbcMzCd+1cVbTGIs7x+Pm++cmsoPbPcyd9HQ6Lqveq5sSN6Q2JYp/C7gGzTMw/kNf3Q1LiCzXQ+6XfhhilCtPcQtZF8w/EMoNJjJ03UM8UMjqEZYB+C9GNEKE2etv2inYtH4s3CWRV+p+MxCJaIeV8sM/VEV5DeLh+HxkEyweJXnagpjX+quCyRAtMrEz8c8zmwmzVarye/yWpiGOI41E6JwQ9VjUOJUq7DXp6qd5zR3xSX4MBlLA4/8BdCkIVmmq505n/AlpJKHmPZ8YzA/Ulk6AoX+JMq/YGtfqASfPHar8GEwlgWqJWYK1PY7n+2YlTd0PvH2BaMAtrbO99IKaEpinp+UFrfOT7nhtEP/mz9BHqlf+Hkjo8HRTI+6CUIDX/BxGtPpbAdeuDNBYBuZmj0gSEsBuBOUDKKwlEmxZ/khZQxlMnBfTvgENDkE+FOghWo/YmAnfTqroC7Jyy1+LcM3QaMXroD+876VoqO46d88MxSK52cJajYTNalx6Fx5x55YQGyDaRzhlZGy2M0Ud83UMeOBwmhBawlD0VtcDdWB7Hi0IzWLWOW7NJ8b1wK+IKiI21pGHp+6kuq2Mn10SbMQQ8VEm8vt/+mzwScvR2KU5gyv5GHx7u+swz30Tb9AQ0uKp083XGXBtQ1JnKTZg5xcIDCT1l1ntiHxsvKCFUV0ibIpsHJbQOQag+T8x/EeCiLH8BlHlIUfzx06f/pjzPHpM0MolGWwm+c5383H9f34lBldnerA0lbLsESkphAZcNTFMuniBkC6jn7/jPzmnjmsb7+rBKjE1JiuVYWrSUI1FBTY9yKtzo1HAYX7Zhru7W4h4JpYy9Dtm4/u9XNNYKsPBVeC6hzeGxk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR12MB8659.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0UJ+zu8be5xyESR1whoQ3yEjLDxcWZ9lon1tBdCq4uES2S2V/1tNWPaQ1p8/UTGm6zRoj2lgbkxcHAj0vzJj9QuRczEJTrTUoctsR8rEH4qyGznREzl14qdRbpZBWizim7/Eqjj+JCFw2bByipsZJCpNJHyeFF2NkwJ1GQ6InXLngd5k+pIpqlUPm1mo3ew4ry002pd1gjq+L6x0TDsGxwz3PCAvLiE1tFuR2xbHJ6g8G44iwIMAYYlnqXnPT6tkjhmhQNyq7aNNJaH4Ili6/zikJ5Vtz5FfUcKcZZRVmOanjl4H9Xw2iWSIaUFogvaiJRkSYwrvyOv6xlRRu3xZ64rexgtvJagFR6rGYqUXymlW3ZFzPnwuzPCtbzlTHwjg2BpjqILW7zUd8jl6nsif6DQsA+tIF+UJ3V7f5krjrXjIqJ6+CUBmKZ8smXC8AmS4KH6VyM9iQH94uLZW/EnLW568/AGjLYgWBcmv+upu4pSO4pmVV3PbtU8eaRCfiBdJD7Ne62tEdtYyRfNajPOFT0tfrUdVLXb+B9L5cpu2+TpvY1zmCZt4mc4PekxwMYbl3yPBH4N+ABuBVue3RP7GE4gws4wUbL2j4QvHSGpLt+bzL+SQO9iDH7NPG0suK7g3kFC59sT5s7SJJHs8+wn5k5OGO9alp85IdKohAmf/kpoIiiA1w2kLTnru67EsqhEOL6DU5g7EnNaDrscKAA+arHAScOwFKF3lZGfxtsplyy3cAXUcPFnybXgEpUCdapxubc6pXplI+v0xGg9WwUKmN6eJL4VR4xLSEQ8KPZuvStda9vNdjxvadZ93KLdkMftJMvcWVjz+TI/iwzN2WCoBBFhL+ibqJIOEDcXL5Tb1HBeHKpmATy/JD8JLdEyMGAudoDDGrtbBPwVXBakQovfYNlWw3vx0CQH5OMq5qc+4Fe1yYbToatpEacs2sM9yl7kqeRJTl3h6/Qr1H4wboVV+jL1X4e7/oubipLgZryocO8d0cI+9i/fY7iiuQRb5+pDgNaaTWIxRxXBkVRTFMrOsUY4CGLPCuvu7C+a37VpC/FhC5cGb4H+Eh2pWTObM0oe+3M6HnOi4EvWWfszWzdGJb53xfyx0k/NIRhRGUapEvpbwY/xFKgIDveSpNH4f8JIHaOZgETqQYTsmk/13lK8CYMMKAC9d7qqLztsUwsdjttZHBYDl7+ABVRfTGG4Dn+Y/rucROWvD0286diQA4ZDukYOt3QVsz3GGy1rHrKydkrCiIMu0AonYi2e3KHjV2/eUZD3fcLWvvKHqbxsvbNvT7XXULTatGEj0DcpjzA6sExQHPtoAzzB2sp1sqFds9PnAbrh9HBjT7RoKmA/sy/vlIuqvGCQ8eIbQy+WpgAs9ScB/VU+2ZC8WWtXSfzKs6P3kb/uQzczQy7p6SPBuDoQWYIkYP3RDCNmdEBIp2LgOv/hW3lTAY0hF1jBw7gFD8eXeH35JKhwKa7wsMqJT315IEM41WjVm1k/zm2yBidWSbsYARf+vZU+VakZf/WTjdr/uRG52fT8/k8aA7xa4KMQOLgvE6EGO+JM+bA1rfNCFNhsuyWIOeZfuKeOPB/4Z48Fa X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f516dd6e-a489-4d75-55fc-08dd55d426f4 X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB8659.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 19:39:43.4542 (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: rbHpkQSrJIiaFvOBLMV506FtueCTDbxavG7wHYyvZerR+E3msn2vLukvxc6nFcK2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5616 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250225_113958_653354_842B12A4 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. 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 Nothing uses the old list_head path now, remove it. Signed-off-by: Jason Gunthorpe Reviewed-by: Lu Baolu --- drivers/iommu/iommu-pages.c | 15 +++------------ drivers/iommu/iommu-pages.h | 8 +------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/iommu/iommu-pages.c b/drivers/iommu/iommu-pages.c index af8694b46417fa..6eacb6a34586a6 100644 --- a/drivers/iommu/iommu-pages.c +++ b/drivers/iommu/iommu-pages.c @@ -67,25 +67,16 @@ void iommu_free_pages(void *virt) EXPORT_SYMBOL_GPL(iommu_free_pages); /** - * iommu_put_pages_list_new - free a list of pages. + * iommu_put_pages_list - free a list of pages. * @list: The list of pages to be freed * * Frees a list of pages allocated by iommu_alloc_pages_node(). */ -void iommu_put_pages_list_new(struct iommu_pages_list *list) +void iommu_put_pages_list(struct iommu_pages_list *list) { struct page *p, *tmp; list_for_each_entry_safe(p, tmp, &list->pages, lru) __iommu_free_page(p); } -EXPORT_SYMBOL_GPL(iommu_put_pages_list_new); - -void iommu_put_pages_list_old(struct list_head *head) -{ - struct page *p, *tmp; - - list_for_each_entry_safe(p, tmp, head, lru) - __iommu_free_page(p); -} -EXPORT_SYMBOL_GPL(iommu_put_pages_list_old); +EXPORT_SYMBOL_GPL(iommu_put_pages_list); diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h index 0acc26af7202df..8dc0202bf108e4 100644 --- a/drivers/iommu/iommu-pages.h +++ b/drivers/iommu/iommu-pages.h @@ -11,13 +11,7 @@ void *iommu_alloc_pages_node(int nid, gfp_t gfp, unsigned int order); void iommu_free_pages(void *virt); -void iommu_put_pages_list_new(struct iommu_pages_list *list); -void iommu_put_pages_list_old(struct list_head *head); - -#define iommu_put_pages_list(head) \ - _Generic(head, \ - struct iommu_pages_list *: iommu_put_pages_list_new, \ - struct list_head *: iommu_put_pages_list_old)(head) +void iommu_put_pages_list(struct iommu_pages_list *list); /** * iommu_pages_list_add - add the page to a iommu_pages_list