From patchwork Tue Apr 8 16:54:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 880048 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) (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 0F9B123BD16; Tue, 8 Apr 2025 16:54:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744131272; cv=fail; b=Bl88jCDqFOtiGCe21cV2Hig/fD7Q4wpRvjLaEea0T+b/4oahxax78fNVGPJe0MHSDJMGtYZkpDt4kEMSzjKTqt3dftk+8b9g7c1TcSqGlqpBXjQhlO3N6YFO6KissKPbjF/NyT9SfvMGhhPL0vMlzidY+CZ5xr8nld71uhA+PY0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744131272; c=relaxed/simple; bh=t4FB3NeteCB4kxcmsCtfjXRnaCDA1xumt3Ajm/w6pAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=gMQLjebb5kqnE2V+pTkdUv2TM4YqCYPQFEnFxwXJXgZPzJywtLsZVONLW+qGeaImjQJPN1/TaggTVPD3X1jEzH9iW4kFrJBICKJCLZNJEth1UURjruOXXJ00dpmZhSl9CXXM6uvC1aaRqWJrY0f6a5K2hAi1BGZyDvTgUvJwem0= 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=TB5hS3gI; arc=fail smtp.client-ip=40.107.94.79 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="TB5hS3gI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N0L37fvseQydKBffuRq5Xt1Anb1gF03LqdGMYqEURPn6+FR5U6A1iZtcTBg3BXoL0m0AJb1VCkn2cTNmtG0A7GH0vItFB59fVU/MvXpbYxg6RCwVHbxKiJI2gFtVcPUxGeq6fLxX+g0TRPoRtwxVwsH3ZoT/B4Qc3ke5LFXDPIlcTJi25jlk9S/RSuBEciik0UFg96GtwjISQTMiD88ow3ZXSedgiNy0MdBdQOQP7Ty3ZAWSgBYHWTZ1ye2lySw+3N5YQGJEYclSpcUOyn6IvYhvdl80mgwak/NABZK+8TL2exHhL34GFuvbwHltiaceF+W9/YE5sSgKNgGpAZmGsg== 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=CtFfGEmratQDUmMvIACkbCBBSwxquvWKV/4GFmZ/KpY=; b=C3IRNDAu8TZ97mHhXLiUaERkvcYSo+XOC4zLYqMo02+aLBUS+CHy4DILwj4lsyIrcdMbauU2x8BwGRHCPCYQpnB29orZ/q1grbWnIpbjD3kcxXNkUdN5sxvvv0+glk2Bsss9cWOW+kmT+X1KxNfKMG1PaNj1o/DZqk04ZV253q0z0THj22o0Gx7qjP2A9/QLQlitbT0GDihIXfeWhQNz8ex+PV229s3R1GXRRuV7B9FODSkOl/YbEL6BRPOxL7Q6tA5YGMQEqfJd2RMAx451MGR+oIA8IfFsCRFkFoEwNP3Ae1sX+hsTaD8dmegHe6wLRSY731+Z9q2510hLcS0Srg== 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=CtFfGEmratQDUmMvIACkbCBBSwxquvWKV/4GFmZ/KpY=; b=TB5hS3gIh4E6T2TfRVTpl7G57kdCNt7ziWvanJLjU6xxzzZPiDdhkwQsqQB0L14XD8cR4cxg9yEcDiEea3C83FZ8eCUfmNi3XEtfHXkxZknLo0LitFCYPtYPYq3Q3087JOwCXjoXXk0vg4L8zy5SteAmWuHGptBFYeYh0/6liitptfvfYs9Sv4TTN+s+kAYfKDbmFnPQnql7xZ/BuncE7DbnZGhoFfH+rp+f2PEII2OjdJuUZeo3Auj8oYBdcSyk3hyg/dcueQSzeFq0dCt0tYNu9CoK3kFzUPGfBL/zotYlLeBeamSkTM0mnaBHehIQ/YUlen1AvOxnVgMi7FGeUg== 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 BL1PR12MB5971.namprd12.prod.outlook.com (2603:10b6:208:39a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 16:54:19 +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.8606.028; Tue, 8 Apr 2025 16:54:19 +0000 From: Jason Gunthorpe To: Alexandre Ghiti , Alim Akhtar , Alyssa Rosenzweig , Albert Ou , asahi@lists.linux.dev, David Woodhouse , Heiko Stuebner , iommu@lists.linux.dev, Janne Grunau , 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 , Neal Gompa , Palmer Dabbelt , Paul Walmsley , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Sven Peter , Thierry Reding , Tomasz Jeznach , Krishna Reddy , Chen-Yu Tsai , Will Deacon Cc: Alejandro Jimenez , Bagas Sanjaya , Lu Baolu , Joerg Roedel , Nicolin Chen , Pasha Tatashin , patches@lists.linux.dev, David Rientjes , Mostafa Saleh , Matthew Wilcox Subject: [PATCH v4 12/23] iommu/pages: Remove iommu_put_pages_list_old and the _Generic Date: Tue, 8 Apr 2025 13:54:00 -0300 Message-ID: <12-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com> In-Reply-To: <0-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com> References: X-ClientProxiedBy: BN9PR03CA0055.namprd03.prod.outlook.com (2603:10b6:408:fb::30) To CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR12MB8659:EE_|BL1PR12MB5971:EE_ X-MS-Office365-Filtering-Correlation-Id: 69d17eab-43be-46d1-bee7-08dd76bdfec2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|7416014|376014|366016|921020; X-Microsoft-Antispam-Message-Info: 8IO42LQqtQvV4FjvgAIybImg9zxaTkzgs/7GVViw9f7DAf7zpZjNz1DT/c6zjh1hzHniR56uLVg6fTTu0oPT6RphxVsoQhTPhkwaBJLvJT2ayEtWZ0vucwMUgTMhP/332kokKramQYdrE00cCybolggVeXNRFngCgw2Bi8Ex7+Y5l3ZqjavefgF4x9olen9AHNP5TdfGrVJ4MynaJtpcmomLyxWjFrJdUDzoVYXKhdCG2CqaB6ZdnmiRInzjWrA8f0kd69hFpqDXQbK0r/TXpWGgtZEMhg9F46S2XqCmWV0z0xYd0UTOWskBaDPJ2/YMuwP1q/WNRMQLuoH9GhJ5zK+xxKJyENM4mqCZhvrdzYszakoGedb09SHZN0DsZROO/pxncoIlz/fHOIfKAEbqGaLqM80nsuYAq0I9wxPQKroWh+m8fHwqZlV/9+QQ8/v6vhUDa/oC6qk4qnaZx6hBH4XFBVm03RXeOBanONg40Rj4YPp+2LIB9++iqC2qFcoojkgpoCVF5lANiKldAvJaye6+vnIA2zTafFJoeTy/8yoh6jnL57gVdgRWjjK6cDEXgLgRNfbMBXnBl9AJ6htR+lmYo11k8dzYjyAzvAtKBIDb4ycYbW6eG+f+5wQtzxaCyo6LgGJbx4sKLnCKTUDEQplb7hRJUMqz57rlEUPtxz18rxZSKQfVlMxXcUc3cv3RRv/CW7Lflfo8pH5lpxOMZPCFIAqxDkl28+q0y/XvFqAtmRg92DYldN+46xcMsIhf/iGoFtstR8XFcOYqrNbkxkLdEPexfmYBf9BGwI8wIDkiLdAKKzmfR87e3/Of4ZFYyoodlqLCjoa1w/OI424jwyL+5sSDiJacD9a169jPtDoTPGhm2ic5Mr3kO9X42lPNSWRW57bRv4IGg2LYaN42NZkw9i/bPye+pbiw6AfxtkfP71w3EezZk5zr+rKIeJbZhw9LwNq1X+GfqTeoDgwFjo1PsiX5Yvs7ZgeqKvD4vheGcM6p0URMwGWuZ3+3JWc000jMNLJVbgG1IP0F2tf3dZkAHM4tMrNangC8wmucycJLQcNNwZ90hn46MEltZSnLDkP3vSfn6ECJmEYnLsFoIzj6Hd+1HFDrAL/rcXHIwTm/Y3y+JXzzR/FZeKqCOfKsrQL2iodPkUD6PjeIa4so0LfGjSaCi5ao3COjzkwWr1fa2G8j5TPXCzxYvEoJeLsouBZq+6i4s46RdMptUSTOCmB60m2FW5AaMwY+6vr8Ycezn7jTI4TU+DZEknAu2AB3zQOsq/Ve/oul0NVxjCz7kyv2fokufQxpZa0BDPya1a1XV593TS4zlU9S/o87L3BqGow3AFQjq9o0khCEJaIdIheQ6u93Cfq9T7+vQ/8hHv5iGXAkbT0qI2+BF+IfMHU9h2023F8bgrnFWxXpSJQhlsnuKXQVdWzNHM9Pgd+Z1fPjmAOLOoN52JF9Suf1gv2KCrAIrpaKx1ZHv6yD9TWv6A== 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)(1800799024)(7416014)(376014)(366016)(921020); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1TAjXzc1d1cy10gpsPlaHxnxCzxrnyFKqg/uFG0tBrGY+tb0QFCNrSnDqkDMc125m1xIBxPDa3ZBdxFpjMR8tZJHAf1E+6U4HCyHZslcuiMgLPuPbQOcLrjg2wpHrJG1FsWkNLuC/YOpYic9jc0PEUQIR1M7ITrG7AlDsTRiGaNHTxZ5uhtsqemWVprBRIhEMlTut5+t+i60l9XvYQYCY77jgFLD40h33jr6lKP5qf0LoH8e0zwFWo9HdyxEZym+OyJrPGXdtt5K7E/fdHhAe1qEmO46zjPkHLp5qPxgNHVBzGorXhBa+Qi52ayqHe5YrZmRBkZpBx6LSs89nJHIel5rcRuNQLAaSkSTaEL0R8UvNL56AKhqw6bDEn57B0pvvGD+TLxx+VqKzAWv3Q8/usKZ4ywinc+8UQFIQV/fAlAtqnnAIOu1+DUA1nva0eQVDWPZs1OLSCxF0bkBdORS3bRouvFKow5zliD/6T6s0J6n4RAWTCDXtTEg/DG8qNhApw6P88ar1MZrvmiULISc5CbltaK9azqOv4O8jM+znIwT06bCtxj1GM0VSlEs5x+2MgCmUO4Bjxu9XTp77s7lIlxlDJT6RddTIaq6jvByY/p10ktCit4W39Yp4Z6CfqnzBphU7EBNBiJIKiisjrG7kGZIHSLZC49QNXD7VPNsHc+HYX5DVX74S39Ybb7b25hWReOuK1MULTMmRET6PWIhP+iCzHkYVHHeYEH3e9+zC44LssFDyxXvVIv/pZaEMSUAi47fea7hsnggeuC/n2LAANVZqgTMKd8HjGk7pGPpDq3SMPEmXF3YujcnSIr3Dwq3zXmpQPbVHuCBLTiPzjn38nf0A2hjyZqJNFWIato8RvsxKrHkdxd0PirP6HgJmw9+Z9j6o9FGrZ25Rjta5iFmrPmTusgfGIAX8FHKK9BwvQwZcRax+7rMupShMVxHPNAqvGXrfQ3v7wCESUFB8MkJa1p5KD7egjt0gnUAfJ8LBeB8AS5WYR7HUSp6P7ra/kkUNoxwYiMlN+KVEN2OW4fqrbPhSNtPG49gOstoyZtoiTOPLi9cL5Bdf2l49j2u4Y7N5DP7Xvay3PKysqu3TH7AyQzxQUjIkgJ9oC0DrHzrAPC7uY6FGkzxBfBP/8ZGAN6vgwvt4MGwekosNoDm5zQUvjrqdMVe9SzpbgLvgGsmLCBLFRUDpuP9U3T4G6+dMyIaHlejI4/kq2WcyND7z0YEVri3zGbqbSywzq7TLqU9sKTGeRZ1yxNiufzyX7iVyCxQUXLseQxk7qxkhX5G22cZMgKgEE/L5tk3kToXQcpk3wqx/0G7OVX67Lcjif5WEDiHEfOoSx/FRjykM4i4kaAU43k9T8vkZ7lngT04kALkIktZYlo+yhTDLwl9PVGRRLZWSw2OF8MHOO6LEyRd2ZZsGeZO1liE7z9FzUs0Hh410uNcmWBzebDPTEnUiBIqf0YjgMoCfxGdH0IRQXkf1/NnR6mrTjYgjTjAFLdrLVfe1G8yLNOtLHrZ3QmiWtCmLzUX0qPa/0PnMEgOYxSmcKOYbuHqMRYPUeNrVR+NeOXW/8dvcEMc4eW+nEh3sMFgsf9B X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d17eab-43be-46d1-bee7-08dd76bdfec2 X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB8659.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 16:54:15.4730 (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: c6JMU0WJ53nA2xCebvBjtISF/fHhNTHHNZCtbzMinQoCPqGQvK6RY8r3k8j9trvH X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5971 Nothing uses the old list_head path now, remove it. Reviewed-by: Lu Baolu Tested-by: Nicolin Chen Tested-by: Alejandro Jimenez Signed-off-by: Jason Gunthorpe --- 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