From patchwork Tue Mar 25 16:25:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14028179 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 C6549C3600B for ; Tue, 25 Mar 2025 07:30:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68975280003; Tue, 25 Mar 2025 03:30:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6189A280001; Tue, 25 Mar 2025 03:30:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26F8A280001; Tue, 25 Mar 2025 03:30:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EBAA1280003 for ; Tue, 25 Mar 2025 03:30:02 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B7105813FF for ; Tue, 25 Mar 2025 07:30:03 +0000 (UTC) X-FDA: 83259249486.13.9C6A348 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf07.hostedemail.com (Postfix) with ESMTP id 405D940007 for ; Tue, 25 Mar 2025 07:30:00 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=none (imf07.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742887802; 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=jOKsxg/eaNk7CGfWrQrZTcqXmXONHMcbTsKd49Pdlig=; b=4Qs6FpWxA1uiNcZ5q8M8Bqn7a5nR81mdYmiHJycCpJOmQFRQPMbdYCk0kBUFYr2jI+Js8S Lbnts7eDmJSr+Ae2aO0OOQoDNpOMaCQYq9tW52pT6zoxJd4sf7hbIg69MDvorex5YIlyhn nghyfYMXJ/P1xCqG3VMqEIo9OsdIHMQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=none (imf07.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742887802; a=rsa-sha256; cv=none; b=l764JIlzRqPpfrr3xKzpVGgKTBoJHGGFlqAwpDvdoaKTrdmFyBgIB/EK0K66SRU2j5H9Uj GFm3GRoFBFIY/zOo03cyjzsATgWU75fskOWMJrLlbA1M3CqsZGKCVro2WyLqbbhKncJYn/ /LvaH13f3gSyTV0ABc+vuqy9iZ3Bkyk= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZMM4X18K6z4f3m6g for ; Tue, 25 Mar 2025 15:29:32 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 861E01A0ACF for ; Tue, 25 Mar 2025 15:29:56 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgB3M2ZxW+JnZofaHQ--.14216S5; Tue, 25 Mar 2025 15:29:56 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, tim.c.chen@linux.intel.com, bhe@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/8] mm: swap: use swap_entries_free() to free swap entry in swap_entry_put_locked() Date: Wed, 26 Mar 2025 00:25:23 +0800 Message-Id: <20250325162528.68385-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250325162528.68385-1-shikemeng@huaweicloud.com> References: <20250325162528.68385-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgB3M2ZxW+JnZofaHQ--.14216S5 X-Coremail-Antispam: 1UD129KBjvJXoWxZF1DKr13Gr4xKr1ktrW3trb_yoW5Wr4xpF ZIgr4DtF48Ar17Kw45Aw45ZayFvw4xWw1jqF9rGw15ZasxJryFgFyDA3y2gFyUA3s8uas8 A3WUtr17uF4jyFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPFb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUa75r DUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 405D940007 X-Stat-Signature: 9fywuknqkfckaipy644dz8b5y6dwyhff X-Rspam-User: X-HE-Tag: 1742887800-236593 X-HE-Meta: U2FsdGVkX1+Xa/rivEqW7T3FxJxnexIEEvYl+a+D4tL8DoQAXUmqUcyDR6Tl4ONYli1tAHPpJH7skdNZN9w3WIkNuMo8SSHaEvMs7+6t6Y1u1dhEBzgNE5P4i+tnluOKpRjq0CR5D/PpK0uUcZJ0KCCwz3rll1MgHUw0Kt/Y2P8i76ujXmMLCisSBuvJbXo0fITjzOodYVLyPKlS3IjkXytq7I+J9dLq4x8YC+WON3DN8HMAZuZ8YjeEhdlgIAUeVkNtzhJpFGmmqrEKuHyi+R/0f46au+i4gGGWnU5WeOPIB5Nd4HwFsF3HGZc+UjNqUHjP+UD6ZfrtAWMfxO8TekPpNaxiQ07kQUX4a9MwjK15eR3IjH2F2OzPds7Zs92Dd6MY+2N4HYjphJkyRBIY1sDlmXfImblQB+V8CgWJE2OpVvEtLvBGJ6re02/jFm9LJeP/+xMNETtc50OBsvKpyf8hYgkw+WVd04C/OWGiq4dUDcTK+yfH/W5+l6t6u/EdyAqV80G8OIj3sMSeooTXOynzGZsM/CgUBksoPShHvbjYgVcGFxlQez3F8RoEdelBeQjQAwRRCSzjxX2oqPT7jYS+J/+6SnCwCCvl9cVqq+jLGcQlfkOBG33yn4WSjnrJIoe4S2h4s36nS9NCHePgEqiMRjZsxV4CxcllYNk4gKRM5qDEv+u5BsoLsIXPLDfnXbEff1WVI557KFsNao3wMbLOF58jMdTrU/dUU53QJEdCTO3ocCwKpxDIsPwLnrCy1QPzA/TQBbroccgtSIk9situUVVLv0vxj6gJzXmLchOt2vOpdbmtMxOCsghm+mc1bdMKYghxcloqB91CE89XD9d+hXzjRzPYeVlZC4wKBjiYHlr8UfuPLH66G/mpWrdVSNW8H8frdiu+PSWpvAai+GTwtIxwjfwAg6Rg4oxnpQi3hnyXPsAllg1QQMB36NUbRdSsuu80WFMA0X6FNN+ XAYVPt6T gTaJUWNrZ/yW5OPnJAGC9l1aOah/pkmv1o4PGX7BjLOieBMWhY6PdL9HF3zlYJHnW+QWAkN8cMW00i8jBvL5bET0Ll2Wq68c9IBivd8ZbMDa/KtwhDP/2WLHPTn5IduZcLJ/0D6xZYbfLHOmWolX9Msr2XHKezoMjOwejk8fyMK1vjt75aYS95VBCpTrObToqTJ0bZCBx01uC421KR0EvslrvycD1lNLXGIfnneLtG1uCtkS5BBIpwqnRTrdznPtLE0DAP2ST1P5x+ZxHf/2Bv/nJfJGRdzTO7H9lXN9GIMfsjTM= 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_entries_free() to do actual swap entry freeing. This introduce an unnecessary intermediate state. By using swap_entries_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 Reviewed-by: Tim Chen Reviewed-by: Kairui Song Reviewed-by: Baoquan He --- mm/swapfile.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 76720ca76aae..d05b58e9c723 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1348,9 +1348,11 @@ static struct swap_info_struct *_swap_info_get(swp_entry_t entry) } 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; @@ -1382,7 +1384,7 @@ static unsigned char swap_entry_put_locked(struct swap_info_struct *si, if (usage) WRITE_ONCE(si->swap_map[offset], usage); else - WRITE_ONCE(si->swap_map[offset], SWAP_HAS_CACHE); + swap_entries_free(si, ci, entry, 1); return usage; } @@ -1461,9 +1463,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_entries_free(si, ci, swp_entry(si->type, offset), 1); + usage = swap_entry_put_locked(si, ci, entry, 1); unlock_cluster(ci); return usage; @@ -1558,8 +1558,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_entries_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); } @@ -1604,10 +1604,8 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) if (swap_only_has_cache(si, offset, 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_entries_free(si, ci, entry, 1); - } + for (int i = 0; i < size; i++, entry.val++) + swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); } unlock_cluster(ci); }