* [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc
@ 2007-03-09 2:45 Mathieu Desnoyers
2007-03-09 13:06 ` Benjamin Herrenschmidt
2007-03-10 8:19 ` Mathieu Desnoyers
0 siblings, 2 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2007-03-09 2:45 UTC (permalink / raw)
To: akpm, mbligh, linux-kernel, linuxppc-dev, paulus
Fix atomicity of TIF update in flush_thread() for powerpc
Race :
parent process executing :
sys_ptrace()
(lock_kernel())
(ptrace_get_task_struct(pid))
arch_ptrace()
ptrace_detach()
ptrace_disable(child);
clear_singlestep(child);
clear_tsk_thread_flag(child, TIF_SINGLESTEP);
(which clears the TIF_SINGLESTEP flag atomically from a different
process)
(put_task_struct(child))
(unlock_kernel())
And at the same time, in the child process :
sys_execve()
do_execve()
search_binary_handler()
load_elf_binary()
flush_old_exec()
flush_thread()
doing a non-atomic thread flag update
Applies on 2.6.20.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -476,8 +476,13 @@ void flush_thread(void)
#ifdef CONFIG_PPC64
struct thread_info *t = current_thread_info();
- if (t->flags & _TIF_ABI_PENDING)
- t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);
+ if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
+ clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
+ if (test_tsk_thread_flag(tsk, TIF_32BIT))
+ clear_tsk_thread_flag(tsk, TIF_32BIT);
+ else
+ set_tsk_thread_flag(tsk, TIF_32BIT);
+ }
#endif
discard_lazy_cpu_state();
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc
2007-03-09 2:45 [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc Mathieu Desnoyers
@ 2007-03-09 13:06 ` Benjamin Herrenschmidt
2007-03-10 8:19 ` Mathieu Desnoyers
1 sibling, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2007-03-09 13:06 UTC (permalink / raw)
To: Mathieu Desnoyers; +Cc: linuxppc-dev, akpm, paulus, linux-kernel, mbligh
.../...
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Nice catch !
> --- a/arch/powerpc/kernel/process.c
> +++ b/arch/powerpc/kernel/process.c
> @@ -476,8 +476,13 @@ void flush_thread(void)
> #ifdef CONFIG_PPC64
> struct thread_info *t = current_thread_info();
>
> - if (t->flags & _TIF_ABI_PENDING)
> - t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);
> + if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
> + clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
> + if (test_tsk_thread_flag(tsk, TIF_32BIT))
> + clear_tsk_thread_flag(tsk, TIF_32BIT);
> + else
> + set_tsk_thread_flag(tsk, TIF_32BIT);
> + }
> #endif
>
> discard_lazy_cpu_state();
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc
2007-03-09 2:45 [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc Mathieu Desnoyers
2007-03-09 13:06 ` Benjamin Herrenschmidt
@ 2007-03-10 8:19 ` Mathieu Desnoyers
1 sibling, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2007-03-10 8:19 UTC (permalink / raw)
To: akpm, mbligh, linux-kernel, linuxppc-dev, paulus
Broken patch. Don't apply. Correct one coming.
* Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca) wrote:
> Fix atomicity of TIF update in flush_thread() for powerpc
>
> Race :
>
> parent process executing :
> sys_ptrace()
> (lock_kernel())
> (ptrace_get_task_struct(pid))
> arch_ptrace()
> ptrace_detach()
> ptrace_disable(child);
> clear_singlestep(child);
> clear_tsk_thread_flag(child, TIF_SINGLESTEP);
> (which clears the TIF_SINGLESTEP flag atomically from a different
> process)
> (put_task_struct(child))
> (unlock_kernel())
>
> And at the same time, in the child process :
> sys_execve()
> do_execve()
> search_binary_handler()
> load_elf_binary()
> flush_old_exec()
> flush_thread()
> doing a non-atomic thread flag update
>
> Applies on 2.6.20.
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
>
> --- a/arch/powerpc/kernel/process.c
> +++ b/arch/powerpc/kernel/process.c
> @@ -476,8 +476,13 @@ void flush_thread(void)
> #ifdef CONFIG_PPC64
> struct thread_info *t = current_thread_info();
>
> - if (t->flags & _TIF_ABI_PENDING)
> - t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);
> + if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
> + clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
> + if (test_tsk_thread_flag(tsk, TIF_32BIT))
> + clear_tsk_thread_flag(tsk, TIF_32BIT);
> + else
> + set_tsk_thread_flag(tsk, TIF_32BIT);
> + }
> #endif
>
> discard_lazy_cpu_state();
> --
> Mathieu Desnoyers
> Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
> OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc
@ 2007-03-10 8:23 Mathieu Desnoyers
0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2007-03-10 8:23 UTC (permalink / raw)
To: akpm, mbligh, linux-kernel, linuxppc-dev, paulus
Fix atomicity of TIF update in flush_thread() for powerpc
Fixes it correctly with *_ti_thread_flag.
Race :
parent process executing :
sys_ptrace()
(lock_kernel())
(ptrace_get_task_struct(pid))
arch_ptrace()
ptrace_detach()
ptrace_disable(child);
clear_singlestep(child);
clear_tsk_thread_flag(child, TIF_SINGLESTEP);
(which clears the TIF_SINGLESTEP flag atomically from a different
process)
(put_task_struct(child))
(unlock_kernel())
And at the same time, in the child process :
sys_execve()
do_execve()
search_binary_handler()
load_elf_binary()
flush_old_exec()
flush_thread()
doing a non-atomic thread flag update
Applies on 2.6.20.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -476,8 +476,13 @@ void flush_thread(void)
#ifdef CONFIG_PPC64
struct thread_info *t = current_thread_info();
- if (t->flags & _TIF_ABI_PENDING)
- t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);
+ if (test_ti_thread_flag(t, TIF_ABI_PENDING)) {
+ clear_ti_thread_flag(t, TIF_ABI_PENDING);
+ if (test_ti_thread_flag(t, TIF_32BIT))
+ clear_ti_thread_flag(t, TIF_32BIT);
+ else
+ set_ti_thread_flag(t, TIF_32BIT);
+ }
#endif
discard_lazy_cpu_state();
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-10 8:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-09 2:45 [PATCH] Fix atomicity of TIF update in flush_thread() for powerpc Mathieu Desnoyers
2007-03-09 13:06 ` Benjamin Herrenschmidt
2007-03-10 8:19 ` Mathieu Desnoyers
-- strict thread matches above, loose matches on Subject: below --
2007-03-10 8:23 Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).