From patchwork Tue Mar 18 15:06:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14020344 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 E8796C282EC for ; Tue, 18 Mar 2025 06:10:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DC77280008; Tue, 18 Mar 2025 02:10:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 027EE280009; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD501280004; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 73718280004 for ; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CD0BC140AAE for ; Tue, 18 Mar 2025 06:10:40 +0000 (UTC) X-FDA: 83233647840.30.650AD8D Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf03.hostedemail.com (Postfix) with ESMTP id 48CEC2000E for ; Tue, 18 Mar 2025 06:10:37 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; spf=pass (imf03.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=1742278239; 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=pZWuk8XCOJsoj12fYiiNKjxaKmMBtIhDEmyJ7bXyEeU=; b=T8cM/hswFtWNeZF2yQwVSFF4jTqdt9XTy+HbBjtZjLNpoY/UDOoK8E684kU+AjglF+/F4q 6AgOri7gSXGrJQhBSYPhIVv5yRRd0RyhuQXf8gtZLkYplzSvd7xuvAZ2Ph31zjdlp5JxDg x3Ejux2j0q4bkNrl7NlJ5qBT8TSOTVA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; spf=pass (imf03.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=1742278239; a=rsa-sha256; cv=none; b=IcOaC9rcDyTPsSktwmikxuw7vz7kGxFBuHkgi2uQYh16Hz8mPDxcvrBhXxWzZzPQF4FhUF 4qVnn8kL+TlXYQ/C8clUc5AqVeMglsn5Ma37wKlgUbgBUfjODJfrOmbOFYqQZPL/zBKFRY Vaxb56CpDncH7twuksiQ10dt06EgFo0= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZH1fH3n8pz4f3jtt for ; Tue, 18 Mar 2025 14:10:15 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id C6DCB1A125D for ; Tue, 18 Mar 2025 14:10:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgD3AGRVDtln65ErGw--.37695S9; Tue, 18 Mar 2025 14:10:32 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: tim.c.chen@linux.intel.com, ryncsn@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] mm: swap: factor out helper to drop cache of entries within a single cluster Date: Tue, 18 Mar 2025 23:06:13 +0800 Message-Id: <20250318150614.6415-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250318150614.6415-1-shikemeng@huaweicloud.com> References: <20250318150614.6415-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgD3AGRVDtln65ErGw--.37695S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uFWkAFy8JF13WF4UXFy7Wrg_yoW8Zr43pF 9Igwn8KF48Xr13Gw4xXw45JaySv3yxWw1UXFy7Gw13Z3Z3Jr10gFyqyrWavry5Crykur98 Ca4ktry2gF1jyF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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-Stat-Signature: 9f156iqdexngeza6k9ibdgr7889caqdb X-Rspamd-Queue-Id: 48CEC2000E X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1742278237-203100 X-HE-Meta: U2FsdGVkX1+zXXvvo6m3h6VyuAxjPx7qRiw1Dq1yU2FcDTPI0rky9aaF4eYnxlS026o0Ds3wIlLR7OeMWDPYFwu0eP4rrfl5nkEGa3XKIe6pfXVZFydQtGU5KRK1svlzowacZlvo7GgpF+0hwSF3fuakYn/QJGxwQC68o+F70+0qNzas2hwhW/rmO7nrK4JlSfrQEK0oqzdyt4ZrKeHhZtTwHQ2Govl8YT/+jf45IKl4Bys4X/1wdXDQ+jZn+B+FQ2cfkudeA9TmCXfoO8OUB+A6na0pz2Z41RP9XyGsia65h6CKus1PSGGfs90mpNaDW5sixxwR+lO7x2dcQxGRinPOm/h8terINgm2wRAq4IHrfbH+4tqR5AtX0967E8eaDnYjAq8qUm4ZSGSYh5ND0WZi40NnDWmKyDQ/FrO7XT+2e5sbNI45WQpR32TVOF2eWIQ2bny3lZhwgfPjef558Py6ev3HgF5G0+QiGIQk4LN/b+LrSvB83oeFJM9gKebHNv7p/m0Xyaf1AwoCjh/PTVf0iP5YqtBS2eZ2I8Gi52Fk0zh/m/ZXULRART2MKS8uQsBPdvmCwCrcCm4uuzmYUrcNOIg7gxcDHoE9YDN8xWZHtNzXYB3CYGK4CMOyE53w4qxB79dbrASqDeJhcYmvW9VOG012M0ecQZ2Cn458SM7/u8ji1s9Cw1oOYH2mNaBoXwWT6Q1q6TRJvmxg9U0pbh8bvyRe8ZNMEsUtb5YthkT+ZzjL72s7+oFBcdJd1sff/HElf4wSsRxy9zFUvXAfg4KIpArYCb9pO/Cow526APdr9i3uUMknVuHBbhgDhede43wVpee6EEIphvxncDNu9INxpGpD1eljhu6ksxHuupeI6F9VgudOIBm9duxiwhDaI29HpjK6jErcrSdV6JE2zmNMx+/DCbbpBzoDQEQKHymPEdv3G2wwc2dCQDvbvem8wUXNJ0WWzSjhQkGkSap L7dF33cM LVzSL/b431jam61O23M/CiUxT5ZT5J+I6I7McohE+15FaS5nEmNYOs7Bat8Xc46J9eYtaWI9kb0QljcamVVqCTsShw9VopmOBRylnyrWrCXVzKQMKwAgPpLH63U2K30tkTvvB8hJ4uqufazo4Ix5tadFYALAS6ND7EMkFjiS5GipNH3iFNJN5+VoBmta9+IyUTvNI 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 Reviewed-by: Tim Chen --- mm/swapfile.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 370509eb2f1f..919daaa3922a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1455,6 +1455,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) { @@ -1588,8 +1603,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)); @@ -1597,13 +1610,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)