From patchwork Thu Mar 20 11:48:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 14023362 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 BC6BCC35FFF for ; Thu, 20 Mar 2025 02:53:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1513A280014; Wed, 19 Mar 2025 22:52:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0005728001C; Wed, 19 Mar 2025 22:52:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5D3828001B; Wed, 19 Mar 2025 22:52:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 99E1F280015 for ; Wed, 19 Mar 2025 22:52:58 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7248AB7F9E for ; Thu, 20 Mar 2025 02:52:58 +0000 (UTC) X-FDA: 83240407236.21.049DA0B Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf21.hostedemail.com (Postfix) with ESMTP id 354161C0007 for ; Thu, 20 Mar 2025 02:52:54 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf21.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=1742439176; a=rsa-sha256; cv=none; b=aSqejIUGubx2cBF5mdy76ZLVDNIIT2H8tfGq/uU7URb9rMTD80Eb6p2UGlcxEYUzecsGla M7j05JUbwF1g9+J6xyF/tDZqiC99nBMNHbsEAaQbYDzL+dCqj+KmQHdFinH9h0kmVWVWKB hE6q+Hmht72DrRx/g/8p8S4OE9dGCMw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf21.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=1742439176; 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=w13Ili6H5XPEUn73KQ1qRBzKLbp933IeTRokg9OeiKY=; b=tsUrhx2FbVydBAf1MYvwOuJwkG0laJDYL9RMSJpuntkPhjUvWW4WqdwGHAi2EhPu+8vYuj w7FAYV6s0wP5g0iWWoiLw7/l3NXH4YdpE0kUop+j2Loei/TCBVMZKJ5SHdoXr6yvb7HAh8 IPYYJNMZqncN/SGjliquyqk6ktCUSBE= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZJ9971gvpz4f3jcs for ; Thu, 20 Mar 2025 10:52:27 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id E4AB31A06DC for ; Thu, 20 Mar 2025 10:52:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP3 (Coremail) with SMTP id _Ch0CgAHW8X_gttnYGGmGw--.42197S5; Thu, 20 Mar 2025 10:52:49 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, tim.c.chen@linux.intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/8] mm: swap: use swap_entries_free() to free swap entry in swap_entry_put_locked() Date: Thu, 20 Mar 2025 19:48:24 +0800 Message-Id: <20250320114829.25751-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250320114829.25751-1-shikemeng@huaweicloud.com> References: <20250320114829.25751-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgAHW8X_gttnYGGmGw--.42197S5 X-Coremail-Antispam: 1UD129KBjvJXoWxZF1DKr13Gr4xKr1ktrW3trb_yoW5XFWDpF ZIgr4DtF48Ar17Kw4UAw45ZayFvw4xWw1jqF9rGw15ZasxJryFgFyDA3y7KFyUA3s8uas8 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-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: 6i6tdcqpy9n7b7sxq83ayjmry8hn9gfz X-Rspamd-Queue-Id: 354161C0007 X-HE-Tag: 1742439174-622103 X-HE-Meta: U2FsdGVkX19ULK+2rIzZgf9ZuldPqCrr9g//wWqThVYt8CAVfbTkmfnLei/O4uhPAx+IP7WTzs0siJEO0GtTCrxGl4F3vuTnA+Y0i46BT5m8tx9TYrA8dJY6VsuJZp2AYlvO86vSDBToLXdop7tpFhBZLmW/BAbOgH3XR2lyrJHcX9RoyQ01sXJ4rYB2UO6N/e3bChkHTLqv8yLm/7j7tfdWidHk6iVN7A1XS19OKcaHvS3NapPp34pXNLeY2FJG0gLR8EeRIUitpyt21MCb3Sc9RyW0UNlQb4PlbZ/nmT/lrheCRl0Z/nWd+LzamMAXJEXjBZUPjnTiSy/z+lVq3E5IeWcuCeV3yGMThRs9Dx3ytR4Irj5nQ2rgkgZf0OWJOfQNX66N8YUq9vbFoLcZptTq0A1VHBnoAkLI3Nueix4g0adk/Uoi5aordpPVeqFhLJa0edaG93tbAF8TH0xZk1o34GfJZqOnlIel0pLkfOtRbwSBbGll3xldlDZHo1cXYdDUPSVSAdHXlJQZYx9dk1lls+bhENuJI05+wWQQuWsNHaeKxzdv3/LxfVC09moSDzUQIl3lZgMe541lQs6KWFegI5A3+jYIcaaHYAt/sXKW/1jf6JHuBkPZtQ52E2975qLXa3ClKBXqlA7saod13r87xxKcKwxcVdVbfAy6aCiQegL6Iwa0dsC9Xk/huRtw03bC7sU7x/wjmw8OaCKzVOUFG8RE9MQQJzmf22g+ggJvxMMuC5uf+C0yJpNxTNxW3TF5S1+4cK1DnN+QhGAn0jFqyANRRjpo8dDeOyl1O95wjSvxha9kxyG2kXLQWLfVd9PMPRfnfBaBIZdVA6RyL83sywr8hUec3Eb8O4SDvvpcMEwK6X7Pnt2SWl+iFufdFwQMLhYKbM6ZeLYOBMfKXpz9/IpktOz14BgU3hByBMJxSdu/4iuIXHxD+AhSigyezJd1i+w/nNlQdxPIzod eCK7Lh1h jGy00wbCkHo79EJPIozX8gDIsdtUXPhx8b2fRdocT/w2TrXkB7GTkdt4KePAooXFIWk6W47q87pctsbRfvDTx4hzlSqoLCnuAxE2Tus44xOFF/AWf02LSYHGDqc4OGKGLKT34bisgT3uYcQkjReddIPe5pVztFPuUtyDptmT6z/y8hXiv9G5vO4nvg7mMF9OxT4HbhBXQhfbp5QB+BEfWe+mK57n5WTb21vXlXK9JaDiBH0AAP6v/VghsxfSVTf5MuoFy 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 | 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); }