Commit 53f1d936 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: make vm_area_desc utilise vma_flags_t only 

Now we have eliminated all uses of vm_area_desc->vm_flags, eliminate this
field, and have mmap_prepare users utilise the vma_flags_t
vm_area_desc->vma_flags field only.

As part of this change we alter is_shared_maywrite() to accept a
vma_flags_t parameter, and introduce is_shared_maywrite_vm_flags() for use
with legacy vm_flags_t flags.

We also update struct mmap_state to add a union between vma_flags and
vm_flags temporarily until the mmap logic is also converted to using
vma_flags_t.

Also update the VMA userland tests to reflect this change.

Link: https://lkml.kernel.org/r/fd2a2938b246b4505321954062b1caba7acfc77a.1769097829.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarPedro Falcato <pfalcato@suse.de>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Yury Norov <ynorov@nvidia.com>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5bd2c065

include/linux/mm.h

+7 −2
Original line number Diff line number Diff line
@@ -1290,15 +1290,20 @@ static inline bool vma_is_accessible(const struct vm_area_struct *vma) 
	return vma->vm_flags & VM_ACCESS_FLAGS;

}



static inline bool is_shared_maywrite(vm_flags_t vm_flags)

static inline bool is_shared_maywrite_vm_flags(vm_flags_t vm_flags)

{

	return (vm_flags & (VM_SHARED | VM_MAYWRITE)) ==

		(VM_SHARED | VM_MAYWRITE);

}



static inline bool is_shared_maywrite(const vma_flags_t *flags)

{

	return vma_flags_test_all(flags, VMA_SHARED_BIT, VMA_MAYWRITE_BIT);

}



static inline bool vma_is_shared_maywrite(const struct vm_area_struct *vma)

{

	return is_shared_maywrite(vma->vm_flags);

	return is_shared_maywrite(&vma->flags);

}



static inline

include/linux/mm_types.h

+1 −4
Original line number Diff line number Diff line
@@ -887,10 +887,7 @@ struct vm_area_desc { 
	/* Mutable fields. Populated with initial state. */

	pgoff_t pgoff;

	struct file *vm_file;

	union {

		vm_flags_t vm_flags;

	vma_flags_t vma_flags;

	};

	pgprot_t page_prot;



	/* Write-only fields. */

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -4012,7 +4012,7 @@ int generic_file_readonly_mmap(struct file *file, struct vm_area_struct *vma) 


int generic_file_readonly_mmap_prepare(struct vm_area_desc *desc)

{

	if (is_shared_maywrite(desc->vm_flags))

	if (is_shared_maywrite(&desc->vma_flags))

		return -EINVAL;

	return generic_file_mmap_prepare(desc);

}

mm/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ int __compat_vma_mmap(const struct file_operations *f_op, 


		.pgoff = vma->vm_pgoff,

		.vm_file = vma->vm_file,

		.vm_flags = vma->vm_flags,

		.vma_flags = vma->flags,

		.page_prot = vma->vm_page_prot,



		.action.type = MMAP_NOTHING, /* Default */

mm/vma.c

+7 −4
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ struct mmap_state { 
	unsigned long end;

	pgoff_t pgoff;

	unsigned long pglen;

	union {

		vm_flags_t vm_flags;

		vma_flags_t vma_flags;

	};

	struct file *file;

	pgprot_t page_prot;
@@ -2369,7 +2372,7 @@ static void set_desc_from_map(struct vm_area_desc *desc, 


	desc->pgoff = map->pgoff;

	desc->vm_file = map->file;

	desc->vm_flags = map->vm_flags;

	desc->vma_flags = map->vma_flags;

	desc->page_prot = map->page_prot;

}
@@ -2650,7 +2653,7 @@ static int call_mmap_prepare(struct mmap_state *map, 
		map->file_doesnt_need_get = true;

		map->file = desc->vm_file;

	}

	map->vm_flags = desc->vm_flags;

	map->vma_flags = desc->vma_flags;

	map->page_prot = desc->page_prot;

	/* User-defined fields. */

	map->vm_ops = desc->vm_ops;
@@ -2823,7 +2826,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, 
		return -EINVAL;



	/* Map writable and ensure this isn't a sealed memfd. */

	if (file && is_shared_maywrite(vm_flags)) {

	if (file && is_shared_maywrite_vm_flags(vm_flags)) {

		int error = mapping_map_writable(file->f_mapping);



		if (error)