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 B3359C28B2F for ; Fri, 14 Mar 2025 21:34:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45472280008; Fri, 14 Mar 2025 17:34:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B6EF280004; Fri, 14 Mar 2025 17:34:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 257BC280008; Fri, 14 Mar 2025 17:34:33 -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 0A3EC280004 for ; Fri, 14 Mar 2025 17:34:33 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 59E9E81610 for ; Fri, 14 Mar 2025 21:34:33 +0000 (UTC) X-FDA: 83221460826.09.2AB634F Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by imf22.hostedemail.com (Postfix) with ESMTP id D3CDEC0006 for ; Fri, 14 Mar 2025 21:34:30 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=S2rk9UdT; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf22.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.17) smtp.mailfrom=tim.c.chen@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988071; a=rsa-sha256; cv=none; b=FX58CjZo3fgO8BjSgrJR2ar2deeZerhs8kYIDLoO4ZSBZ+1vdv1/8BYi19gtY6XjKeDfl0 bXvD8GoCk814ztI1rY6Yivd1dZG+6o7fYU9mp0qny6Kv0/7kKiaiWOr2oAaJeNkGJqL25/ BSvTE/SrmIEgLSi9uzAL2Q4Ln7mkOAI= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=S2rk9UdT; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf22.hostedemail.com: domain of tim.c.chen@linux.intel.com has no SPF policy when checking 198.175.65.17) smtp.mailfrom=tim.c.chen@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741988071; 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=grF9xomGpubBSLwcACawQN1orT2E3ukkxauA5f+NTBM=; b=nuS6pcGBqZ/V03LCGP+QZvMDJvv1kCU4B8sq8wfhKSAtL4lPFfJB4F/nXBVXHWWPJ52ufn 449QOz405QYTM3eWtDKnQEPJhbOjs4HIYi5jWN4eKAPNCW3xgqoytPRyeNuFNg1AXmu1PR cF8LJRrt+E8zAGRVRmFDip8MUUCos4Y= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741988071; x=1773524071; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=adPnlmvhTOmnILUm3dr3Xc2tHoJ+pzdZl7dWXQwEBhU=; b=S2rk9UdTeCpOQHrqgHmdAF2T27t0wfT18RTeI3tjcZH62m1htXVTsz/6 3AsDtZt2yUGh7dhmAuX89nhA4AC5IcE/PQmwQYi+hgIejhzT7N6n5CP0e wVQCql6PTHaw2Yg3E3gXxdnld8rL6U2QNPKdP1B8/LePivvG/irJ70f9t 5+x77DXpc1/aaJLmm1QqAneV7e8LbBvGKUvHF80sEN20nNf/iECA1cPW5 dw7hFxAKeRxfFU5sb3Sdk46JUkTut4z/1IRFGPBqFCYAM7Z18hjaoHpwY tOpBbgW3U/aXNXD/F7DYGksYr0fyEcATk5LDE48DFmVH+B27hMcYvQosM w==; X-CSE-ConnectionGUID: KCRC07F4S0iVS3jhk4klFQ== X-CSE-MsgGUID: cue88xGrQhifzIfjBVzM5A== X-IronPort-AV: E=McAfee;i="6700,10204,11373"; a="43191711" X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="43191711" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 14:34:20 -0700 X-CSE-ConnectionGUID: jP9meFiCRcmEnUNIa0NPLQ== X-CSE-MsgGUID: RbjKNXj7Tvq6Y3miW/XdcQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,246,1736841600"; d="scan'208";a="122116800" Received: from dnelso2-mobl.amr.corp.intel.com (HELO [10.125.108.212]) ([10.125.108.212]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2025 14:34:19 -0700 Message-ID: <8f757efce4efd600c2c49975f5ef8298c1ff5f4f.camel@linux.intel.com> Subject: Re: [PATCH 6/9] mm: swap: drop last SWAP_MAP_SHMEM flag in batch in swap_entries_put_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 14:34:18 -0700 In-Reply-To: <20250313210515.9920-7-shikemeng@huaweicloud.com> References: <20250313210515.9920-1-shikemeng@huaweicloud.com> <20250313210515.9920-7-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-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: yz86nzaixwx9hi71xcxehehnamdw13tj X-Rspamd-Queue-Id: D3CDEC0006 X-HE-Tag: 1741988070-903233 X-HE-Meta: U2FsdGVkX1/KM+omconDlTJml1Cr1yXNtB2LZmchwsNB7UTG0e7lwYkVvOKBnLsIwL2HwgybqP78QhlapKwKiJILZwUSyvAb6M8JwrxUZh8NmSQoXocX+LB3wngVUeFD4QwhDooZv7Pos+RBcCz9RRIUkveMFA3Ct+fVx3GQMX8pSOFJ5GTU4bae9GQ6pwY4iQAY4doUlqZKheMJw9yNkj+SbS+NH7Wgjk6xgQnvbl8zSqF9LCzsCjtfMLIprCyDL15URY+LDk89rzlXPtsdOrE7V8+lPs1dcTj8gPmFSloIR3xkWgM1JImkrtGExgO5UGZWK0dgJ+BhSCJ/t/vIJjf/w9SdUN3VaNfUKQuuqrc9dgItkweZswyT2axFZf3e/hvRT21EDUJOf+QcShp/S3+pnIH01WpAT00cd36lPdnhDdzD0oKgsMy8pKQJ3zJIDfOSrx0zIO2CB5k5QNj5crBdcQnAH/Lf4i24T2VKykdQKTipZBLrhc1kFmwZRnVBlHzKUSDqjABpe1oAjJxwPQZKkY0kzPwg3VRewb/w/kLMNFY1NFEhdWdffZ6wqUzaAfIwRuBZAeWoQRberxFLSH3SYG/b0f329PCH3l4mB5EfrSuJ2d6dMGX/bf6RD/6xWMh6YOHk5r/DZ71uGpNSLuqfEG585G2twRxPgH0wgMngdh+i3e72oq3ONx6UIqZGNam8Y+VWBSi5I0O0HNtfOFLA6GR/xqQNxDsO1RRhuY9YqPFZw3QAYTH5mPzbFIfL+CWRdvGi0Y2IFYWjTEFUVqAvWV3jwEky6MaecYkTpJOAttHuQLuG/OeR+/0vz9lqmDsPY7yzqYduS39UqbglQKmkOn5MfvxjiXw2YDgqWQZ5m8/pqpx+nQ/GU1WrGOSh4RpFPIvQXCY2RvoL0Lhe6h3+1zvy7fCGJ0PQlgij5uOsEzPtla6hM4SloApvjjpB5OPGYq0tvXtMzJS7M1x QBhl2BIc 1mIiQezsLhElBVyShz9PJ4WEHWCjMXLcoGTPUz2nOnq+OPJhfm+dNRUQ/Q6vMbhyWjB3trXmna2ACoSPKads09LnWdTODG4wSpbQJLVwcGbHnG5ANacgImPadtHVa0wnPLX8E+KhZHGGSrLS7AJz4a6j/5fkJSEhKktMqaYWuvYL7RFfnyhWWbEVc1A3yqhh+fCt8qQFEHpRsRWofw3HFsXMgnK0WPBjUapXkCYXpfkhX2r0= 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: > The SWAP_MAP_SHMEM indicates last map from shmem. Therefore we can drop > SWAP_MAP_SHMEM in batch in similar way to drop last 1 flag in batch. >=20 > Signed-off-by: Kemeng Shi Reviewed-by: Tim Chen > --- > mm/swapfile.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) >=20 > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 0ce0ca08594e..2d0f5d630211 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -192,7 +192,7 @@ static bool swap_is_last_map(struct swap_info_struct = *si, > unsigned char *map_end =3D map + nr_pages; > unsigned char count =3D *map; > =20 > - if (swap_count(count) !=3D 1) > + if (swap_count(count) !=3D 1 && swap_count(count) !=3D SWAP_MAP_SHMEM) > return false; > =20 > while (++map < map_end) { > @@ -1497,7 +1497,10 @@ static bool swap_entries_put_nr(struct swap_info_s= truct *si, > unsigned char count; > int i; > =20 > - if (nr <=3D 1 || swap_count(data_race(si->swap_map[offset])) !=3D 1) > + if (nr <=3D 1) > + goto fallback; > + count =3D swap_count(data_race(si->swap_map[offset])); > + if (count !=3D 1 && count !=3D SWAP_MAP_SHMEM) > goto fallback; > /* cross into another cluster */ > if (nr > SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER)