diff options
| author |   Kees Cook <keescook@chromium.org> | 2021-09-29 15:02:15 -0700 |
|---|---|---|
| committer |   Peter Zijlstra <peterz@infradead.org> | 2021-10-15 11:25:13 +0200 |
| commit | 4e046156792c26bef8a4e30be711777fc8578257 (patch) | |
| tree | 2b1c78b7f3069885e3ec36cf04e4724e8de21691 /fs/proc/array.c | |
| parent | leaking_addresses: Always print a trailing newline (diff) | |
| download | linux-dev-4e046156792c26bef8a4e30be711777fc8578257.tar.xz linux-dev-4e046156792c26bef8a4e30be711777fc8578257.zip | |
proc: Use task_is_running() for wchan in /proc/$pid/stat
The implementations of get_wchan() can be expensive. The only information
imparted here is whether or not a process is currently blocked in the
scheduler (and even this doesn't need to be exact). Avoid doing the
heavy lifting of stack walking and just report that information by using
task_is_running().
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20211008111626.211281780@infradead.org
Diffstat (limited to '')
| -rw-r--r-- | fs/proc/array.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 49be8c8ef555..77cf4187adec 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -541,7 +541,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, } if (permitted && (!whole || num_threads < 2)) - wchan = get_wchan(task); + wchan = !task_is_running(task); if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; @@ -606,10 +606,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, * * This works with older implementations of procps as well. */ - if (wchan) - seq_puts(m, " 1"); - else - seq_puts(m, " 0"); + seq_put_decimal_ull(m, " ", wchan); seq_put_decimal_ull(m, " ", 0); seq_put_decimal_ull(m, " ", 0); |