Commit 1c71222e authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Andrew Morton
Browse files

mm: replace vma->vm_flags direct modifications with modifier calls 

Replace direct modifications to vma->vm_flags with calls to modifier
functions to be able to track flag changes and to keep vma locking
correctness.

[akpm@linux-foundation.org: fix drivers/misc/open-dice.c, per Hyeonggon Yoo]
Link: https://lkml.kernel.org/r/20230126193752.297968-5-surenb@google.com


Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Acked-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arjun Roy <arjunroy@google.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David Rientjes <rientjes@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Joel Fernandes <joelaf@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Laurent Dufour <ldufour@linux.ibm.com>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Minchan Kim <minchan@google.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Peter Oskolkov <posk@google.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Punit Agrawal <punit.agrawal@bytedance.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e430a95a

arch/arm/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int __init gate_vma_init(void) 
	gate_vma.vm_page_prot = PAGE_READONLY_EXEC;

	gate_vma.vm_start = 0xffff0000;

	gate_vma.vm_end	= 0xffff0000 + PAGE_SIZE;

	gate_vma.vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;

	vm_flags_init(&gate_vma, VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC);

	return 0;

}

arch_initcall(gate_vma_init);

arch/ia64/mm/init.c

+4 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ ia64_init_addr_space (void) 
		vma_set_anonymous(vma);

		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;

		vma->vm_end = vma->vm_start + PAGE_SIZE;

		vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;

		vm_flags_init(vma, VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT);

		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);

		mmap_write_lock(current->mm);

		if (insert_vm_struct(current->mm, vma)) {
@@ -127,8 +127,8 @@ ia64_init_addr_space (void) 
			vma_set_anonymous(vma);

			vma->vm_end = PAGE_SIZE;

			vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);

			vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO |

					VM_DONTEXPAND | VM_DONTDUMP;

			vm_flags_init(vma, VM_READ | VM_MAYREAD | VM_IO |

				      VM_DONTEXPAND | VM_DONTDUMP);

			mmap_write_lock(current->mm);

			if (insert_vm_struct(current->mm, vma)) {

				mmap_write_unlock(current->mm);
@@ -272,7 +272,7 @@ static int __init gate_vma_init(void) 
	vma_init(&gate_vma, NULL);

	gate_vma.vm_start = FIXADDR_USER_START;

	gate_vma.vm_end = FIXADDR_USER_END;

	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;

	vm_flags_init(&gate_vma, VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC);

	gate_vma.vm_page_prot = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX);



	return 0;

arch/loongarch/include/asm/tlb.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline void tlb_flush(struct mmu_gather *tlb) 
	struct vm_area_struct vma;



	vma.vm_mm = tlb->mm;

	vma.vm_flags = 0;

	vm_flags_init(&vma, 0);

	if (tlb->fullmm) {

		flush_tlb_mm(tlb->mm);

		return;

arch/powerpc/kvm/book3s_xive_native.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static int kvmppc_xive_native_mmap(struct kvm_device *dev, 
		return -EINVAL;

	}



	vma->vm_flags |= VM_IO | VM_PFNMAP;

	vm_flags_set(vma, VM_IO | VM_PFNMAP);

	vma->vm_page_prot = pgprot_noncached_wc(vma->vm_page_prot);



	/*

arch/powerpc/mm/book3s64/subpage_prot.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void subpage_mark_vma_nohuge(struct mm_struct *mm, unsigned long addr, 
	 * VM_NOHUGEPAGE and split them.

	 */

	for_each_vma_range(vmi, vma, addr + len) {

		vma->vm_flags |= VM_NOHUGEPAGE;

		vm_flags_set(vma, VM_NOHUGEPAGE);

		walk_page_vma(vma, &subpage_walk_ops, NULL);

	}

}