kernel: move exit_task_work() past exit_notify()
PATCH 1/1 kernel: move exit_task_work() past exit_notify()
exit_task_work() must be called after exit_notify, because exit_task_namespaces() may release a file and fput() enqueues a work.
exit_notify
exit_task_namespaces
free_ipc_ns
shm_destroy
fput
task_work_add
so if task works don't run after exit_notify(), a few files may leak.
--- kernel/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/exit.c +1 -1
@@ -795,7 +795,6 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); -exit_task_work (tsk);check_stack_usage ();exit_thread ();
@@ -822,6 +821,7 @@ void do_exit(long code)ptrace_put_breakpoints (tsk);exit_notify (tsk, group_dead); +exit_task_work (tsk);#ifdef CONFIG_NUMA task_lock (tsk);mpol_put (tsk->mempolicy);
Signature · 1 line
1.8.1.4
Quoted 35 lines · Andrey Vagin
exit_task_work()must be called afterexit_notify, becauseexit_task_namespaces()may release a file andfput()enqueues a work.
exit_notify
exit_task_namespaces
free_ipc_ns
shm_destroy
fput
task_work_addso if task works don't run after
exit_notify(), a few files may leak.Cc Andrew Morton <[email protected]>Cc "Eric W. Biederman" <[email protected]>Cc Al Viro <[email protected]>Cc Oleg Nesterov <[email protected]>Cc David Howells <[email protected]>Signed-off-by Andrey Vagin <[email protected]>--- kernel/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/exit.c +0
-1@@ -795,7 +795,6 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); -exit_task_work (tsk);check_stack_usage ();exit_thread ();
kernel/exit.c void do_exit(long code) · line 824
Quoted 4 lines
kernel/exit.c +1
-0@@ -822,6 +821,7 @@ void do_exit(long code)ptrace_put_breakpoints (tsk);exit_notify (tsk, group_dead); +exit_task_work (tsk);
I am not comfortable with this change...
The task is "really dead" after exit_notify(), even release_task(current) can be called.
Let me think a bit... It seems that we have the alternative.
Oleg.
cover (Was: kernel: move exit_task_work() past exit_notify())
Quoted 19 lines · Oleg Nesterov
Quoted 12 lines
kernel/exit.c +0
-1@@ -795,7 +795,6 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); -exit_task_work (tsk);check_stack_usage ();exit_thread ();kernel/exit.c void do_exit(long code) · line 824
Quoted 4 lines
kernel/exit.c +1
-0@@ -822,6 +821,7 @@ void do_exit(long code)ptrace_put_breakpoints (tsk);exit_notify (tsk, group_dead); +exit_task_work (tsk);I am not comfortable with this change...
Quoted 4 lines
The task is "really dead" after
exit_notify(), evenrelease_task(current)can be called.Let me think a bit... It seems that we have the alternative.
Andrey, Eric, how about this patch?
COMPLETELY UNTESTED and I need to recheck, but perhaps you can review?
Oleg.
PATCH 1/1 move exit_task_namespaces() outside of exit_notify()
exit_notify() does exit_task_namespaces() after forget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can do do_notify_parent() and use the parent's (ours) pid_ns.
However, after 32084504 "pidns: use task_active_pid_ns in do_notify_parent" ->nsproxy != NULL is no longer needed, we rely on task_active_pid_ns().
Move exit_task_namespaces() from exit_notify() to do_exit(), after exit_fs() and before exit_task_work().
This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does fput() which needs task_work_add(). And this allows us do simplify exit_notify(), we can avoid unlock/lock(tasklist) and we can change ->exit_state instead of PF_EXITING in forget_original_parent().
kernel/exit.c +1 -1
@@ -649,7 +649,6 @@ static void exit_notify(struct task_stru* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ forget_original_parent (tsk); -exit_task_namespaces (tsk);write_lock_irq (&tasklist_lock);if (group_dead)
@@ -795,6 +794,7 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); +exit_task_namespaces (tsk);exit_task_work (tsk);check_stack_usage ();exit_thread ();
Re: [PATCH 1/1] move exit_task_namespaces() outside of exit_notify()
Quoted 9 lines · Oleg Nesterov
exit_notify()doesexit_task_namespaces()afterforget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can dodo_notify_parent()and use the parent's (ours)pid_ns.However, after 32084504 "pidns: use
task_active_pid_nsindo_notify_parent" ->nsproxy != NULL is no longer needed, we rely ontask_active_pid_ns().
Quoted 7 lines
Move
exit_task_namespaces()fromexit_notify()todo_exit(), afterexit_fs()and beforeexit_task_work().This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does
fput()which needstask_work_add(). And this allows us do simplifyexit_notify(), we can avoid unlock/lock(tasklist) and we can change ->exit_state instead ofPF_EXITINGinforget_original_parent().
It feels like this ought to work, certainly the pid namespace should not need this, and the pid namespace was the motivating case for most of the movement. However we haven't called exit_task_namespaces this early since 2006.
Ugh. I goofed and used that field in scm.c. Sigh. I will push a patch to rename that field nsproxy->childrens_pid_ns so it is harder to make the mistake I just made.
None of the uses of nsproxy->net_ns look like they will be used on the exit path.
The /proc/<pid>/ns/{uts,ipc,net,mnt,pid} files are fine as nsproxy itself is what becomes NULL and they test for that. Well except the pid file uses task_active_pid_ns.
nsproxy->ipc_ns is isolated to files under ipc so it is probably fine.
Likewise the nsproxy->uts_ns uses look like they will be fine.
Likewise the nsproxy->mnt_ns uses look like they will be fine.
So in a quick skim through the uses no problem cases stick out, nor can I think of anything that would cause trouble. This looks like a good patch.
Quoted 21 lines
Reported-by Andrey Vagin <[email protected]>Signed-off-by Oleg Nesterov <[email protected]>kernel/exit.c +1
-1@@ -649,7 +649,6 @@ static void exit_notify(struct task_stru* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ forget_original_parent (tsk); -exit_task_namespaces (tsk);write_lock_irq (&tasklist_lock);if (group_dead)@@ -795,6 +794,7 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); +exit_task_namespaces (tsk);exit_task_work (tsk);check_stack_usage ();exit_thread ();
Re: [PATCH 1/1] move exit_task_namespaces() outside of exit_notify()
In reply to Oleg Nesterov2013/4/13 Oleg Nesterov <[email protected]>
Quoted 10 lines
exit_notify()doesexit_task_namespaces()afterforget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can dodo_notify_parent()and use the parent's (ours)pid_ns.However, after 32084504 "pidns: use
task_active_pid_nsindo_notify_parent" ->nsproxy != NULL is no longer needed, we rely ontask_active_pid_ns().
Quoted 8 lines
Move
exit_task_namespaces()fromexit_notify()todo_exit(), afterexit_fs()and beforeexit_task_work().This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does
fput()which needstask_work_add(). And this allows us do simplifyexit_notify(), we can avoid unlock/lock(tasklist) and we can change ->exit_state instead ofPF_EXITINGinforget_original_parent().
It looks good for me. I have tested it a bit and don't find any problem. Oleg, thank you.
Quoted 22 lines
Reported-by Andrey Vagin <[email protected]>Signed-off-by Oleg Nesterov <[email protected]>kernel/exit.c +1
-1@@ -649,7 +649,6 @@ static void exit_notify(struct task_stru* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ forget_original_parent (tsk); -exit_task_namespaces (tsk);write_lock_irq (&tasklist_lock);if (group_dead)@@ -795,6 +794,7 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); +exit_task_namespaces (tsk);exit_task_work (tsk);check_stack_usage ();exit_thread ();
Re: [PATCH 1/1] move exit_task_namespaces() outside of exit_notify()
Quoted 5 lines · Andrey Wagin
It looks good for me. I have tested it a bit and don't find any problem. Oleg, thank you.
Acked-by Andrew Vagin <[email protected]>
Thanks Andrey and Eric.
Quoted 8 lines
Quoted 8 lines
kernel/exit.c +0
-1@@ -649,7 +649,6 @@ static void exit_notify(struct task_stru* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ forget_original_parent (tsk); -exit_task_namespaces (tsk);
Quoted 8 lines
kernel/exit.c void do_exit(long code) · line 798
Quoted 8 lines
kernel/exit.c +1
-0write_lock_irq (&tasklist_lock);if (group_dead)@@ -795,6 +794,7 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); +exit_task_namespaces (tsk);exit_task_work (tsk);
I do not see any problems with this patch too... but still I am worried.
Even if fput() can work correctly after exit_task_namespaces(), this limits the usage of task_work_add(). Probably this is fine, but can't we at least discuss another change?
We can change fput() so that it can always work, even after exit_task_work(),
void fput(struct file *file)
{
if (atomic_long_dec_and_test(&file->f_count)) {
struct task_struct *task = current;
unsigned long flags;
file_sb_list_del(file);
if (likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {
init_task_work(&file->f_u.fu_rcuhead, ____fput);
if (!task_work_add(task, &file->f_u.fu_rcuhead, true))
return;
}
spin_lock_irqsave(&delayed_fput_lock, flags);
list_add(&file->f_u.fu_list, &delayed_fput_list);
schedule_work(&delayed_fput_work);
spin_unlock_irqrestore(&delayed_fput_lock, flags);
}
}Al, what do you think?
Untested patch below.
Oleg.
fs/file_table.c +11 -9
@@ -306,17 +306,19 @@ void fput(struct file *file) {if (atomic_long_dec_and_test (&file->f_count)) {struct task_struct *task = current; +unsigned long flags; +file_sb_list_del (file); -if (unlikely (in_interrupt () || task->flags &PF_KTHREAD )) { -unsigned long flags; -spin_lock_irqsave (&delayed_fput_lock, flags); -list_add (&file->f_u.fu_list, &delayed_fput_list); -schedule_work (&delayed_fput_work); -spin_unlock_irqrestore (&delayed_fput_lock, flags); -return ; +if (likely (!in_interrupt () && !(task->flags &PF_KTHREAD ))) { +init_task_work (&file->f_u.fu_rcuhead, ____fput); +if (!task_work_add (task, &file->f_u.fu_rcuhead, true)) +return ; } -init_task_work (&file->f_u.fu_rcuhead, ____fput); -task_work_add (task, &file->f_u.fu_rcuhead, true); + +spin_lock_irqsave (&delayed_fput_lock, flags); +list_add (&file->f_u.fu_list, &delayed_fput_list); +schedule_work (&delayed_fput_work); +spin_unlock_irqrestore (&delayed_fput_lock, flags); } }
Re: [PATCH 1/1] move exit_task_namespaces() outside of exit_notify()
In reply to Oleg NesterovQuoted 9 lines · Oleg Nesterov
exit_notify()doesexit_task_namespaces()afterforget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can dodo_notify_parent()and use the parent's (ours)pid_ns.However, after 32084504 "pidns: use
task_active_pid_nsindo_notify_parent" ->nsproxy != NULL is no longer needed, we rely ontask_active_pid_ns().
Quoted 8 lines
Move
exit_task_namespaces()fromexit_notify()todo_exit(), afterexit_fs()and beforeexit_task_work().This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does
fput()which needstask_work_add(). And this allows us do simplifyexit_notify(), we can avoid unlock/lock(tasklist) and we can change ->exit_state instead ofPF_EXITINGinforget_original_parent().
It looks good for me. kmemleak doesn't report any leaks. CRIU test cases, which use namespaces, work without any errors.
Thanks.
Quoted 22 lines
Reported-by Andrey Vagin <[email protected]>Signed-off-by Oleg Nesterov <[email protected]>kernel/exit.c +1
-1@@ -649,7 +649,6 @@ static void exit_notify(struct task_stru* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ forget_original_parent (tsk); -exit_task_namespaces (tsk);write_lock_irq (&tasklist_lock);if (group_dead)@@ -795,6 +794,7 @@ void do_exit(long code)exit_shm (tsk);exit_files (tsk);exit_fs (tsk); +exit_task_namespaces (tsk);exit_task_work (tsk);check_stack_usage ();exit_thread ();
Re: [PATCH 1/1] move exit_task_namespaces() outside of exit_notify()
Quoted 14 lines · Andrew Vagin
Quoted 12 lines · Oleg Nesterov
exit_notify()doesexit_task_namespaces()afterforget_original_parent(). This was needed to ensure that ->nsproxy can't be cleared prematurely, an exiting child we are going to reparent can dodo_notify_parent()and use the parent's (ours)pid_ns.However, after 32084504 "pidns: use
task_active_pid_nsindo_notify_parent" ->nsproxy != NULL is no longer needed, we rely ontask_active_pid_ns().Move
exit_task_namespaces()fromexit_notify()todo_exit(), afterexit_fs()and beforeexit_task_work().
Quoted 8 lines
Quoted 5 lines
This solves the problem reported by Andrey, free_ipc_ns()->shm_destroy() does
fput()which needstask_work_add(). And this allows us do simplifyexit_notify(), we can avoid unlock/lock(tasklist) and we can change ->exit_state instead ofPF_EXITINGinforget_original_parent().It looks good for me. kmemleak doesn't report any leaks. CRIU test cases, which use namespaces, work without any errors.
OK, thanks.
I guess I need to resend this patch with your and Eric's acks.
But in fact I am going to send the 2nd change as well, it should fix the same problem too and imho it makes sense anyway. And to me the 2nd one looks like 3.10 material, it is much more simple and straightforward.
Oleg.