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 34310C282EC for ; Mon, 17 Mar 2025 17:30:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06024280002; Mon, 17 Mar 2025 13:30:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 00EFA280001; Mon, 17 Mar 2025 13:30:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1A2C280002; Mon, 17 Mar 2025 13:30:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C4AF3280001 for ; Mon, 17 Mar 2025 13:30:45 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EA2E01A0437 for ; Mon, 17 Mar 2025 17:30:46 +0000 (UTC) X-FDA: 83231732892.24.346ECE8 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by imf18.hostedemail.com (Postfix) with ESMTP id DB0551C0022 for ; Mon, 17 Mar 2025 17:30:43 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=h+BWn4g3; spf=none (imf18.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.16) 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=1742232644; 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=2iUOvEIosT3HN3YB38JbHZOkLO8qdjUM9JmniVQ2h44=; b=JJZ8A/8z8819kbpQ0Z2+hVBZBomDc/4Fj5jNrmtr52SSXVTuKf32qHX2Uw9x0SkqX8Pxey OhDvajhaG/yXqYcwm0jEQwHzCZv24AcMTXXa3w+h4ujR8MGCr3Hq2PZneiIgVaQkQTlO7L jsihTo4bUZ61aL7y5U/HYsVHl3lssak= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742232644; a=rsa-sha256; cv=none; b=Xn56SFzvfuJ03lI+MwL35PEe8jaqPgqtoTMfM+1gGI0dY7SSXYoazUJe/p7q05xjmWWk3H fYEd3z6+w4MpuJvYC+HD0HImW3yA+pxZCj0elpJwpPGc9oYDZ3KBhghfXGO/jBjHQzLq08 zzB8k9/fLlfUqV4qwRcqMXeIJns1G24= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=h+BWn4g3; spf=none (imf18.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.16) 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=1742232644; x=1773768644; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=U0QNfwzq5+qYex0ZXXsaTM9f0PLx9ngrcjFU8zcmQyo=; b=h+BWn4g3zP4nr3hBs/k1wTVibYC/B9UO31HmB/t+anGlFVN88X9MZVj9 +l2uVorZTXThN0hsuQkS1F4PWxS4B2t+4zjJjV5SC6RXflFduwTnubUQh 8dEK/Lseya2oHmoVhkAnPpp69oVT/rJqzijqMQhwnJDKpDZwV4lXJ8Elg AP3jSkMksY6bVxfutcZ7gGBtMA2os6LEz53O3oxemfEGdHBN1ZvaaTYUP TLn87znUUshteY25z9TM19+Q4L/nLmo82PgU9E9dVnUBF1ZM0v7lXRUKu tKXqRLt4oibasHQiVMaulT+H3ERfTbI+uCFQR/ARsOFki6mW1MxrLS563 g==; X-CSE-ConnectionGUID: VfGM84v3TcK8YudJkaahvA== X-CSE-MsgGUID: sqTbtXZcTWyuW3oQHFHJrw== X-IronPort-AV: E=McAfee;i="6700,10204,11376"; a="43445087" X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="43445087" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2025 10:30:41 -0700 X-CSE-ConnectionGUID: z80e267JSla7Xm8wCIJXLw== X-CSE-MsgGUID: EP29uFebSnC3YSS1C6Eedw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="122505807" Received: from aschofie-mobl2.amr.corp.intel.com (HELO [10.125.109.110]) ([10.125.109.110]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2025 10:30:40 -0700 Message-ID: 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: Mon, 17 Mar 2025 10:30:39 -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: rspam11 X-Rspamd-Queue-Id: DB0551C0022 X-Stat-Signature: d3qty1sunqm9ixinsdauzrb97yxkuowd X-HE-Tag: 1742232643-343243 X-HE-Meta: U2FsdGVkX1+OfAm+QE6crSvX/VONwGAbiSblwTArGD74sDKOXTlOG/dymx63m41aahPXdH10IWWifXISQyDi5eJUNACxrZbIc3HSWJWJJAYEronUeU+8cbX8tqS+fArzvlJuEjTSMPJNuwDFFAjy0NSPIgn2bUuSBFSBM2Jf25DBLnwy8suINbHB5SCjCVtUE75OaY6GaoZi7L1NK6dx9HGfFG9xLbgCxG+tfQ3Q3NYXNsiLcBi7T/sWYPaWfexFV0TwhJ4Phwo9QVRpCooPbwdTUZ8M6ytuNKdk0Qw70eCqzn41KRbI52cPLAug/1Cs5sIhJcUaiLyJu4nhGZ72ocqgBbzpmlqxIMXrz5QB7T8dMWCQ0oenCy8ZrNar9JE2Hh2uDb0m2cs9nAzgFcnIzEIZtZX0e4jUOFdl/MMueLmXcFyev7gxAH82ch5mNjh/ZXUtZBWxno//C27wpg4//nUZvOW+fgQZ67W3T1l9l+hAXXpaUVx+5n1vuGoga7kZrgNZTXBbByDzFYACnQNK7eFbZZ1Zmk3Kc8Mr2PUJemTbUff5hnuG+WiN/eUikNzF6apHT9dPyEb04p8EscAWEzB8ZPDdiwAT9ckZmfOcnL6w9M/9VSJasWLNffaeW0Yq3L0O++Vx99BfqhnrJROmHNTqdISQJHsFuKNN3Hix1mFHlRdaeonC/1t11cnnPizBLZTrNsifycRhu1HbvbXfS1Fu0G+wHbfG7XfLBh5v+y36rit23nIhrgp6x19KdrG+rFwU5VAjmX7YmkjqLn/hXn5slZoekMYqnhqYix5Ui1+yROUasvXl0w+l0fB6YQ1u+rp5bTu1MyxLfs09Rwa5cAIp0d4Cun+vr9WVS3J87EaPf0TwIVe4zjE5MMyIoyyT54W95eaiJQjp9sPC0UX4G3VrvnkH37GcLjo4BdzprmueHgVilCveajp5IedWu2P3fJ6OdbJhx62zZ2ShFbc Nwx0K1OQ TBLo63Z91/ZzMxkjQf+hXu9rjpR9SMeHaCcYE7isUNYRc/zFnbdR5GuOCaw5KM6NCSnj32RUHhpBK9JgEO8PWNBe5j91lJXZBINXpmd60+upI/LSGfAZAifmxVE3PGQBlNykY9+bYkMy1DRaknBvSmfZsywqCDnf+Hj/Nv+NOfcIjTJUzC6ywZNpuTYkxwR936mMR 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: > =20 > fallback: > - for (i =3D 0; i < nr; i++) { > - if (data_race(si->swap_map[offset + i])) { > - count =3D swap_entry_put(si, swp_entry(type, offset + i)); > - if (count =3D=3D SWAP_HAS_CACHE) > - has_cache =3D true; > - } else { > - WARN_ON_ONCE(1); > - } > + ci =3D lock_cluster(si, offset); Relocking the cluster is unnecessary overhead if we don't release the ci lo= ck prior to jumping to fallback label for the locked case. Maybe something like: diff --git a/mm/swapfile.c b/mm/swapfile.c index 9cd93a03b25c..41aa841b86d6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1504,8 +1504,7 @@ static bool swap_entries_put_map(struct swap_info_str= uct *si, =20 ci =3D lock_cluster(si, offset); if (!swap_is_last_map(si, offset, nr, &has_cache)) { - unlock_cluster(ci); - goto fallback; + goto locked_fallback; } if (!has_cache) swap_entries_free(si, ci, entry, nr); @@ -1518,6 +1517,7 @@ static bool swap_entries_put_map(struct swap_info_str= uct *si, =20 fallback: ci =3D lock_cluster(si, offset); +locked_fallback: for (i =3D 0; i < nr; i++, entry.val++) { count =3D swap_entry_put_locked(si, ci, entry, 1); if (count =3D=3D SWAP_HAS_CACHE) Tim > + for (i =3D 0; i < nr; i++, entry.val++) { > + count =3D swap_entry_put_locked(si, ci, entry, 1); > + if (count =3D=3D SWAP_HAS_CACHE) > + has_cache =3D true; > } > + unlock_cluster(ci); > + return has_cache; > + > +} > +