niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mm: defer second attempt at merge on mmap()

Browse source 
Rather than trying to merge again when ostensibly allocating a new VMA,
instead defer until the VMA is added and attempt to merge the existing
range.

This way we have no complicated unwinding logic midway through the process
of mapping the VMA.

In addition this removes limitations on the VMA not being able to be the
first in the virtual memory address space which was previously implicitly
required.

In theory, for this very same reason, we should unconditionally attempt
merge here, however this is likely to have a performance impact so it is
better to avoid this given the unlikely outcome of a merge.

[lorenzo.stoakes@oracle.com: remove unnecessary indirection]
  Link: https://lkml.kernel.org/r/5106696d-e625-4d8a-8545-9d1430301730@lucifer.local
Link: https://lkml.kernel.org/r/d4f84502605d7651ac114587f507395c0fc76004.1729858176.git.lorenzo.stoakes@oracle.com
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Lorenzo Stoakes 2024-10-25 13:26:27 +01:00 • committed by Andrew Morton
parent 5a689bac0b
commit 5ac87a885a
1 changed files with 14 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
mm/vma.c
View file

@ -19,6 +19,7 @@ struct mmap_state {
struct file *file; struct file *file;
unsigned long charged; unsigned long charged;
bool retry_merge;
struct vm_area_struct *prev; struct vm_area_struct *prev;
struct vm_area_struct *next; struct vm_area_struct *next;
@ -2278,11 +2279,11 @@ static int __mmap_prepare(struct mmap_state *map, struct list_head *uf)
return 0; return 0;
} }
static int __mmap_new_file_vma(struct mmap_state *map, static int __mmap_new_file_vma(struct mmap_state *map,
struct vm_area_struct **vmap, bool *mergedp) struct vm_area_struct *vma)
{ {
struct vma_iterator *vmi = map->vmi; struct vma_iterator *vmi = map->vmi;
struct vm_area_struct *vma = *vmap;
int error; int error;
vma->vm_file = get_file(map->file); vma->vm_file = get_file(map->file);
@ -2308,37 +2309,10 @@ static int __mmap_new_file_vma(struct mmap_state *map,
!(map->flags & VM_MAYWRITE) && !(map->flags & VM_MAYWRITE) &&
(vma->vm_flags & VM_MAYWRITE)); (vma->vm_flags & VM_MAYWRITE));
/* mmap_file() might have changed VMA flags. */ /* If the flags change (and are mergeable), let's retry later. */
map->retry_merge = vma->vm_flags != map->flags && !(vma->vm_flags & VM_SPECIAL);
map->flags = vma->vm_flags; map->flags = vma->vm_flags;
vma_iter_config(vmi, map->addr, map->end);
/*
* If flags changed after mmap_file(), we should try merge
* vma again as we may succeed this time.
*/
if (unlikely(map->flags != vma->vm_flags && map->prev)) {
struct vm_area_struct *merge;
VMG_MMAP_STATE(vmg, map, /* vma = */ NULL);
merge = vma_merge_new_range(&vmg);
if (merge) {
/*
* ->mmap() can change vma->vm_file and fput
* the original file. So fput the vma->vm_file
* here or we would add an extra fput for file
* and cause general protection fault
* ultimately.
*/
fput(vma->vm_file);
vm_area_free(vma);
vma = merge;
*mergedp = true;
} else {
vma_iter_config(vmi, map->addr, map->end);
}
}
*vmap = vma;
return 0; return 0;
} }
@ -2346,10 +2320,6 @@ static int __mmap_new_file_vma(struct mmap_state *map,
* __mmap_new_vma() - Allocate a new VMA for the region, as merging was not * __mmap_new_vma() - Allocate a new VMA for the region, as merging was not
* possible. * possible.
* *
* An exception to this is if the mapping is file-backed, and the underlying
* driver changes the VMA flags, permitting a subsequent merge of the VMA, in
* which case the returned VMA is one that was merged on a second attempt.
*
* @map: Mapping state. * @map: Mapping state.
* @vmap: Output pointer for the new VMA. * @vmap: Output pointer for the new VMA.
* *
@ -2359,7 +2329,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap)
{ {
struct vma_iterator *vmi = map->vmi; struct vma_iterator *vmi = map->vmi;
int error = 0; int error = 0;
bool merged = false;
struct vm_area_struct *vma; struct vm_area_struct *vma;
/* /*
@ -2382,7 +2351,7 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap)
} }
if (map->file) if (map->file)
error = __mmap_new_file_vma(map, &vma, &merged); error = __mmap_new_file_vma(map, vma);
else if (map->flags & VM_SHARED) else if (map->flags & VM_SHARED)
error = shmem_zero_setup(vma); error = shmem_zero_setup(vma);
else else
@ -2391,9 +2360,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap)
if (error) if (error)
goto free_iter_vma; goto free_iter_vma;
if (merged)
goto file_expanded;
#ifdef CONFIG_SPARC64 #ifdef CONFIG_SPARC64
/* TODO: Fix SPARC ADI! */ /* TODO: Fix SPARC ADI! */
WARN_ON_ONCE(!arch_validate_flags(map->flags)); WARN_ON_ONCE(!arch_validate_flags(map->flags));
@ -2410,8 +2376,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap)
* call covers the non-merge case. * call covers the non-merge case.
*/ */
khugepaged_enter_vma(vma, map->flags); khugepaged_enter_vma(vma, map->flags);
file_expanded:
ksm_add_vma(vma); ksm_add_vma(vma);
*vmap = vma; *vmap = vma;
return 0; return 0;
@ -2493,6 +2457,14 @@ unsigned long __mmap_region(struct file *file, unsigned long addr,
goto unacct_error; goto unacct_error;
} }
/* If flags changed, we might be able to merge, so try again. */
if (map.retry_merge) {
VMG_MMAP_STATE(vmg, &map, vma);
vma_iter_config(map.vmi, map.addr, map.end);
vma_merge_existing_range(&vmg);
}
__mmap_complete(&map, vma); __mmap_complete(&map, vma);
return addr; return addr;