mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: akpm@linux-foundation.org, hughd@google.com, david@kernel.org
Cc: ziy@nvidia.com, liam@infradead.org, nico.pache@linux.dev,
	ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org,
	lance.yang@linux.dev, usama.arif@linux.dev, kas@kernel.org,
	ljs@kernel.org, baolin.wang@linux.alibaba.com,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 05/12] mm: khugepaged: add max_ptes_none check in collapse_file()
Date: Fri, 18 Sep 2026 11:58:36 +0800	[thread overview]
Message-ID: <56bd2febf013c88e2fedbd653e7cc5dc12c6bc85.1789701677.git.baolin.wang@linux.alibaba.com> (raw)
In-Reply-To: <cover.1789701677.git.baolin.wang@linux.alibaba.com>

Similar to the anonymous folios collapse, we should also check the
'max_ptes_none' when trying to collapse shmem/file folios, which is
also intended as preparation for shmem mTHP collapse in the
following patches.

Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
---
 mm/khugepaged.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 249ee91a66f2..f741dec3acc2 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -2158,6 +2158,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff)
 static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,
 		struct file *file, pgoff_t start, struct collapse_control *cc)
 {
+	const unsigned int max_ptes_none = collapse_max_ptes_none(cc, NULL, HPAGE_PMD_ORDER);
 	struct address_space *mapping = file->f_mapping;
 	struct page *dst;
 	struct folio *folio, *tmp, *new_folio;
@@ -2222,7 +2223,13 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,
 						goto xa_locked;
 					}
 				}
-				nr_none++;
+
+				if (++nr_none > max_ptes_none) {
+					result = SCAN_EXCEED_NONE_PTE;
+					count_vm_event(THP_SCAN_EXCEED_NONE_PTE);
+					goto xa_locked;
+				}
+
 				index++;
 				continue;
 			}
-- 
2.47.3


  parent reply	other threads:[~2026-09-18  3:59 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-18  3:58 [PATCH 00/12] add shmem mTHP collapse support Baolin Wang
2026-09-18  3:58 ` [PATCH 01/12] mm: khugepaged: remove outdated comments and check for shmem Baolin Wang
2026-09-18  5:31   ` Barry Song
2026-09-18  3:58 ` [PATCH 02/12] mm: khugepaged: drop the hugepage_madvise() Baolin Wang
2026-09-18  5:33   ` Barry Song
2026-09-18  3:58 ` [PATCH 03/12] mm: shmem: don't expose 'deny' and 'force' via the kernel command line Baolin Wang
2026-09-18  5:45   ` Barry Song
2026-09-18  8:31     ` Baolin Wang
2026-09-18  3:58 ` [PATCH 04/12] mm: khugepaged: move cc->scan_file and cc->scan_pgoff assignment into collapse_scan_file() Baolin Wang
2026-09-18  3:58 ` Baolin Wang [this message]
2026-09-18  3:58 ` [PATCH 06/12] mm: khugepaged: generalize collapse_file() for shmem mTHP support Baolin Wang
2026-09-18  3:58 ` [PATCH 07/12] mm: khugepaged: add an order check for PMD-sized THP statistics Baolin Wang
2026-09-18  3:58 ` [PATCH 08/12] mm: khugepaged: add a helper to get the minimal collapse order Baolin Wang
2026-09-18  3:58 ` [PATCH 09/12] mm: khugepaged: add shmem mTHP collapse support Baolin Wang
2026-09-18  3:58 ` [PATCH 10/12] mm: shmem: run khugepaged for all shmem mTHP orders Baolin Wang
2026-09-18  3:58 ` [PATCH 11/12] mm: khugepaged: allow khugepaged to check all shmem mTHP-sized orders Baolin Wang
2026-09-18  3:58 ` [PATCH 12/12] selftests: mm: add shmem mTHP collapse test cases Baolin Wang

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=56bd2febf013c88e2fedbd653e7cc5dc12c6bc85.1789701677.git.baolin.wang@linux.alibaba.com \
    --to=baolin.wang@linux.alibaba.com \
    --cc=akpm@linux-foundation.org \
    --cc=baohua@kernel.org \
    --cc=david@kernel.org \
    --cc=dev.jain@arm.com \
    --cc=hughd@google.com \
    --cc=kas@kernel.org \
    --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=nico.pache@linux.dev \
    --cc=ryan.roberts@arm.com \
    --cc=usama.arif@linux.dev \
    --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®