mm-mincore-handle-non-swap-entries-before-config_swap-guard.patch removed from -mm tree
The quilt patch titled
Subject: mm/mincore: handle non-swap entries before !CONFIG_SWAP guard
has been removed from the -mm tree. Its filename was
mm-mincore-handle-non-swap-entries-before-config_swap-guard.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Usama Arif <[email protected]>
Subject: mm/mincore: handle non-swap entries before !CONFIG_SWAP guard
Date: Tue, 2 Jun 2026 10:22:47 -0700
mincore_swap() also fields migration/hwpoison entries (and shmem swapin-error entries), which can exist on !CONFIG_SWAP builds when CONFIG_MIGRATION or CONFIG_MEMORY_FAILURE is enabled. The !IS_ENABLED(CONFIG_SWAP) guard ran before the non-swap-entry early return, so mincore_pte_range() can spuriously WARN and report these pages nonresident on !CONFIG_SWAP kernels.
Move the guard below the non-swap-entry check so only true swap entries trip the WARN, and migration/hwpoison entries take the existing "uptodate / non-shmem" path.
---
mm/mincore.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/mincore.c renamed from mm/mincore.c~mm-mincore-handle-non-swap-entries-before-config_swap-guard +5 -5
@@ -64,11 +64,6 @@ static unsigned char mincore_swap(swp_enstruct folio *folio =NULL ;unsigned char present =0 ; -if (!IS_ENABLED (CONFIG_SWAP )) { -WARN_ON (1 ); -return 0 ; - } -/* * Shmem mapping may contain swapin error entries, which are * absent. Page table may contain migration or hwpoison
@@ -77,6 +72,11 @@ static unsigned char mincore_swap(swp_enif (!softleaf_is_swap (entry))return !shmem; +if (!IS_ENABLED (CONFIG_SWAP )) { +WARN_ON (1 ); +return 0 ; + } +/* * Shmem mapping lookup is lockless, so we need to grab the swap * device. mincore page table walk locks the PTL, and the swap
_
Patches currently in -mm which might be from [email protected] are
mm-bypass-mmap_miss-heuristic-for-vm_exec-readahead.patch mm-use-mapping_max_folio_order-for-force_thp_readahead-order.patch