From: Frederic Weisbecker <fweisbec@gmail.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@kernel.org>, Oleg Nesterov <oleg@redhat.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 1/5] sched: Convert thread_group_cputime() to use for_each_thread()
Date: Wed, 9 Apr 2014 18:11:18 +0200 [thread overview]
Message-ID: <1397059882-23063-2-git-send-email-fweisbec@gmail.com> (raw)
In-Reply-To: <1397059882-23063-1-git-send-email-fweisbec@gmail.com>
do_each_thread/while_each_thread iterators are deprecated by
for_each_thread/for_each_process_thread() APIs.
Lets convert the callers in the cputime code accounting. The ultimate
goal is to remove the struct task_struct::thread_group field and
the corresponding do_each_thread/while_each_thread iterators that are
RCU unsafe.
It also makes thread_group_cputime() eventually RCU-safe.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
kernel/sched/cputime.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index a95097c..5d27848 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -281,11 +281,11 @@ static __always_inline bool steal_account_process_tick(void)
/*
* Accumulate raw cputime values of dead tasks (sig->[us]time) and live
- * tasks (sum on group iteration) belonging to @tsk's group.
+ * tasks (sum on group iteration) belonging to @p's group.
*/
-void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)
+void thread_group_cputime(struct task_struct *p, struct task_cputime *times)
{
- struct signal_struct *sig = tsk->signal;
+ struct signal_struct *sig = p->signal;
cputime_t utime, stime;
struct task_struct *t;
@@ -295,16 +295,15 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)
rcu_read_lock();
/* make sure we can trust tsk->thread_group list */
- if (!likely(pid_alive(tsk)))
+ if (!likely(pid_alive(p)))
goto out;
- t = tsk;
- do {
+ for_each_thread(p, t) {
task_cputime(t, &utime, &stime);
times->utime += utime;
times->stime += stime;
times->sum_exec_runtime += task_sched_runtime(t);
- } while_each_thread(tsk, t);
+ }
out:
rcu_read_unlock();
}
--
1.8.3.1
next prev parent reply other threads:[~2014-04-09 16:11 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-09 16:11 [PATCH 0/5] core: Convert thread iteration to use for_each[_process]_thread APIs, 1st pile Frederic Weisbecker
2014-04-09 16:11 ` Frederic Weisbecker [this message]
2014-04-09 17:12 ` [PATCH 1/5] sched: Convert thread_group_cputime() to use for_each_thread() Oleg Nesterov
2014-04-09 17:16 ` Peter Zijlstra
2014-04-09 17:32 ` Oleg Nesterov
2014-04-09 18:30 ` Peter Zijlstra
2014-04-09 19:46 ` Oleg Nesterov
2014-04-09 19:49 ` Peter Zijlstra
2014-04-10 16:19 ` Peter Zijlstra
2014-04-10 16:32 ` Peter Zijlstra
2014-04-10 17:29 ` Oleg Nesterov
2014-04-10 17:36 ` Peter Zijlstra
2014-04-10 17:42 ` Peter Zijlstra
2014-04-10 19:15 ` Oleg Nesterov
2014-04-10 20:55 ` Peter Zijlstra
2014-04-10 7:56 ` Ingo Molnar
2014-04-09 16:11 ` [PATCH 2/5] tracepoint: Convert process iteration to use for_each_process_thread() Frederic Weisbecker
2014-04-09 16:28 ` Mathieu Desnoyers
2014-04-09 16:40 ` Frederic Weisbecker
2014-04-09 16:42 ` Steven Rostedt
2014-04-09 17:05 ` [PATCH 0/2] Was: " Oleg Nesterov
2014-04-09 17:05 ` [PATCH RESEND 1/2] tracing: syscall_*regfunc() can race with copy_process() Oleg Nesterov
2014-04-10 13:04 ` Steven Rostedt
2014-04-10 13:33 ` Oleg Nesterov
2014-04-10 13:06 ` Steven Rostedt
2014-04-10 13:34 ` Oleg Nesterov
2014-04-11 15:22 ` Steven Rostedt
2014-04-11 15:58 ` Oleg Nesterov
2014-04-13 18:58 ` [PATCH v2 0/3] tracing: syscall_*regfunc() fixes Oleg Nesterov
2014-04-13 18:58 ` [PATCH v2 1/3] tracing: fix syscall_*regfunc() vs copy_process() race Oleg Nesterov
2014-04-14 23:57 ` Frederic Weisbecker
2014-04-13 18:59 ` [PATCH v2 2/3] tracing: change syscall_*regfunc() to check PF_KTHREAD and use for_each_process_thread() Oleg Nesterov
2014-04-13 18:59 ` [PATCH v2 3/3] tracing: syscall_regfunc() should not skip kernel threads Oleg Nesterov
2014-04-14 23:46 ` [PATCH v2 0/3] tracing: syscall_*regfunc() fixes Frederic Weisbecker
2014-06-18 14:23 ` Steven Rostedt
2014-06-18 15:36 ` Oleg Nesterov
2014-04-09 17:06 ` [PATCH RESEND 2/2] tracing: syscall_regfunc() should not skip kernel threads Oleg Nesterov
2014-04-10 13:28 ` Steven Rostedt
2014-04-10 13:38 ` Oleg Nesterov
2014-04-10 14:28 ` Steven Rostedt
2014-04-10 14:46 ` Oleg Nesterov
2014-04-10 15:08 ` Steven Rostedt
2014-04-10 17:57 ` Oleg Nesterov
2014-04-10 18:14 ` Oleg Nesterov
2014-04-10 19:00 ` Oleg Nesterov
2014-04-10 19:13 ` Steven Rostedt
2014-04-10 19:38 ` Oleg Nesterov
2014-04-10 19:55 ` Steven Rostedt
2014-04-11 12:03 ` Oleg Nesterov
2014-04-11 12:37 ` Steven Rostedt
2014-04-10 13:03 ` [PATCH 0/2] Was: Convert process iteration to use for_each_process_thread() Steven Rostedt
2014-04-09 16:11 ` [PATCH 3/5] hung_task: " Frederic Weisbecker
2014-04-09 17:23 ` Oleg Nesterov
2014-04-09 16:11 ` [PATCH 4/5] procfs: Convert process iteration to use for_each_thread() Frederic Weisbecker
2014-04-09 16:11 ` [PATCH 5/5] sched: Convert tasks iteration to use for_each_process_thread() Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397059882-23063-2-git-send-email-fweisbec@gmail.com \
--to=fweisbec@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®