From patchwork Tue Mar 18 15:06:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14020345 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 156D5C28B28 for ; Tue, 18 Mar 2025 06:10:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 693B7280009; Tue, 18 Mar 2025 02:10:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D1C2280003; Tue, 18 Mar 2025 02:10:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE743280007; Tue, 18 Mar 2025 02:10:39 -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 7B7AD280005 for ; Tue, 18 Mar 2025 02:10:39 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8D1D9160449 for ; Tue, 18 Mar 2025 06:10:40 +0000 (UTC) X-FDA: 83233647840.24.3D8A800 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf05.hostedemail.com (Postfix) with ESMTP id B0FF5100003 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.56 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=fGTdKC52eaOuSEKPZCWHcHm+IXptrsgwodAK4pJ7wHSj23auh15aRxd64aM1toGTK2WYsJ cbyleg9GzjG3uFHLw9cszsUH5qZiad0WpuMoILwCmjeMj1vpT28WOPYN6E52/RrraJdjae iyTTFzxq0FLysrjm4WnNvip854TyqNQ= 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.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=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=x4dCFdeP1M99ZZCBPEcsO4blovDMs56YPed0XdIg/z8=; b=cDx/OrfjGdr86AwM2G8gj2YmlVr1/FWJTSqJR1bCmqdDqVcErKh4Ivmv4g7GMeXMec5QaV R/+wuqcIg1B05x3SJspNlP3lhPlniVqOPPvtRD4ZQc7fXJDlSwG3SeXiP5OERIoHACHRPI SzjOwgBNmeNRkRg4KD5MMrkEpoGM+bY= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZH1f90Hlsz4f3khS for ; Tue, 18 Mar 2025 14:10:09 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id A30591A11C5 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--.37695S5; 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 3/8] mm: swap: use swap_entries_free() to free swap entry in swap_entry_put_locked() Date: Tue, 18 Mar 2025 23:06:09 +0800 Message-Id: <20250318150614.6415-4-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--.37695S5 X-Coremail-Antispam: 1UD129KBjvJXoWxZF1DKr13Gry5JF48Ar1fWFg_yoW5XFW7pF ZIgrs8tF4xAr17Kw45Aw45ZayFvw4xGw1jgF9rGw13ZasxJryFgFyqy3y2gFyUA3s5uas8 A3WUtr17uF4jyFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPFb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUaTKu UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: mff5xzgtf17hnje3f7mmc3iu3q8bjahu X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: B0FF5100003 X-Rspam-User: X-HE-Tag: 1742278236-109690 X-HE-Meta: U2FsdGVkX1+WdXHKp07d5p2L/IB1wDhHdcgW24qruVTPE0tTI6BZMFue/jDGGz4YjQgR24x6CYNCdc1QgEsObV2/7GQJJjrxznVHZHrcLIPlL0NqeGYNaUuaXjLWDVEiUiJm6UMljbNMQ+CnAoDEn4XxZ9llt5wOP14e62WcYCOcIlDMeKYxe+ZmQfaYKnbOeUjx0hlrxYiOPLrj+Dc25gNCyBJ1I1NyZhghXkgr5P7SSlPeYk+yshYqAKA3yl76xbRjUEAasnyv5PQFsx2rANQR9nv+crcHjt/MtTc75BUZvfxcAQz1ldhmNknCRLW+4hXW8xYSrT7Y+DKq03hRLs1CI8YAiC0KZ/yOgMB6Rup4iKqtkmDU67eVF/DpYTwsTTFVE8ry3lBVpi5Nfd96fSS9X2aVG2yXR0r6Ev52y18VEglJgMUtdeCLef/C1SkIXeBF7VNSvlpczIhwPvCsQ5WrzrrNxn0SK+YAro6tF7Enh5EvtLpL9lyzNm7oS3vVpEyemkGBUjXIExVyT2ndPbfzX7ynGmS2X23XySIgvkDczcLftiEHmhwoqo5XpqsZZ0veLWp4vAZsOxXg+2uUCX6SI87huAesvTXc+tJZOoBxCirVG3dzvtB+NQITKI9Y171H71cYbGf3iZnmEoLsTj+dx4wjfsBYdD5sfjb9aknzmkM1GoPKmpzvlDFh5BT0ZvsQqsWNB+K3zsgNtdsCnB/G7IhU1zHjpGou5+jlIKHSYT8pvcP63qQjK1cjo0Yv/K6uvfw3K5jqM0YaTZ7xCNsKPmJ4qGghF3JVee0iUiP16k798pKvEzxgNgefYWvZxg2x3bSexXxf1tI2CxZ9OjMpkVo5nPlLkF0CIvpdhfBKQlX9XgDbpQNmT4MymZfEqCWBP/F7BkqIK4oF1nV6+8hlcn5GgNo2d7JQLJUoRw3pP6AIWh4kG/gNVP4kmCth 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 --- mm/swapfile.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 0aa7ce82c013..40e41e514813 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; @@ -1551,8 +1551,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); } @@ -1596,12 +1596,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_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); - } - } + else + for (int i = 0; i < size; i++, entry.val++) + swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); unlock_cluster(ci); }