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 C2E83C282EC for ; Fri, 14 Mar 2025 07:32:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD548280002; Fri, 14 Mar 2025 03:32:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B84A7280001; Fri, 14 Mar 2025 03:32:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4F3F280002; Fri, 14 Mar 2025 03:32:46 -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 892C0280001 for ; Fri, 14 Mar 2025 03:32:46 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 18E8A1A0BED for ; Fri, 14 Mar 2025 07:32:48 +0000 (UTC) X-FDA: 83219339616.01.B72B49A Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf06.hostedemail.com (Postfix) with ESMTP id 798BA180007 for ; Fri, 14 Mar 2025 07:32:42 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) 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=1741937566; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SSLgbiAXGMoxRYPaOXUNdwkKRPx63sAZxVJ/G4CPda4=; b=Y9fgsCY4DcGvh9dIPbHEiG4xeJjYb33aZVwv8lf6JmLIW1UzJ0jNDNQirsAXQFShvWxPnN QwhJ+OUnmHo4hgpcR81JFqmQgl8yJ4r9qXQ1cShDLmM9YZO00oX1HpySdMIV05fK5uUaVZ 1igT9FXOKAj0oOw88v7XZet+1MEoWTE= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741937566; a=rsa-sha256; cv=none; b=yfMv8FBkdMyuj8FB1RowPR6L8pcFvM2EXgnjfuRi+H6UzEvY4mlwsRp9XhjgQGBiU/sw8I 8xj/ozNou2oFzFUIb/x+p71diNmfO4gEejTZDYsonbI3Neh/IEf4q2OQ2X58t3q9rysNa5 If7t4BgHMBzm7cSCScXUYyIAWA13/Oo= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4ZDbfm4xRQz4f3jqq for ; Fri, 14 Mar 2025 15:32:16 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id BDE571A1AD5 for ; Fri, 14 Mar 2025 15:32:33 +0800 (CST) Received: from [10.174.178.129] (unknown [10.174.178.129]) by APP1 (Coremail) with SMTP id cCh0CgDXh3iQ29Nnwp5zGQ--.58146S2; Fri, 14 Mar 2025 15:32:33 +0800 (CST) Subject: Re: [PATCH 2/9] mm: swap: factor out the actual swap entry freeing logic to new helper To: Kairui Song Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250313210515.9920-1-shikemeng@huaweicloud.com> <20250313210515.9920-3-shikemeng@huaweicloud.com> From: Kemeng Shi Message-ID: Date: Fri, 14 Mar 2025 15:32:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDXh3iQ29Nnwp5zGQ--.58146S2 X-Coremail-Antispam: 1UD129KBjvJXoWxWFW7Zr1xKFy5Xr1rWry5twb_yoW5Ww43pF 9aqFs0kF4kJryxGFsxXa1qv3yayw4rKF1kXFnrKwn3AF9xJr92qF1DCrWY9ryDAwn7CFyI va1DK3sruFs0yFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyCb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxk0xIA0c2IEe2xFo4CEbIxvr21l42xK82IYc2Ij 64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x 8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE 2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42 xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF 7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07UE-erUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 798BA180007 X-Stat-Signature: 1bb4r78dmfxn9qkuc5pfswo9r5mqcjh9 X-HE-Tag: 1741937562-377632 X-HE-Meta: U2FsdGVkX18sCEcRtWsu2cWZC0oQGk8ac6vYnxjZ4txVcOWjqlHe3mUDuWK+kb4t+VHgsHQ2ut2CyboaYvu0kkdz5r8at+zLpG9Lnk91iP5qOHBVsAwt8LhU/8NES2od/uu3lLMmxjsvaLxXqGw0hD7dHJnRE3GYrBxbsGY4A33tlBQ/6qEwUaznr0EII+zezZkoGhOO6lBIk0ARjp5uAEPVdE/X0gwkH5M+F4XMiihivToTK73lLyGuw5+j7mo0G+/a6JdhllvPvGSjqkBaSnS50U0K6Ao9vpboLNOUqBgZwnB3XbT2i5oYYKe3FKLHJed/2mH3HqmjiSr3x80FvuFDMYbzq7gj7dyYL1x1E+m9wtT3IpvUBGDiU7KQMj0t9oxNF/QDIQEZnN/syUzy+oNm8vA2j+az6yGBVG3wBAz8KTEwv03mN5cnfjNkhvxPiSw1RijM6+LHa1VBCCTrnjAukcCL6AItJKvoM+15GkoO9ep4UYwO5EzGtDfY/C/EcJh2NlFKxMKLihaRXuL4GtDJ9bSdsQPfpiw8sQhldam50sr6wvxYtopCc7DeyCbcfVz0pD6Fe/qKFsuCn+cEc6b3e5DSC9YHJP8QHKXxzYgAkaJ7swMkdstEZarPB+r9MJd8F9gRVoADwMi55y6/VtIoyWRwCed6WmMvTj5peSo9SoPUBRVepDuk8BZyj/INaHI6x5Gy83BNqv08UE6aNJ8TKgRimlfIueuIPDCu6NQh5sD09BF/6BHtGcDBQqYFXW+8Hn6AZPXKlEcRnjfRWYQuchmugKBVY2gxHJZWSRmaKJNIUMG9PSO8BfdIM+BgzGXKiZXb9RcTrxA+XHzKrJzCeznwoNweAmdMTr1cPa9LCepF68GfAR00IhOVhHtL1+qVpV5AdZdEB5rfgC0wNX+lhzjIKQWBJUBeEWOJQmRQ0T8ulRCngUS0KBm312D8zstKy3XYv77dW16S5yM O46RJefz cZ4VXIyvjs498050K0gnL1OMmkdSM2C2c27KBMreqgR8g5pQJ+NNeE2Z+UewqEhygKKVeP36s0tWdbqmuilzaNw1xbV3wh8LwuvF0jkMwuoBDeFb+G+Mr5AZp04L5yTzhhOB1aUZ1iSSqNS3qeIPzHc/T6oDgxQVy5exvAQlr3S4f80yIzCsgcBgg31QPIeba6Jv0y3THQ1ifpM4= 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: on 3/14/2025 1:42 AM, Kairui Song wrote: > On Thu, Mar 13, 2025 at 8:09 PM Kemeng Shi wrote: >> >> Factor out the actual swap entry freeing logic to new helper >> __swap_entries_free(). >> This allow us to futher simplify other swap entry freeing code by >> leveraging __swap_entries_free() helper function. >> >> Signed-off-by: Kemeng Shi >> --- >> mm/swapfile.c | 30 ++++++++++++++++++++---------- >> 1 file changed, 20 insertions(+), 10 deletions(-) >> >> diff --git a/mm/swapfile.c b/mm/swapfile.c >> index 5a775456e26c..7c886f9dd6f9 100644 >> --- a/mm/swapfile.c >> +++ b/mm/swapfile.c >> @@ -1347,6 +1347,25 @@ static struct swap_info_struct *_swap_info_get(swp_entry_t entry) >> return NULL; >> } >> >> +static inline void __swap_entries_free(struct swap_info_struct *si, >> + struct swap_cluster_info *ci, >> + swp_entry_t entry, unsigned int nr_pages) >> +{ >> + unsigned long offset = swp_offset(entry); >> + >> + VM_BUG_ON(cluster_is_empty(ci)); >> + VM_BUG_ON(ci->count < nr_pages); >> + >> + ci->count -= nr_pages; >> + mem_cgroup_uncharge_swap(entry, nr_pages); >> + swap_range_free(si, offset, nr_pages); >> + >> + if (!ci->count) >> + free_cluster(si, ci); >> + else >> + partial_free_cluster(si, ci); >> +} >> + >> static unsigned char swap_entry_put_locked(struct swap_info_struct *si, >> unsigned long offset, >> unsigned char usage) >> @@ -1525,22 +1544,13 @@ static void swap_entry_range_free(struct swap_info_struct *si, >> >> /* It should never free entries across different clusters */ >> VM_BUG_ON(ci != offset_to_cluster(si, offset + nr_pages - 1)); >> - VM_BUG_ON(cluster_is_empty(ci)); >> - VM_BUG_ON(ci->count < nr_pages); >> >> - ci->count -= nr_pages; >> do { >> VM_BUG_ON(*map != SWAP_HAS_CACHE); >> *map = 0; >> } while (++map < map_end); >> >> - mem_cgroup_uncharge_swap(entry, nr_pages); >> - swap_range_free(si, offset, nr_pages); >> - >> - if (!ci->count) >> - free_cluster(si, ci); >> - else >> - partial_free_cluster(si, ci); >> + __swap_entries_free(si, ci, entry, nr_pages); >> } >> >> static void cluster_swap_free_nr(struct swap_info_struct *si, >> -- >> 2.30.0 >> >> > > Hi Kemeng, Hello Kairui, Thanks for feedback. > > This patch is a bit too trivial to be a standalone one, you can fold > it with the later one easily. Also you may want to carry the > VM_BUG_ON(ci != offset_to_cluster(si, offset + nr_pages - 1)); check > as well. Sure, I will do this in next version. > > But, that is basically just renaming swap_entry_range_free, you may > just remove the HAS_CACHE check as you rename it, that way the changes > should be cleaner. > Sorry, I don't quite follow. Are you suggesting that should fold this patch to later one which removes the HAS_CACHE check and renmae the swap_entry_range_free. Thanks, Kemeng