diff options
author | Yang Shi <yang.shi@linux.alibaba.com> | 2018-06-07 20:05:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 20:34:34 -0400 |
commit | 88aa7cc688d48ddd84558b41d5905a0db9535c4b (patch) | |
tree | f96e9a774928d21785f9be72718cfe0c6d6840a3 /fs/proc/base.c | |
parent | 05fec35ebb0e0e1f4603cc241fdf65fd3abb3092 (diff) |
mm: introduce arg_lock to protect arg_start|end and env_start|end in mm_struct
mmap_sem is on the hot path of kernel, and it very contended, but it is
abused too. It is used to protect arg_start|end and evn_start|end when
reading /proc/$PID/cmdline and /proc/$PID/environ, but it doesn't make
sense since those proc files just expect to read 4 values atomically and
not related to VM, they could be set to arbitrary values by C/R.
And, the mmap_sem contention may cause unexpected issue like below:
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
Call Trace:
schedule+0x36/0x80
rwsem_down_read_failed+0xf0/0x150
call_rwsem_down_read_failed+0x18/0x30
down_read+0x20/0x40
proc_pid_cmdline_read+0xd9/0x4e0
__vfs_read+0x37/0x150
vfs_read+0x96/0x130
SyS_read+0x55/0xc0
entry_SYSCALL_64_fastpath+0x1a/0xc5
Both Alexey Dobriyan and Michal Hocko suggested to use dedicated lock
for them to mitigate the abuse of mmap_sem.
So, introduce a new spinlock in mm_struct to protect the concurrent
access to arg_start|end, env_start|end and others, as well as replace
write map_sem to read to protect the race condition between prctl and
sys_brk which might break check_data_rlimit(), and makes prctl more
friendly to other VM operations.
This patch just eliminates the abuse of mmap_sem, but it can't resolve
the above hung task warning completely since the later
access_remote_vm() call needs acquire mmap_sem. The mmap_sem
scalability issue will be solved in the future.
[yang.shi@linux.alibaba.com: add comment about mmap_sem and arg_lock]
Link: http://lkml.kernel.org/r/1524077799-80690-1-git-send-email-yang.shi@linux.alibaba.com
Link: http://lkml.kernel.org/r/1523730291-109696-1-git-send-email-yang.shi@linux.alibaba.com
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mateusz Guzik <mguzik@redhat.com>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index af128b374143..ef3f7df50023 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -239,12 +239,12 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf, | |||
239 | goto out_mmput; | 239 | goto out_mmput; |
240 | } | 240 | } |
241 | 241 | ||
242 | down_read(&mm->mmap_sem); | 242 | spin_lock(&mm->arg_lock); |
243 | arg_start = mm->arg_start; | 243 | arg_start = mm->arg_start; |
244 | arg_end = mm->arg_end; | 244 | arg_end = mm->arg_end; |
245 | env_start = mm->env_start; | 245 | env_start = mm->env_start; |
246 | env_end = mm->env_end; | 246 | env_end = mm->env_end; |
247 | up_read(&mm->mmap_sem); | 247 | spin_unlock(&mm->arg_lock); |
248 | 248 | ||
249 | BUG_ON(arg_start > arg_end); | 249 | BUG_ON(arg_start > arg_end); |
250 | BUG_ON(env_start > env_end); | 250 | BUG_ON(env_start > env_end); |
@@ -927,10 +927,10 @@ static ssize_t environ_read(struct file *file, char __user *buf, | |||
927 | if (!mmget_not_zero(mm)) | 927 | if (!mmget_not_zero(mm)) |
928 | goto free; | 928 | goto free; |
929 | 929 | ||
930 | down_read(&mm->mmap_sem); | 930 | spin_lock(&mm->arg_lock); |
931 | env_start = mm->env_start; | 931 | env_start = mm->env_start; |
932 | env_end = mm->env_end; | 932 | env_end = mm->env_end; |
933 | up_read(&mm->mmap_sem); | 933 | spin_unlock(&mm->arg_lock); |
934 | 934 | ||
935 | while (count > 0) { | 935 | while (count > 0) { |
936 | size_t this_len, max_len; | 936 | size_t this_len, max_len; |