From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6165F472775 for ; Wed, 3 Jun 2026 12:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780490645; cv=none; b=eCHo6K/xeMQ2FoSRWDEfqNCzvCdwnga7Wuv0EJqYLp/Y5YsIZu5gTUwAK/B3BlhcyCgWxjY43PXFm8RpGgifgYv+xnX+2aYU26qXp1m5aJ7oeMsr2VQTHUQYEujbFjTdB8GDGYyjgaC8u0TRpcaFbgAH9YKkWermxX/O8llm+Rs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780490645; c=relaxed/simple; bh=sCgktHf0u0yijUEHKaRoESyUsZGWLcp5N5PPEOd7wIA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qKXNtaeqDnmqRqz8vp4QlY+ssdzRjmKUWprBroB8wE8Hfvwg7apnETyxk6mvCoDhNnXMICtzkyJxtT4h67i/urjwJqNe/eIH4n/nqMGYYdTt+r5e05x735sw3U+/P6c+A3TKIOC//7UCJy4+ph3G3w6uSu5xg4ZF8JQLasLJGzQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nzHlbMr9; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nzHlbMr9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 585EB1F00893; Wed, 3 Jun 2026 12:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780490644; bh=77CURzg/jAFNtzXDpoyP4AKbJU13c4kpfI7PfLbw04M=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=nzHlbMr9Zu7Uvk7B04WhJ0QhPOPOipiK2G9DXWdN/kL9jUYjtrFt4j4JyEEt0lfi8 SM2IY/6fCLWcREl46bmA4f8munOLqLt0a7M+YHpNB9dRZ4svHQskfBJrbfaZGsQDvc c2OIjE7vNBAYPLTQsBf2e9DtCBVwd8XBvShQR5roqbtI22mTyNN0Iqyl/0lgvlEXmp HAdGkKaKwytnjhr3Wb4OS23yvjJTZK8NdvrrnYquhc0tIUaJRWK7kTEGtzwtRkY/RF hzICiQ4z0CElqqjXYONrxy8KjBVRMNyEvgkLw1IxcMw0fLkHBDCPBGbepLfYQ6QMnN vQkU+Dtf4Rrzw== Date: Wed, 3 Jun 2026 13:43:55 +0100 From: Lorenzo Stoakes To: Jianyue Wu Cc: Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , Qi Zheng , Shakeel Butt , Axel Rasmussen , Yuanchu Xie , Wei Xu , Johannes Weiner , David Hildenbrand , Michal Hocko , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Hugh Dickins , Baolin Wang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/3] mm: move folio LRU code out of swap Message-ID: References: <20260602-ch-swap-series-plus-folio-lru-cleanup-v3-0-5bbb567f8c99@gmail.com> <20260602-ch-swap-series-plus-folio-lru-cleanup-v3-2-5bbb567f8c99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260602-ch-swap-series-plus-folio-lru-cleanup-v3-2-5bbb567f8c99@gmail.com> On Tue, Jun 02, 2026 at 09:01:16AM +0800, Jianyue Wu wrote: > Rename mm/swap.c to mm/folio_lru.c so the filename better matches > the code's main responsibility. > > This keeps the implementation split from swap-specific code without > changing the published LRU helper interfaces. > > Update MAINTAINERS and the remaining mm/swap.c documentation references > after the rename. > > Suggested-by: Baoquan He > Suggested-by: David Hildenbrand > Signed-off-by: Jianyue Wu This LGTM, swap.c is really misleading, and we can figure out the naming-is-hard stuff later :P So: Reviewed-by: Lorenzo Stoakes But also - do we want to rename swap.h to folio_lru.h? Actually that's less clear as we have actual swap stuff in there too. I do also need to do more work on the softleaf conversion for e.g. swapops.h. > --- > Documentation/admin-guide/sysctl/vm.rst | 2 +- > Documentation/core-api/mm-api.rst | 2 +- > MAINTAINERS | 3 +-- > mm/Makefile | 2 +- > mm/{swap.c => folio_lru.c} | 2 +- > 5 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst > index 97e12359775c..31d135e107cb 100644 > --- a/Documentation/admin-guide/sysctl/vm.rst > +++ b/Documentation/admin-guide/sysctl/vm.rst > @@ -20,7 +20,7 @@ of the virtual memory (VM) subsystem of the Linux kernel and > the writeout of dirty data to disk. > > Default values and initialization routines for most of these > -files can be found in mm/swap.c. > +files can be found in mm/swap_state.c. > > Currently, these files are in /proc/sys/vm: > > diff --git a/Documentation/core-api/mm-api.rst b/Documentation/core-api/mm-api.rst > index aabdd3cba58e..d6d189b9a996 100644 > --- a/Documentation/core-api/mm-api.rst > +++ b/Documentation/core-api/mm-api.rst > @@ -117,7 +117,7 @@ More Memory Management Functions > .. #kernel-doc:: mm/hmm.c (build warnings) > .. kernel-doc:: mm/memremap.c > .. kernel-doc:: mm/hugetlb.c > -.. kernel-doc:: mm/swap.c > +.. kernel-doc:: mm/folio_lru.c > .. kernel-doc:: mm/memcontrol.c > .. #kernel-doc:: mm/memory-tiers.c (build warnings) > .. kernel-doc:: mm/shmem.c > diff --git a/MAINTAINERS b/MAINTAINERS > index e3ee97f5474e..6bd39e0afceb 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -16900,7 +16900,7 @@ F: Documentation/admin-guide/mm/multigen_lru.rst > F: Documentation/mm/multigen_lru.rst > F: include/linux/mm_inline.h > F: include/linux/mmzone.h > -F: mm/swap.c > +F: mm/folio_lru.c > F: mm/vmscan.c > F: mm/workingset.c > > @@ -17045,7 +17045,6 @@ F: include/linux/swap.h > F: include/linux/swapfile.h > F: include/linux/swapops.h > F: mm/page_io.c > -F: mm/swap.c > F: mm/swap.h > F: mm/swap_table.h > F: mm/swap_state.c > diff --git a/mm/Makefile b/mm/Makefile > index eff9f9e7e061..5f712f9bbe73 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -50,7 +50,7 @@ endif > > obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ > maccess.o page-writeback.o folio-compat.o \ > - readahead.o swap.o truncate.o vmscan.o shrinker.o \ > + readahead.o folio_lru.o truncate.o vmscan.o shrinker.o \ > shmem.o util.o mmzone.o vmstat.o backing-dev.o \ > mm_init.o percpu.o slab_common.o \ > compaction.o show_mem.o \ > diff --git a/mm/swap.c b/mm/folio_lru.c > similarity index 99% > rename from mm/swap.c > rename to mm/folio_lru.c > index e4b3dadaa6dc..7dab6a544d94 100644 > --- a/mm/swap.c > +++ b/mm/folio_lru.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * linux/mm/swap.c > + * linux/mm/folio_lru.c > * > * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds > */ > > -- > 2.43.0 >