From patchwork Tue Mar 25 16:25: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: 14028184 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 7AAB0C36008 for ; Tue, 25 Mar 2025 07:30:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ADED280006; Tue, 25 Mar 2025 03:30:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C84B280008; 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 1F4E3280006; Tue, 25 Mar 2025 03:30:04 -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 E9514280007 for ; Tue, 25 Mar 2025 03:30:03 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D3B6681196 for ; Tue, 25 Mar 2025 07:30:04 +0000 (UTC) X-FDA: 83259249528.03.6F5219B Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf19.hostedemail.com (Postfix) with ESMTP id 770DF1A0007 for ; Tue, 25 Mar 2025 07:30:02 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=none (imf19.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) 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=eDcecE7ywDggFmIF4cUnutAAE6EHM/8tQ4gRrnhl1oQ=; b=MnWfTu+a2WbECuCqePfyWtGn4FlVXG16KP3+cGVmF1YjeRaSWvb9X/dJVPlmV7Y86t1l9O bur0Af06e5p6M0Hu1u93QznNPmzywC8VQXSEqnegWukd/5M3WdUQOPPWdWKfPx88bZFt1M r4xyTE5cxdg4yB5CfZQnY2lYYj9iudI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742887803; a=rsa-sha256; cv=none; b=ROA7hzx52DyonG8j2pbkLS1GY1y2KVrgD+0P1DKq0NsM3MhsBDxzgbc2H7Un6f6P20+QU0 jJPTXWp4cjLm4YjOrbjo0+8rHH13eNMRDrncpRmEI2cRGnp94HZtxcuIITKRsvjkcpn6Hz zI48ITA9Ub8xixMq3YU0qUDNjDcKisw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=none (imf19.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZMM4Y5g47z4f3lgS for ; Tue, 25 Mar 2025 15:29:33 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 2B3B01A1400 for ; Tue, 25 Mar 2025 15:29:58 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgB3M2ZxW+JnZofaHQ--.14216S10; Tue, 25 Mar 2025 15:29:58 +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 8/8] mm: swap: replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() Date: Wed, 26 Mar 2025 00:25:28 +0800 Message-Id: <20250325162528.68385-9-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--.14216S10 X-Coremail-Antispam: 1UD129KBjvJXoWxCF1DJr1rCFWUGryxXF4rGrg_yoW5Xw43pF 93Wwn8Kr4xJr1xGr4fXw4DZFya93yxW3WUXFy7Ww1rZasFkryIqF1vyrZ7Cry5G34kuFZI k3W7tr9xuF4Yyr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7I U09YFtUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: 9tkpim7ep7qu5kswj11qi9wgkjb5ajbi X-Rspam-User: X-Rspamd-Queue-Id: 770DF1A0007 X-Rspamd-Server: rspam08 X-HE-Tag: 1742887802-222913 X-HE-Meta: U2FsdGVkX19mdgxDkV3xR7rHKsy2yUfMVgZfyuVBRvswjkwk4IMDWusvYoSrWdEgpSeGwpDjXnWBs+iU4MYJtR3bNG+wfdoUC9SIiQTXa7/PPHJZvSbrK0AI/qR4/uRW/X9loWjMvr+JPDEJNGx/A6lKBvGOxXOC7D3uXwkkiwpwOBvRrvJY6QsQ9MkRT+2zZjwPLdIroKBe655R/1+CHIqxe1dp+hgY3AYxgvou33AzRd47OQab/yXLsYEyTDmSt1fHIW7MWpSm+lLrTU71RU1YEqcj7/6ZqG/AB81SROA6DvTT5K4uHir016kD6omZy8ZGHuMgz8CSOawvDBMjKvQfooguIlpi0Fz/mPkZf91GKEh5JtjmG2q/gksLPoOZGVqYCZqIjKPd+ZO6VuMdzM0bwlXfuSnxA95BRRPPd1Mz5MbKaj9Yp10v5qrmS7S/smJpM3hsBhr7XXP7OGrZGSqfoukJnIIBDpbIPj4lxWzWtbf0BWEOH1k7jAQHWwN8zINjbBMTMm/KhBabv89AjDCKJ1DccfiLYwJ5Gk8QC1RNaQNsL5oFSP/YU8cVIf90BipbJUXmAltJTqwhiLVxgOt/nDod30otTeXgf6drRqjDXoNxBwi/J4v5ZhVxO4j5O74C9QYvKMHqu7xenizj00b+V2qP3tRAchA1nM63gnHglp7yg3TjRkmfRc9vMqDPhVo1kbaMOxPLe2aCbMbuhG2siQJNOZb7zvLkpFIsJTpYJzc+wTHOWmjyQ4ISGbPW2IgjK8V3YWmvDqApoYWKHKe1Kdwzju/uQ4dWF8Sd+esuExVWtt7kUKcgkBoEk+XP52GIawy8GIqp/98jIStep1JxClcKjGxmd8lZH2sVKWagZv6iX3wmen4Cd2l5ntV5B4weKdl/KbiJPf7ROI4xEV56P/Xu0FIswWlb6/OS4X+UtFYmjO9jaBXBLYqUmybsAeHzitK+o2Fzz720OVf ATxe+ww4 YAhGGA1rjPNN5Smpadk+iNbFsJrOHmATJDuMdueD0j/zOWXdk5c+2cp2sBMHx+t0ej8HFbsv0wr84zX5eirEXvB/qZFZkxkMytl8bI2QoVzTRG6/mQ+gASxfZcmHM4VuHqmgr+7d+PDl+F3PZ8uNYRADEho2ujCgfVcIlFNqFeBzV3LA2kxHLTF9VfjwD3j0Y8kWyHIcyyWMrmoUewORFwZ0BAxHAqOUeTarUbwNj6OKnXdVEnHOtTfCOEB3qxG+tS1H6WIN2MhKWblzFDvD/8C8Qig== 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: Replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() to remove repeat code and leverage batch-remove for entries with last flag. After removing cluster_swap_free_nr, only functions with "_nr" suffix could free entries spanning cross clusters. Add corresponding description in comment of swap_entries_put_map_nr() as is first function with "_nr" suffix and have a non-suffix variant function swap_entries_put_map(). Signed-off-by: Kemeng Shi Reviewed-by: Tim Chen Reviewed-by: Baoquan He --- mm/swapfile.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 40a7d75c01e8..c46b56d636af 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1512,6 +1512,11 @@ static bool swap_entries_put_map(struct swap_info_struct *si, } +/* + * Only functions with "_nr" suffix are able to free entries spanning + * cross multi clusters, so ensure the range is within a single cluster + * when freeing entries with functions without "_nr" suffix. + */ static bool swap_entries_put_map_nr(struct swap_info_struct *si, swp_entry_t entry, int nr) { @@ -1569,21 +1574,6 @@ static void swap_entries_free(struct swap_info_struct *si, partial_free_cluster(si, ci); } -static void cluster_swap_free_nr(struct swap_info_struct *si, - unsigned long offset, int nr_pages, - unsigned char usage) -{ - struct swap_cluster_info *ci; - unsigned long end = offset + nr_pages; - - ci = lock_cluster(si, offset); - do { - swap_entry_put_locked(si, ci, swp_entry(si->type, offset), - usage); - } while (++offset < end); - unlock_cluster(ci); -} - /* * Caller has made sure that the swap device corresponding to entry * is still around or has not been recycled. @@ -1600,7 +1590,7 @@ void swap_free_nr(swp_entry_t entry, int nr_pages) while (nr_pages) { nr = min_t(int, nr_pages, SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER); - cluster_swap_free_nr(sis, offset, nr, 1); + swap_entries_put_map(sis, swp_entry(sis->type, offset), nr); offset += nr; nr_pages -= nr; } @@ -3623,11 +3613,13 @@ int swapcache_prepare(swp_entry_t entry, int nr) return __swap_duplicate(entry, SWAP_HAS_CACHE, nr); } +/* + * Caller should ensure entries belong to the same folio so + * the entries won't span cross cluster boundary. + */ void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry, int nr) { - unsigned long offset = swp_offset(entry); - - cluster_swap_free_nr(si, offset, nr, SWAP_HAS_CACHE); + swap_entries_put_cache(si, entry, nr); } struct swap_info_struct *swp_swap_info(swp_entry_t entry)