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 06D5EC282EC for ; Mon, 17 Mar 2025 18:23:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0C5F280003; Mon, 17 Mar 2025 14:23:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABC72280001; Mon, 17 Mar 2025 14:23:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 985FE280003; Mon, 17 Mar 2025 14:23:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7B200280001 for ; Mon, 17 Mar 2025 14:23:52 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EBDFBB6976 for ; Mon, 17 Mar 2025 18:23:53 +0000 (UTC) X-FDA: 83231866746.12.52BCF13 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by imf10.hostedemail.com (Postfix) with ESMTP id 54084C0012 for ; Mon, 17 Mar 2025 18:23:51 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fOqwYOF0; spf=none (imf10.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 192.198.163.10) 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=1742235831; 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=hmi3YbHnN6lfw7K7iyXYyL72WFUUUVBQvWX+popxY1M=; b=PtzqkEceXb2UMCv13WJKdPfWMILbqSiTUMH8vBx1BptBMAO7VSFua2SlWuEdzZhKbczvvm yTfvC4bp9DoJ60m3GISD+GIBfUAWq16ZO1ShBNTRUlzVv/7TQXdqFOJgIgTxOonLTtqVYW c0Zbd0DFPamSLdbp11uo6Bz8ICzk2mc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742235831; a=rsa-sha256; cv=none; b=v+PVyYMb9Ss9mKFu26a7xMU2iqMpxtQqaOesTk93hdVUtxT7b/MIB/3XkNS7JPYD6cxuLK xMvPZ9tAnPHqV/F2DmkdPLn/5qmMUh5lqRa4Gr1Jwg97BqvPTZKJrEN38Kqru5s/OM+srP zH6oL9/OJceUdHrz8lj57JFmHrbQgG0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fOqwYOF0; spf=none (imf10.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 192.198.163.10) 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=1742235831; x=1773771831; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=Jk/K6zIn9osKO3C+0ens+03myrUFYSybl0/ovakDeFI=; b=fOqwYOF0op5/K+0g2vYbFxADYImddgEjJhNP+zwFIEmhuzOMSi+IvWi0 x5nuSkxRgEAeo+pA9FCuSCZTKumiHgBc7Ups4eEp+7+gbDF6zZW6MJpHa eXYrEed4c094sx736t+DliBOR4JjViMQXXlfyex/ktDtEeKohRGLSbpzv jQUIj7+32D32nO5RcF1wSMo0y1ciW/bu6c/Zohi6E4hN+Bbfo/tTcrFM7 ZTZNktUsnaVMi20xVbB0PEi9hgh38ghiISjstUGJZKNo4pX6I6TXZT6l8 BEJxCkRyc3kIwCztYwC1/4V7d523Clx+HfRjr+S9jflFXkXfUyWwy28Cc w==; X-CSE-ConnectionGUID: sCITMUxgTwOkGa12srihqg== X-CSE-MsgGUID: rCMXqj0DTwuGVCkZW14EBw== X-IronPort-AV: E=McAfee;i="6700,10204,11376"; a="54723355" X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="54723355" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2025 11:23:49 -0700 X-CSE-ConnectionGUID: UokWbO1ySKKkZTwpyn9/KQ== X-CSE-MsgGUID: u5JgGuMDSKW0GNrBjc3p/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="121752137" Received: from aschofie-mobl2.amr.corp.intel.com (HELO [10.125.109.110]) ([10.125.109.110]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2025 11:23:50 -0700 Message-ID: <754b55926794f41f0c064be98c74b89abff1172c.camel@linux.intel.com> Subject: Re: [PATCH 9/9] mm: swap: replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() From: Tim Chen To: Kemeng Shi , akpm@linux-foundation.org Cc: kasong@tencent.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Mon, 17 Mar 2025 11:23:49 -0700 In-Reply-To: <20250313210515.9920-10-shikemeng@huaweicloud.com> References: <20250313210515.9920-1-shikemeng@huaweicloud.com> <20250313210515.9920-10-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: 54084C0012 X-Stat-Signature: uj3ecws7dut5nhwxx4tygwe6eodtgce9 X-HE-Tag: 1742235831-701540 X-HE-Meta: U2FsdGVkX1+nWs0h0gQpX+tYpqN4RQoXQLGJkNFAKc3GPzLoj85UItvB0EGjvP6g2WEXAo8cwfn5MkPtwAtsISW4IxH2YyZwxvMfefpFur1rKxvYhPadMeHJ86RWQs4bujaaciT5vAdRIrrzgmsAUj3f/KhbcDwr3CESVj7CpM7FE5DTVMOVpKFBRWcmfDxsfSCLFRQbCde4InGOMo1tzFN9wNUXPWRMZAe6zyDkqKUdRwQNehvcIA0GBi0RP98tUM3G7bhtuBcp3+xgmr/dqvf3f0yC8058Vf1HTvwOtumypLX+eVe4Dibw0pRpghuOGuEAIALFZ3DoAzk3UTTW2+udeyd4rl9vzmImuQzqCl4/eUhtvEwXoSiDE1bPnghTsX1OTCpJbFbThZn+jENwJwaE5qcJLfJE069NimVpM98yLDa4LCp23FIM5fsfrfilPKANw34d5g5LHk7q3Tgn9Txymt6PuvRuA0WZkCqmXvwTDEj0Th9UljkiXTAHolekC0wcYb/zmZx+USobydlikq8nb5vahOBiBHXklx55SZkAMmfp1s3yjZzBJpgKsHuJwawd64vf0pyDRlbg4vBEdV0Hr2l5MbvWbz6YMz8//JV+VWMRH0EGP48hLE0vlI7kYjEC7m0vHvb3ESxRd27ApbN1DjaBF5qoQk7Hc4cxcV/p4LEYATC8oJUXPYH0AqNgRYFSpmi8moqqe00Vc4n2PifpSy689/4mqQsN9IdZ/ALH/7UQzM9pRVeWkl5D7pa0sqqhz7ULZ6s8jKoiXpbmDvzA6A7YibwlKKr6f0JIQO4RrsrudydCGi5UYxVtjosM48P3QSuNE0exSiPS+eh6jCHJ5KDK7qhohHopS5zzmypNn9w2t2OPuQH5ENxBnkKpOxmXr35waC/6p7FU432VPBnEa79T6Sgylel2oFXk3EEU0WTzwR0eULguCb2a7VqG5lJh1IvPQlGl1Agp9bF UfCG82g7 BVG2TckoShzAHGuBiS49GBi79c+ndlrVCordW3hSfqYCd86aXaRdoBEVLseEhl8ixm97jtqH7A2WwFRqJ9juz/EqsDAKqo8QNhR28Y3DDhCRLd5aUe1TfX4sT3yOZj91Ft1erCcnXYaWjTi8CzzpZedek55jjrHP3qmvJKBeVtFd5r53Dfw9iLEBIQ9lYqzVNfsxTiyeVsicILzVWxwWcPuF72A== 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: > Replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() to > remove repeat code and leverage batch-remove for entries with last flag. >=20 > Signed-off-by: Kemeng Shi > --- > mm/swapfile.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) >=20 > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 343b34eb2a81..c27cf09d84a6 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1570,21 +1570,6 @@ static void swap_entries_free(struct swap_info_str= uct *si, > __swap_entries_free(si, ci, entry, nr_pages); > } > =20 > -static void cluster_swap_free_nr(struct swap_info_struct *si, > - unsigned long offset, int nr_pages, > - unsigned char usage) > -{ > - struct swap_cluster_info *ci; > - unsigned long end =3D offset + nr_pages; > - > - ci =3D lock_cluster(si, offset); > - do { > - swap_entry_put_locked(si, ci, swp_entry(si->type, offset), > - usage); > - } while (++offset < end); > - unlock_cluster(ci); > -} > - > /* > * Caller has made sure that the swap device corresponding to entry > * is still around or has not been recycled. > @@ -1601,7 +1586,7 @@ void swap_free_nr(swp_entry_t entry, int nr_pages) > =20 > while (nr_pages) { > nr =3D min_t(int, nr_pages, SWAPFILE_CLUSTER - offset % SWAPFILE_CLUST= ER); > - cluster_swap_free_nr(sis, offset, nr, 1); > + swap_entries_put_map(sis, swp_entry(sis->type, offset), nr); > offset +=3D nr; > nr_pages -=3D nr; > } > @@ -3632,9 +3617,7 @@ int swapcache_prepare(swp_entry_t entry, int nr) > =20 > void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry, int= nr) > { > - unsigned long offset =3D swp_offset(entry); > - > - cluster_swap_free_nr(si, offset, nr, SWAP_HAS_CACHE); > + swap_entries_put_cache(si, entry, nr); swap_entries_put_cache() assumes nr does not cross cluster boundary as we only lock the cluster associated with the beginning entry. Current callers to swapcache_clear() like do_swap_page() and shmem_swapin_folio, call swapcache_clear() only for pages within a folio so we do fall in a cluster so we are okay. Perhaps we should document with a comment that caller to swapcache_clear() should use the function only for pages in a folio so the pages don't cross clusters for future users of swapcache_clear(). Otherwise the patch looks good. Tim > } > =20 > struct swap_info_struct *swp_swap_info(swp_entry_t entry)