From patchwork Tue Mar 18 15:06:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14020343 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 51BE8C35FF8 for ; Tue, 18 Mar 2025 06:10:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5FC4280001; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C34AC280003; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9506A280003; Tue, 18 Mar 2025 02:10:39 -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 68AA3280001 for ; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B2C101A0964 for ; Tue, 18 Mar 2025 06:10:40 +0000 (UTC) X-FDA: 83233647840.03.143CF6F Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf05.hostedemail.com (Postfix) with ESMTP id D432B100007 for ; Tue, 18 Mar 2025 06:10:36 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1742278239; a=rsa-sha256; cv=none; b=np3RrWSZtC/HVzqK8JxsfdeuyUnXJpd/EFKCrLKO0hwv1f1BftxDwGfaqKE96NpO6XP/1d bG8GcUuvu7FNZCbaspbObzGV9CaDdOpjesmuPisilxzPV20eUTM5mLvRWH5JghTepbkQw3 A2joQhosdzBYj94xlWZBAKtBHINiWDQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1742278239; 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=dQVB+VPaharGcBY/3eC5N68aQjXdHCJ0Gii6lQHB9bE=; b=5h7xgDyKC56qVNALlCCYH/0dV/Lrc4nQF/s+oA1C05dOmBUtsaTpiwUGSrmBCT0WTUrnxU WXAL5WSGszebmz9BCB5cosxlO3kC7/i4ZXXgsi5JT2YGEx/R8Pv/LGqPMaQdAXD4GdcJC1 7kGHyAfcQYm0ch/dY94iIHDMu29Mtsc= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZH1f725bxz4f3m6g for ; Tue, 18 Mar 2025 14:10:07 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 614F01A058E for ; Tue, 18 Mar 2025 14:10:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgD3AGRVDtln65ErGw--.37695S4; Tue, 18 Mar 2025 14:10:31 +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 2/8] mm: swap: remove unneeded VM_BUG_ON(*map != SWAP_HAS_CACHE) in swap_entry_range_free() Date: Tue, 18 Mar 2025 23:06:08 +0800 Message-Id: <20250318150614.6415-3-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--.37695S4 X-Coremail-Antispam: 1UD129KBjvJXoWxWr45tF15GrW8Gw1UJrW5Jrb_yoWrXFy5pF 9Igrn8Kr4xAF13K3y3Jw45tw4Sv3yxWw10gF9rGw1av3ZxJry0qFyDA3yjkFy5A3s5uasI k3WDtr17WF4jvFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPFb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUVveH DUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: jmt1tzwbpnwgg3ispaz78gfjzj66js99 X-Rspamd-Queue-Id: D432B100007 X-HE-Tag: 1742278236-404498 X-HE-Meta: U2FsdGVkX1++zcMfDvRKy9web6BUzLGyxvwkziIqDf5nrexD78b0QHrkN1vfY66YMRho+7Da3brjkhdEUmu5tJDF3Vo5iOWA2Wml61AXiss5v7gZSt1mKTWl40R2wKcx/e5hNNMGDxigQklxJZZVIET7sDrHKFAHZcypcPfH99ohCAemaVXo6a+vh8FYMZHVbeH/y904WyYnNpHtP+ou1MM02jxFMoLUGevoMBwuUm+nw8wSMfDKDSIrV+lOD+2ZNtgoSOsasaVS61CnTI2bkQzfQE04hMOjIw+uGrubu67S48gOdA8FtBGNIKws6UzW8mqOorKBMn5lPqwMgxp+z/1kbUelAQ6G1xBBB4YMmZeNdSrBE6R+/mg06M5mso1gWTMSShv7LqEdLRlFO9QF334F3n5wcoQuuOF3n40sEqHg4FT28q4SD7dKUuzi//GRgLrAMcFJw7v01e7IsAjO3fdLwAGfWAVBBJS+a0p8Zghv5BeaE8OrGBk4XYeAa/3Vg1a/bVgPBG/HnELwmFsMNPnTMyrnKoIIGuMYQ9PUkyjpZ1h1Zns9pZSohB/S132xbeb0/v5A/Gv50C56Df8oApa92kiqsoXcLWSLPbXes+EsGdilLoj4RXEqFjdaYEbD6WoFeijwOtvGXGUfHs/EnwrPG0h/LLp7HaDu/7xiPHJDc9se1Xz2OsMsrCUM4iGrxacBteNapvX6DqM8npUZFpxe3/o0g/2FNpEGKL3zk/GmjndjejaBvzsJOi/f9LYf8f3Dck2OX5WDgSXHRegu1vFLJrkXSHB2qpWjzuLkf6RiK09n2kSQVUfrQKLAwXH2mNHfuDEgjnfiZH6ZqaYssRji9vJY4QEhGZhVB66j2gcvHFZ+Z6iAoYnOW8LCuK7vLY3d52g9WDAW8wDAXe0RFZtk7C65J9X0liYSkh0HHhQGgxgU/oxRmTLPAuwEWs0BcmJJgJnH4QYqPPFpKLx OftBBGPc WtTsYe9fJBuyjTFCK2XmTMzsY1E0KJcGmzMi1SVRDmKgm7ZNzkMSXeGf/9S2PT+MoVjzGkwe/JZ5xWHy8ZHueR3ca2zOdOHfgRWt1iHnla7sNoCQSQhJhx46aA6PUwh/Bq7wVG/sxqNVTB4PerD7W0lNtwFD4phjWx1JLDMlNoTIjiO1yyAmT1bbeUYuUN3l+SMv2YJZnab5nClw2DRJ6vpAlq7uUOoPghakaH8dwkAZXmFpFRd5tmcHYZkp4ivEUA7Hjsq34T8Yi0Kss+a0NvN+OfQ== 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: As all callers of swap_entry_range_free() have already ensured slots to be freed are marked as SWAP_HAS_CACHE while holding the cluster lock, the BUG_ON check can be safely removed. After this, the function swap_entry_range_free() could drop any kind of last flag, rename it to swap_entries_free() and update it's comment accordingly. This is a preparation to use swap_entries_free() to drop last ref count and SWAP_MAP_SHMEM flag. Signed-off-by: Kemeng Shi Reviewed-by: Tim Chen --- mm/swapfile.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 5a775456e26c..0aa7ce82c013 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -52,9 +52,9 @@ static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); static void free_swap_count_continuations(struct swap_info_struct *); -static void swap_entry_range_free(struct swap_info_struct *si, - struct swap_cluster_info *ci, - swp_entry_t entry, unsigned int nr_pages); +static void swap_entries_free(struct swap_info_struct *si, + struct swap_cluster_info *ci, + swp_entry_t entry, unsigned int nr_pages); static void swap_range_alloc(struct swap_info_struct *si, unsigned int nr_entries); static bool folio_swapcache_freeable(struct folio *folio); @@ -1463,7 +1463,7 @@ static unsigned char swap_entry_put(struct swap_info_struct *si, ci = lock_cluster(si, offset); usage = swap_entry_put_locked(si, offset, 1); if (!usage) - swap_entry_range_free(si, ci, swp_entry(si->type, offset), 1); + swap_entries_free(si, ci, swp_entry(si->type, offset), 1); unlock_cluster(ci); return usage; @@ -1493,7 +1493,7 @@ static bool swap_entries_put_nr(struct swap_info_struct *si, for (i = 0; i < nr; i++) WRITE_ONCE(si->swap_map[offset + i], SWAP_HAS_CACHE); if (!has_cache) - swap_entry_range_free(si, ci, entry, nr); + swap_entries_free(si, ci, entry, nr); unlock_cluster(ci); return has_cache; @@ -1512,12 +1512,12 @@ static bool swap_entries_put_nr(struct swap_info_struct *si, } /* - * Drop the last HAS_CACHE flag of swap entries, caller have to - * ensure all entries belong to the same cgroup. + * Drop the last flag(1, SWAP_HAS_CACHE or SWAP_MAP_SHMEM) of swap entries, + * caller have to ensure all entries belong to the same cgroup and cluster. */ -static void swap_entry_range_free(struct swap_info_struct *si, - struct swap_cluster_info *ci, - swp_entry_t entry, unsigned int nr_pages) +static 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); unsigned char *map = si->swap_map + offset; @@ -1530,7 +1530,6 @@ static void swap_entry_range_free(struct swap_info_struct *si, ci->count -= nr_pages; do { - VM_BUG_ON(*map != SWAP_HAS_CACHE); *map = 0; } while (++map < map_end); @@ -1553,7 +1552,7 @@ static void cluster_swap_free_nr(struct swap_info_struct *si, ci = lock_cluster(si, offset); do { if (!swap_entry_put_locked(si, offset, usage)) - swap_entry_range_free(si, ci, swp_entry(si->type, offset), 1); + swap_entries_free(si, ci, swp_entry(si->type, offset), 1); } while (++offset < end); unlock_cluster(ci); } @@ -1596,11 +1595,11 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) ci = lock_cluster(si, offset); if (swap_only_has_cache(si, offset, size)) - swap_entry_range_free(si, ci, entry, size); + swap_entries_free(si, ci, entry, size); else { for (int i = 0; i < size; i++, entry.val++) { if (!swap_entry_put_locked(si, offset + i, SWAP_HAS_CACHE)) - swap_entry_range_free(si, ci, entry, 1); + swap_entries_free(si, ci, entry, 1); } } unlock_cluster(ci);