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 F0EC9C282DE for ; Thu, 13 Mar 2025 12:09:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 476AD280003; Thu, 13 Mar 2025 08:09:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4337280001; 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 8C4FB28000A; 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 3B9B4280007 for ; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4BC95C2047 for ; Thu, 13 Mar 2025 12:09:34 +0000 (UTC) X-FDA: 83216408268.04.30C2083 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf08.hostedemail.com (Postfix) with ESMTP id 29BB516000F for ; Thu, 13 Mar 2025 12:09:29 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf08.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=eRdUuyrRl9vxSQQ8IC1q8KtEMvMCp8ISCkDYPh/GW577hL4C7ZZmbHfN6082T8jNJ1hlbY gcrLwB3bCRayxUGgaudtUcHCSM55nok2fyTRgS6mpjocOw3KXz4RtK3MQYb4NDxQ1hSGN0 JGjs5tyP0R9O6nFyvRZjrXGz8LC2u/Y= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf08.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=mKM6FZmYqv1agP0DMaN6qqTmvH0b6aZIVxavwo6kZ6Y=; b=ZDcnhx9qHNc049xVjVJK6MocuCGvmLn/uf/jNT5WvhHaMisVGCmlEvPYgU1vtt/+pLAFNj fX2hRaJiYPJ4kczFp4j+1ONRZ/m3q3U8YLC9QKnorIUz6jblIFiRLt4J5Qvu0bnk5g9cxl msrh+5e5L1IyvIgL2rJAXEUde3MGbV0= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZD5rY0JdHz4f3mHc 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 E7DF21A06D7 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--.9643S5; 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 3/9] mm: swap: use __swap_entry_free() to free swap entry in swap_entry_put_locked() Date: Fri, 14 Mar 2025 05:05:09 +0800 Message-Id: <20250313210515.9920-4-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--.9643S5 X-Coremail-Antispam: 1UD129KBjvJXoWxZF13AF1UArW3Jw4xXFyxXwb_yoW5WrW8pF 9Igrs8tF4xZr17K3yrJw45ZayFvw4xWw10qFnrGw13ZasxXryFgFyDC3y2gFyUA3s5uF98 Z3WUtr17ur42vFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3G-eDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Queue-Id: 29BB516000F X-Stat-Signature: yce6qi8codu7ep54admndphtr8xnhpgb X-Rspamd-Server: rspam06 X-HE-Tag: 1741867769-928630 X-HE-Meta: U2FsdGVkX1/g17mZQO0FBD/lbz2Q89IgS5J7vnY+gms67h9UWrom1/NcmeO9pfI9RXm8w3BtBChhsyf9E7gW6zlID6A2E7HbdYDO6ro1lCxyff3BGzPljlVF1TvlrZ/fKP6RGjykIqmUceZX5IuhQgKYf9Bg5p7isMnCdVhXPlBEQVhHqpeY48BIHAOW6qT6CFgyFSa15ViY7hqRIgUtRI1yifokJRF4ABDq6Rqgc5uFkmVmOJ+9R/NKeFkV4iKLCWYysAiSfCeMyQwRlR6GR747c+34s1ZF/47vEdqwzzD+n2WBoBsCcurzzu0NkPAgoso2a0EpgKA6sRJyhFYLehS+GnEQ/1maBqAbsNZpw5x7G1U6p4zcTjzsrnVbIJHJNB0Dy8O3vA0zEA5lnyWlHSusHB8bAw45LSG4fiOtO3nvwAqN7O/+9JDxNA1I9PunVV96OPotiFGHwHIEON3RUrWH+2Tq5RbYPn9CWoQm7cHNaiJ9aLE7IOr7CWFMH2/0zh3L7DVH+aGPLefx9ftnRiN+aUjYQ/PRBBbIwqU2YGKPIJPLtr6loxChHxJZs2tHVS7vviJsCs3L2BG12d1dS5SqQFRDzikDyd+WyiSxrl92aL73GHe2KbLozkLIH5Rl3T9R9K9diFn2oJLu3w5sD7tFwUA8c9iUK+4JQo/zgXBoSYG9QNXXDklzniCKc0XYh1heLbEPV+7MQyq8vSy+Nt7nc3ffSZ4CNx06dI1DjGVcSwzsHbIWdALFq7TERe72hK9cSjzxzXjpCUQQfWeMM0Z0wMZC8MsOfZl/oxGnGdSRwGhon55bq0YUVHSIBkSkd9y6y1mqEYhBaX88E7SP8x9lopZtE5JMIi8f6571pkNoDWg+nEbel+iW1ParlDrbKPFyzrKkNK1guTmlxs6aDa3mKIxncdg8QCyb1e3aB6mpq8ag0nocAf3QEF5ypF4Qrhe+n01wMvB6HeBypNj QQQH0EXc 3JB2smmH9Du7mVgCrmqxVEOvk6ibfNBHbDEqUskFl3ec7KAhzpzPHiUyxFSGeBeBL3wXv+Bcr0rKaYSxJpqJLMwUAIzbfM/UjLWkomq6PjTp8tpTZhrRfwb4zmY5i2kRA8RN3Em2PAeRaOGGH1iCQ7fXapVHFqZQ4W0N1gtyrnOZB/QpkmwCEbsf5bYyPoPt7cDmMDtIh6BVr1XGr1phHIJC2VA== 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: In swap_entry_put_locked(), we will set slot to SWAP_HAS_CACHE before using swap_entry_range_free to do actual swap entry freeing. This introduce an unnecessary intermediate state. By using __swap_entry_free() in swap_entry_put_locked(), we can eliminate the need to set slot to SWAP_HAS_CACHE. This change would make the behavior of swap_entry_put_locked() more consistent with other put() operations which will do actual free work after put last reference. Signed-off-by: Kemeng Shi --- mm/swapfile.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 7c886f9dd6f9..ba37b9bff586 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1367,9 +1367,11 @@ static inline void __swap_entries_free(struct swap_info_struct *si, } static unsigned char swap_entry_put_locked(struct swap_info_struct *si, - unsigned long offset, + struct swap_cluster_info *ci, + swp_entry_t entry, unsigned char usage) { + unsigned long offset = swp_offset(entry); unsigned char count; unsigned char has_cache; @@ -1398,10 +1400,9 @@ static unsigned char swap_entry_put_locked(struct swap_info_struct *si, } usage = count | has_cache; - if (usage) - WRITE_ONCE(si->swap_map[offset], usage); - else - WRITE_ONCE(si->swap_map[offset], SWAP_HAS_CACHE); + WRITE_ONCE(si->swap_map[offset], usage); + if (!usage) + __swap_entries_free(si, ci, entry, 1); return usage; } @@ -1480,9 +1481,7 @@ static unsigned char swap_entry_put(struct swap_info_struct *si, unsigned char usage; 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); + usage = swap_entry_put_locked(si, ci, entry, 1); unlock_cluster(ci); return usage; @@ -1562,8 +1561,8 @@ 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_entry_put_locked(si, ci, swp_entry(si->type, offset), + usage); } while (++offset < end); unlock_cluster(ci); } @@ -1607,12 +1606,9 @@ 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); - 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); - } - } + else + for (int i = 0; i < size; i++, entry.val++) + swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); unlock_cluster(ci); } -- 2.30.0