mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kiryl Shutsemau <kirill@shutemov.name>
To: kasong@tencent.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	 Andrew Morton <akpm@linux-foundation.org>,
	David Hildenbrand <david@kernel.org>,
	 Lorenzo Stoakes <ljs@kernel.org>, Zi Yan <ziy@nvidia.com>,
	 Baolin Wang <baolin.wang@linux.alibaba.com>,
	"Liam R. Howlett" <liam@infradead.org>,
	 Nico Pache <nico.pache@linux.dev>,
	Ryan Roberts <ryan.roberts@arm.com>, Dev Jain <dev.jain@arm.com>,
	 Lance Yang <lance.yang@linux.dev>,
	Usama Arif <usama.arif@linux.dev>,
	 Vlastimil Babka <vbabka@kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	 Suren Baghdasaryan <surenb@google.com>,
	Michal Hocko <mhocko@suse.com>, Chris Li <chrisl@kernel.org>,
	 Kemeng Shi <shikemeng@huaweicloud.com>,
	Nhat Pham <nphamcs@gmail.com>, Baoquan He <baoquan.he@linux.dev>,
	 Barry Song <baohua@kernel.org>,
	Youngjun Park <youngjun.park@lge.com>,
	 Shivam Kalra <shivamkalra98@zohomail.in>,
	Kairui Song <ryncsn@gmail.com>
Subject: Re: [PATCH v3 07/18] mm/huge_memory: move EOF trimming into the file split helper
Date: Mon, 31 Aug 2026 02:08:43 +0100	[thread overview]
Message-ID: <apTTW3q5Gj0razE4@thinkstation> (raw)
In-Reply-To: <20260821-swap-thp-cleanup-v3-7-9b43f5163238@tencent.com>

On Fri, Aug 21, 2026 at 02:55:20AM +0800, Kairui Song via B4 Relay wrote:
> From: Kairui Song <kasong@tencent.com>
> 
> Instead of receiving @end and @nr_shmem_dropped from the caller, the
> file split helper now computes the EOF boundary and trims pages beyond
> it itself, as this is only needed for file split.  This drops the
> redundant parameter passing and sanity check.
> 
> Reviewed-by: Zi Yan <ziy@nvidia.com>
> Signed-off-by: Kairui Song <kasong@tencent.com>

Reviewed-by: Kiryl Shutsemau (Meta) <kas@kernel.org>

Couple of nits below.

