From patchwork Tue Mar 18 15:06:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14020349 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 A4A14C35FF8 for ; Tue, 18 Mar 2025 06:10:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F34828000A; Tue, 18 Mar 2025 02:10:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 050CF280007; Tue, 18 Mar 2025 02:10:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5BC728000A; Tue, 18 Mar 2025 02:10:44 -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 BDC38280007 for ; Tue, 18 Mar 2025 02:10:44 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1090BC04BD for ; Tue, 18 Mar 2025 06:10:46 +0000 (UTC) X-FDA: 83233648092.02.1CE880D Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf18.hostedemail.com (Postfix) with ESMTP id 7B2B31C000B for ; Tue, 18 Mar 2025 06:10:43 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.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=1742278244; a=rsa-sha256; cv=none; b=MpbwZ8Az7S71RgaAozTc/OOkAQazuLcwLy/xxte1cOqPM+oPUPQhtTnA6ZqWI3aIp9MEGT C2KrlA8F5wxgmimxJ6z9WRgSXEgrm3K8YzbeRSe+YcBh/2Cfwp62jmzEJvDuf+elRDZ4rF Rl9za93x1uMtB3x7tVj4MUcZk4GFSUE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.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=1742278244; 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=nZYIGlMkOgqdoxPKCxEEYXPzHnTNoEgMTcbbjluQhO0=; b=7n8uUXOICXzV/KVjh79Mj4ny8YUavGRmFtNRLolq7WqDmN82G+urlCxhiyDr/frqH9rEvR 0ZhWI0VUiWgPKP85g3LMTDzUvhXVq6v1DZZbaeTPFfmWfuIv6Oe1Di2uKOg5AY6O6MtyNP QyvJ7+6lkCpSKyiIJ1kU+zRYVZCmcs8= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZH1f86w09z4f3m6g for ; Tue, 18 Mar 2025 14:10:08 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 14A8E1A01A1 for ; Tue, 18 Mar 2025 14:10:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgD3AGRVDtln65ErGw--.37695S10; 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 8/8] mm: swap: replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() Date: Tue, 18 Mar 2025 23:06:14 +0800 Message-Id: <20250318150614.6415-9-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--.37695S10 X-Coremail-Antispam: 1UD129KBjvJXoWxCF4UZF4rAFy8Zw1fGF4fuFg_yoW5Xr45pF 9agrn8Kr4xJr1xJr4xAw4DZryav397W3WUJFy7Ww1rZasrKr92qF1vyrWxCry5G34kurZI k3Zrtr9ruFs0yr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV W8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU s3kuDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: a1s8ncqa5rkpa47unwk1hmybh8hou9xz X-Rspamd-Queue-Id: 7B2B31C000B X-HE-Tag: 1742278243-563291 X-HE-Meta: U2FsdGVkX1/DD4z1aOdQpaI6B1WueOczZPGgtMJ93a1HDa3FwAh7R5ykxduf34xlHJYKjSYC3sEnPKCtun1f7vHxCTBzCIF5O6SG87QV4pP+oqTZuR/EWhf4gig71oLezFgqLZQtDXvYN/WO3kZdKfUebPayP57uizKt4cSvnm+W7DKLygDatYYZ/diIN0TlLa8ekulMDr9AtohnYSdIBPi1/807PYTbzid+TNHHbFlLVe3a1Lhshm0zPLLhoaD8YE9RQqE8BhdJIYukrhqVAV+y6y1wAxeWL97MXgpkwKxPHtLYPWvH/W8Uf+b1mILOj+az8XoZI47P8QAeT4XaX6yo6E93M9Z37lQCTl7yAb8cbx6yG0FrhS4J1xdS7JaYrRB5WSAwVSmnm6xnT2nqXOQjY+gR5Ibbcqu4vv+Ttdj05msw4ZP38qnSHDE7FkgmHQ6HOWcVgrHkah3ZC7XPJQSFLPOifZRtMAIPxYSAyJi4vHb3D+KRQRC37Ub+gKB2wMnOKOZ5THwuWoGAr0lltSSdW38qgIAVdXuxMbPUajY5SEh/ETRa9JUdcJFTHCtRCciwWz2K+7vrN1siJlSdMEgC4Sgd52ZmbXCTMcEkh3XO5m8IDV1JG9DG4W70Aut6q6SCIlP/ujEO0cqLQaTCMaXhQiV1nUoj6bwuzKZx7iAc7pcbLQYLxy0+W1nf5pi/KWZZP0rkMdQ6ni7QnrBzH+F9kBEX1rK+UBw5OrZ4dfh5S0ei/Kez4xsg8VcMmSneVaIOy5g4sUJkYhwPCfxWu8qiSDa6H0luk9Ygxut3F+kLOu/dJUUFZBVewvWNDSB4kNz7JBemmwdCeFz09PhKlUk1LyxUbyhmJEkFDPJ/Hr2HnPxUvEbX4nSHKTgTgJlAdxEA0QL2ydSvZ6HOTOJYUHEnwJn7DFLeQyEaMfjNQ9Vmd3hKnnHG6p0mbFSIeTAsIPjDlpfQQxPhCb/UZIz e8ny9BQJ ZTPPXUBaJf1lUfrVvuKdKg7JVnxeHJbrLvh3fBCyQfu/y8VwqIIYawM+DoTHpmHm9z/79P5k25E0+nuG2wXrJJwlh66oRCqGWzz4LsQeH3vxluBomOW5wXAATCrY0AlXFlbXMehem/jh+ggz0NGBfKmNM7HIR0fXdvXdA/AvmezM85sbgnoZFZzX0yUGqayIE/6wjSlI2qVl4WhYjIhUZIE2sNA== 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 --- mm/swapfile.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 919daaa3922a..7f3e9ce998f9 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1511,6 +1511,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) { @@ -1561,21 +1566,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. @@ -1592,7 +1582,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; } @@ -3615,11 +3605,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)