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 51040C282DE for ; Thu, 13 Mar 2025 12:09:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17794280002; Thu, 13 Mar 2025 08:09:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10242280001; 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 EE3AE280002; Thu, 13 Mar 2025 08:09:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D182B280001 for ; Thu, 13 Mar 2025 08:09:33 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 11732BA0B5 for ; Thu, 13 Mar 2025 12:09:34 +0000 (UTC) X-FDA: 83216408268.14.23F4F72 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf11.hostedemail.com (Postfix) with ESMTP id 9E4DB40006 for ; Thu, 13 Mar 2025 12:09:29 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.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=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:references; bh=mnNOZXh6rtrXdqlnN1gf5bkzrP90E3oG+kC1PAEe0XQ=; b=tSWgvhT0p8oxjq/KEFdDOgdOgJB9LNGpnoVEWHoXIfJLkptVeIzJPQdL8CvZmEoKATmnk7 SxEiJFOjYBt2M2RMWinFMffBRWA9zRwVMlBsYTJNWw3Q5AYl1geRlptU8GNXkGnV6KW4b3 PlH3Qhu+j8iNG5cIZVu0i/8z9NwHmc0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741867772; a=rsa-sha256; cv=none; b=uAznzaVqmfQwvuKg97BDEwKkW6EVcXELRovsvros8FaQLUGLycmdQmgJeXgtc+HpWrPPoH aC18dfAdg70mBql9hx9dmyyv6h6FAW7GmIQ52rURJJwiwVsk+v2S/9ctFJRTLmD18Gmo7B 5DhgorHdOFhzEpB0DgmHvJpQwRfYE9w= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4ZD5rY5Plmz4f3js3 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 3263D1A06D7 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--.9643S2; 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 0/9] Minor cleanups and improvements to swap freeing code Date: Fri, 14 Mar 2025 05:05:06 +0800 Message-Id: <20250313210515.9920-1-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:Syh0CgCnsGPyytJnTaZeGQ--.9643S2 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF43AF1DZw1fWF45Xw48tFb_yoW8ZF1fpF W3uwnxGF18JrnaywsxAw10qryrX3yrKF47G3W7ur18Zw43uF18XryjyrZ5ZFyDA395JrWq qF48K34UuF4YvrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk0b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_ tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r xl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z2 80aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42 IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280 aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUsBMNUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 9E4DB40006 X-Stat-Signature: 6cmx4acecxfnqdyw7j78ta55nd99tos5 X-HE-Tag: 1741867769-53997 X-HE-Meta: U2FsdGVkX18G9TwP8UBdsrVKcv/ew3R7xIAety0L1nydvXaeAuPXxq2RmX2lwIu1xs4EvNfaeHGzc5t0jgerFPXzYE99oM1VFCuZDVr3a1vnVa5lxloUmyidF+iMVWx5FZQ6GqwtHH6dIOS+V46KlEB6GNxXb9EacuftYETgThILylQ/QG3iqs4TX/ujCOPlBBCuttilfFzXemOezr2A9V07Fq4En3qgu1OyQWCZ4y2Z2mEtXp7eT71tfplzloo2rL2h4OoLPAsvlxsFg6sAX7cx7U4kxOMKjByXyCr0gzWwKwnfGK6AqKUIx/KtfGuAfUVl/djcc8PUyQb83eYtMlloI6IUYZ6sR5PjW29NKhBdLfn6UNU8verZYX2Ex0WnGvI/ihNJ/5hnDizldBhusb4gC9n6YUMHNj7xx52fpM8Jlg2eIgHA8e4NSplxfddjYZ6kap+PWlEVw3qD4wNawKBx2QGHiBe2yMtMPfCxAAH+YgTswInjTTUZi+3q0eOFd3Wy/GCFFo2DUSosme7XhvIXeL/t8zXwyWCXd8GI/IzZVBwNLwU7g4mTO/rUVpu1N7VRyZyd2uEc0Rw81HqVtniSZX8W8KCquNf06NMVgmb+QCHybdLoVxkl7g3zA8MSxrHjGVdWCdVzmpYNm5Yt3sNaz61YxHQBw+dDmpB8biZpvZz3EAGBKL6LwFX++GzhjFWI3L89Qwe7zIoEJB1vy3KjvvuVTFuU+C0v7q4G9m1GtPWMslL4YAWSVR0fLB4d8q3P4HQtKWKWXXK8IfumuiMfIh+e0Cmbf4DCvpOBrA3pOAy0waLlDLQZKMnLNuMafahKgdPZNQvu7i8qOicS4NuTvWtmRcfPTAqjZYSqa6IiKQaMqJMqfoChF2Tos3it9uHkEzdWQns= 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: Hi All, This series contains some cleanups and improvements which are made during learning swapfile. Here is a summary of the changes: 1. Function nameing improvments. -Use "put" instead of "free" to name functions which only do actual free when count drops to zero. -Use "entry" to name function only frees one swap slot. Use "entries" to name function could may free multi swap slots within one cluster. Use "_nr" suffix to name function which could free multi swap slots spanning cross multi clusters. 2. Eliminate the need to set swap slot to intermediate SWAP_HAS_CACHE value before do actual free by using swap_entry_range_free() 3. Add helpers swap_entries_put_map() and swap_entries_put_cache() as a general-purpose routine to free swap entries within a single cluster which will try batch-remove first and fallback to put eatch entry indvidually with cluster lock acquired/released only once. By using these helpers, we could remove repeated code, levarage batch-remove in more cases and aoivd to acquire/release cluster lock for each single swap entry. Kemeng Shi (9): mm: swap: rename __swap_[entry/entries]_free[_locked] to swap_[entry/entries]_put[_locked] mm: swap: factor out the actual swap entry freeing logic to new helper mm: swap: use __swap_entry_free() to free swap entry in swap_entry_put_locked() mm: swap: remove unneeded VM_BUG_ON(*map != SWAP_HAS_CACHE) in swap_entry_range_free() mm: swap: use swap_entries_free() drop last 1 flag in swap_entries_put_nr() mm: swap: drop last SWAP_MAP_SHMEM flag in batch in swap_entries_put_nr() mm: swap: free each cluster individually in swap_entries_put_map_nr() mm: swap: factor out helper to drop cache of entries within a single cluster mm: swap: replace cluster_swap_free_nr() with swap_entries_put_[map/cache]() mm/swapfile.c | 173 +++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 87 deletions(-) -- 2.30.0