de_thread: fix deadlockable process addition
Subsystems (3)
PATCH 1/1 de_thread: fix deadlockable process addition
On top of
task-make-task-list-manipulations-rcu-safe.patch
This patch
pidhash-kill-switch_exec_pids.patch
changed de_thread() so that it doesn't remove 'leader' from it's thread group. However de_thread() still adds current to init_task.tasks without removing 'leader' from this list. What if another CLONE_VM task starts do_coredump() after de_thread() drops tasklist_lock but before it calls release_task(leader) ?
do_coredump()->zap_threads() will find this thread group twice on init_task.tasks list. And it will increment mm->core_waiters twice for the new leader (current in de_thread). So, exit_mm()->complete(mm->core_startup_done) doesn't happen, and we have a deadlock.
fs/exec.c renamed from fs/exec.c~0_DET +1 -1
@@ -713,7 +713,7 @@ static int de_thread(struct task_structattach_pid (current,PIDTYPE_PID , current->pid);attach_pid (current,PIDTYPE_PGID , current->signal->pgrp);attach_pid (current,PIDTYPE_SID , current->signal->session); -list_add_tail_rcu (¤t->tasks, &init_task.tasks); +list_replace_rcu (&leader->tasks, ¤t->tasks); current->parent = current->real_parent = leader->real_parent; leader->parent = leader->real_parent = child_reaper;
kernel/exit.c renamed from kernel/exit.c~0_DET +3 -1
@@ -55,7 +55,9 @@ static void __unhash_process(struct taskdetach_pid (p,PIDTYPE_PGID );detach_pid (p,PIDTYPE_SID ); -list_del_rcu (&p->tasks); +/* see de_thread()->list_replace_rcu() */ +if (likely (p->tasks.prev !=LIST_POISON2 )) +list_del_rcu (&p->tasks);__get_cpu_var (process_counts)--; }list_del_rcu (&p->thread_group);
Quoted 11 lines · Oleg Nesterov
On top of
task-make-task-list-manipulations-rcu-safe.patchThis patch
pidhash-kill-switch_exec_pids.patchchanged
de_thread()so that it doesn't remove 'leader' from it's thread group. Howeverde_thread()still adds current to init_task.tasks without removing 'leader' from this list. What if anotherCLONE_VMtask startsdo_coredump()afterde_thread()dropstasklist_lockbut before it callsrelease_task(leader)?
Quoted 7 lines
do_coredump()->zap_threads() will find this thread group twice on init_task.tasks
list. And it will incrementmm->core_waiterstwice for the new leader (current inde_thread). So, exit_mm()->complete(mm->core_startup_done) doesn't happen, and we
have a deadlock.
Ack. The evils of de_thread!
We need this to keep from seeing the same task twice in do_each_thread.
This bug is in 2.6.17-rc1 so this code needs to go to Linus sometime soon.
Eric
Quoted 26 lines
Signed-off-by Oleg Nesterov <[email protected]>fs/exec.c renamed from fs/exec.c~0_DET +1
-1@@ -713,7 +713,7 @@ static int de_thread(struct task_structattach_pid (current,PIDTYPE_PID , current->pid);attach_pid (current,PIDTYPE_PGID , current->signal->pgrp);attach_pid (current,PIDTYPE_SID , current->signal->session); -list_add_tail_rcu (¤t->tasks, &init_task.tasks); +list_replace_rcu (&leader->tasks, ¤t->tasks); current->parent = current->real_parent = leader->real_parent; leader->parent = leader->real_parent = child_reaper;kernel/exit.c renamed from kernel/exit.c~0_DET +3
-1@@ -55,7 +55,9 @@ static void __unhash_process(struct taskdetach_pid (p,PIDTYPE_PGID );detach_pid (p,PIDTYPE_SID ); -list_del_rcu (&p->tasks); +/* see de_thread()->list_replace_rcu() */ +if (likely (p->tasks.prev !=LIST_POISON2 )) +list_del_rcu (&p->tasks);__get_cpu_var (process_counts)--; }list_del_rcu (&p->thread_group);
Quoted 2 lines · Eric W. Biederman
Ack. The evils of
de_thread!
Yes, just noticed another thing,
[PATCH] task-make-task-list-manipulations-rcu-safe-fix-fix
We shoudn't decrement process_counts if de_thread() unhashed the task.
kernel/exit.c renamed from kernel/exit.c~ +3 -2
@@ -56,9 +56,10 @@ static void __unhash_process(struct taskdetach_pid (p,PIDTYPE_SID );/* see de_thread()->list_replace_rcu() */ -if (likely (p->tasks.prev !=LIST_POISON2 )) +if (likely (p->tasks.prev !=LIST_POISON2 )) {list_del_rcu (&p->tasks); -__get_cpu_var (process_counts)--; +__get_cpu_var (process_counts)--; + } }list_del_rcu (&p->thread_group);remove_parent (p);
kernel/exit.c static void __unhash_process(struct task · line 59
Quoted 3 lines · Oleg Nesterov
kernel/exit.c renamed from kernel/exit.c~ +1
-1-if (likely (p->tasks.prev !=LIST_POISON2 )) +if (likely (p->tasks.prev !=LIST_POISON2 )) {
argh.
c'mon guys, we can't put a dependency on list_head poisoning into generic code.
We have one in detach_timer() but that's just debugging.
Quoted 11 lines · Andrew Morton
kernel/exit.c static void __unhash_process(struct task · line 59
Quoted 3 lines · Oleg Nesterov
kernel/exit.c renamed from kernel/exit.c~ +1
-1-if (likely (p->tasks.prev !=LIST_POISON2 )) +if (likely (p->tasks.prev !=LIST_POISON2 )) {argh.
c'mon guys, we can't put a dependency on
list_headpoisoning into generic code.
A suitable fix might be to add a new list_del_poison() (or list_del_rcu_something()?) and use that everywhere.
But it should use a different poisoning pattern, so we know that the kernel will still work correctly when someone removes the list_head debugging.
Quoted 13 lines · Andrew Morton
Quoted 11 lines · Andrew Morton
Review
Quoted 3 lines · Oleg Nesterov
(quoted diff) +1
-1- if (likely(p->tasks.prev != LIST_POISON2)) + if (likely(p->tasks.prev != LIST_POISON2)) {argh.
c'mon guys, we can't put a dependency on
list_headpoisoning into generic code.
Quoted 5 lines
A suitable fix might be to add a new
list_del_poison()(orlist_del_rcu_something()?) and use that everywhere.But it should use a different poisoning pattern, so we know that the kernel will still work correctly when someone removes the
list_headdebugging.
Agreed. That is ugly. I would recommend some new functions list functions but in thinking about this I believe I see how we can avoid this case completely.
The first step is to optimize thread_group_leader to be defined in terms of tasks and not process ids. Which is one less pointer dereference.
The second step is to modify de_thread to reduce the
old thread group leader to a thread. This requires changing the leaders parents, changing the leaders thread_group leader, unhashing the leader from the process group and session, and removing the leader from the task list.
With those two changes exit.c should not need to account for the de_thread case.
Oleg please take a hard look and see if you can find anything that will break with the patch below.
I believe that is all that is needed to cleanly keep do_each_thread from seeing a single thread multiple times.
Eric
include/linux/sched.h +1 -1
@@ -1203,7 +1203,7 @@ extern void wait_task_inactive(task_t *#define while_each_thread (g, t) \ while ((t = next_thread(t)) != g) -#define thread_group_leader (p) (p->pid == p->tgid) +#define thread_group_leader (p) (p == p->group_leader)static inline task_t *next_thread (task_t *p) {
fs/exec.c +7 -2
@@ -721,9 +721,14 @@ static int de_thread(struct task_structlist_add_tail (¤t->tasks, &init_task.tasks); current->parent = current->real_parent = leader->real_parent; - leader->parent = leader->real_parent = child_reaper; + leader->parent = leader->real_parent = current; current->group_leader = current; - leader->group_leader = leader; + leader->group_leader = current; + +/* Reduce leader to a thread */ +detach_pid (leader,PIDTYPE_PGID , current->signal->pgrp); + detach_pid(leader, PIDTYPE_SID current->signal->session); +list_del_init (&leader->tasks);add_parent (current);add_parent (leader);
Quoted 2 lines · Eric W. Biederman
Agreed. That is ugly.
Yes, I agree also.
Review
Quoted 8 lines
(quoted diff) +2
-2-#define thread_group_leader(p) (p->pid == p->tgid) +#define thread_group_leader(p) (p == p->group_leader) - leader->group_leader = leader; + leader->group_leader = current;
I thought about similar change too, but I am unsure about release_task(old_leader)->proc_flush_task() path (because I don't understand this code).
This change can confuse next_tid(), but this is minor. I don't see other problems.
However, I think we can do something better instead of attach_pid(current)/detach_pid(leader):
void exec_pid(task_t *old, task_t * new, enum pid_type type)
{
new->pids[type].pid = old->pids[type].pid;
hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
old->pids[type].pid = NULL;
}So de_thread() can do
exec_pid(leader, current, PIDTYPE_PGID); exec_pid(leader, current, PIDTYPE_SID);
This allows us to iterate over pgrp/session lockless without seeing the same task twice, btw. But may be it is just unneeded complication.
Review
Quoted 6 lines
This requires changing the leaders parents
(quoted diff) +1
-1current->parent = current->real_parent = leader->real_parent; - leader->parent = leader->real_parent = child_reaper; + leader->parent = leader->real_parent = current; current->group_leader = current;
I don't understand why do we need this change.
Actually, I think leader doesn't need reparenting at all. ptrace_unlink(leader) already restored leader->parent = ->real_parent and ->sibling. So I think we can do (for review only, should go in a separate patch) this:
fs/exec.c renamed from fs/exec.c~ +1 -4
@@ -704,7 +704,6 @@ static int de_thread(struct task_structptrace_unlink (current);ptrace_unlink (leader);remove_parent (current); -remove_parent (leader);/* Become a process group leader with the old leader's pid.
@@ -718,13 +717,11 @@ static int de_thread(struct task_structattach_pid (current,PIDTYPE_SID , current->signal->session);list_replace_rcu (&leader->tasks, ¤t->tasks); - current->parent = current->real_parent = leader->real_parent; - leader->parent = leader->real_parent = child_reaper; + current->parent = current->real_parent = leader->parent; current->group_leader = current; leader->group_leader = leader;add_parent (current); -add_parent (leader);if (ptrace) { current->ptrace = ptrace;__ptrace_link (current, parent);
Oleg.
Quoted 10 lines · Oleg Nesterov
Quoted 2 lines · Eric W. Biederman
Agreed. That is ugly.
Yes, I agree also.
Quoted 4 lines
(quoted diff) +1
-1-#define thread_group_leader(p) (p->pid == p->tgid) +#define thread_group_leader(p) (p == p->group_leader)
Quoted 8 lines
Review
Quoted 4 lines
...
(quoted diff) +1
-1- leader->group_leader = leader; + leader->group_leader = current;I thought about similar change too, but I am unsure about release_task(old_leader)->proc_flush_task() path (because I don't understand this code).
proc_flush_task() is purely an optimization to kill the proc dcache entries when a process exits. So we don't plug up the dcache with old proc entries.
All it looks at currently and pid an tgid.
So proc_flush_task() should not be a non-issue.
proc_pid_unhash() in -linus is a little more
serious but it only unhashes things.
Quoted 2 lines
This change can confuse
next_tid(), but this is minor. I don't see other problems.
next_tid?
Quoted 10 lines
However, I think we can do something better instead of attach_pid(current)/detach_pid(leader):
void exec_pid(task_t *old, task_t * new, enum pid_type type) { new->pids[type].pid = old->pids[type].pid; hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node); old->pids[type].pid = NULL; }
Quoted 8 lines
So
de_thread()can doexec_pid(leader, current, PIDTYPE_PGID); exec_pid(leader, current, PIDTYPE_SID);This allows us to iterate over pgrp/session lockless without seeing the same task twice, btw. But may be it is just unneeded complication.
I think it may be worthwhile. Currently we can't do any process group or session traversal lockless so it isn't worth looking at until we get the bug fix handled.
Ultimately I think I would like PGID and SID to live in ->signal in which case we would not need to touch them at all.
Quoted 8 lines
fs/exec.c static int de_thread(struct task_struct · line 721
Quoted 6 lines
This requires changing the leaders parents
fs/exec.c renamed from fs/exec.c~ +1
-1current->parent = current->real_parent = leader->real_parent; - leader->parent = leader->real_parent = child_reaper; + leader->parent = leader->real_parent = current; current->group_leader = current;I don't understand why do we need this change.
I was just trying to come as close as I could to normal thread semantics. The fewer special cases in de_thread, the fewer problems it is.
Quoted 4 lines
Actually, I think leader doesn't need reparenting at all.
ptrace_unlink(leader)already restoredleader->parent= ->real_parent and ->sibling. So I think we can do (for review only, should go in a separate patch) this:
Duh. All processes in a thread group share the same real_parent. It looks like the only practical thing we accomplish with remove_parent/add_parent is to change our place on our parents list of children.
Since ptrace_link and ptrace_unlink already does this we don't have a guaranteed order on that list, so skipping the order change should definitely be safe.
This means your patch doesn't go far enough. We should be able to kill all of the parent list manipulation inde_thread. Doing reduces the places that assignreal_parent to just fork and exit.
Eric
Quoted 6 lines · Eric W. Biederman
Quoted 2 lines · Oleg Nesterov
This change can confuse
next_tid(), but this is minor. I don't see other problems.
next_tid?
proc_task_readdir:
first_tid() returns old_leader
next_tid() returns new_leader
de_thread:
old_leader->group_leader = new_leader;
next_rid() returns old_leader again,
because it is not thread_group_leader()
anymore
Quoted 4 lines
This means your patch doesn't go far enough. We should be able to kill all of the parent list manipulation in
de_thread. Doing reduces the places that assignreal_parentto just fork and exit.
Yes!
I think I understand why we had the reason to reparent 'leader' in the past. We used to set leader->exit_state = EXIT_ZOMBIE, so without reparenting current's parent could have a bogus do_wait() result if this do_wait() happens before release_task(leader).
Now we set leader->exit_state = EXIT_DEAD, which means this task is not visible to do_wait().
Oleg.
Quoted 7 lines · Oleg Nesterov
proc_task_readdir:
first_tid()returnsold_leader
next_tid()returnsnew_leader
Quoted 7 lines
de_thread:
old_leader->group_leader=new_leader;
next_rid()returnsold_leaderagain,
because it is notthread_group_leader()
anymore
I think something like this for next_tid() is sufficient:
- if (thread_group_leader(pos)) + if (pos->pid == pos->tgid)
We can also do the same change in first_tgid().
Oleg.
Quoted 16 lines · Oleg Nesterov
Quoted 7 lines · Oleg Nesterov
proc_task_readdir:
first_tid()returnsold_leader
next_tid()returnsnew_leaderQuoted 7 lines
de_thread:old_leader->group_leader=new_leader;
next_rid()returnsold_leaderagain,
because it is notthread_group_leader()
anymore
Quoted 6 lines
I think something like this for
next_tid()is sufficient:- if (thread_group_leader(pos)) + if (pos->pid == pos->tgid)We can also do the same change in
first_tgid().
But the loop will terminate when things settle down,
and we can always use my original test of pos == start->group_leader.
I was worried about the stable kernel case and next_tid was such a generic name I failed to associate it with /proc.
Short of confusion (and de_thread invariably introduces that) I don't see anything that the code will actually do wrong.
Eric
PATCH 1/1 de_thread: Don't confuse users do_each_thread.
In reply to Oleg NesterovOleg Nesterov spotted two interesting bugs with the current de_thread code. The simplest is a long standing double decrement of __get_cpu_var(process_counts) in __unhash_process. Caused by two processes exiting when only one was created.
The other is that since we no longer detach from the thread_group list it is possible for do_each_thread when run under the tasklist_lock to see the same task_struct twice. Once on the task list as a thread_group_leader, and once on the thread list of another thread.
The double appearance in do_each_thread can cause a double increment of mm_core_waiters in zap_threads resulting in problems later on in coredump_wait.
To remedy those two problems this patch takes the simple approach of changing the old thread group leader into a child thread. The only routine in release_task that cares is __unhash_process, and it can be trivially seen that we handle cleaning up a thread group leader properly.
Since de_thread doesn't change the pid of the exiting leader process and instead shares it with the new leader process. I change thread_group_leader to recognize group leadership based on the group_leader field and not based on pids. This should also be slightly cheaper then the existing thread_group_leader macro.
I performed a quick audit and I couldn't see any user of thread_group_leader that cared how cared about the difference.
I believe this is 2.6.17 material as the bug is present in 2.6.17-rc1 and the fix is simple.
---
fs/exec.c | 7 ++++++- include/linux/sched.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-)
1432f138ecaedcc0575c91e9b0ec84ef25f3f11e
include/linux/sched.h +2 -1
@@ -1203,7 +1203,8 @@ #define do_each_thread(g, t) \#define while_each_thread (g, t) \ while ((t = next_thread(t)) != g) -#define thread_group_leader (p) (p->pid == p->tgid) +/* de_thread depends on thread_group_leader not being a pid based check */ +#define thread_group_leader (p) (p == p->group_leader)static inline task_t *next_thread (task_t *p) {
fs/exec.c +6 -1
@@ -723,7 +723,12 @@ static int de_thread(struct task_struct current->parent = current->real_parent = leader->real_parent; leader->parent = leader->real_parent = child_reaper; current->group_leader = current; - leader->group_leader = leader; + leader->group_leader = current; + +/* Reduce leader to a thread */ +detach_pid (leader,PIDTYPE_PGID , current->signal->pgrp); +detach_pid (leader,PIDTYPE_SID , current->signal->session); +list_del_init (&leader->tasks);add_parent (current);add_parent (leader);
Signature · 1 line
1.3.0.rc3.g6b3a
PATCH 1/1 de_thread: Don't confuse users do_each_thread.
I can't seem to send out a correct patch out today with out sending it twice. I accidently grabbed my old version that sent to many arguments to detach_pid and so would not compile. Oops.
---
Oleg Nesterov spotted two interesting bugs with the current de_thread code. The simplest is a long standing double decrement of __get_cpu_var(process_counts) in __unhash_process. Caused by two processes exiting when only one was created.
The other is that since we no longer detach from the thread_group list it is possible for do_each_thread when run under the tasklist_lock to see the same task_struct twice. Once on the task list as a thread_group_leader, and once on the thread list of another thread.
The double appearance in do_each_thread can cause a double increment of mm_core_waiters in zap_threads resulting in problems later on in coredump_wait.
To remedy those two problems this patch takes the simple approach of changing the old thread group leader into a child thread. The only routine in release_task that cares is __unhash_process, and it can be trivially seen that we handle cleaning up a thread group leader properly.
Since de_thread doesn't change the pid of the exiting leader process and instead shares it with the new leader process. I change thread_group_leader to recognize group leadership based on the group_leader field and not based on pids. This should also be slightly cheaper then the existing thread_group_leader macro.
I performed a quick audit and I couldn't see any user of thread_group_leader that cared how cared about the difference.
I believe this is 2.6.17 material as the bug is present in 2.6.17-rc1 and the fix is simple.
---
fs/exec.c | 7 ++++++- include/linux/sched.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-)
e621f800b1de6684beb995014190b3ccaad5c0b3
include/linux/sched.h +2 -1
@@ -1203,7 +1203,8 @@ #define do_each_thread(g, t) \#define while_each_thread (g, t) \ while ((t = next_thread(t)) != g) -#define thread_group_leader (p) (p->pid == p->tgid) +/* de_thread depends on thread_group_leader not being a pid based check */ +#define thread_group_leader (p) (p == p->group_leader)static inline task_t *next_thread (task_t *p) {
fs/exec.c +6 -1
@@ -723,7 +723,12 @@ static int de_thread(struct task_struct current->parent = current->real_parent = leader->real_parent; leader->parent = leader->real_parent = child_reaper; current->group_leader = current; - leader->group_leader = leader; + leader->group_leader = current; + +/* Reduce leader to a thread */ +detach_pid (leader,PIDTYPE_PGID ); +detach_pid (leader,PIDTYPE_SID ); +list_del_init (&leader->tasks);add_parent (current);add_parent (leader);
Signature · 1 line
1.3.0.rc3.g6b3a
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Hi Eric,
Quoted 4 lines · you
I can't seem to send out a correct patch out today with out sending it twice. I accidently grabbed my old version that sent to many arguments to
detach_pidand so would not compile. Oops.
While you are at it: Could you please avoid calculating current over and over again?
Just calculate it once and use the task_struct pointer.
If I do this for some random occurances of "current" in fs/exec.c I get this on Linus' latest git tree:
text data bss dec hex filename
9501 84 12 9597 257d old/fs/exec.o 9386 84 12 9482 250a new/fs/exec.o
Do you see any side effects, except reduced size
and increased performance here?
Is a patch doing this for the whole file welcome, if you are too busy?
Regards
Ingo Oeser
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Quoted 16 lines · Ingo Oeser
Hi Eric,
Quoted 4 lines · you
I can't seem to send out a correct patch out today with out sending it twice. I accidently grabbed my old version that sent to many arguments to
detach_pidand so would not compile. Oops.While you are at it: Could you please avoid calculating current over and over again?
Just calculate it once and use the
task_structpointer.If I do this for some random occurances of "current" in
fs/exec.cI get this on Linus' latest git tree:
Quoted 6 lines
text data bss dec hex filename 9501 84 12 9597 257d old/fs/exec.o 9386 84 12 9482 250a new/fs/exec.oDo you see any side effects, except reduced size
and increased performance here?
Not that I know of. I was cleaning up pids and signaling and wound up in fixing de_thread. It is just an ugly beast.
Quoted 1 line
Is a patch doing this for the whole file welcome, if you are too busy?
I could probably spare a couple of minutes to help review such a patch. Beyond de_thread I'm to busy to write such a patch.
Eric
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
In reply to Ingo OeserQuoted 5 lines · Ingo Oeser
While you are at it: Could you please avoid calculating current over and over again?
Just calculate it once and use the
task_structpointer.
Ironically, de_thread() has 'tsk' parameter which is equal to 'current'.
Oleg.
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Quoted 8 lines · Oleg Nesterov
Quoted 5 lines · Ingo Oeser
While you are at it: Could you please avoid calculating current over and over again?
Just calculate it once and use the
task_structpointer.Ironically,
de_thread()has 'tsk' parameter which is equal to 'current'.
That's the thing that made me doubt :-)
But thinking more about it: current cannot change within one thread, right? So all of this can be cleaned up.
I'll clean them up tonight and sent out a patch against current -mm.
Regards
Ingo Oeser
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Quoted 8 lines · Ingo Oeser
Quoted 7 lines · Oleg Nesterov
Quoted 5 lines · Ingo Oeser
While you are at it: Could you please avoid calculating current over and over again?
Just calculate it once and use the
task_structpointer.
Quoted 8 lines
Quoted 1 line
Ironically,
de_thread()has 'tsk' parameter which is equal to 'current'.That's the thing that made me doubt :-)
But thinking more about it: current cannot change within one thread, right? So all of this can be cleaned up.
I'll clean them up tonight and sent out a patch against current -mm.
Please skip de_thread. I will catch that one, in a minute. There is enough churn on that function that you are likely to patch the wrong version.
Eric
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
On Tuesday, 11. April 2006 09:36, Eric W. Biederman wrote:
[cleanup of current usage]
Quoted 3 lines
Please skip
de_thread. I will catch that one, in a minute. There is enough churn on that function that you are likely to patch the wrong version.
Ok, I'll wait for you and Oleg. Maybe I should revisit this cleanup after 2.6.18 opens up. If you both are done in that area, just tell me and I'll cook up a patch.
Regards
Ingo Oeser
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
In reply to Eric W. Biedermanfs/exec.c static int de_thread(struct task_struct · line 731
Quoted 7 lines · Eric W. Biederman
I believe this is 2.6.17 material as the bug is present in 2.6.17-rc1 and the fix is simple.
...
fs/exec.c +1
-0+list_del_init (&leader->tasks);
I beleive this is ok for 2.6.17-rc1, but this breaks lockless for_each_process/while_each_thread (I am talking about -mm tree).
Andrew, could you please drop these ones:
task-make-task-list-manipulations-rcu-safe-fix.patch task-make-task-list-manipulations-rcu-safe-fix-fix.patch
Then we need this "patch" for de_thread:
- list_add_tail_rcu(¤t->tasks, &init_task.tasks);
+ list_replace_rcu(&leader->tasks, ¤t->tasks);
...
- list_del_init(&leader->tasks);
Currently I don't know how the code looks in -mm tree, I lost the plot.
Oleg.
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Review
Quoted 5 lines · Oleg Nesterov
Andrew, could you please drop these ones:
(quoted diff) +0
-0task-make-task-list-manipulations-rcu-safe-fix.patch task-make-task-list-manipulations-rcu-safe-fix-fix.patch
plop, plop.
Quoted 6 lines
Then we need this "patch" for
de_thread:-
list_add_tail_rcu(¤t->tasks, &init_task.tasks);
+list_replace_rcu(&leader->tasks, ¤t->tasks);
...
-list_del_init(&leader->tasks);
OK, please send patch.
Quoted 1 line
Currently I don't know how the code looks in -mm tree,
http://www.zip.com.au/~akpm/linux/patches/stuff/x.bz2 is -mm-as-of-now.
Quoted 1 line
I lost the plot.
What plot?
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
Quoted 6 lines · Andrew Morton
Quoted 2 lines · Oleg Nesterov
Currently I don't know how the code looks in -mm tree,
http://www.zip.com.au/~akpm/linux/patches/stuff/x.bz2 is -mm-as-of-now.
Thanks. Here is the patch:
[PATCH] de_thread: fix lockless do_each_thread
We should keep the value of old_leader->tasks.next in de_thread, otherwise we can't do for_each_process/do_each_thread without tasklist_lock held.
fs/exec.c renamed from fs/exec.c~ +1 -2
@@ -725,7 +725,7 @@ static int de_thread(struct task_structattach_pid (current,PIDTYPE_PID , current->pid);attach_pid (current,PIDTYPE_PGID , current->signal->pgrp);attach_pid (current,PIDTYPE_SID , current->signal->session); -list_add_tail_rcu (¤t->tasks, &init_task.tasks); +list_replace_rcu (&leader->tasks, ¤t->tasks); current->parent = current->real_parent = leader->real_parent; leader->parent = leader->real_parent = child_reaper;
@@ -735,7 +735,6 @@ static int de_thread(struct task_struct/* Reduce leader to a thread */ detach_pid (leader,PIDTYPE_PGID );detach_pid (leader,PIDTYPE_SID ); -list_del_init (&leader->tasks);add_parent (current);add_parent (leader);
Re: [PATCH] de_thread: Don't confuse users do_each_thread.
In reply to Oleg NesterovQuoted 11 lines · Oleg Nesterov
fs/exec.c static int de_thread(struct task_struct · line 731
Quoted 7 lines · Eric W. Biederman
I believe this is 2.6.17 material as the bug is present in 2.6.17-rc1 and the fix is simple.
...
fs/exec.c +1
-0+list_del_init (&leader->tasks);I beleive this is ok for 2.6.17-rc1, but this breaks lockless for_each_process/while_each_thread (I am talking about -mm tree).
Agreed.
Quoted 12 lines
Andrew, could you please drop these ones:
task-make-task-list-manipulations-rcu-safe-fix.patch task-make-task-list-manipulations-rcu-safe-fix-fix.patch
Then we need this "patch" for
de_thread:(quoted diff) +1
-2- list_add_tail_rcu(¤t->tasks, &init_task.tasks); + list_replace_rcu(&leader->tasks, ¤t->tasks); - list_del_init(&leader->tasks);
Quoted 1 line
Currently I don't know how the code looks in -mm tree, I lost the plot.
Since the patches don't conflict on context I bet they are all in there, at the moment. I am just about to see if I can sort that out.
Eric