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 982EEC2BA1B for ; Thu, 13 Mar 2025 12:09:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CAF4280006; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 743E5280004; 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 5DE4F280009; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 384E8280005 for ; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5E99B141FDE for ; Thu, 13 Mar 2025 12:09:34 +0000 (UTC) X-FDA: 83216408268.23.52D4BD7 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf25.hostedemail.com (Postfix) with ESMTP id 6539BA0017 for ; Thu, 13 Mar 2025 12:09:30 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf25.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=1741867772; a=rsa-sha256; cv=none; b=t/8Hl/PBFozxwOhHZ+xHwbq8DegjNi2ckbUdJdzx/83cF8qP67gJBC9Q/kga+QvMErh60u iOWH+GqZtroq4Mcv2tTJ+KWv3s2QJ6YQC5TMsRAfUOEHzG/hdUJnp+MT9Q+7/5VehIFv96 Sz00k0Qs3rw0i6rzUj3xlv2Ht12A/9M= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf25.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=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=tRX3m5fwTtAy1qWNufJtAxMoSxdfYH4F7/5ThR6oeoM=; b=H47MKJ33pHtjSNkCMJtpcMGvPhwuaYSa3m1djUTvdNy/qYJ/TO4cREJEhA+1fOsIsUr/u9 gTETZsIV3+SxVrBSSqprm7KGASm4ZZza+hd5XvEDxxuk3hIYv/kqo3LMRcAdd9Uh1uqcA9 I5aLhGxrKCbX6V8TBcXJjRTbH01kH6c= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZD5rY2GRZz4f3mHp for ; Thu, 13 Mar 2025 20:09:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 3183E1A06DE for ; Thu, 13 Mar 2025 20:09:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgCnsGPyytJnTaZeGQ--.9643S6; Thu, 13 Mar 2025 20:09:25 +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 4/9] mm: swap: remove unneeded VM_BUG_ON(*map != SWAP_HAS_CACHE) in swap_entry_range_free() Date: Fri, 14 Mar 2025 05:05:10 +0800 Message-Id: <20250313210515.9920-5-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--.9643S6 X-Coremail-Antispam: 1UD129KBjvJXoWxWr45tF15GrW8Gw1UJry7Wrg_yoW5CryrpF 9agwn8KFs7Jr13KrW7Jw4qka1S9397WF18ZF9rGw1av3Z3Jry0qFyDArWjkFyUAFykuasI y3WDtr17Ga1jvFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3XTQUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Queue-Id: 6539BA0017 X-Rspamd-Server: rspam05 X-Stat-Signature: toymokqmarigbzjucwfi4itcxa6dzoz5 X-HE-Tag: 1741867770-693291 X-HE-Meta: U2FsdGVkX1+APk7ks/3LJdkP38JI0uw7s3ACKqd29dCVs828wk+awB4ZPyeCOlVa3GirVYkBzzQSjm/wYMu1zQN9My/00Cdh49Sw5VzW2/H5M95imSAbNppMpRPaQb1erLnr+wnAspekh/D9XsDCi6F7N4gzI93nsKgolGyYCtnaU8cmBsjSJJh1ra3rWvs4HMQ10oTM9uuij8sGFEaQJ0TWVpSwkoHYnx17tj1AHuf5eAcghFzaZkRgwX07+yPsNl0DFOe4Bumg67HjsceEsqtFd6yTXbfKAKhnX61xOeUUrWwhRkzB3H05iEhSYdpb6EG6kcWQC9w6GGhxwg2NBkHK6Y4LCJ3vCGowI1C6bNAfbZpqpMTWEu7QJzwWwZObTWxDxyrxW++UCg480OV8x45JX/JYo8sCfjHzEUM75+rKRDCZFzkdr77rNWID5MseYMk4YUrlQcFnmxzxRo9GfI1csOixM0U68pj1MJOQV+tV6xG1DxV0ndF9Dpzkt4t71v+Jcmph0U/zUzFt6Jj0nBZ/f+flwM2u8rHONA/bIb+0CCXLoet+23AhiV0BhgI32L3M+/H6w3E5wBXD7pQaXVMse6IfPKkBG3keUl6yFMefEum9GPnuQqr5SkuqxVOFiAd9DlUT88rnAG81FHhozck5w7YAwFAuLIpbd/1rpQpG0ScIw7pqoeqATUCWyRW7gDsnDPkEQMHXFKK7ohkCsGG1YAMK0WN0VnSvLkNkhQMAkuU1T18gkR/jLwvvP0anM6m/eEmw+Vc4Dx5040HRPthmCIt37unItE/Z9CkEctj+qz2DcY5d0O4f2QsX0hRoUAN/SX/XW+KCl91/XmRVgaapQeaa9Juh/krFIxbNXqvyw/jAa3uEZAXu9UoCNEtWPx+TVwNLcaR95XRpWgWPRvkZ4yeLsULhz0eJKoxruj5vo1RakHub/2fUAk6g/Kbs9QLiWZm0aMHCYM7GFEr W8j+ZIFZ Og+RU7jWBVJkihf25U6+bnb+rW6rVOxWJ2DNpaTo7JvR1YswPtFbrsiqeiBECXU5vIeHiyc7vgxiikTld0T1LaTjrq7z3FVuFPw6CCb3qv2mwkpbShm+ZvOA+EBASS4mSA/77iTtNaRhKNYKSnpgKmnhwbyyYThSPEKIU/+TtdqBeGuUGKJG4XuzqIwNKrpW6RHjRs0o7NqSMC3AZxckGI3SPMjpLZXw3wpbllvKjKv4Ui2eFKDMwSC3imIwbDW4Bzrle 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 1 and SWAP_MAP_SHMEM flag. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index ba37b9bff586..14b7b37996ff 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); @@ -1511,7 +1511,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; @@ -1530,12 +1530,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. */ -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; @@ -1545,7 +1545,6 @@ static void swap_entry_range_free(struct swap_info_struct *si, VM_BUG_ON(ci != offset_to_cluster(si, offset + nr_pages - 1)); do { - VM_BUG_ON(*map != SWAP_HAS_CACHE); *map = 0; } while (++map < map_end); @@ -1605,7 +1604,7 @@ 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++) swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); -- 2.30.0