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 /kernel/sys.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 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index d1b2b8d934bb..38509dc1f77b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -2018,7 +2018,11 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data | |||
2018 | return error; | 2018 | return error; |
2019 | } | 2019 | } |
2020 | 2020 | ||
2021 | down_write(&mm->mmap_sem); | 2021 | /* |
2022 | * arg_lock protects concurent updates but we still need mmap_sem for | ||
2023 | * read to exclude races with sys_brk. | ||
2024 | */ | ||
2025 | down_read(&mm->mmap_sem); | ||
2022 | 2026 | ||
2023 | /* | 2027 | /* |
2024 | * We don't validate if these members are pointing to | 2028 | * We don't validate if these members are pointing to |
@@ -2032,6 +2036,7 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data | |||
2032 | * to any problem in kernel itself | 2036 | * to any problem in kernel itself |
2033 | */ | 2037 | */ |
2034 | 2038 | ||
2039 | spin_lock(&mm->arg_lock); | ||
2035 | mm->start_code = prctl_map.start_code; | 2040 | mm->start_code = prctl_map.start_code; |
2036 | mm->end_code = prctl_map.end_code; | 2041 | mm->end_code = prctl_map.end_code; |
2037 | mm->start_data = prctl_map.start_data; | 2042 | mm->start_data = prctl_map.start_data; |
@@ -2043,6 +2048,7 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data | |||
2043 | mm->arg_end = prctl_map.arg_end; | 2048 | mm->arg_end = prctl_map.arg_end; |
2044 | mm->env_start = prctl_map.env_start; | 2049 | mm->env_start = prctl_map.env_start; |
2045 | mm->env_end = prctl_map.env_end; | 2050 | mm->env_end = prctl_map.env_end; |
2051 | spin_unlock(&mm->arg_lock); | ||
2046 | 2052 | ||
2047 | /* | 2053 | /* |
2048 | * Note this update of @saved_auxv is lockless thus | 2054 | * Note this update of @saved_auxv is lockless thus |
@@ -2055,7 +2061,7 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data | |||
2055 | if (prctl_map.auxv_size) | 2061 | if (prctl_map.auxv_size) |
2056 | memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); | 2062 | memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); |
2057 | 2063 | ||
2058 | up_write(&mm->mmap_sem); | 2064 | up_read(&mm->mmap_sem); |
2059 | return 0; | 2065 | return 0; |
2060 | } | 2066 | } |
2061 | #endif /* CONFIG_CHECKPOINT_RESTORE */ | 2067 | #endif /* CONFIG_CHECKPOINT_RESTORE */ |