From patchwork Tue Mar 25 16:25:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14028185 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 BC5A5C3600B for ; Tue, 25 Mar 2025 07:30:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ACB3B280008; Tue, 25 Mar 2025 03:30:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7BB528000A; Tue, 25 Mar 2025 03:30:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91CA9280008; Tue, 25 Mar 2025 03:30:04 -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 73DC328000A for ; Tue, 25 Mar 2025 03:30:04 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 69CA6BB292 for ; Tue, 25 Mar 2025 07:30:05 +0000 (UTC) X-FDA: 83259249570.05.87BA8CE Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf21.hostedemail.com (Postfix) with ESMTP id 0F1621C0013 for ; Tue, 25 Mar 2025 07:30:02 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; spf=none (imf21.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.56) 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=1742887803; 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=iFDR8t5KM5HJ52zX81OYj/zuu15U/MwIUesj9wQTiVg=; b=7hrmAYGRZN/GD89Ab49FAQ3Sx590RqyKN/pvsNe2qkUpFW8Akb43nf0FUt0Q7rgBcYGzyu O7S2imsopYC2bNsE38U+0yRINbvRHm4sMvy38tj8d3vfu+N0UYo/G44dYPkP9Gm0kcWGZD QNdNqCAEhTpUAd0/oyJxO/zCxLRIM4k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742887803; a=rsa-sha256; cv=none; b=vKBFqutVt7w0JzIyBoBOvul4clByF9NyWuxk+KjAAcSGPa1y+GKREKlfD0AUgsOx8NJE9v 6Q7ggxmlPryYiwSMxs3bDwZz4e9Ouaf2bDhbrzX+/u95BXWApXu1lTtRHXsPno5k9SUeJZ eU/2a0QN3T/pSLzovuZQyiT34LiDht8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=none (imf21.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZMM4Z6njmz4f3jYH for ; Tue, 25 Mar 2025 15:29:34 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id CD93F1A199D for ; Tue, 25 Mar 2025 15:29:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgB3M2ZxW+JnZofaHQ--.14216S9; Tue, 25 Mar 2025 15:29:57 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, tim.c.chen@linux.intel.com, bhe@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/8] mm: swap: factor out helper to drop cache of entries within a single cluster Date: Wed, 26 Mar 2025 00:25:27 +0800 Message-Id: <20250325162528.68385-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250325162528.68385-1-shikemeng@huaweicloud.com> References: <20250325162528.68385-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgB3M2ZxW+JnZofaHQ--.14216S9 X-Coremail-Antispam: 1UD129KBjvJXoW7WryftFWUuFWrKw1xWF1kGrg_yoW8ZFy8pF yagwn8Kr48Xr13Gw4Sqw45JayFv3yxW3W2qFy7Gr1av3Z3Jr10gFyqyrWa9r98Cr95uF98 Ca4DKry2gF4jyF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU s3kuDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0F1621C0013 X-Stat-Signature: sniipuhsbrwqtwfixmoej9aweqysn1cu X-HE-Tag: 1742887802-461140 X-HE-Meta: U2FsdGVkX1/1E1JP+2JIRwZ8feNzROlHGNNMb9A+besaR+5uy6NASYXk1TaWM+3k6wHsxpbb6jpsFpTYyMyg0SJAoPsZfGHp7UL5ehIvcEP9j0p44sH3FikQ7Hll/T7s0GtLq2h9bo0i/CqFOyF1RMY3wyfno6UqCtxeONyWWh9QAIAG8gVsqK+yp0h7BR/7t7gXpdIOd1kCkLrfHEnkgkt+eGISVn++jVFcoG8zcufQ+7xq0B1320SflJ8UUoC7cv21MlfJEJTZGeUSDsSjf4R/mljwSzeks03YwNmu1Zb+3l24kfprBbbXKnKzBlumaWcSQ92ybde7nwsUhXUo51+IWMzLWfsqV6bYINCy+FYaHWvaopB72/s6eo89AWuhMtyPzskKSC+PKgWa4woMFJJFHEkueXPiWXqCooYIvAkgZCd/NXqeQv6TUfyLO20XQvJEL3UYNuugKkireYRWcHENJmSxmnsp5cMJPdNNeOqCPb6ZHcYWpS6UBEKJIs3m09gz4o5V89L3lDWAe82rOrU4x21GREiOe2R7YF+Qnso2AgrJNXhYwiIXb024FeJYaWrFJOMdilCb+XDZweU76Clr3ycyAkevnh0AGhBdJ9hTBM7iHNMyPh9rjLuJCf91c32LS54SmuV8nGzUNKj0X+zIJK7QJ7G5kb03CMR64/R6SRf5i75HglzKy8cHXmeue+wX2fMfnplVOxvDUXouoSAS4pBvanBcP+9izyFvGIPqZ5UEw1X68kG+Xe7922ch6iD/YdNt8N2pgpFiusVUCyY9fx8o+QToZrZd7ZiR+CHW1yyJPofJpG6C9oyuVs7Ve6BFha0kAM+u7L3u4J6ImpQxy73SE7M/kfg2kl/orc4DpsEcOlUiEnDQuPnme9Ep8rxN1VrkPPM5TjEKRyuYdWXJpy2ztBB143Yj1QWtwudhWUTjMwpaYvMasD+r+qwhMpAg79CrbGbr+NJj5f7 yVMu/i5s x2qBf0wBAVw2qK9FV3hF5W8anYewr+VYEIvlSmxw3Rpp3l0hPY63qzGfzYIEvKnefn9nvRfowju5Thdgs48Ngs+2qVlT0BBtg40uAD6nN7QxkG0C/HZFeV0YDMOidZgRi6V6w08usNjrGY+9U7r3lNJQWvBcqJaeeF+ZH6i35kMVyCjWGuRp9cDfu3bbBXpyuohqYYPdKyjmSfFnXMN5pyJ/VISx7ve2+5ZJx 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 serve as a general-purpose routine for dropping cache flag of entries within a single cluster. Signed-off-by: Kemeng Shi Reviewed-by: Tim Chen Reviewed-by: Baoquan He --- mm/swapfile.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 646efccdd2ec..40a7d75c01e8 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1455,6 +1455,22 @@ 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) { @@ -1595,8 +1611,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)); @@ -1604,14 +1618,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)