Skip to contentSkip to conversation

FAILED: patch "[PATCH] mm/khugepaged: fix the address passed to notifier on testing" failed to apply to 5.4-stable tree

PATCH New [email protected] 2 participants 2 messages Sep 13, 2025

Subsystems (3)
Stable branch Memory management THP
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 394bfac1c7f7b701c2c93834c5761b9c9ceeebcf
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025091346-ambition-mangle-6099@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 394bfac1c7f7b701c2c93834c5761b9c9ceeebcf Mon Sep 17 00:00:00 2001
From: Wei Yang <[email protected]>
Date: Fri, 22 Aug 2025 06:33:18 +0000
Subject: [PATCH] mm/khugepaged: fix the address passed to notifier on testing
young

Commit 8ee53820edfd ("thp: mmu_notifier_test_young") introduced mmu_notifier_test_young(), but we are passing the wrong address. In xxx_scan_pmd(), the actual iteration address is "_address" not "address". We seem to misuse the variable on the very beginning.

Change it to the right one.

[[email protected] fix whitespace, per everyone]
Link https://lkml.kernel.org/r/[email protected] open here
Fixes 8ee53820edfd ("thp: mmu_notifier_test_young")
Signed-off-by Wei Yang <[email protected]>
Reviewed-by Dev Jain <[email protected]>
Reviewed-by Zi Yan <[email protected]>
Acked-by David Hildenbrand <[email protected]>
Reviewed-by Lorenzo Stoakes <[email protected]>
Cc Baolin Wang <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Nico Pache <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Barry Song <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
mm/khugepaged.c +2 -2
index 6b40bdfd224c..b486c1d19b2d 100644
@@ -1417,8 +1417,8 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm,
 		 */
 		if (cc->is_khugepaged &&
 		    (pte_young(pteval) || folio_test_young(folio) ||
-		     folio_test_referenced(folio) || mmu_notifier_test_young(vma->vm_mm,
-								     address)))
+		     folio_test_referenced(folio) ||
+		     mmu_notifier_test_young(vma->vm_mm, _address)))
 			referenced++;
 	}
 	if (!writable) {
#1 lore raw

PATCH 1/1 mm/khugepaged: fix the address passed to notifier on testing young

[ Upstream commit 394bfac1c7f7b701c2c93834c5761b9c9ceeebcf ]

Commit 8ee53820edfd ("thp: mmu_notifier_test_young") introduced mmu_notifier_test_young(), but we are passing the wrong address. In xxx_scan_pmd(), the actual iteration address is "_address" not "address". We seem to misuse the variable on the very beginning.

Change it to the right one.

[[email protected] fix whitespace, per everyone]
Link https://lkml.kernel.org/r/[email protected] open here
Fixes 8ee53820edfd ("thp: mmu_notifier_test_young")
Signed-off-by Wei Yang <[email protected]>
Reviewed-by Dev Jain <[email protected]>
Reviewed-by Zi Yan <[email protected]>
Acked-by David Hildenbrand <[email protected]>
Reviewed-by Lorenzo Stoakes <[email protected]>
Cc Baolin Wang <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Nico Pache <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Barry Song <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
 mm/khugepaged.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/khugepaged.c +1 -1
index d6da1fcbef6f..dbbe86bdf04e 100644
@@ -1227,7 +1227,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
 		}
 		if (pte_young(pteval) ||
 		    page_is_young(page) || PageReferenced(page) ||
-		    mmu_notifier_test_young(vma->vm_mm, address))
+		    mmu_notifier_test_young(vma->vm_mm, _address))
 			referenced++;
 	}
 	if (writable) {
Signature · 1 line
2.34.1