[folded-merged] mm-vma-read-anon_vma-carefully-in-validate_mm-fix.patch removed from -mm tree

[folded-merged] mm-vma-read-anon_vma-carefully-in-validate_mm-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-vma-read-anon_vma-carefully-in-validate_mm-fix
has been removed from the -mm tree.  Its filename was
     mm-vma-read-anon_vma-carefully-in-validate_mm-fix.patch

This patch was dropped because it was folded into mm-vma-read-anon_vma-carefully-in-validate_mm.patch

------------------------------------------------------
From: Kiryl Shutsemau <kas@kernel.org>
Subject: mm-vma-read-anon_vma-carefully-in-validate_mm-fix
Date: Mon, 2 Nov 2026 10:48:45 +0000

reduce ifdeffery

Link: https://lore.kernel.org/auhn01dpDzK47igy@thinkstation
Signed-off-by: Kiryl Shutsemau <kas@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Songsen Yang <yangsongsen@insta360.com>
Cc: <syzbot+10e72ea5747737bcd2ad@syzkaller.appspotmail.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
---

 include/linux/mm.h |    2 --
 mm/vma.c           |   12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

--- a/include/linux/mm.h~mm-vma-read-anon_vma-carefully-in-validate_mm-fix
+++ a/include/linux/mm.h
@@ -4370,9 +4370,7 @@ anon_rmap_tree_iter_first(struct anon_vm
 struct anon_vma_chain *
 anon_rmap_tree_iter_next(struct anon_vma_chain *avc,
 			 pgoff_t pgoff_start, pgoff_t pgoff_last);
-#ifdef CONFIG_DEBUG_VM_RB
 void anon_rmap_tree_verify(struct anon_vma_chain *avc);
-#endif
 
 #define anon_rmap_tree_foreach(avc, anon_vma, pgoff_start, pgoff_last)		 \
 	for (avc = anon_rmap_tree_iter_first(anon_vma, pgoff_start, pgoff_last); \
--- a/mm/vma.c~mm-vma-read-anon_vma-carefully-in-validate_mm-fix
+++ a/mm/vma.c
@@ -676,14 +676,17 @@ static int dup_anon_vma(struct vm_area_s
 }
 
 #ifdef CONFIG_DEBUG_VM_MAPLE_TREE
-#ifdef CONFIG_DEBUG_VM_RB
 static void validate_mm_anon_rmap(struct vm_area_struct *vma)
 {
-	struct anon_vma *anon_vma = READ_ONCE(vma->anon_vma);
+	struct anon_vma *anon_vma;
 	struct anon_vma_chain *avc;
 
+	if (!IS_ENABLED(CONFIG_DEBUG_VM_RB))
+		return;
+
 	vma_assert_stabilised(vma);
 
+	anon_vma = READ_ONCE(vma->anon_vma);
 	if (!anon_vma)
 		return;
 
@@ -692,11 +695,6 @@ static void validate_mm_anon_rmap(struct
 		anon_rmap_tree_verify(avc);
 	anon_vma_unlock_read(anon_vma);
 }
-#else
-static void validate_mm_anon_rmap(struct vm_area_struct *vma)
-{
-}
-#endif
 
 void validate_mm(struct mm_struct *mm)
 {
_

Patches currently in -mm which might be from kas@kernel.org are

mm-vma-read-anon_vma-carefully-in-validate_mm.patch