mm: replace vma->vm_flags indirect modification in ksm_madvise

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. Add a BUG_ON check in ksm_madvise() to catch indirect
vm_flags modification attempts.

Signed-off-by: Suren Baghdasaryan <surenb@google.com>

diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c
index e2f11f9c3f2aa691bd4b1a130d06d38d989ecc5c..924209bb932f025e1282079e81d5ff2e8aff76aa 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_uvmem.c
+++ b/arch/powerpc/kvm/book3s_hv_uvmem.c
@@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm,
 {
        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,14 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm,
                        ret = H_STATE;
                        break;
                }
+               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;
                }
+               reset_vm_flags(vma, vm_flags);
                start = vma->vm_end;
        } while (end > vma->vm_end);
 

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 439638122c9226192b16e26d77c6047e6327a872..d38a82a190f3bd0116557d0841200cc98ff65cf5 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -2583,14 +2583,17 @@ 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) {
+               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;
+               reset_vm_flags(vma, vm_flags);
        }
        mm->def_flags &= ~VM_MERGEABLE;
        return 0;

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 4734315f79407bc75db0f995445621f41b1d2f17..c7e0385556130bd0b3e0a5fac0e12a2a6ac55187 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -352,6 +352,8 @@ struct attribute_group khugepaged_attr_group = {
 int hugepage_madvise(struct vm_area_struct *vma,
                     unsigned long *vm_flags, int advice)
 {
+       /* vma->vm_flags can be changed only using modifier functions */
+       BUG_ON(vm_flags == &vma->vm_flags);
        switch (advice) {
        case MADV_HUGEPAGE:
 #ifdef CONFIG_S390

diff --git a/mm/ksm.c b/mm/ksm.c
index c19fcca9bc03dcd9511486000c6cadb11d724c29..01aa69909407018af71b63ea67634b38719024d2 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2444,6 +2444,8 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
        struct mm_struct *mm = vma->vm_mm;
        int err;
 
+       /* vma->vm_flags can be changed only using modifier functions */
+       BUG_ON(vm_flags == &vma->vm_flags);
        switch (advice) {
        case MADV_MERGEABLE:
                /*