mm/vma: read anon_vma carefully in validate_mm()
Subsystems (3)
Lorenzo Stoakes (ARM)
maintainerPATCH 1/1 mm/vma: read anon_vma carefully in validate_mm()
Commit 38564710f443 ("mm: implement and use vma_has_anon_rmap(), silence KCSAN") rather clumsily converted the read of vma->anon_vma into a vma_has_anon_rmap() without accounting for the separation between assignment of anon_vma and later use of it.
vma_has_anon_rmap() is intended as an optimistic check, so doesn't need to protect against a torn read in vma->anon_vma. The caller is expected to take care of this themselves if they then in fact access the field.
validate_mm() does indeed then reference the field, so resolve the issue via READ_ONCE(), and simplify the code by separating this into a new function validate_mm_anon_rmap().
Finally, add a vma_assert_stabilised() to make it clear the required state of the VMA.
--- mm/vma.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
mm/vma.c +24 -12
@@ -669,6 +669,28 @@ static int dup_anon_vma(struct vm_area_struct *dst, }#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_chain *avc; + +vma_assert_stabilised (vma); + +if (!anon_vma) +return ; + +anon_vma_lock_read (anon_vma); +list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) +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) {int bug =0 ;
@@ -678,10 +700,6 @@ void validate_mm(struct mm_struct *mm)mt_validate (&mm->mm_mt);for_each_vma (vmi, vma) { -#ifdef CONFIG_DEBUG_VM_RB -struct anon_vma *anon_vma = vma->anon_vma; -struct anon_vma_chain *avc; -#endif unsigned long vmi_start, vmi_end;bool warn =0 ;
@@ -702,14 +720,8 @@ void validate_mm(struct mm_struct *mm)vma_iter_dump_tree (&vmi); } -#ifdef CONFIG_DEBUG_VM_RB -if (vma_has_anon_rmap (vma)) { -anon_vma_lock_read (anon_vma); -list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) -anon_rmap_tree_verify (avc); -anon_vma_unlock_read (anon_vma); - } -#endif +validate_mm_anon_rmap (vma); +/* Check for a infinite loop */ if (++i > mm->map_count +10 ) { i =-1 ;
---
base-commit: b61fa14ce6bcbba2cb9a96feea31b760226d6b43
change-id: 20261102-fix-validate_mm-b7930d41388b
Cheers,
Signature · 1 line
Lorenzo Stoakes (ARM) <[email protected]>
Quoted 16 lines · Lorenzo Stoakes (ARM)
Commit
38564710f443("mm: implement and usevma_has_anon_rmap(), silence KCSAN") rather clumsily converted the read ofvma->anon_vmainto avma_has_anon_rmap()without accounting for the separation between assignment ofanon_vmaand later use of it.
vma_has_anon_rmap()is intended as an optimistic check, so doesn't need to protect against a torn read invma->anon_vma. The caller is expected to take care of this themselves if they then in fact access the field.
validate_mm()does indeed then reference the field, so resolve the issue viaREAD_ONCE(), and simplify the code by separating this into a new functionvalidate_mm_anon_rmap().Finally, add a
vma_assert_stabilised()to make it clear the required state of the VMA.
Quoted 6 lines
Fixes 38564710f443 ("mm: implement and use vma_has_anon_rmap(), silence KCSAN")Reported-by [email protected]Reported-by Songsen Yang <[email protected]>Signed-off-by Lorenzo Stoakes (ARM) <[email protected]>
Signature · 1 line
Pedro
Quoted 49 lines · Lorenzo Stoakes (ARM)
Commit
38564710f443("mm: implement and usevma_has_anon_rmap(), silence KCSAN") rather clumsily converted the read ofvma->anon_vmainto avma_has_anon_rmap()without accounting for the separation between assignment ofanon_vmaand later use of it.
vma_has_anon_rmap()is intended as an optimistic check, so doesn't need to protect against a torn read invma->anon_vma. The caller is expected to take care of this themselves if they then in fact access the field.
validate_mm()does indeed then reference the field, so resolve the issue viaREAD_ONCE(), and simplify the code by separating this into a new functionvalidate_mm_anon_rmap().Finally, add a
vma_assert_stabilised()to make it clear the required state of the VMA.Fixes 38564710f443 ("mm: implement and use vma_has_anon_rmap(), silence KCSAN")Reported-by [email protected]Reported-by Songsen Yang <[email protected]>Signed-off-by Lorenzo Stoakes (ARM) <[email protected]>--- mm/vma.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)mm/vma.c +15
-0@@ -669,6 +669,28 @@ static int dup_anon_vma(struct vm_area_struct *dst, } #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_chain *avc; + + vma_assert_stabilised(vma); + + if (!anon_vma) + return; + + anon_vma_lock_read(anon_vma); + list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) + anon_rmap_tree_verify(avc); + anon_vma_unlock_read(anon_vma);
mm/vma.c static int dup_anon_vma(struct vm_area_struct *dst, · line 696
Quoted 10 lines
mm/vma.c +7
-0+} +#else +static void validate_mm_anon_rmap (struct vm_area_struct *vma) +{ +} +#endif +void validate_mm (struct mm_struct *mm) {int bug =0 ;
This ifdeffery seems unnecessary. What about this:
include/linux/mm.h +0 -2
@@ -4363,9 +4363,7 @@ anon_rmap_tree_iter_first(struct anon_vma *anon_vma,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); \
mm/vma.c +22 -12
@@ -669,6 +669,26 @@ static int dup_anon_vma(struct vm_area_struct *dst, }#ifdef CONFIG_DEBUG_VM_MAPLE_TREE +static void validate_mm_anon_rmap (struct vm_area_struct *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 ; + +anon_vma_lock_read (anon_vma); +list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) +anon_rmap_tree_verify (avc); +anon_vma_unlock_read (anon_vma); +} +void validate_mm (struct mm_struct *mm) {int bug =0 ;
@@ -678,10 +698,6 @@ void validate_mm(struct mm_struct *mm)mt_validate (&mm->mm_mt);for_each_vma (vmi, vma) { -#ifdef CONFIG_DEBUG_VM_RB -struct anon_vma *anon_vma = vma->anon_vma; -struct anon_vma_chain *avc; -#endif unsigned long vmi_start, vmi_end;bool warn =0 ;
@@ -702,14 +718,8 @@ void validate_mm(struct mm_struct *mm)vma_iter_dump_tree (&vmi); } -#ifdef CONFIG_DEBUG_VM_RB -if (vma_has_anon_rmap (vma)) { -anon_vma_lock_read (anon_vma); -list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) -anon_rmap_tree_verify (avc); -anon_vma_unlock_read (anon_vma); - } -#endif +validate_mm_anon_rmap (vma); +/* Check for a infinite loop */ if (++i > mm->map_count +10 ) { i =-1 ;
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Lorenzo Stoakes (ARM)
maintainerQuoted 54 lines · Kiryl Shutsemau
Quoted 53 lines · Lorenzo Stoakes (ARM)
Commit
38564710f443("mm: implement and usevma_has_anon_rmap(), silence KCSAN") rather clumsily converted the read ofvma->anon_vmainto avma_has_anon_rmap()without accounting for the separation between assignment ofanon_vmaand later use of it.
vma_has_anon_rmap()is intended as an optimistic check, so doesn't need to protect against a torn read invma->anon_vma. The caller is expected to take care of this themselves if they then in fact access the field.
validate_mm()does indeed then reference the field, so resolve the issue viaREAD_ONCE(), and simplify the code by separating this into a new functionvalidate_mm_anon_rmap().Finally, add a
vma_assert_stabilised()to make it clear the required state of the VMA.Fixes 38564710f443 ("mm: implement and use vma_has_anon_rmap(), silence KCSAN")Reported-by [email protected]Reported-by Songsen Yang <[email protected]>Signed-off-by Lorenzo Stoakes (ARM) <[email protected]>--- mm/vma.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)mm/vma.c +19
-0@@ -669,6 +669,28 @@ static int dup_anon_vma(struct vm_area_struct *dst, } #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_chain *avc; + + vma_assert_stabilised(vma); + + if (!anon_vma) + return; + + anon_vma_lock_read(anon_vma); + list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) + anon_rmap_tree_verify(avc); + anon_vma_unlock_read(anon_vma); +} +#else +static void validate_mm_anon_rmap(struct vm_area_struct *vma) +{
Quoted 8 lines
mm/vma.c static int dup_anon_vma(struct vm_area_struct *dst, · line 694
Quoted 6 lines
mm/vma.c +3
-0+} +#endif +void validate_mm (struct mm_struct *mm) {int bug =0 ;This ifdeffery seems unnecessary. What about this:
Yup, even better.
Andrew - could you update it in-place or do you need a v2?
Quoted 66 lines
include/linux/mm.h +0
-2@@ -4363,9 +4363,7 @@ anon_rmap_tree_iter_first(struct anon_vma *anon_vma,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); \mm/vma.c +20
-9@@ -669,6 +669,26 @@ static int dup_anon_vma(struct vm_area_struct *dst, }#ifdef CONFIG_DEBUG_VM_MAPLE_TREE +static void validate_mm_anon_rmap (struct vm_area_struct *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 ; + +anon_vma_lock_read (anon_vma); +list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) +anon_rmap_tree_verify (avc); +anon_vma_unlock_read (anon_vma); +} +void validate_mm (struct mm_struct *mm) {int bug =0 ;@@ -678,10 +698,6 @@ void validate_mm(struct mm_struct *mm)mt_validate (&mm->mm_mt);for_each_vma (vmi, vma) { -#ifdef CONFIG_DEBUG_VM_RB -struct anon_vma *anon_vma = vma->anon_vma; -struct anon_vma_chain *avc; -#endif unsigned long vmi_start, vmi_end;bool warn =0 ;@@ -702,14 +718,8 @@ void validate_mm(struct mm_struct *mm)vma_iter_dump_tree (&vmi); } -#ifdef CONFIG_DEBUG_VM_RB -if (vma_has_anon_rmap (vma)) { -anon_vma_lock_read (anon_vma); -list_for_each_entry (avc, &vma->anon_vma_chain, same_vma) -anon_rmap_tree_verify (avc);
mm/vma.c void validate_mm(struct mm_struct *mm)
Quoted 10 lines
mm/vma.c +2
-4-anon_vma_unlock_read (anon_vma); - } -#endif +validate_mm_anon_rmap (vma); +/* Check for a infinite loop */ if (++i > mm->map_count +10 ) { i =-1 ; -- Kiryl Shutsemau / Kirill A. Shutemov
--
Cheers, Lorenzo
Andrew Morton
maintainerQuoted 5 lines · On Mon, 2 Nov 2026 11:02:56 +0000 "Lorenzo Stoakes (ARM)" <[email protected]>…
Quoted 1 line
This ifdeffery seems unnecessary. What about this:
Yup, even better.
Andrew - could you update it in-place or do you need a v2?
I queued this update:
include/linux/mm.h renamed from include/linux/mm.h~mm-vma-read-anon_vma-carefully-in-validate_mm-fix +0 -2
@@ -4370,9 +4370,7 @@ anon_rmap_tree_iter_first(struct anon_vmstruct 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); \
mm/vma.c renamed from mm/vma.c~mm-vma-read-anon_vma-carefully-in-validate_mm-fix +5 -7
@@ -669,14 +669,17 @@ static int dup_anon_vma(struct vm_area_s }#ifdef CONFIG_DEBUG_VM_MAPLE_TREE -#ifdef CONFIG_DEBUG_VM_RBstatic 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 ;
@@ -685,11 +688,6 @@ static void validate_mm_anon_rmap(structanon_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) {
_