The patch titled
Subject: proc: use down_read_killable mmap_sem for /proc/pid/clear_refs
has been added to the -mm tree. Its filename is
proc-use-down_read_killable-mmap_sem-for-proc-pid-clear_refs.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/proc-use-down_read_killable-mmap_sem-for-proc-pid-clear_refs.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/proc-use-down_read_killable-mmap_sem-for-proc-pid-clear_refs.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Subject: proc: use down_read_killable mmap_sem for /proc/pid/clear_refs
Do not remain stuck forever if something goes wrong. Using a killable
lock permits cleanup of stuck tasks and simplifies investigation.
Replace the only unkillable mmap_sem lock in clear_refs_write().
Link: http://lkml.kernel.org/r/156007493826.3335.5424884725467456239.stgit@buzz
Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
Reviewed-by: Roman Gushchin <guro@xxxxxx>
Reviewed-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Reviewed-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Michal Koutný <mkoutny@xxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/fs/proc/task_mmu.c~proc-use-down_read_killable-mmap_sem-for-proc-pid-clear_refs
+++ a/fs/proc/task_mmu.c
@@ -1140,7 +1140,10 @@ static ssize_t clear_refs_write(struct f
goto out_mm;
}
- down_read(&mm->mmap_sem);
+ if (down_read_killable(&mm->mmap_sem)) {
+ count = -EINTR;
+ goto out_mm;
+ }
tlb_gather_mmu(&tlb, mm, 0, -1);
if (type == CLEAR_REFS_SOFT_DIRTY) {
for (vma = mm->mmap; vma; vma = vma->vm_next) {
_
Patches currently in -mm which might be from khlebnikov@xxxxxxxxxxxxxx are
proc-use-down_read_killable-mmap_sem-for-proc-pid-maps.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-smaps_rollup.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-pagemap.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-clear_refs.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files.patch
mm-use-down_read_killable-for-locking-mmap_sem-in-access_remote_vm.patch
