mm/mmap: Don't unlock VMAs in remap_file_pages()
Subsystems (2)
PATCH 1/1 mm/mmap: Don't unlock VMAs in remap_file_pages()
do_mmap() will unlock the necessary VMAs. There is also a bug in the loop which will evaluate as false and not unlock any VMAs anyways.
Signed-off-by Liam R. Howlett <[email protected]>
--- mm/mmap.c | 19 ------------------- 1 file changed, 19 deletions(-)
mm/mmap.c +0 -19
@@ -3025,25 +3025,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, flags &=MAP_NONBLOCK ; flags |=MAP_SHARED |MAP_FIXED |MAP_POPULATE ; -if (vma->vm_flags &VM_LOCKED ) { -struct vm_area_struct *tmp; - flags |=MAP_LOCKED ; - -/* drop PG_Mlocked flag for over-mapped range */ -for (tmp = vma; tmp->vm_start >= start + size; - tmp = tmp->vm_next) { -/* -* Split pmd and munlock page on the border -* of the range. -*/ -vma_adjust_trans_huge (tmp, start, start + size,0 ); - -munlock_vma_pages_range (tmp, -max (tmp->vm_start, start), -min (tmp->vm_end, start + size)); - } - } - file =get_file (vma->vm_file); ret =do_mmap (vma->vm_file, start, size, prot, flags, pgoff, &populate,NULL );
Signature · 1 line
2.28.0
mm/mmap.c SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, · line 3030
Quoted 7 lines · Liam R. Howlett
mm/mmap.c +0
-3@@ -3025,25 +3025,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, flags &=MAP_NONBLOCK ; flags |=MAP_SHARED |MAP_FIXED |MAP_POPULATE ; -if (vma->vm_flags &VM_LOCKED ) { -struct vm_area_struct *tmp; - flags |=MAP_LOCKED ;
I think you need to keep ^^^ that line because the vma needs to stay mlocked.
Quoted 12 lines · Matthew Wilcox
mm/mmap.c SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, · line 3030
Quoted 7 lines · Liam R. Howlett
mm/mmap.c +0
-3@@ -3025,25 +3025,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, flags &=MAP_NONBLOCK ; flags |=MAP_SHARED |MAP_FIXED |MAP_POPULATE ; -if (vma->vm_flags &VM_LOCKED ) { -struct vm_area_struct *tmp; - flags |=MAP_LOCKED ;I think you need to keep ^^^ that line because the vma needs to stay mlocked.
Yes. I missed that this is transferred through by calc_vm_flag_bits() in do_mmap(). I will revise the patch.
Thanks,
Liam