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 335EDC28B2E for ; Thu, 13 Mar 2025 12:09:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29BB8280004; Thu, 13 Mar 2025 08:09:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 983AF280007; Thu, 13 Mar 2025 08:09:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0850C280005; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BA166280009 for ; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F302EC2047 for ; Thu, 13 Mar 2025 12:09:34 +0000 (UTC) X-FDA: 83216408268.01.6263C1B Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf06.hostedemail.com (Postfix) with ESMTP id 39180180010 for ; Thu, 13 Mar 2025 12:09:29 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741867773; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vN+zxinYtJgl5VhyLg4gN0/1iNFAUWY7Wn2AGVpvSSc=; b=7ultTOvbwMTv33X0b8eU0u8q4ciQz0fafph7o/yiiSdPQo1vJDtws+790KE+fBi6j8oKY+ gG/x3ofiSR0GJ1Xd8Dn9Xdqx2VS5AOdGFBZ/7xOn60Y68+rAy0JND58T8ZK2gg5vW2GrwY g1PI38dP0Mwi45D7vwrTzOd7MgYPG1k= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741867773; a=rsa-sha256; cv=none; b=MH2KLARF5qSnwY+kJQphzQK2an6R6l9gPhPtyDG/Hht/c1ylFuwpdPoh1h4vslIkAiV2kr SaPEWpx2liiywQk+9ITOVLftc7ZGbiE2KUcFUtaCfttIr5Dh7ePsJcUnJzpTwfvq+1ihkG UcgvE14IjCFi7n4N22TwPwScwtN4+1k= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZD5rZ2c2Vz4f3mHX for ; Thu, 13 Mar 2025 20:09:02 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 425DD1A0AA4 for ; Thu, 13 Mar 2025 20:09:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgCnsGPyytJnTaZeGQ--.9643S10; Thu, 13 Mar 2025 20:09:26 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] mm: swap: factor out helper to drop cache of entries within a single cluster Date: Fri, 14 Mar 2025 05:05:14 +0800 Message-Id: <20250313210515.9920-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250313210515.9920-1-shikemeng@huaweicloud.com> References: <20250313210515.9920-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:Syh0CgCnsGPyytJnTaZeGQ--.9643S10 X-Coremail-Antispam: 1UD129KBjvJXoW7uFWkAF4DJr4rGryrJF13Arb_yoW8CFykpF 9Igrn8KF48Xr13Gw4xJw45J3ySv3yIg3WUZFy7Gw13Z3Z3Jr10gFyqyrWa9ryYkr95ur98 Ca48try2gF1jyF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 39180180010 X-Stat-Signature: kmbdgrxbzhc6krqwxzyxfopq6keigis5 X-HE-Tag: 1741867769-412478 X-HE-Meta: U2FsdGVkX1/w6s4WxswUVjbeh5eYwbwYNkf4ETKyxWexA+j6U+zA1Z52oIqiEBhI1bUVJPEAhNMxqN2WaIVpqTM+HJTvP8bOVYOLlZeJOPjvAdqnfB9Uq7cxwTwwjELe+bnjolA3QFQcsnkkmZ0sY+Vjhqir8cbHGp3jeMrk4iSH2ZDssQQJETxo92kmhMzDVjfiprAizLu+oWt6Kz4p0Y4IyIn1wOdaRgvCRox6l8H29NH0o2rasJL81uNXTGj6FvYBV25TTrzUTXu30CKKABKe7n8x2eAqFcbZYy2cdWKx/EhP1gGqQKMzp5VM0MEzla/7Ukeoi/K0weYJbpjsSjWru6bxk5QfPk3bM8QQ78OmKaD3y9pE+ocdX7NA63g5oquib4LMWnjPpbfzcctmNr/O+5/lWRzMqp8g+v3Pw7/Ef3jCbOGCRZD5ZDjj9JhJJtovWUZxGFgqux4w/QurfZD4k6KZ2HE9SYtxJWnw6KZXQfXj9TQ3bYDsknSxR3iG+thiNUU79Vftq2iKVNKh3QKNYzwvnkBMa12CQoEXt09Our1Mo63rp4A/XnjEQgxqo4a5VIS/KmjuV3hQk27CGk60QJTvgijSiAGhI3qXtEM/igjTdRUM2lAf6Qy+aEFmEQtgqxHQwytIoDxwIDqEKe1tx5DXKJUlwb9/qyoGMU37AhXYtmPlU4cdTKU/F9AxN2NOabiB+K0AF3KqufYiZkIYb/brvGdyley51348yy6usFTFUxSqcrFtGjyYJ8otIMm58GBNTBlXR9YefUXPmN/4WUdoTu+5ac50m2Nq9x7CqzXoLG5Lf8zsJygJ7XFItmXWJtlJ6uDXr9dk9vUgBKaqdtoJsvEB5eM7E0yepBdbxywROQ75bEW3yt9mg+jZkpDhTxnKGzyNUZhE6fl+tQIVZRZwC9Ro97ZcHHZRYhsQ84iSkSYrujIGMl2Z8CzdYFtV6A2Ck0cBfGl3rud BKLsEipB MmCLCc/uvER5b/pUdINREzg6LCmT+TG6NG5q/IM7Wg0z8xVimW7Uf5xZHa4fHK0N+VAhtb3lqRDcKp5ed1LTC1zSMc4jY8bsfE3lYhdE8fniPAea8I5HNHUh2N2OLoPS0+rM9sa8t3id7wKVK3FyhnjToHvGSdpMbLs6x 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: Factor out helper swap_entries_put_cache() from put_swap_folio() to server as a general-purpose routine for dropping cache flag of entries within a single cluster. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) 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; } +static void swap_entries_put_cache(struct swap_info_struct *si, + swp_entry_t entry, int nr) +{ + unsigned long offset = swp_offset(entry); + struct swap_cluster_info *ci; + + ci = lock_cluster(si, offset); + if (swap_only_has_cache(si, offset, nr)) + swap_entries_free(si, ci, entry, nr); + else + for (int i = 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 = swp_offset(entry); - struct swap_cluster_info *ci; struct swap_info_struct *si; int size = 1 << swap_entry_order(folio_order(folio)); @@ -1606,13 +1619,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) if (!si) return; - ci = lock_cluster(si, offset); - if (swap_only_has_cache(si, offset, size)) - swap_entries_free(si, ci, entry, size); - else - for (int i = 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); } int __swap_count(swp_entry_t entry) -- 2.30.0