From patchwork Thu Mar 20 11:48:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14023368 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 510D7C36002 for ; Thu, 20 Mar 2025 02:53:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B542228001A; Wed, 19 Mar 2025 22:53:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B046C280019; Wed, 19 Mar 2025 22:53:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9817428001A; Wed, 19 Mar 2025 22:53:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 71B87280019 for ; Wed, 19 Mar 2025 22:53:03 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 62636B7F7C for ; Thu, 20 Mar 2025 02:53:03 +0000 (UTC) X-FDA: 83240407446.23.B4766FD Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf15.hostedemail.com (Postfix) with ESMTP id 07FFFA0006 for ; Thu, 20 Mar 2025 02:53:00 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742439181; 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=Tp0/ysp3nLQQHGfaUf0+hlrtUQ5JR9wezteM5dANrb0=; b=f5f4wvBOur2RJVSTDJv1kjjcH9jHpXien0GcO3UPZJXVZI23Ppl7mM1KllRbyRDPGicQnI znJNuZJc7VVs4khCcCLqn/T0z/QHMw4GRh10k7R0E98MfZ3ZEx2qwf/uwOTP8khLiqphe+ BYQGI6WCSRRaQTqBjstTt+VluOSSaSo= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742439181; a=rsa-sha256; cv=none; b=4RqtYxff4Xi9Z6O5EOdDxeaC4tGhcFZ3d/L4PqE7zU+nvyubLUZcCNvuNxO/v/M6K2lgGE xw0D7Il8vzuF+yNrO4AhZCAivQ0beNk3R5OqQvPykX9q0San2UjA5nM5nWOydLvnI2GQ9o W8IZO1ZavQw+iytOulUsy83ssALGo1M= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZJ99F5jP8z4f3jt8 for ; Thu, 20 Mar 2025 10:52:33 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 23B2B1A058E for ; Thu, 20 Mar 2025 10:52:51 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP3 (Coremail) with SMTP id _Ch0CgAHW8X_gttnYGGmGw--.42197S9; Thu, 20 Mar 2025 10:52:51 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, tim.c.chen@linux.intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/8] mm: swap: factor out helper to drop cache of entries within a single cluster Date: Thu, 20 Mar 2025 19:48:28 +0800 Message-Id: <20250320114829.25751-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250320114829.25751-1-shikemeng@huaweicloud.com> References: <20250320114829.25751-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgAHW8X_gttnYGGmGw--.42197S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uFWkAFy5WF48GF4xGFWkCrg_yoW8ZryxpF 9Igwn8Kr48Xr13Gw4xXw45JayFv3yxW3W2qFy7Gr1av3Z3Jr10gFyqyrWa9ry5CrykuF98 Ca4DKry2gF4jyF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w 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-Queue-Id: 07FFFA0006 X-Rspamd-Server: rspam08 X-Stat-Signature: bbesg83dh879t7qpkjoc6fhi6b7bre99 X-HE-Tag: 1742439180-729340 X-HE-Meta: U2FsdGVkX18icKpE1w+kLMrmwM8Oc4uelN4M4fF/3EwGGbzjZA6tqFsMvHSlyrHt4hnUypktor4iJNRhaiHyP5A2vvqHv+zXgZB0r9X2AUUl0e5p/oTN4rC5INh9scCpTowW2id2NZtmferNrXxEDeYC0HwzW7RSkA7E9WFupu7W7QQ7cuuG1PJ4wNNr7KDn5+1QQQiWoNzA4iH38yqfOx5sLo9ycQEa0MQyQlhQHXKs45EKntQsb8XF3aJWB+ly0VkfqhLcBgMAoVZ9oOrLZYQikhagupglcKyDMSTyJY+OCTo0rcZdPKVvIJxbqUgNO9T3dGgdTPo74X7DT5ItLOBIiQcrLwJIseIcUnb7u69iZDOioKAfr72wAhs+G346CWHiOGLy7EpwawXhrwLS8im9iVizlnrotaer1PAvDL0GO1bfmITeoCYwXpdV1FBXj8LzGg3lWNz8SA79r7gxhCdrFlJMUPLghf02Em6er1I73Nr1gPl5fEtW6d/1j9tWKww2JAhdMB4AoMMMdEH3m0dkFtdmVHFRrbGJmrC7nyEjPH5yKrtIsjd5NWsx4dsQVwbDoRzTqEaLGG5C1uzPUNv3xPyBQpAN8DcrHVKY6u6i320CWwRmHzg+axa3w+esjw7IVCgCJchYzihIf4JcGHtkFFxRo0vXS/vUepJq+9+ALhigEIZuw5Xz/kQQlhH1htzAOiEGwd+ODjBCdDTzaCQD+Ay1fNx2rWI17EWtU+A6McizkRNvSFhrl42buszdKlRGyeS2O3tGYmJ++JorNuOXlTIvhApxHt2gAiMSDZtEUxV0AaDMlfleXNf2mORGxh/45Yla1AqrMYWmqY45ZHM31M+96ZZ3VvYTgOZh2lFydSc984gZQHsuvQKaaLvgTgBanoFUKyCHJq11HJNb2Qvm+SP7DqjXZf/bUQeUtrcPferg2pOH95yBl6ldP5MymsDxNdyizPwilGmjvaF JMAL2CE8 irDYDyO4s07qxXemvOOUINpQoNEIbexXIQJA+We26Gpfhpu3O+Z72PpHWaw3WxsKmQZns76UwT6B7/oZgiZiv9aiirRFXoprC+fB9VJQbG24cyyOfz21jNK1ujx6tIjLvfrKU2TJGV2ai47kjNQJmFtbdBD31xUDGkVrxsJG0EnGl+gXuLnyK2N0Yl1IlrUR+nkyN 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 | 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)