fs: proc: use down_read_killable in proc_pid_cmdline_read()
PATCH 1/1 fs: proc: use down_read_killable in proc_pid_cmdline_read()
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds.
Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
ps D 0 14018 1 0x00000004
ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0
ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040
00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000
Call Trace:
[<ffffffff817154d0>] ? __schedule+0x250/0x730
[<ffffffff817159e6>] schedule+0x36/0x80
[<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150
[<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30
[<ffffffff81717db0>] down_read+0x20/0x40
[<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0
[<ffffffff81253c95>] ? do_filp_open+0xa5/0x100
[<ffffffff81241d87>] __vfs_read+0x37/0x150
[<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0
[<ffffffff81242266>] vfs_read+0x96/0x130
[<ffffffff812437b5>] SyS_read+0x55/0xc0
[<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the mmap_sem for long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.
down_read_trylock() sounds too aggressive, and we already have killable version APIs for semaphore, here use down_read_killable() to improve the responsiveness.
--- fs/proc/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/proc/base.c +3 -1
@@ -242,7 +242,9 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, goto out_mmput; } -down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;
Signature · 1 line
1.8.3.1
Quoted 32 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 7 lines
fs/proc/base.c +3
-1-down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;
Fix is incomplete
1) /proc/*/cmdline only wants to read 4 values atomically, those 4 values are basically random values and aren't related to VM part at all (after C/R went in, they are settable to arbitrary values)
2) access_remote_vm() et al will do the same ->mmap_sem, and
3) /proc/*/environ and get_cmdline() do the same.
Quoted 29 lines · Alexey Dobriyan
Quoted 28 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.
Quoted 11 lines
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 10 lines
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.fs/proc/base.c +3
-1-down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;Fix is incomplete
Yes, it is. Since I just ran into the above splat, so I just did the minimum change.
Quoted 4 lines
1)
/proc/*/cmdlineonly wants to read 4 values atomically, those 4 values are basically random values and aren't related to VM part at all (after C/R went in, they are settable to arbitrary values)
Sorry, I don't get your point here. Could you please elaborate?
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, and
Yes, it does. But, __access_remote_vm() is called by access_process_vm() too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.
Quoted 1 line
3)
/proc/*/environandget_cmdline()do the same.
They look suitable to use killable version.
BTW, I just realized the code should go to out_free_page instead of out_mmput. Will rectify in newer version once we decide the extra places to use killable version.
Thanks,
Yang
Quoted 47 lines · Yang Shi
Quoted 29 lines · Alexey Dobriyan
Quoted 28 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.Quoted 11 lines
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 10 lines
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.fs/proc/base.c +3
-1-down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;Fix is incomplete
Yes, it is. Since I just ran into the above splat, so I just did the minimum change.
Quoted 6 lines
Quoted 4 lines
1)
/proc/*/cmdlineonly wants to read 4 values atomically, those 4 values are basically random values and aren't related to VM part at all (after C/R went in, they are settable to arbitrary values)Sorry, I don't get your point here. Could you please elaborate?
I hoped there is some random spinlock those 4 values could be moved to but no.
Quoted 5 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.
Yeah, but ->mmap_sem is taken 3 times per /proc/*/cmdline read and your scalability tests should trigger next backtrace right away.
Quoted 7 lines
Quoted 1 line
3)
/proc/*/environandget_cmdline()do the same.They look suitable to use killable version.
BTW, I just realized the code should go to
out_free_pageinstead ofout_mmput. Will rectify in newer version once we decide the extra places to use killable version.
Quoted 46 lines · Alexey Dobriyan
Quoted 45 lines · Yang Shi
Quoted 29 lines · Alexey Dobriyan
Quoted 28 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.Quoted 11 lines
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 10 lines
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.fs/proc/base.c +3
-1-down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;Fix is incomplete
Yes, it is. Since I just ran into the above splat, so I just did the minimum change.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
1)
/proc/*/cmdlineonly wants to read 4 values atomically, those 4 values are basically random values and aren't related to VM part at all (after C/R went in, they are settable to arbitrary values)Sorry, I don't get your point here. Could you please elaborate?
I hoped there is some random spinlock those 4 values could be moved to but no.
Those 4 values might be changed by prctl_set_mm concurrently if mm->mmap_sem is not acquired.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.
Yes, however, I didn't run into it if mmap_sem is acquired earlier.
How about defining a killable version, like __access_remote_vm_killable() which use down_read_killable(), then the killable version can be used by proc/*/cmdline? There might be other users in the future.
Thanks,
Yang
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
3)
/proc/*/environandget_cmdline()do the same.They look suitable to use killable version.
BTW, I just realized the code should go to
out_free_pageinstead ofout_mmput. Will rectify in newer version once we decide the extra places to use killable version.
Quoted 7 lines · Yang Shi
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.
Quoted 6 lines
Yes, however, I didn't run into it if
mmap_semis acquired earlier.How about defining a killable version, like
__access_remote_vm_killable()which usedown_read_killable(), then the killable version can be used by proc/*/cmdline? There might be other users in the future.
It would be a disaster as interfaces multiply.
Quoted 8 lines · Alexey Dobriyan
Quoted 6 lines · Yang Shi
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.
Quoted 7 lines
Quoted 6 lines
Yes, however, I didn't run into it if
mmap_semis acquired earlier.How about defining a killable version, like
__access_remote_vm_killable()which usedown_read_killable(), then the killable version can be used by proc/*/cmdline? There might be other users in the future.It would be a disaster as interfaces multiply.
Might be not that bad. Just need add:
__access_remote_vm_killable()access_remote_vm_killable()
Then access_process_vm() keep using __access_remote_vm(). And, use access_remote_vm_killable() in fs/proc/base. And, it looks the access_process_vm() calls in get_cmdline() can be changed to access_remote_vm() (non killable version).
Yang
Quoted 13 lines · Yang Shi
Quoted 10 lines · Alexey Dobriyan
Quoted 8 lines · Yang Shi
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.Yes, however, I didn't run into it if
mmap_semis acquired earlier.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
How about defining a killable version, like
__access_remote_vm_killable()which usedown_read_killable(), then the killable version can be used by proc/*/cmdline? There might be other users in the future.It would be a disaster as interfaces multiply.
Might be not that bad.
Maybe.
But you need to explain why there is no backtrace several lines later:
access_remote_vm __access_remote_vm down_read(&mm->mmap_sem)
Quoted 18 lines · Alexey Dobriyan
Quoted 17 lines · Yang Shi
Quoted 15 lines · Alexey Dobriyan
Quoted 4 lines · Yang Shi
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Quoted 8 lines
Quoted 2 lines
Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.Yes, however, I didn't run into it if
mmap_semis acquired earlier.How about defining a killable version, like
__access_remote_vm_killable()which usedown_read_killable(), then the killable version can be used by proc/*/cmdline? There might be other users in the future.It would be a disaster as interfaces multiply.
Quoted 8 lines
Quoted 1 line
Might be not that bad.
Maybe.
But you need to explain why there is no backtrace several lines later:
access_remote_vm __access_remote_vm down_read(&mm->mmap_sem)
I think it might be because:
CPU A CPU B
read /proc/*/cmdline get_mm
acquire mmap_sem
munmap(300G) try to acquire mmap_sem --> go to sleep
release mmap_sem
got mmap_sem release mmap_sem
access_remote_vm put_mm
The munmap might happen right before access_remote_vm(), but I just didn't run into it for the time being. It may be hit on another machine or with some changes to the test cases.
BTW, even the hung I met happened occassionally, not very often. So, the access_remote_vm() hit sounds less often. But, I agree it is still possible in theory.
Regards,
Yang
Quoted 54 lines · Alexey Dobriyan
Quoted 42 lines · Yang Shi
Quoted 29 lines · Alexey Dobriyan
Quoted 28 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.Quoted 11 lines
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 10 lines
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.fs/proc/base.c +3
-1-down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;Fix is incomplete
Quoted 8 lines
Yes, it is. Since I just ran into the above splat, so I just did the minimum change.
Quoted 4 lines
1)
/proc/*/cmdlineonly wants to read 4 values atomically, those 4 values are basically random values and aren't related to VM part at all (after C/R went in, they are settable to arbitrary values)Sorry, I don't get your point here. Could you please elaborate?
I hoped there is some random spinlock those 4 values could be moved to but no.
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
2)
access_remote_vm()et al will do the same ->mmap_sem, andYes, it does. But,
__access_remote_vm()is called byaccess_process_vm()too, which is used by much more places, i.e. ptrace, so I was not sure if it is preferred to convert to killable version. So, I leave it untouched.Yeah, but ->mmap_sem is taken 3 times per
/proc/*/cmdlineread and your scalability tests should trigger next backtrace right away.Quoted 2 lines
Quoted 1 line
3)
/proc/*/environandget_cmdline()do the same.They look suitable to use killable version.
Had a look at get_cmdline() further. It looks it is not necessary to convert to killable since it is called mainly by audit_exit(), which is called when process or syscall exit, so it might be preferred to wait until the mmap_sem is released. So, it sounds pointless to use down_read_killable().
Thanks,
Yang
Quoted 4 lines
Quoted 4 lines
BTW, I just realized the code should go to
out_free_pageinstead ofout_mmput. Will rectify in newer version once we decide the extra places to use killable version.
Quoted 43 lines · Yang Shi
When running vm-scalability with large memory (> 300GB), the below hung task issue happens occasionally.
INFO: task ps:14018 blocked for more than 120 seconds. Tainted: G E 4.9.79-009.ali3000.alios7.x86_64 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ps D 0 14018 1 0x00000004 ffff885582f84000 ffff885e8682f000 ffff880972943000 ffff885ebf499bc0 ffff8828ee120000 ffffc900349bfca8 ffffffff817154d0 0000000000000040 00ffffff812f872a ffff885ebf499bc0 024000d000948300 ffff880972943000 Call Trace: [<ffffffff817154d0>] ? __schedule+0x250/0x730 [<ffffffff817159e6>] schedule+0x36/0x80 [<ffffffff81718560>] rwsem_down_read_failed+0xf0/0x150 [<ffffffff81390a28>] call_rwsem_down_read_failed+0x18/0x30 [<ffffffff81717db0>] down_read+0x20/0x40 [<ffffffff812b9439>] proc_pid_cmdline_read+0xd9/0x4e0 [<ffffffff81253c95>] ? do_filp_open+0xa5/0x100 [<ffffffff81241d87>] __vfs_read+0x37/0x150 [<ffffffff812f824b>] ? security_file_permission+0x9b/0xc0 [<ffffffff81242266>] vfs_read+0x96/0x130 [<ffffffff812437b5>] SyS_read+0x55/0xc0 [<ffffffff8171a6da>] entry_SYSCALL_64_fastpath+0x1a/0xc5When manipulating a large mapping, the process may hold the
mmap_semfor long time, so reading /proc/<pid>/cmdline may be blocked in uninterruptible state for long time.
down_read_trylock()sounds too aggressive, and we already have killable version APIs for semaphore, here usedown_read_killable()to improve the responsiveness.Signed-off-by Yang Shi <[email protected]>Cc Alexey Dobriyan <[email protected]>--- fs/proc/base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/proc/base.c +0
-0
fs/proc/base.c static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, · line 250
Quoted 10 lines
fs/proc/base.c +3
-1@@ -242,7 +242,9 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, goto out_mmput; } -down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_mmput; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;
Should goto out_free_page, amended patch as below.
fs/proc/base.c +3 -1
@@ -242,7 +242,9 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, goto out_mmput; } -down_read (&mm->mmap_sem); + rv =down_read_killable (&mm->mmap_sem); +if (rv) + goto out_free_page; arg_start = mm->arg_start; arg_end = mm->arg_end; env_start = mm->env_start;