From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D601BC282EC for ; Fri, 14 Mar 2025 20:53:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8018C280006; Fri, 14 Mar 2025 16:53:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B1B1280004; Fri, 14 Mar 2025 16:53:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67AEA280006; Fri, 14 Mar 2025 16:53:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4BEE9280004 for ; Fri, 14 Mar 2025 16:53:26 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D2FCEB916F for ; Fri, 14 Mar 2025 20:53:27 +0000 (UTC) X-FDA: 83221357254.03.08106DF Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by imf27.hostedemail.com (Postfix) with ESMTP id 002B04000B for ; Fri, 14 Mar 2025 20:53:24 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kmK3zOU5; spf=none (imf27.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 192.198.163.12) smtp.mailfrom=tim.c.chen@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741985605; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pyCN2vuWTbXBmIs/foZPHrBLm730YNnjOPfkJv5U7L4=; b=gil3ZxKYL7NChEqLx2ftNAMXqSxfq8lZvXIj4lKkeANxh1TVsxZYcBCE6xq2Qkvb4EJmlL 4qh1A+wgPSdOmn/q+S+uIeaq7OKCM4Je7hJU+y1FpzkgKwxXejiBDiOzJ1xy4PjYbNrhx3 prfG81PXhd1Jta5rC+I7h7/griPTMoU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741985605; a=rsa-sha256; cv=none; b=7g/gYkMIMWcQk25FSxgByqOQtU67B9TL1Rx1zZyqME1f5W2p0Ddk3SLiGLzcLHRcO+0zBK plRVJVco+1cOqg0WvJd1I/RtPjrqY5BCyfXsPyS+fEOH+LIYKQ68chDRYwCYTPefGI6Wav nOVQLr+P1VLwzORUxiL4pxepkQIppPU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kmK3zOU5; spf=none (imf27.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 192.198.163.12) smtp.mailfrom=tim.c.chen@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741985605; x=1773521605; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=6N4p6EXC5EJsTWDFQGsg15hcwkQwhw3wWWe1QulouK0=; b=kmK3zOU5WKMu7WaWU2DrUPSgzLfMnxJLzwkwPzUtHlNm51qJDzll+yKL Vo4eWLNgh6LoflQqVOB1/OrE8FUI06q4J1UY7/Z2CrS2hTHxeWdAB901D UFVneRptBNs1mrDt4Wo647YhLSNUbXndbdRfb58Q6vVK4U2StG7iIWtUl bMTG1USzEaufvxCMupkZeza/ohfYyyjv12+d9hRn1K7SyZ+YsQCUukacL ci3qz5FI0yxjldFHQQfBsKJ/0JVa/Henn0vgr8KtyP78DS5Xd49n2m8Ig JPzW6eu0xl2IFb8OyF8yMssUPuXKuk3vRFTvFXaR3IykOPDKVqTE96a7Q w==; X-CSE-ConnectionGUID: 2DD5AU6dTeyb9UBm+adPHA== X-CSE-MsgGUID: GJTwJB7xRRG1o8JgiuZYUA== X-IronPort-AV: E=McAfee;i="6700,10204,11373"; a="47048694" X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="47048694" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 13:53:24 -0700 X-CSE-ConnectionGUID: kMLvpZk7SFOS6vLGJORBNw== X-CSE-MsgGUID: jVgeCFp6RzGoyP8JFWgKDw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="121376923" Received: from dnelso2-mobl.amr.corp.intel.com (HELO [10.125.108.212]) ([10.125.108.212]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 13:53:24 -0700 Message-ID: <785953484810b0b57bf1d366532e80f4be3329de.camel@linux.intel.com> Subject: Re: [PATCH 7/9] mm: swap: free each cluster individually in swap_entries_put_map_nr() From: Tim Chen To: Kemeng Shi , akpm@linux-foundation.org Cc: kasong@tencent.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Fri, 14 Mar 2025 13:53:23 -0700 In-Reply-To: <20250313210515.9920-8-shikemeng@huaweicloud.com> References: <20250313210515.9920-1-shikemeng@huaweicloud.com> <20250313210515.9920-8-shikemeng@huaweicloud.com> Autocrypt: addr=tim.c.chen@linux.intel.com; prefer-encrypt=mutual; keydata=mQENBE6N6zwBCADFoM9QBP6fLqfYine5oPRtaUK2xQavcYT34CBnjTlhbvEVMTPlNNzE5v04Kagcvg5wYcGwr3gO8PcEKieftO+XrzAmR1t3PKxlMT1bsQdTOhKeziZxh23N+kmA7sO/jnu/X2AnfSBBw89VGLN5fw9DpjvU4681lTCjcMgY9KuqaC/6sMbAp8uzdlue7KEl3/D3mzsSl85S9Mk8KTLMLb01ILVisM6z4Ns/X0BajqdD0IEQ8vLdHODHuDMwV3veAfnK5G7zPYbQUsK4+te32ruooQFWd/iqRf815j6/sFXNVP/GY4EWT08UB129Kzcxgj2TEixe675Nr/hKTUVKM/NrABEBAAGJAS4EIAECABgFAk6ONYoRHQFLZXkgaXMgcmVwbGFjZWQACgkQHH3vaoxLv2UmbAgAsqa+EKk2yrDc1dEXbZBBGeCiVPXkP7iajI/FiMVZHFQpme4vpntWhg0BIKnF0OSyv0wgn3wzBWx0Zh3cve/PICIj268QvXkb0ykVcIoRnWwBeavO4dd304Mzhz5fBzJwjYx06oabgUmeGawVCEq7UfXy+PsdQdoTabsuD1jq0MbOL/4sB6CZc4V2mQbW4+Js670/sAZSMj0SQzK9CQyQdg6Wivz8GgTBjWwWsfMt4g2u0s6rtBo8NUZG/yw6fNdaoDaT/OCHuBopGmsmFXInigwOXsjyp15Yqs/de3S2Nu5NdjJUwmN1Qd1bXEc/ItvnrFB0RgoNt2gzf25aPifLabQlVGltIENoZW4gPHRpbS5jLmNoZW5AbGludXguaW50ZWwuY29tPokBOAQTAQIAIgUCTo3rPAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQHH3vaoxLv2XYdAf8DgRO4eIAtWZy4zLv0EZHWiJ35GYAQ5fPFWBoNURE0+vICrvLyfCKTlUTFxFxTiAWHUO7JM+uBHQSJVsE+ ERmTPsiU O1m7SxZakGy9U2WOEiWMZMRp7HZE8vPUY5AM1OD0b38WBeUD3FPx5WRlQ0z6izF9aIHxoQhci0/WtmGLOPw3HUlCy1c4DDl6cInpy/JqUPcYlvsp+bWbdm7R5b33WW2CNVVr1eLj+1UP0Iow4jlLzNLW+jOpivLDs3G/bNC1Uu/SAzTvbaDBRRO9ToX5rlg3Zi8PmOUXWzEfO6N+L1gFCAdYEB4oSOghSbk2xCC4DRlUTlYoTJCRsjusXEy4bkBDQROjes8AQgAzuAQ5rF4/ZYaklzSXjXERiX0y1zBYmcYd2xVOKf50gh8IYv8allShkQ8mAalwIwyxTY+1k72GNCZIRVILSsuQY6fLmPUciuCk/X1y4oLNsF/Np8M9xxwYwqUibUwRdWwpSG2V0bcqjtUH1akaoY758wLONUmXrlfVonCfENd0aiP+ZLxYE1d1CRPv4KbAZ6z6seQCEQrappE4YXIC9yJUqT076DD1RhPmwNbNTTAauuwG+vX+jWsc5hUaHbKsAf/Rsw13+RA3dzWekbeIxO9qvQoQ26oqKEA31mxWhwNDnkTeo07+e2EGC2BV6s+sU1/m/lup5Bj34JLP7qYtd6EswARAQABiQEeBBgBAgAJBQJOjes8AhsMAAoJEBx972qMS79lYmQH+I4qdFm8wlkh/ZVWNJMSpfUfupuLPZ0g0hxNr3l2ZltEskVl5w+wJV+hBZ7zMmSxMYvMjJ+5aBDSZOfzhnK6+ETl4e/heDYiBLPYCtvU88cMRFb3jKcVxSfSzbBawEr7OFfCny3UtmYQ0PJmHFT6p+wlEHSyKxtyDDlLS/uPPR/llK94fOhvQlX8dir9b8r7JGuFTjtG2YbsTuapi3sFDmBhFZwYcNMt80FSIXGQjJzrsl1ZVSIwmqlF2191+F/Gr0Ld92dz1oEOjwKH1oRb/0MTsNU7udZv7L8iGKWCjHnA0dIoXKilf8EJyXGQ0wjQE3WBAdMecb vSKDRA7k 9a75kCDQROjjboARAAtXPJWkNkK3s22BXrcK8w9L/Kzqmp4+V9Y5MkkK94Zv66lXAybnXH3UjL9ATQgo7dnaHxcVX0S9BvHkEeKqEoMwxg86Bb2tzY0yf9+E5SvTDKLi2O1+cd7F3Wba1eM4Shr90bdqLHwEXR90A6E1B7o4UMZXD5O3MI013uKN2hyBW3CAVJsYaj2s9wDH3Qqm4Xe7lnvTAGV+zPb5Oj26MjuD4GUQLOZVkaA+GX0TrUlYl+PShJDuwQwpWnFbDgyE6YmlrWVQ8ZGFF/w/TsRgJMZqqwsWccWRw0KLNUp0tPGig9ECE5vy1kLcMdctD+BhjF0ZSAEBOKyuvQQ780miweOaaTsADu5MPGkd3rv7FvKdNencd+G1BRU8GyCyRb2s6b0SJnY5mRnE3L0XfEIJoTVeSDchsLXwPLJy+Fdd2mTWQPXlnforgfKmX6BYsgHhzVsy1/zKIvIQey8RbhBp728WAckUvN47MYx9gXePW04lzrAGP2Mho+oJfCpI0myjpI9CEctvJy4rBXRgb4HkK72i2gNOlXsabZqy46dULcnrMOsyCXj6B1CJiZbYz4xb8n5LiD31SAfO5LpKQe/G4UkQOZgt+uS7C0Zfp61+0mrhKPG+zF9Km1vaYNH8LIsggitIqE05uCFi9sIgwez3oiUrFYgTkTSqMQNPdweNgVhSUAEQEAAbQ0VGltIENoZW4gKHdvcmsgcmVsYXRlZCkgPHRpbS5jLmNoZW5AbGludXguaW50ZWwuY29tPokCVQQTAQgAPwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQTRofI2lb24ozcpAhyiZ7WKota4SQUCYjOVvwUJF2fF1wAKCRCiZ7WKota4SeetD/4hztE+L/Z6oqIYlJJGgS9gjV7c08YH/jOsiX99yEmZC/BApyEpqCIs+RUYl12hwVUJc++sOm/p3d31iXvgddXGYxim00+ DIhIu6sJ aDzohXRm8vuB/+M/Hulv+hTjSTLreAZ9w9eYyqffre5AlEk/hczLIsAsYRsqyYZgjfXLk5JN0L7ixsoDRQ5syZaY11zvo3LZJX9lTw0VPWlGeCxbjpoQK91CRXe9dx/xH/F/9F203ww3Ggt4VlV6ZNdl14YWGfhsiJU2rbeJ930sUDbMPJqV60aitI93LickNG8TOLG5QbN9FzrOkMyWcWW7FoXwTzxRYNcMqNVQbWjRMqUnN6PXCIvutFLjLF6FBe1jpk7ITlkS1FvA2rcDroRTU/FZRnM1k0K4GYYYPj11Zt3ZBcPoI0J3Jz6P5h6fJioqlhvZiaNhYneMmfvZAWJ0yv+2c5tp2aBmKsjmnWecqvHL5r/bXeziKRdcWyXqrEEj6OaJr3S4C0MIgGLteARvbMH+3tNTDIqFuyqdzHLKwEHuvKxHzYFyV7I5ZEQ2HGH5ZRZ2lRpVjSIlnD4L1PS6Bes+ALDrWqksbEuuk+ixFKKFyIsntIM+qsjkXseuMSIG5ADYfTla9Pc5fVpWBKX/j0MXxdQsxT6tiwE7P+osbOMwQ6Ja5Qi57hj8jBRF1znDjDZkBDQRcCwpgAQgAl12VXmQ1X9VBCMC+eTaB0EYZlzDFrW0GVmi1ii4UWLzPo0LqIMYksB23v5EHjPvLvW/su4HRqgSXgJmNwJbD4bm1olBeecIxXp6/S6VhD7jOfi4HACih6lnswXXwatzl13OrmK6i82bufaXFFIPmd7x7oz5Fuf9OQlLOnhbKXB/bBSHXRrMCzKUJKRia7XQx4gGe+AT6JxEj6YSvRT6Ik/RHpS/QpuOXcziNHhcRPD/ZfHqJSEa851yA1J3Qvx1KQK6t5I4hgp7zi3IRE0eiObycHJgT7nf/lrdAEs7wrSOqIx5/mZ5eoKlcaFXiKJ3E0Wox6bwiBQXrAQ/2yxBxVwARAQABtCVUaW0gQ2hlbiA8dGltLmMuY2hlbkBsaW51eC5pbnRl bC5jb20+ iQFUBBMBCAA+FiEEEsKdz9s94XWwiuG96lQbuGeTCYsFAlwLCmACGwMFCQHhM4AFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ6lQbuGeTCYuQiQf9G2lkrkRdLjXehwCl+k5zBkn8MfUPi2ItU2QDcBit/YyaZpNlSuh8h30gihp5Dlb9BnqBVKxooeIVKSKC1HFeG0AE28TvgCgEK8qP/LXaSzGvnudek2zxWtcsomqUftUWKvoDRi1AAWrPQmviNGZ4caMd4itKWf1sxzuH1qF5+me6eFaqhbIg4k+6C5fk3oDBhg0zr0gLm5GRxK/lJtTNGpwsSwIJLtTI3zEdmNjW8bb/XKszf1ufy19maGXB3h6tA9TTHOFnktmDoWJCq9/OgQS0s2D7W7f/Pw3sKQghazRy9NqeMbRfHrLq27+Eb3Nt5PyiQuTE8JeAima7w98quQ== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.4 (3.50.4-1.fc39) MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 002B04000B X-Stat-Signature: kefiecfb4r57cwsyngear8g73yk9tet8 X-HE-Tag: 1741985604-128414 X-HE-Meta: U2FsdGVkX19SeeRy4FDB89n7sKaBjwfEEQzwJQdgKGEO0+h/ZIUUEAZUQB/wmiNk5l2SCMBZIu9t0JQrSlLw/XnNBKytDE+JyfsC6+yZnao3RNfrb+wFdxatHP69x7l3o3NEcgi5D7F+wrITyrvTGfXfYoAdiS9uRj8t5s2VFMiWvC9kecOJkLPSsA3Acm126QjzlFvjroYmPkkfnlChi94VVKzrE1Iav/yQKCK603o9B53cMksDNgGPas0V59Ip9JUJ6IrezatvZb6epTrIS/CYeJ7eAHMI+ogpRu1j5pNNT6YWpqGXA7ua8x1uO7OgVECXpu+/3vp3v02+J/pqg3e1o2IsYJSJDIoVf1RrY1uefqzMmxs3uwkvH2hyk77EzHU7qFg87uzrftLu0BMtNRQm7wayq1KQ8jYiXZhtsGQe3ia52qo7qt0APt/CfvE9b4Cvk51PEBfZM4OB7Gl3l0wcn+ZriCWtdd92G9AVP8y9G4LioHg0AbrxsBGtQXTwDm6A3L+zCQlSqIwx1JMDQOG9bMowwpUVSp4zJ52oUCfMUxv7WbQgWzkJoUbxrsQrLuKsbZY+r5WlrFCDgiQ82uItkVSVm5xYVpHPWX1tZafMxlWWet3YZiBy2ImaqhsSBSGp7neQPEqb2HOBfk6Cm357M3Gxu+klfs843Kzpoe0vvXN1UT7cu9969+USghNoDfy1yO7yYpZx0p0+6bmaYCdK6WKFRSbB8ZLwta6CgMxsVXf1xu358sZmpF2VXvHs7Q39sxd/rvEitlIO/qsLyQKlJSbpY+vUmrLu2Ay5EHISkYZa8RyElEqOePA907y03w74B1K7Meato1d7vFHhTVlgJ91hLYbSUKV+2/9hOXDDP1VLytYR+3QQEyEPjBe6n2bnCre8Y6Kwv9KruMODxOvfEGM1hLu6AhIjgOTbvFhZWk0Ibh2IrlAMDhhAnS5p1wmDr0UesIU0mfvlbH2 OfJ7iB9t AN3rzcZ9Lki/mxoLs0P+a0eMP+rJlz+Ydcxj1Eo7lWpVf2KY7J0ZJnxrGyks2PsJKqqGEmw8TAxl4bKZyTvh+yQKJixeh3tcjqhap3S3CYHYK9HESFQ062zqEKJd5bY4sOsYyIcnhOP14k3ps+QwXWvyJQYBqzaGRBEA7l6MQ85PBItxW+I4bKpbadTJwzSmSNSV2Cneno7rBKKI/zxO+f5i27A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, 2025-03-14 at 05:05 +0800, Kemeng Shi wrote: > 1. Factor out general swap_entries_put_map() helper to drop entries belon= g > to one cluster. If entries are last map, free entries in batch, otherwise > put entries with cluster lock acquired and released only once. > 2. Iterate and call swap_entries_put_map() for each cluster in > swap_entries_put_nr() to leverage batch-remove for last map belong to one > cluster and reduce lock acquire/release in fallback case. > 3. As swap_entries_put_nr() won't handle SWAP_HSA_CACHE drop, rename it t= o > swap_entries_put_map_nr(). >=20 > Signed-off-by: Kemeng Shi > --- > mm/swapfile.c | 58 +++++++++++++++++++++++++-------------------------- > 1 file changed, 29 insertions(+), 29 deletions(-) >=20 > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 2d0f5d630211..ebac9ff74ba7 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1473,25 +1473,10 @@ struct swap_info_struct *get_swap_device(swp_entr= y_t entry) > return NULL; > } > =20 > -static unsigned char swap_entry_put(struct swap_info_struct *si, > - swp_entry_t entry) Need to update comment in free_swap_and_cache_nr() now that swap_entry_put(= ) goes away. * the swap once per folio in the common case. If we do * swap_entry_put() and __try_to_reclaim_swap() in the same loop, t= he * latter will get a reference and lock the folio for every individ= ual ... > +static bool swap_entries_put_map(struct swap_info_struct *si, > + swp_entry_t entry, int nr) > { > - struct swap_cluster_info *ci; > unsigned long offset =3D swp_offset(entry); > - unsigned char usage; > - > - ci =3D lock_cluster(si, offset); > - usage =3D swap_entry_put_locked(si, ci, entry, 1); > - unlock_cluster(ci); > - > - return usage; > -} > -