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 C10C2C28B30 for ; Sat, 15 Mar 2025 00:24:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C3D10280003; Fri, 14 Mar 2025 20:24:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BEE3B280002; Fri, 14 Mar 2025 20:24:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8DA6280003; Fri, 14 Mar 2025 20:24:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8F1BC280002 for ; Fri, 14 Mar 2025 20:24:52 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D92821412F8 for ; Sat, 15 Mar 2025 00:24:52 +0000 (UTC) X-FDA: 83221890024.15.BF5FD03 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf11.hostedemail.com (Postfix) with ESMTP id 10A5240003 for ; Sat, 15 Mar 2025 00:24:49 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=eO0UNev0; spf=none (imf11.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.9) 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=1741998290; 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=qAYhpzZJh1LIgJ6/iRsKcQse1jFeQ9ytzCojP6evRtc=; b=rrKYnptPm6wfY6P8Y176c+6/t7HoRghpwRXLhYOtkyJjyldi2KdxT68tyn2SA4qo1bo7n0 3+ufbsrYcw4FVqA5E58O2eIaa7YYCzgoFbGKWg/Wkuhkr8t2V2K/FPVrnm1sycsocfNuua tRN5ql+MUxrQ7DcSelHWYTAv7jZVndA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=eO0UNev0; spf=none (imf11.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.9) smtp.mailfrom=tim.c.chen@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741998290; a=rsa-sha256; cv=none; b=RCE9Nys1Zc9nRmPLf+h4knP1AKMmcy3+sJENVCzfKOzz/hG4rzInV7WEd4S1eCcx4LYaNw XqN7MOPEurM2HtdJAtxv4nxB/heCuDEDQlm3OE0xpOcnZLxhh+eBhBFM4WJhb/Af2MLyDh +yrZy3iOJl7AhiRAijFy1rbv/NRc9Ok= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741998290; x=1773534290; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=64a9Fds9FKkf2EcK+lloBIMWnzrTARzBuZXF8DTcqos=; b=eO0UNev0O2JjT7jnkQgX2hNcxpp0uJJ5bCgpFxtEadyZDMQpDqfusZf/ oj95l7qj4UDRSvuw9fnEYLzIcwVxJZFv0X52+W6s6LdzrFSXGHEZ5cQ6c Am0u3eFqrtrJTypA+rSv70rncBszPo2s3fymVCITvm7NqpIoc2Vru0bqe ilRJkFuYEZbO8qbVk8LnAp1huRkLAkvfV+k3pClpFFIHdniSUJ82XDOiN lpf/a1Fz3tdHdaf5n0hqhjK/SiyzKnOYS0ftQzcm+2Fcw6XZI1Q3bkZsK 1xr57WNH5i3WKrs9wCpMnQhrsboaxDdReYVXX2xeMaTHuYsJ0kpxIEmVB Q==; X-CSE-ConnectionGUID: yeTW0GcoQu2mRIN0yBOTVw== X-CSE-MsgGUID: AGKdvY1kTXWIhQMzAaXytQ== X-IronPort-AV: E=McAfee;i="6700,10204,11373"; a="65624097" X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="65624097" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 17:24:48 -0700 X-CSE-ConnectionGUID: LAy2uxrESyanpHv5FWo50g== X-CSE-MsgGUID: PW7BqhysRs+1bdgoueIuUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="152311962" Received: from dnelso2-mobl.amr.corp.intel.com (HELO [10.125.108.212]) ([10.125.108.212]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 17:24:47 -0700 Message-ID: Subject: Re: [PATCH 8/9] mm: swap: factor out helper to drop cache of entries within a single cluster 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 17:24:47 -0700 In-Reply-To: <20250313210515.9920-9-shikemeng@huaweicloud.com> References: <20250313210515.9920-1-shikemeng@huaweicloud.com> <20250313210515.9920-9-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-Stat-Signature: yagxwiaiwnpm3b9kj7ecnbgkabkouj9j X-Rspamd-Queue-Id: 10A5240003 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741998289-885139 X-HE-Meta: U2FsdGVkX18c5iy0OHDYkHFqkd1LDOKYlJZie4VmJZyAAXQDgOxLh8vYvgAlOwf/mPx6I18D4xyndjnulDhNCA8Xy1z/iwLPZN8VM0Phdczb3A2y7Tx4UYCrDniLCnj4uLxdtGHRxOe5COfiDeQh/RozGVtWm6c2sgJqQ7Cio213S7FuIrGEeU4d7jEyKB9CFFjjo94y86PZ6Yc5OW4hSlf9E/go2YDmhXC1z0ZWAoD9or8e0yY1OaO9W0MeX0uZZ4Lj3u2aCmGqhm7VByt/kHgviWb8BKdBTA1sny53A1KuPZJjo6zzxRbmXo2568EpN7qk83KvklCjqNXyLZYp+LLjIpOpjroPTfB8D9Zde2dfSOUK4XE4MJ+hDCt+fXD9KMDjp2u2Aik0hZxLeE8zDSw8Sjz+1J4PVZL8DKuqJ2E4fL7KMsBBi2kh/ew/bv/Qnx2MLNoYcBtcNt+/97B6b/8oS2rWHssYWumS8IA6kjxxkDMUe2VDrVxPPKTB4K0jDPCyydtUeaIYMdLe3U6BXGDZgIIW5GaLUO+kPUDCjgRp6o2pgOJWi2VrNgrvYrKAAAr1Xy1prY1Ey5xw5gry+vxCgli7kbDWzDzb2HU7IN+fOk5wDNfHlSzUF6x3F9BbYECcpRFSLNC70Q/zjaNmaN+tcGCCrfnSBB/Gy92aweXk+oZcjfw03U256Tyw+hn+er9Cj9lgyOImV3cjcuxG3cheKFxRiM1eDoCGeUta7XsPMICa8qvTBJwUD+6GLyi4Dk7X0TPbQPTgcaSkmMbJEhyf7SCYoxQg4eA1JYrtEXr0aSs4nZwB3OX27Uwwev7YDb9+dKoQFugcemGAHy0b1h0L944C6obWiRyxCSGBg2X6b2/BYRlgGIUCxUdMUAUbegDtUdt3dMH7i3g/V98DTc2OIMzd1NEGEM2LXQ1JsflrtaFnx2nsnzl+azT7sXqlibmV3w1YyvzXjHWlAEs xSHFa2wS USd7SEPMq6/aQxGuzcFAScz3x6l0CHa3ESF5jwsLCtx9eD20Z+JMJb+h1WCqy3n4tpNhAPdD+o97j2jM0Jr3Vgb/COT90IxJDbsm04jxE2ca1/EmC2Cn3QGfKZQE2y11tXs+QwIq1jpGavQZFa9GIYnK88KNN7r3vaoIW6lz+lJJeu4HVntm6BynL50EWyilT2qgp 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: > Factor out helper swap_entries_put_cache() from put_swap_folio() to serve= r > as a general-purpose routine for dropping cache flag of entries within a > single cluster. >=20 > Signed-off-by: Kemeng Shi Reviewed-by: Tim Chen > --- > mm/swapfile.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) >=20 > diff --git a/mm/swapfile.c b/mm/swapfile.c > index ebac9ff74ba7..343b34eb2a81 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1473,6 +1473,21 @@ struct swap_info_struct *get_swap_device(swp_entry= _t entry) > return NULL; > } > =20 > +static void swap_entries_put_cache(struct swap_info_struct *si, > + swp_entry_t entry, int nr) > +{ > + unsigned long offset =3D swp_offset(entry); > + struct swap_cluster_info *ci; > + > + ci =3D lock_cluster(si, offset); > + if (swap_only_has_cache(si, offset, nr)) > + swap_entries_free(si, ci, entry, nr); > + else > + for (int i =3D 0; i < nr; i++, entry.val++) > + swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); > + unlock_cluster(ci); > +} > + > static bool swap_entries_put_map(struct swap_info_struct *si, > swp_entry_t entry, int nr) > { > @@ -1597,8 +1612,6 @@ void swap_free_nr(swp_entry_t entry, int nr_pages) > */ > void put_swap_folio(struct folio *folio, swp_entry_t entry) > { > - unsigned long offset =3D swp_offset(entry); > - struct swap_cluster_info *ci; > struct swap_info_struct *si; > int size =3D 1 << swap_entry_order(folio_order(folio)); > =20 > @@ -1606,13 +1619,7 @@ void put_swap_folio(struct folio *folio, swp_entry= _t entry) > if (!si) > return; > =20 > - ci =3D lock_cluster(si, offset); > - if (swap_only_has_cache(si, offset, size)) > - swap_entries_free(si, ci, entry, size); > - else > - for (int i =3D 0; i < size; i++, entry.val++) > - swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); > - unlock_cluster(ci); > + swap_entries_put_cache(si, entry, size); > } > =20 > int __swap_count(swp_entry_t entry)