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 71B09C28B2E for ; Thu, 13 Mar 2025 12:09:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 770B1280001; Thu, 13 Mar 2025 08:09:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1227928000B; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC5D728000B; Thu, 13 Mar 2025 08:09:34 -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 3C72D280008 for ; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 56B3A1A2019 for ; Thu, 13 Mar 2025 12:09:34 +0000 (UTC) X-FDA: 83216408268.06.17D66FF Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf23.hostedemail.com (Postfix) with ESMTP id 0273F140021 for ; Thu, 13 Mar 2025 12:09:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 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=1741867772; 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=M95PdNHeN90bHjN5236SIDrj9VHoN/RlhNtfrvoXB+o=; b=Aa70d7MKy4hS+Zi65sW6ogqwPHpj+o32ZlQmORZt/1v/xEzhmtTfcz6i4S8Fzqb0LNsWYI gCqTOUbDqg5Dg35URMmNmxOXd2auf7lwyQGOPEVQJlAsRR924ug4c1kxqhOLG/QOXxWoM2 5wJH2Z1gVaZc/rz+LkvHaUE2CmP8vFA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741867772; a=rsa-sha256; cv=none; b=JB3RlBknG8Ng9jpENLRAsvSUhqQ+HY4gUax+sY3mBdNNvHUlIyBYhHkXj4+PxHpdnUE7Ce H/zOGctN8e05WDS3OjKSP+ckFkGA4C+eUdLFzfZKPM6xRW5d/u1dXLmUZ+VeplBAKAIbze mh7QrWSHNOAdJfiPuEaUF4ivk7ShFHA= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZD5rZ1r5xz4f3jrl 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 AB9CB1A0D03 for ; Thu, 13 Mar 2025 20:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgCnsGPyytJnTaZeGQ--.9643S4; Thu, 13 Mar 2025 20:09:24 +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 2/9] mm: swap: factor out the actual swap entry freeing logic to new helper Date: Fri, 14 Mar 2025 05:05:08 +0800 Message-Id: <20250313210515.9920-3-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--.9643S4 X-Coremail-Antispam: 1UD129KBjvJXoW7AF13JF4UXrykCF4DJF17GFg_yoW8Zry5pF nIgrn8Ga1xJr93GFZxAFn8Z34akw4Fg3W8WF9rGwnayas3JryIqFnrArWYkry5Ja4ku34a 9Fs8Kr17uF4YyFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUsmiiDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0273F140021 X-Stat-Signature: igfuwwwshxwqxf7ckjab7akjriasxttt X-HE-Tag: 1741867769-740434 X-HE-Meta: U2FsdGVkX18hgPzzWiSNcl85HTM5mB2fAiT9pE4vpJWnaj0GcFNLzkdn23gwvSQPQ1fVXCz9Sz+KZoTk1bQA7SpEQAt3FX4/fgn/tYtS8zMnoBv0/2yKr34tJaTX4ICZmJA4zQogerP322etn/dMnaXfa6gPGOM3tu/tTMGgn594oe6fhC//ODmwdIfEsNL4mZZjcbevmXtAWMj/QfR0MGqOtT/DuRyAkDLqcsmiivhmImSJzTfBLTSvPaHAIPtM68CgmLZ177B+3+fNlsRkn0aFOcwc/HXIWN53hyqsJXLwgwQ2Pd8j3EK8qvuErEMK2S4la+8kpiUtvrfUlT74H+jca1hS8l3tVgGD9NCbc2KqnG2Hfi+S+reryRpV1sLMYX1iW7laVZU8j7jW2WUrgam+nxMLEP9vZcZxRBMeDigkGWX3EJLqsNF0Fz6/7MKvLCs0wE6dnzrVlYC+Bd1YDVKh0YpWFfkecou+RD5P4JZUZmpecL4MCPzchICncjOdURXgg95rtSqh7MFV8bZqjggc0aQYVRTbJygpWSys/Xif60yVjeT1g9TPSm1IED3OHyL5wRS1PtXC0r9Uzo2QH/nKiqxC00QXO49n3Cw7qkHyJiBQkyyJiiG1oIDO50IdUOpXl+YIs7YHHjmyhCqDUjbyIRjrDrgafV2Wd8TLE//saIlgDiBCR0yjF3azmoIuAGd10ry/y93+BmmYIWyh2BUEvcahPWRMax5lzXzTWeycA7VxHJsgbk/YIfz0Q68c8Wdj90Jrz8w1bA18xkERl/Hy/MELTou9O72UdFSpRTVEc1XsduGnmgDR3KcYww6kjAjEJxCXgCaZrzFjDJVKHEnF3a3ErfpX6/gPqVC6WsBH4jmYuK2/f69T7BQ9/QCxKpp+XMIsAZlvOpD1HbZErJE8SfBMEs6bAMPKaMIcOhfoitJ4WpFXaGwn6+eoVONWUIu0KrhZ/xyBxtjGIxd vSL8Tt0A jkxacQUZy53IOz+wzGKWuoIxcuXdx2IbNjruTyaK5O9mXsrsEM5A8+AHTafESRB251T8a2PcFJSNYPuNM+5y2O4WgjoEB0PiJ24lQT1tllKFuEhcKFFwJDKbaBM1gd3ilg06EJa3Iy5XfcH/22y8BAIoPZstAi8uZKpvSUspUbre2a9jbccYD2biHYO+NdmZLoDafTFYvlO8e4BU= 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 the actual swap entry freeing logic to new helper __swap_entries_free(). This allow us to futher simplify other swap entry freeing code by leveraging __swap_entries_free() helper function. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 5a775456e26c..7c886f9dd6f9 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1347,6 +1347,25 @@ static struct swap_info_struct *_swap_info_get(swp_entry_t entry) return NULL; } +static inline void __swap_entries_free(struct swap_info_struct *si, + struct swap_cluster_info *ci, + swp_entry_t entry, unsigned int nr_pages) +{ + unsigned long offset = swp_offset(entry); + + VM_BUG_ON(cluster_is_empty(ci)); + VM_BUG_ON(ci->count < nr_pages); + + ci->count -= nr_pages; + mem_cgroup_uncharge_swap(entry, nr_pages); + swap_range_free(si, offset, nr_pages); + + if (!ci->count) + free_cluster(si, ci); + else + partial_free_cluster(si, ci); +} + static unsigned char swap_entry_put_locked(struct swap_info_struct *si, unsigned long offset, unsigned char usage) @@ -1525,22 +1544,13 @@ static void swap_entry_range_free(struct swap_info_struct *si, /* It should never free entries across different clusters */ VM_BUG_ON(ci != offset_to_cluster(si, offset + nr_pages - 1)); - VM_BUG_ON(cluster_is_empty(ci)); - VM_BUG_ON(ci->count < nr_pages); - ci->count -= nr_pages; do { VM_BUG_ON(*map != SWAP_HAS_CACHE); *map = 0; } while (++map < map_end); - mem_cgroup_uncharge_swap(entry, nr_pages); - swap_range_free(si, offset, nr_pages); - - if (!ci->count) - free_cluster(si, ci); - else - partial_free_cluster(si, ci); + __swap_entries_free(si, ci, entry, nr_pages); } static void cluster_swap_free_nr(struct swap_info_struct *si, -- 2.30.0