Skip to content

Commit

Permalink
[PATCH] sys_times: don't take tasklist_lock
Browse files Browse the repository at this point in the history
sys_times: don't take tasklist_lock

Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 29, 2006
1 parent 5876700 commit 7d7185c
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions kernel/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ asmlinkage long sys_times(struct tms __user * tbuf)
struct task_struct *t;
cputime_t utime, stime, cutime, cstime;

read_lock(&tasklist_lock);
spin_lock_irq(&tsk->sighand->siglock);
utime = tsk->signal->utime;
stime = tsk->signal->stime;
t = tsk;
Expand All @@ -1216,20 +1216,9 @@ asmlinkage long sys_times(struct tms __user * tbuf)
t = next_thread(t);
} while (t != tsk);

/*
* While we have tasklist_lock read-locked, no dying thread
* can be updating current->signal->[us]time. Instead,
* we got their counts included in the live thread loop.
* However, another thread can come in right now and
* do a wait call that updates current->signal->c[us]time.
* To make sure we always see that pair updated atomically,
* we take the siglock around fetching them.
*/
spin_lock_irq(&tsk->sighand->siglock);
cutime = tsk->signal->cutime;
cstime = tsk->signal->cstime;
spin_unlock_irq(&tsk->sighand->siglock);
read_unlock(&tasklist_lock);

tmp.tms_utime = cputime_to_clock_t(utime);
tmp.tms_stime = cputime_to_clock_t(stime);
Expand Down

0 comments on commit 7d7185c

Please sign in to comment.