mm/mmap: Don't unlock VMAs in remap_file_pages()
Subsystems (2)
PATCH v3 1/1 mm/mmap: Don't unlock VMAs in remap_file_pages()
Since this call uses MAP_FIXED, do_mmap() will munlock the necessary range. There is also an error in the loop test expression which will evaluate as false and the loop body has never execute.
Signed-off-by Liam R. Howlett <[email protected]>
Acked-by Hugh Dickins <[email protected]>
--- mm/mmap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
mm/mmap.c +1 -17
@@ -3025,25 +3025,9 @@ 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; +if (vma->vm_flags &VM_LOCKED ) 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.30.0
Quoted 6 lines · Liam Howlett
Since this call uses
MAP_FIXED,do_mmap()will munlock the necessary range. There is also an error in the loop test expression which will evaluate as false and the loop body has never execute.Signed-off-by Liam R. Howlett <[email protected]>Acked-by Hugh Dickins <[email protected]>
Reviewed-by Matthew Wilcox (Oracle) <[email protected]>
Quoted 32 lines · Liam Howlett
Since this call uses
MAP_FIXED,do_mmap()will munlock the necessary range. There is also an error in the loop test expression which will evaluate as false and the loop body has never execute.Signed-off-by Liam R. Howlett <[email protected]>Acked-by Hugh Dickins <[email protected]>--- mm/mmap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)mm/mmap.c +1
-10@@ -3025,25 +3025,9 @@ 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; +if (vma->vm_flags &VM_LOCKED ) 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 );
mm/mmap.c SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, · line 3033
Quoted 10 lines
mm/mmap.c +0
-7- -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 );
Reviewed-by David Hildenbrand <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb