Skip to content

Commit

Permalink
[PATCH] proc: Remove tasklist_lock from proc_task_readdir.
Browse files Browse the repository at this point in the history
This is just like my previous removal of tasklist_lock from first_tgid, and
next_tgid.  It simply had to wait until it was rcu safe to walk the thread
list.

This should be the last instance of the tasklist_lock in proc.  So user
processes should not be able to influence the tasklist lock hold times.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jun 26, 2006
1 parent df26c40 commit cc28873
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2224,11 +2224,12 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
* In the case of a seek we start with the leader and walk nr
* threads past it.
*/
static struct task_struct *first_tid(struct task_struct *leader, int tid, int nr)
static struct task_struct *first_tid(struct task_struct *leader,
int tid, int nr)
{
struct task_struct *pos = NULL;
read_lock(&tasklist_lock);

rcu_read_lock();
/* Attempt to start with the pid of a thread */
if (tid && (nr > 0)) {
pos = find_task_by_pid(tid);
Expand Down Expand Up @@ -2258,7 +2259,7 @@ static struct task_struct *first_tid(struct task_struct *leader, int tid, int nr
}
pos = NULL;
done:
read_unlock(&tasklist_lock);
rcu_read_unlock();
return pos;
}

Expand All @@ -2271,15 +2272,15 @@ static struct task_struct *first_tid(struct task_struct *leader, int tid, int nr
static struct task_struct *next_tid(struct task_struct *start)
{
struct task_struct *pos;
read_lock(&tasklist_lock);
rcu_read_lock();
pos = start;
if (pid_alive(start))
pos = next_thread(start);
if (pid_alive(pos) && (pos != start->group_leader))
get_task_struct(pos);
else
pos = NULL;
read_unlock(&tasklist_lock);
rcu_read_unlock();
put_task_struct(start);
return pos;
}
Expand Down

0 comments on commit cc28873

Please sign in to comment.