superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: fix clear_refs_write locking 

Turning page table entries read-only requires the mmap_sem held for
writing.

So stop doing the odd games with turning things from read locks to write
locks and back.  Just get the write lock.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
pull/712/merge
Linus Torvalds 2021-01-08 13:13:41 -08:00
parent 1d94330a43
commit 29a951dfb3
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/proc/task_mmu.c
View File

@ -1215,41 +1215,26 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
.type = type, .type = type,
}; };
if (mmap_write_lock_killable(mm)) {
count = -EINTR;
goto out_mm;
}
if (type == CLEAR_REFS_MM_HIWATER_RSS) { if (type == CLEAR_REFS_MM_HIWATER_RSS) {
if (mmap_write_lock_killable(mm)) {
count = -EINTR;
goto out_mm;
}
/* /*
* Writing 5 to /proc/pid/clear_refs resets the peak * Writing 5 to /proc/pid/clear_refs resets the peak
* resident set size to this mm's current rss value. * resident set size to this mm's current rss value.
*/ */
reset_mm_hiwater_rss(mm); reset_mm_hiwater_rss(mm);
mmap_write_unlock(mm); goto out_unlock;
goto out_mm;
} }
if (mmap_read_lock_killable(mm)) {
count = -EINTR;
goto out_mm;
}
tlb_gather_mmu(&tlb, mm, 0, -1); tlb_gather_mmu(&tlb, mm, 0, -1);
if (type == CLEAR_REFS_SOFT_DIRTY) { if (type == CLEAR_REFS_SOFT_DIRTY) {
for (vma = mm->mmap; vma; vma = vma->vm_next) { for (vma = mm->mmap; vma; vma = vma->vm_next) {
if (!(vma->vm_flags & VM_SOFTDIRTY)) if (!(vma->vm_flags & VM_SOFTDIRTY))
continue; continue;
mmap_read_unlock(mm); vma->vm_flags &= ~VM_SOFTDIRTY;
if (mmap_write_lock_killable(mm)) { vma_set_page_prot(vma);
count = -EINTR;
goto out_mm;
}
for (vma = mm->mmap; vma; vma = vma->vm_next) {
vma->vm_flags &= ~VM_SOFTDIRTY;
vma_set_page_prot(vma);
}
mmap_write_downgrade(mm);
break;
} }
mmu_notifier_range_init(&range, MMU_NOTIFY_SOFT_DIRTY, mmu_notifier_range_init(&range, MMU_NOTIFY_SOFT_DIRTY,
@ -1261,7 +1246,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
if (type == CLEAR_REFS_SOFT_DIRTY) if (type == CLEAR_REFS_SOFT_DIRTY)
mmu_notifier_invalidate_range_end(&range); mmu_notifier_invalidate_range_end(&range);
tlb_finish_mmu(&tlb, 0, -1); tlb_finish_mmu(&tlb, 0, -1);
mmap_read_unlock(mm); out_unlock:
mmap_write_unlock(mm);
out_mm: out_mm:
mmput(mm); mmput(mm);
} }