Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] taskstats: don't use tasklist_lock

Browse source 
Remove tasklist_lock from taskstats.c. find_task_by_pid() is rcu-safe.
->siglock allows us to traverse subthread without tasklist.

Q: delay accounting looks wrong to me.  If sub-thread has already called
taskstats_exit_send() but didn't call release_task(self) yet it will be
accounted twice.  The window is big.  No?

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Jay Lan <jlan@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov 2006-10-28 10:38:54 -07:00 committed by Linus Torvalds
parent b8534d7bd8
commit a98b609426
1 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
kernel/taskstats.c
View file

@ -174,21 +174,19 @@ static void send_cpu_listeners(struct sk_buff *skb, unsigned int cpu)
up_write(&listeners->sem); up_write(&listeners->sem);
} }
static int fill_pid(pid_t pid, struct task_struct *pidtsk, static int fill_pid(pid_t pid, struct task_struct *tsk,
struct taskstats *stats) struct taskstats *stats)
{ {
int rc = 0; int rc = 0;
struct task_struct *tsk = pidtsk;
if (!pidtsk) { if (!tsk) {
read_lock(&tasklist_lock); rcu_read_lock();
tsk = find_task_by_pid(pid); tsk = find_task_by_pid(pid);
if (!tsk) { if (tsk)
read_unlock(&tasklist_lock); get_task_struct(tsk);
rcu_read_unlock();
if (!tsk)
return -ESRCH; return -ESRCH;
}
get_task_struct(tsk);
read_unlock(&tasklist_lock);
} else } else
get_task_struct(tsk); get_task_struct(tsk);
@ -214,40 +212,28 @@ static int fill_pid(pid_t pid, struct task_struct *pidtsk,
} }
static int fill_tgid(pid_t tgid, struct task_struct *tgidtsk, static int fill_tgid(pid_t tgid, struct task_struct *first,
struct taskstats *stats) struct taskstats *stats)
{ {
struct task_struct *tsk, *first; struct task_struct *tsk;
unsigned long flags; unsigned long flags;
int rc = -ESRCH;
/* /*
* Add additional stats from live tasks except zombie thread group * Add additional stats from live tasks except zombie thread group
* leaders who are already counted with the dead tasks * leaders who are already counted with the dead tasks
*/ */
first = tgidtsk; rcu_read_lock();
if (!first) { if (!first)
read_lock(&tasklist_lock);
first = find_task_by_pid(tgid); first = find_task_by_pid(tgid);
if (!first) {
read_unlock(&tasklist_lock);
return -ESRCH;
}
get_task_struct(first);
read_unlock(&tasklist_lock);
} else
get_task_struct(first);
if (!first || !lock_task_sighand(first, &flags))
goto out;
if (first->signal->stats)
memcpy(stats, first->signal->stats, sizeof(*stats));
tsk = first; tsk = first;
read_lock(&tasklist_lock);
/* Start with stats from dead tasks */
if (first->sighand) {
spin_lock_irqsave(&first->sighand->siglock, flags);
if (first->signal->stats)
memcpy(stats, first->signal->stats, sizeof(*stats));
spin_unlock_irqrestore(&first->sighand->siglock, flags);
}
do { do {
if (tsk->exit_state == EXIT_ZOMBIE && thread_group_leader(tsk)) if (tsk->exit_state == EXIT_ZOMBIE && thread_group_leader(tsk))
continue; continue;
@ -260,15 +246,18 @@ static int fill_tgid(pid_t tgid, struct task_struct *tgidtsk,
delayacct_add_tsk(stats, tsk); delayacct_add_tsk(stats, tsk);
} while_each_thread(first, tsk); } while_each_thread(first, tsk);
read_unlock(&tasklist_lock);
stats->version = TASKSTATS_VERSION;
unlock_task_sighand(first, &flags);
rc = 0;
out:
rcu_read_unlock();
stats->version = TASKSTATS_VERSION;
/* /*
* Accounting subsytems can also add calls here to modify * Accounting subsytems can also add calls here to modify
* fields of taskstats. * fields of taskstats.
*/ */
put_task_struct(first); return rc;
return 0;
} }