mm-replace-vma-vm_flags-indirect-modification-in-ksm_madvise.patch removed from -mm tree
The quilt patch titled
Subject: mm: replace vma->vm_flags indirect modification in ksm_madvise
has been removed from the -mm tree. Its filename was
mm-replace-vma-vm_flags-indirect-modification-in-ksm_madvise.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Suren Baghdasaryan <[email protected]>
Subject: mm: replace vma->vm_flags indirect modification in ksm_madvise
Date: Thu, 26 Jan 2023 11:37:50 -0800
Replace indirect modifications to vma->vm_flags with calls to modifier functions to be able to track flag changes and to keep vma locking correctness.
Signed-off-by Suren Baghdasaryan <[email protected]>
Acked-by Michal Hocko <[email protected]>
Acked-by Mel Gorman <[email protected]>
Reviewed-by Hyeonggon Yoo <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Arjun Roy <[email protected]>
Cc Axel Rasmussen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Howells <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc David Rientjes <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Greg Thelen <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jann Horn <[email protected]>
Cc Joel Fernandes <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kent Overstreet <[email protected]>
Cc Laurent Dufour <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Paul E. McKenney <[email protected]>
Cc Peter Oskolkov <[email protected]>
Cc Peter Xu <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Punit Agrawal <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc Sebastian Reichel <[email protected]>
Cc Shakeel Butt <[email protected]>
Cc Soheil Hassas Yeganeh <[email protected]>
Cc Song Liu <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/powerpc/kvm/book3s_hv_uvmem.c | 6 +++++- arch/s390/mm/gmap.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_hv_uvmem.c renamed from arch/powerpc/kvm/book3s_hv_uvmem.c~mm-replace-vma-vm_flags-indirect-modification-in-ksm_madvise +5 -1
@@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(str {unsigned long gfn = memslot->base_gfn;unsigned long end, start =gfn_to_hva (kvm, gfn); +unsigned long vm_flags;int ret =0 ;struct vm_area_struct *vma;int merge_flag = (merge) ?MADV_MERGEABLE :MADV_UNMERGEABLE ;
@@ -409,12 +410,15 @@ static int kvmppc_memslot_page_merge(str ret =H_STATE ;break ; } +/* Copy vm_flags to avoid partial modifications in ksm_madvise */ + vm_flags = vma->vm_flags; ret =ksm_madvise (vma, vma->vm_start, vma->vm_end, - merge_flag, &vma->vm_flags); + merge_flag, &vm_flags);if (ret) { ret =H_STATE ;break ; } +vm_flags_reset (vma, vm_flags); start = vma->vm_end; }while (end > vma->vm_end);
arch/s390/mm/gmap.c renamed from arch/s390/mm/gmap.c~mm-replace-vma-vm_flags-indirect-modification-in-ksm_madvise +5 -1
@@ -2587,14 +2587,18 @@ int gmap_mark_unmergeable(void) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma; +unsigned long vm_flags;int ret;VMA_ITERATOR (vmi, mm,0 );for_each_vma (vmi, vma) { +/* Copy vm_flags to avoid partial modifications in ksm_madvise */ + vm_flags = vma->vm_flags; ret =ksm_madvise (vma, vma->vm_start, vma->vm_end, -MADV_UNMERGEABLE , &vma->vm_flags); +MADV_UNMERGEABLE , &vm_flags);if (ret)return ret; +vm_flags_reset (vma, vm_flags); } mm->def_flags &= ~VM_MERGEABLE ;return 0 ;
_
Patches currently in -mm which might be from [email protected] are