Commit c154124f authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

mm/mmap.c: pass in mapping to __vma_link_file() 

__vma_link_file() resolves the mapping from the file, if there is one.
Pass through the mapping and check the vm_file externally since most
places already have the required information and check of vm_file.

Link: https://lkml.kernel.org/r/20220906194824.2110408-71-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Tested-by: default avatarYu Zhao <yuzhao@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d0601a50

mm/mmap.c

+12 −17
Original line number Diff line number Diff line
@@ -407,14 +407,9 @@ static unsigned long count_vma_pages_range(struct mm_struct *mm, 
	return nr_pages;

}



static void __vma_link_file(struct vm_area_struct *vma)

static void __vma_link_file(struct vm_area_struct *vma,

			    struct address_space *mapping)

{

	struct file *file;



	file = vma->vm_file;

	if (file) {

		struct address_space *mapping = file->f_mapping;



	if (vma->vm_flags & VM_SHARED)

		mapping_allow_writable(mapping);
@@ -422,7 +417,6 @@ static void __vma_link_file(struct vm_area_struct *vma) 
	vma_interval_tree_insert(vma, &mapping->i_mmap);

	flush_dcache_mmap_unlock(mapping);

}

}



/*

 * vma_mas_store() - Store a VMA in the maple tree.
@@ -488,10 +482,11 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma) 
	}



	vma_mas_store(vma, &mas);

	__vma_link_file(vma);



	if (mapping)

	if (mapping) {

		__vma_link_file(vma, mapping);

		i_mmap_unlock_write(mapping);

	}



	mm->map_count++;

	validate_mm(mm);
@@ -730,14 +725,14 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, 
			uprobe_munmap(next, next->vm_start, next->vm_end);



		i_mmap_lock_write(mapping);

		if (insert) {

		if (insert && insert->vm_file) {

			/*

			 * Put into interval tree now, so instantiated pages

			 * are visible to arm/parisc __flush_dcache_page

			 * throughout; but we cannot insert into address

			 * space until vma start or end is updated.

			 */

			__vma_link_file(insert);

			__vma_link_file(insert, insert->vm_file->f_mapping);

		}

	}