mm/mmap: Don't unlock VMAs in remap_file_pages()
Subsystems (2)
PATCH v2 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.
--- 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.28.0
Quoted 2 lines · Liam R. Howlett
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.
If there is a BUG, do we have a Fixes: tag? Also
1. Can we fix the bug separately first?
2. Can we have a better description on what the bug actually is "evaluate as false"? What is the result of the bug?
CCing some people that might know if this is actually a sane change. Skimming over do_mmap(), it's not immediately clear to me that "do_mmap() will unlock the necessary VMAs".
Quoted 38 lines
Signed-off-by Liam R. Howlett <[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 · 3 lines
Thanks, David / dhildenb
Thank you for looking at this. I appreciate the scrutiny.
Quoted 5 lines · David Hildenbrand
Quoted 2 lines · Liam R. Howlett
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.If there is a BUG, do we have a Fixes: tag? Also
The bug would never show up as it is masked by do_mmap() unlocking the necessary range. Although there is a bug in this code, the code does not cause an issue as it won't execute so should I have a Fixes tag? The code works and what I've done is remove a chunk of code that never runs.
Quoted 2 lines
1. Can we fix the bug separately first?
I think it is safer to remove unexecuted code than enable it and then remove it.
Quoted 2 lines
2. Can we have a better description on what the bug actually is "evaluate as false"? What is the result of the bug?
The bug is in the for loop test expression that I removed in the patch. Here is the long explaination of why the loop has never run.
Line 2982: if (start + size <= start
Line 2983: goto out;
size is positive.
Line 2992: vma = find_vma(mm, start);
Look up the first VMA which satisfies start < vm_end
Line 2997: if (start < vma->vm_start)
Line 2998: goto out;
So now vma->vm_start >= start.
If vma->vm_start > start, then there are no VMAs in that area, otherwise it would have been returned by find_vma().
So we can say that vma->vm_start == start.
Line 3033: for (tmp = vma; tmp->vm_start >= start + size;
Line 3034: tmp = tmp->vm_next) {
This is the for loop with the error in the test expression.
tmp->vm_start == start which cannot be >= (start + size).
I believe the intention was to loop through vmas in the range of start to (start + size) and unlock them.
The result of the bug is no VMA is unlocked in this fuction. But that doesn't matter as they are unlocked later in the call chain - which is why this code works as intended.
Quoted 4 lines
CCing some people that might know if this is actually a sane change. Skimming over
do_mmap(), it's not immediately clear to me that "do_mmap()will unlock the necessary VMAs".
Ah, yes. That is understandable.
do_mmap() L1583 -> mmap_region() L1752 -> munmap_vma_range() -> do_munmap() -> __do_munmap() loop at 2891 to unlock the range.
Would you like me to add this call chain to the changelog?
Quoted 20 lines
Quoted 20 lines
Signed-off-by Liam R. Howlett <[email protected]>--- mm/mmap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)mm/mmap.c +1
-2@@ -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 ;
Quoted 2 lines
mm/mmap.c SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, · line 3033
Quoted 2 lines
mm/mmap.c +0
-2-/* drop PG_Mlocked flag for over-mapped range */ - for (tmp = vma; tmp->vm_start >= start + size;
This should probably be less than ---^
Quoted 25 lines
Quoted 17 lines
mm/mmap.c +0
-13- 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 · 3 lines
Thanks, David / dhildenb
Hugh Dickins
Acked-byQuoted 17 lines · Liam R. Howlett
Thank you for looking at this. I appreciate the scrutiny.
Quoted 5 lines · David Hildenbrand
Quoted 2 lines · Liam R. Howlett
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.If there is a BUG, do we have a Fixes: tag? Also
The bug would never show up as it is masked by
do_mmap()unlocking the necessary range. Although there is a bug in this code, the code does not cause an issue as it won't execute so should I have a Fixes tag? The code works and what I've done is remove a chunk of code that never runs.Quoted 1 line
Quoted 4 lines
Quoted 1 line
1. Can we fix the bug separately first?
I think it is safer to remove unexecuted code than enable it and then remove it.
Agreed.
Quoted 30 lines
Quoted 3 lines
2. Can we have a better description on what the bug actually is "evaluate as false"? What is the result of the bug?
The bug is in the for loop test expression that I removed in the patch. Here is the long explaination of why the loop has never run.
Line 2982: if (start + size <= start
Line 2983: goto out;size is positive.
Line 2992: vma =
find_vma(mm, start);
Look up the first VMA which satisfies start <vm_endLine 2997: if (start <
vma->vm_start)
Line 2998: goto out;So now
vma->vm_start>= start.
Ifvma->vm_start> start, then there are no VMAs in that area, otherwise it would have been returned byfind_vma().
So we can say thatvma->vm_start== start.Line 3033: for (tmp = vma;
tmp->vm_start>= start + size;
Line 3034: tmp =tmp->vm_next) {
This is the for loop with the error in the test expression.
tmp->vm_start== start which cannot be >= (start + size).
Quoted 7 lines
I believe the intention was to loop through vmas in the range of start to (start + size) and unlock them.
The result of the bug is no VMA is unlocked in this fuction. But that doesn't matter as they are unlocked later in the call chain - which is why this code works as intended.
Yes.
Quoted 7 lines
Quoted 6 lines
CCing some people that might know if this is actually a sane change. Skimming over
do_mmap(), it's not immediately clear to me that "do_mmap()will unlock the necessary VMAs".
Quoted 6 lines
Ah, yes. That is understandable.
do_mmap()L1583 ->mmap_region()L1752 ->munmap_vma_range()->do_munmap()->__do_munmap()loop at 2891 to unlock the range.Would you like me to add this call chain to the changelog?
I don't think you need to add that: do_mmap(MAP_FIXED) simply has to be able to munlock the range, much else would be broken if it did not.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Signed-off-by Liam R. Howlett <[email protected]>
This is indeed a sane change. I stumbled over that mistaken code back in the days of PageTeam shmem huge pages, when syzkaller hit a VM_BUG_ON_PAGE because of it; deleted the block as you have in v2; then it fell off our radar when updating to PageCompound huge pages - when Salman noticed as you have that the loop was ineffectual anyway. It's just good to delete this dead code and confusion.
Though, in the course of writing that paragraph, I have come to wonder:
how did syzkaller hit a VM_BUG_ON_PAGE in code that is never executed?? Was something else different back then, or are we overlooking a case?
But whatever, the block is redundant and your v2 patch is good.
Quoted 44 lines
Quoted 17 lines
Quoted 17 lines
--- mm/mmap.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)mm/mmap.c +1
-2@@ -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 ;Quoted 2 lines
mm/mmap.c SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, · line 3033
Quoted 2 lines
mm/mmap.c +0
-2-/* drop PG_Mlocked flag for over-mapped range */ - for (tmp = vma; tmp->vm_start >= start + size;This should probably be less than ---^
Quoted 23 lines
Quoted 17 lines
mm/mmap.c +0
-13- 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 · 3 lines
Thanks, David / dhildenb
Quoted 8 lines · Liam R. Howlett
Thank you for looking at this. I appreciate the scrutiny.
Quoted 4 lines · David Hildenbrand
Quoted 2 lines · Liam R. Howlett
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.
Quoted 8 lines
Quoted 1 line
If there is a BUG, do we have a Fixes: tag? Also
The bug would never show up as it is masked by
do_mmap()unlocking the necessary range. Although there is a bug in this code, the code does not cause an issue as it won't execute so should I have a Fixes tag? The code works and what I've done is remove a chunk of code that never runs.
Ok I see. The use of "bug" here is misleading. The unnecessary code is simply not doing what it promised to do without doing any harm.
Quoted 5 lines
Quoted 2 lines
1. Can we fix the bug separately first?
I think it is safer to remove unexecuted code than enable it and then remove it.
I agree, as it is not actually a bug.
Quoted 30 lines
Quoted 3 lines
2. Can we have a better description on what the bug actually is "evaluate as false"? What is the result of the bug?
The bug is in the for loop test expression that I removed in the patch. Here is the long explaination of why the loop has never run.
Line 2982: if (start + size <= start
Line 2983: goto out;size is positive.
Line 2992: vma =
find_vma(mm, start);
Look up the first VMA which satisfies start <vm_endLine 2997: if (start <
vma->vm_start)
Line 2998: goto out;So now
vma->vm_start>= start.
Ifvma->vm_start> start, then there are no VMAs in that area, otherwise it would have been returned byfind_vma().
So we can say thatvma->vm_start== start.Line 3033: for (tmp = vma;
tmp->vm_start>= start + size;
Line 3034: tmp =tmp->vm_next) {
This is the for loop with the error in the test expression.
tmp->vm_start== start which cannot be >= (start + size).
Quoted 8 lines
I believe the intention was to loop through vmas in the range of start to (start + size) and unlock them.
The result of the bug is no VMA is unlocked in this fuction. But that doesn't matter as they are unlocked later in the call chain - which is why this code works as intended.
Thanks for clarifying!
Quoted 6 lines
Quoted 5 lines
CCing some people that might know if this is actually a sane change. Skimming over
do_mmap(), it's not immediately clear to me that "do_mmap()will unlock the necessary VMAs".
Quoted 6 lines
Ah, yes. That is understandable.
do_mmap()L1583 ->mmap_region()L1752 ->munmap_vma_range()->do_munmap()->__do_munmap()loop at 2891 to unlock the range.Would you like me to add this call chain to the changelog?
Yes please, in a simplified form.
I suggest something like the following patch description:
"do_mmap(MAP_FIXED) will already unlock pages via munmap_vma_range(). We can remove the superfluous manual unlocking in remap_file_pages().
Note that the manual unlocking is even incorrect, as it might miss unlocking some pages - no harm done.
"
Signature · 3 lines
Thanks, David / dhildenb