diff options
author | Vlastimil Babka <vbabka@suse.cz> | 2023-02-23 16:40:48 +0100 |
---|---|---|
committer | Vlastimil Babka <vbabka@suse.cz> | 2023-03-08 09:26:14 +0100 |
commit | 21cdc6b137dfe26277421e443e93f7a178c96ec5 (patch) | |
tree | 95c7e64440a7e24f61f0cff9ce296b620b1b6564 | |
parent | 15b4d71a880f201af8258f0d3281b99777958f5e (diff) | |
download | linux-vma_merge_cleanup-v1r2.tar.gz |
mm/mremap: simplify vma expansion againvma_merge_cleanup-v1r2
This effectively reverts d014cd7c1c35 ("mm, mremap: fix mremap()
expanding for vma's with vm_ops->close()"). After the recent changes,
vma_merge() is able to handle the expansion properly even when the vma
being expanded has a vm_ops->close operation, so we don't need to
special case it anymore.
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
-rw-r--r-- | mm/mremap.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/mm/mremap.c b/mm/mremap.c index 411a85682b5802..65f5b545601e8e 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1040,23 +1040,11 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, * vma (expand operation itself) and possibly also with * the next vma if it becomes adjacent to the expanded * vma and otherwise compatible. - * - * However, vma_merge() can currently fail due to - * is_mergeable_vma() check for vm_ops->close (see the - * comment there). Yet this should not prevent vma - * expanding, so perform a simple expand for such vma. - * Ideally the check for close op should be only done - * when a vma would be actually removed due to a merge. */ - if (!vma->vm_ops || !vma->vm_ops->close) { - vma = vma_merge(&vmi, mm, vma, extension_start, - extension_end, vma->vm_flags, vma->anon_vma, - vma->vm_file, extension_pgoff, vma_policy(vma), - vma->vm_userfaultfd_ctx, anon_vma_name(vma)); - } else if (vma_expand(&vmi, vma, vma->vm_start, - addr + new_len, vma->vm_pgoff, NULL)) { - vma = NULL; - } + vma = vma_merge(&vmi, mm, vma, extension_start, + extension_end, vma->vm_flags, vma->anon_vma, + vma->vm_file, extension_pgoff, vma_policy(vma), + vma->vm_userfaultfd_ctx, anon_vma_name(vma)); if (!vma) { vm_unacct_memory(pages); ret = -ENOMEM; |