> ---
>  mm/huge_memory.c | 42 +++++++++++++++++++-----------------------
>  1 file changed, 19 insertions(+), 23 deletions(-)
> 
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 69d3a6889f9e..01c8cf428595 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -4029,14 +4029,26 @@ static int __folio_freeze_split_unmapped_anon(struct folio *folio, unsigned int
>  static int __folio_freeze_split_unmapped_file(struct folio *folio, unsigned int new_order,
>  					      struct page *split_at, struct xa_state *xas,
>  					      struct address_space *mapping, bool do_lru,
> -					      struct list_head *list, enum split_type split_type,
> -					      pgoff_t end, int *nr_shmem_dropped)
> +					      struct list_head *list, enum split_type split_type)
>  {
>  	struct folio *end_folio = folio_next(folio);
>  	struct folio *new_folio, *next;
> +	int nr_shmem_dropped = 0;
>  	struct lruvec *lruvec;
> +	pgoff_t end = 0;

No need to initialize.

>  	int ret;
>  
> +	/*
> +	 * __split_frozen_folio() may need to trim off pages beyond

Does it require update?

	 * The loop below may need to trim off pages beyond

...

> +	 * EOF: but on 32-bit, i_size_read() takes an irq-unsafe
> +	 * seqlock, which cannot be nested inside the page tree lock.
> +	 * So note end now: i_size itself may be changed at any moment,
> +	 * but folio lock is good enough to serialize the trimming.
> +	 */
> +	end = DIV_ROUND_UP(i_size_read(mapping->host), PAGE_SIZE);
> +	if (shmem_mapping(mapping))
> +		end = shmem_fallocend(mapping->host, end);
> +
>  	xas_lock_irq(xas);
>  
>  	/*
> @@ -4101,10 +4113,9 @@ static int __folio_freeze_split_unmapped_file(struct folio *folio, unsigned int
>  			continue;
>  		}
>  
> -		VM_WARN_ON_ONCE(!nr_shmem_dropped);
>  		/* Drop folio beyond EOF: ->index >= end */
> -		if (shmem_mapping(mapping) && nr_shmem_dropped)
> -			*nr_shmem_dropped += nr_pages;
> +		if (shmem_mapping(mapping))
> +			nr_shmem_dropped += nr_pages;
>  		else if (folio_test_clear_dirty(new_folio))
>  			folio_account_cleaned(new_folio,
>  					      inode_to_wb(mapping->host));
> @@ -4125,6 +4136,8 @@ static int __folio_freeze_split_unmapped_file(struct folio *folio, unsigned int
>  
>  fail:
>  	xas_unlock_irq(xas);
> +	if (nr_shmem_dropped)
> +		shmem_uncharge(mapping->host, nr_shmem_dropped);
>  	return ret;
>  }
>  
> @@ -4161,9 +4174,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order,
>  	struct anon_vma *anon_vma = NULL;
>  	int old_order = folio_order(folio);
>  	struct folio *new_folio, *next;
> -	int nr_shmem_dropped = 0;
>  	enum ttu_flags ttu_flags = 0;
> -	pgoff_t end = 0;
>  	int ret;
>  
>  	VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);
> @@ -4240,17 +4251,6 @@ static int __folio_split(struct folio *folio, unsigned int new_order,
>  
>  		anon_vma = NULL;
>  		i_mmap_lock_read(mapping);
> -
> -		/*
> -		 * __split_frozen_folio() may need to trim off pages beyond
> -		 * EOF: but on 32-bit, i_size_read() takes an irq-unsafe
> -		 * seqlock, which cannot be nested inside the page tree lock.
> -		 * So note end now: i_size itself may be changed at any moment,
> -		 * but folio lock is good enough to serialize the trimming.
> -		 */
> -		end = DIV_ROUND_UP(i_size_read(mapping->host), PAGE_SIZE);
> -		if (shmem_mapping(mapping))
> -			end = shmem_fallocend(mapping->host, end);
>  	}
>  
>  	/*
> @@ -4266,16 +4266,12 @@ static int __folio_split(struct folio *folio, unsigned int new_order,
>  
>  	if (!is_anon) {
>  		ret = __folio_freeze_split_unmapped_file(folio, new_order, split_at, &xas, mapping,
> -							 true, list, split_type, end,
> -							 &nr_shmem_dropped);
> +							 true, list, split_type);
>  	} else {
>  		ret = __folio_freeze_split_unmapped_anon(folio, new_order, split_at, true,
>  							 list, split_type);
>  	}
>  
> -	if (nr_shmem_dropped)
> -		shmem_uncharge(mapping->host, nr_shmem_dropped);
> -
>  	if (!ret && is_anon && !folio_is_device_private(folio))
>  		ttu_flags = TTU_USE_SHARED_ZEROPAGE;
>  
> 
> -- 
> 2.55.0
> 
> 

-- 
  Kiryl Shutsemau / Kirill A. Shutemov

  parent reply	other threads:[~2026-08-31  1:08 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-20 18:55 [PATCH v3 00/18] mm/huge_memory: clean up folio split and lift swapcache split limits Kairui Song via B4 Relay
2026-08-20 18:55 ` [PATCH v3 01/18] mm/swap: fix off-by-one in swap cache replace sanity check Kairui Song via B4 Relay
2026-08-23  8:53   ` Barry Song
2026-08-27 14:13   ` Kiryl Shutsemau
2026-08-27 15:57   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 02/18] mm/huge_memory: fix rejection of swap cache folios with a mapping Kairui Song via B4 Relay
2026-08-27  8:46   ` Barry Song
2026-08-27  9:31     ` Kairui Song
2026-08-27 14:33   ` Kiryl Shutsemau
2026-08-27 15:58     ` David Hildenbrand (Arm)
2026-08-27 14:36   ` Kiryl Shutsemau
2026-08-27 16:01     ` David Hildenbrand (Arm)
2026-08-27 16:00   ` David Hildenbrand (Arm)
2026-08-27 17:02     ` Kiryl Shutsemau
2026-08-27 17:11       ` David Hildenbrand (Arm)
2026-08-27 17:07     ` Kairui Song
2026-08-20 18:55 ` [PATCH v3 03/18] mm/huge_memory: invert folio_ref_freeze() check to reduce indentation Kairui Song via B4 Relay
2026-08-27  9:05   ` Barry Song
2026-08-27 14:39   ` Kiryl Shutsemau
2026-08-27 16:02   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 04/18] mm/huge_memory: split the routine for splitting anon and file folio Kairui Song via B4 Relay
2026-08-26  1:31   ` Zi Yan
2026-08-27 14:58   ` Kiryl Shutsemau
2026-08-27 17:19     ` Kairui Song
2026-08-27 16:19   ` David Hildenbrand (Arm)
2026-08-27 17:17     ` Kairui Song
2026-08-27 19:05       ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 05/18] mm/huge_memory: rename __split_unmapped_folio() to __split_frozen_folio() Kairui Song via B4 Relay
2026-08-27 15:06   ` Kiryl Shutsemau
2026-08-27 16:22     ` David Hildenbrand (Arm)
2026-08-27 17:21       ` Kairui Song
2026-08-20 18:55 ` [PATCH v3 06/18] mm/huge_memory: consolidate irq and locking for folio split Kairui Song via B4 Relay
2026-08-27 15:15   ` Kiryl Shutsemau
2026-08-27 16:24   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 07/18] mm/huge_memory: move EOF trimming into the file split helper Kairui Song via B4 Relay
2026-08-27 16:25   ` David Hildenbrand (Arm)
2026-08-31  1:08   ` Kiryl Shutsemau [this message]
2026-08-20 18:55 ` [PATCH v3 08/18] mm/huge_memory: move unmap and remap into the split helpers Kairui Song via B4 Relay
2026-08-27 16:32   ` David Hildenbrand (Arm)
2026-08-27 17:35     ` Kairui Song
2026-08-27 19:09       ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 09/18] mm/huge_memory: move anon_vma and filemap management into " Kairui Song via B4 Relay
2026-08-27 16:36   ` David Hildenbrand (Arm)
2026-08-27 17:37     ` Kairui Song
2026-08-30 15:23     ` Kairui Song
2026-08-20 18:55 ` [PATCH v3 10/18] mm/huge_memory: move memcg switch into the file split helper Kairui Song via B4 Relay
2026-08-27 16:37   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 11/18] mm/huge_memory: allow splitting mappingless swap cache folios Kairui Song via B4 Relay
2026-08-26  1:55   ` Zi Yan
2026-08-27 16:41   ` David Hildenbrand (Arm)
2026-08-27 17:41     ` Kairui Song
2026-08-27 19:16       ` David Hildenbrand (Arm)
2026-08-27 19:29         ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 12/18] mm/huge_memory: add kerneldoc for the split helpers Kairui Song via B4 Relay
2026-08-26  1:57   ` Zi Yan
2026-08-27 16:45   ` David Hildenbrand (Arm)
2026-08-27 17:43     ` Kairui Song
2026-08-20 18:55 ` [PATCH v3 13/18] mm/huge_memory: drop the unused do_lru argument of the file split helper Kairui Song via B4 Relay
2026-08-26  1:57   ` Zi Yan
2026-08-27 16:45   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 14/18] mm/huge_memory: clean up after-split folio freeing in __folio_split Kairui Song via B4 Relay
2026-08-27 16:48   ` David Hildenbrand (Arm)
2026-08-27 17:47     ` Kairui Song
2026-08-27 19:33       ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 15/18] mm/huge_memory: lift order-0 restriction for swapcache split Kairui Song via B4 Relay
2026-08-27 16:51   ` David Hildenbrand (Arm)
2026-08-27 17:48     ` Kairui Song
2026-08-27 20:22       ` David Hildenbrand (Arm)
2026-08-30 13:19         ` Kairui Song
2026-08-20 18:55 ` [PATCH v3 16/18] mm/huge_memory: clarify supported split orders in comment Kairui Song via B4 Relay
2026-08-26  2:02   ` Zi Yan
2026-08-27 17:48     ` Kairui Song
2026-08-27 16:54   ` David Hildenbrand (Arm)
2026-08-20 18:55 ` [PATCH v3 17/18] mm/huge_memory: count only swap cache refs in anon folio split Kairui Song via B4 Relay
2026-08-20 18:55 ` [PATCH v3 18/18] mm/huge_memory: drop the redundant mapping argument of __split_frozen_folio Kairui Song via B4 Relay
2026-08-26  2:06   ` Zi Yan
2026-08-27 12:19 ` [PATCH v3 00/18] mm/huge_memory: clean up folio split and lift swapcache split limits Yeoreum Yun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=apTTW3q5Gj0razE4@thinkstation \
    --to=kirill@shutemov.name \
    --cc=akpm@linux-foundation.org \
    --cc=baohua@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=baoquan.he@linux.dev \
    --cc=chrisl@kernel.org \
    --cc=david@kernel.org \
    --cc=dev.jain@arm.com \
    --cc=kasong@tencent.com \
    --cc=lance.yang@linux.dev \
    --cc=liam@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=ljs@kernel.org \
    --cc=mhocko@suse.com \
    --cc=nico.pache@linux.dev \
    --cc=nphamcs@gmail.com \
    --cc=rppt@kernel.org \
    --cc=ryan.roberts@arm.com \
    --cc=ryncsn@gmail.com \
    --cc=shikemeng@huaweicloud.com \
    --cc=shivamkalra98@zohomail.in \
    --cc=surenb@google.com \
    --cc=usama.arif@linux.dev \
    --cc=vbabka@kernel.org \
    --cc=youngjun.park@lge.com \
    --cc=ziy@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®