From patchwork Thu Mar 20 11:48:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14023367 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 E9343C35FFC for ; Thu, 20 Mar 2025 02:53:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F6B5280017; Wed, 19 Mar 2025 22:53:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09FA5280019; Wed, 19 Mar 2025 22:52:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A35F5280016; Wed, 19 Mar 2025 22:52:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C5ABC28001A for ; Wed, 19 Mar 2025 22:52:58 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AB93AB7FA8 for ; Thu, 20 Mar 2025 02:52:58 +0000 (UTC) X-FDA: 83240407236.06.4320F37 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf07.hostedemail.com (Postfix) with ESMTP id 4AC7940007 for ; Thu, 20 Mar 2025 02:52:55 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742439177; a=rsa-sha256; cv=none; b=nS95GKruYb+YgWhP/4PMCyDnuxxZ9TH/BHEA0rvOGMKod1xOxZV9R7D2llD7ZMPdX410vC SWR/6qTwGILxdWZpIat9Br0v47WBvcs+xnzW/ItNMjOxoos0rtYJsd1Iqfx1DjghOGxwFC QSXhf+Tp3Mbp+FA5FooEEjIVJ1IAGXg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 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=1742439177; 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=+nB5yvayjgNcX/Chl87fBU5Xsm6igsVeO3k8ELr2hiQ=; b=cJ5ccaLmyH43BmVciz7P1gRSYv3bxoiX+YL8nR7Y3lu/7dyIW+bkZT4pmuPktVd6axcihQ xnmjpYvpYe0u6s4hJaNU2BpAXjr8ajem5MKhy60LvUwGkBpP3XetVdlfEByINVh4GdYbTt bUKKL1k5qS0f47RE5nGEQRddg2E/LLE= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZJ9986yhvz4f3jch for ; Thu, 20 Mar 2025 10:52:28 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id A53EC1A109D 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--.42197S10; 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 8/8] mm: swap: replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() Date: Thu, 20 Mar 2025 19:48:29 +0800 Message-Id: <20250320114829.25751-9-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--.42197S10 X-Coremail-Antispam: 1UD129KBjvJXoWxCF1DJr1rCFWUGryxXF4rGrg_yoW5XF4kpF Z3Wwn8Kr4xJr1xGr4xXw4DZFya9397W3WUJFy7Ww1rZasFkryIqF1vyrZ7Cry5G34kuFZI k3W7tr9ruFs0yr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w 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: htxzfismoxa9buuu4nd4cxu57tpf5gax X-Rspamd-Queue-Id: 4AC7940007 X-HE-Tag: 1742439175-101791 X-HE-Meta: U2FsdGVkX1+iRuwCjUBVnE/m+hHZsWIF28qDV+bhuy5Cga1nEaCUQMGsQJa8vSMYbpqNcYy+ThnSAew6K8NFPySXBo8Edlsze6n5hjLA6HTl34TN/Dez1PpCgvFsm29BKORsuSiHTMVmkdAAoFfbhngcIGtEmjeE/sQ8zq6Hjtil5h1XxtgPfB9B21DgOozfRehBwr3PgZ/P8mQgKdCDhP8pkGyChbujkgnBBnpXxZmPkE82iRiSS/JmrqqiDM1FQzr1KSOGpS5QG56grn+HQuaq/IvJms62JpnMb8NdbTolLBInhkrV+Z6ixNxOAasSBW6qd0fRLCLd1UHV6zZoLDnEbjiYxkOzBJxhaHZ3YTJNmz3FyifMMNqTB0V+EnRThbPYPbzILrhMSJeqXX9I8lL6irds+4zp7xmNPcJuIVJTV2bAhyuf/tdTblFOiCitFU1kJmrxmPPBnf61Jdi1RJHl46eMjGBO5y47fyIbla/whCIMToyRqZPTutB/aXIZZIQi1vBY98HXmWkoqQkWrpQMAIdxiGusrc4TJeftD+1LXb6Gf7payZEGvkyVg/hIYu6DUt8jOsoMVLWNWIdiGgP2FmvJVgwDsEfEowJtyNa6mvv/mUhlptWYCdK0ADtbOpAw4l4WVrw6cuvmKN7gbPhyVCnawp2Z0l8hyIHayLouqz9tNC2nxmvpxA/Q37Slpo7tU6vQxo+LJztBr1VvlS0w0ys9MTCyqGnBK3DipuANMNez8VDJ2mYJvBYhOlka9VGwKyZkMfLC0b+w98qIUZ1cp12oN/qq6OdJMhpRGefPNa3zsBApcoftBznJwGxLhaR7YB8GEMSfO6oYxC51QYoFoFYcy+UL2gMMSQnygf3dM83vgl1/QD5B73gRkYK5JkZlARaLZo/YPpzYddlA3Lq9zvPF3Dfm2q5JJwf5c+xqGrmIcNtZbgZ2ffZAkZZdXB298Lb7LOOh5ljAOTY FR6+1qHz Ul4zCXR1vdedHkKQt29ANmPciwvNnMcb/2X/sYTy3zRMiGyNtyQ9ekvHgozOc55owbZvFmuRh/lptam5MVy3OWMHdswVp6yLlzkrfPg4IhE0bMmaKBUDmtOw8/XdB4BvAPd0AxZusP2DGC3UqEfttsG+8hbJmEFVQQAWDPi3k+ooygrgKPGahQ2BhFh3Y5k3zW5pSQU6kz2xgNZPGOCy3oLiHlBO2rvbUCsX574uJLA0kH5d1xUlKu3Xf7w== 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 --- 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)