Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

use __set_task_state() for TRACED/STOPPED tasks

1. It is much easier to grep for ->state change if __set_task_state() is used
instead of the direct assignment.

2. ptrace_stop() and handle_group_stop() use set_task_state() which adds the
unneeded mb() (btw even if we use mb() it is still possible that do_wait()
sees the new ->state but not ->exit_code, but this is ok).

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Oleg Nesterov and committed by
Linus Torvalds
d9ae90ac 06b8e878

+6 -8
+1 -1
kernel/fork.c
··· 1510 1510 if (!(clone_flags & CLONE_STOPPED)) 1511 1511 wake_up_new_task(p, clone_flags); 1512 1512 else 1513 - p->state = TASK_STOPPED; 1513 + __set_task_state(p, TASK_STOPPED); 1514 1514 1515 1515 if (unlikely (trace)) { 1516 1516 current->ptrace_message = nr;
+4 -6
kernel/ptrace.c
··· 53 53 spin_lock(&child->sighand->siglock); 54 54 if (task_is_traced(child)) { 55 55 if (child->signal->flags & SIGNAL_STOP_STOPPED) { 56 - child->state = TASK_STOPPED; 56 + __set_task_state(child, TASK_STOPPED); 57 57 } else { 58 58 signal_wake_up(child, 1); 59 59 } ··· 103 103 && child->signal != NULL) { 104 104 ret = 0; 105 105 spin_lock_irq(&child->sighand->siglock); 106 - if (task_is_stopped(child)) { 106 + if (task_is_stopped(child)) 107 107 child->state = TASK_TRACED; 108 - } else if (!task_is_traced(child) && !kill) { 108 + else if (!task_is_traced(child) && !kill) 109 109 ret = -ESRCH; 110 - } 111 110 spin_unlock_irq(&child->sighand->siglock); 112 111 } 113 112 read_unlock(&tasklist_lock); 114 113 115 - if (!ret && !kill) { 114 + if (!ret && !kill) 116 115 wait_task_inactive(child); 117 - } 118 116 119 117 /* All systems go.. */ 120 118 return ret;
+1 -1
kernel/signal.c
··· 1601 1601 current->exit_code = exit_code; 1602 1602 1603 1603 /* Let the debugger run. */ 1604 - set_current_state(TASK_TRACED); 1604 + __set_current_state(TASK_TRACED); 1605 1605 spin_unlock_irq(&current->sighand->siglock); 1606 1606 try_to_freeze(); 1607 1607 read_lock(&tasklist_lock);