TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()"

Browse Source 
This reverts commit bf40183285.

Use upstream stable commit.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
This commit is contained in:
Tim Gardner
2014-06-26 13:20:05 -06:00
parent 8100832ea3
commit a55a4c2739
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/sched.h
View File

@@ -2693,16 +2693,7 @@ static inline void thread_group_cputime_init(struct signal_struct *sig)
extern void recalc_sigpending_and_wake(struct task_struct *t); extern void recalc_sigpending_and_wake(struct task_struct *t);
extern void recalc_sigpending(void); extern void recalc_sigpending(void);
extern void signal_wake_up_state(struct task_struct *t, unsigned int state); extern void signal_wake_up(struct task_struct *t, int resume_stopped);
static inline void signal_wake_up(struct task_struct *t, bool resume)
{
signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0);
}
static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume)
{
signal_wake_up_state(t, resume ? __TASK_TRACED : 0);
}
/* /*
* Wrappers for p->thread_info->cpu access. No-op on UP. * Wrappers for p->thread_info->cpu access. No-op on UP.

8
kernel/ptrace.c
View File

@@ -117,7 +117,7 @@ void __ptrace_unlink(struct task_struct *child)
* TASK_KILLABLE sleeps. * TASK_KILLABLE sleeps.
*/ */
if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child)) if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child))
ptrace_signal_wake_up(child, true); signal_wake_up(child, task_is_traced(child));
spin_unlock(&child->sighand->siglock); spin_unlock(&child->sighand->siglock);
} }
@@ -312,7 +312,7 @@ static int ptrace_attach(struct task_struct *task, long request,
*/ */
if (task_is_stopped(task) && if (task_is_stopped(task) &&
task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING)) task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING))
signal_wake_up_state(task, __TASK_STOPPED); signal_wake_up(task, 1);
spin_unlock(&task->sighand->siglock); spin_unlock(&task->sighand->siglock);
@@ -729,7 +729,7 @@ int ptrace_request(struct task_struct *child, long request,
* tracee into STOP. * tracee into STOP.
*/ */
if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP))) if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP)))
ptrace_signal_wake_up(child, child->jobctl & JOBCTL_LISTENING); signal_wake_up(child, child->jobctl & JOBCTL_LISTENING);
unlock_task_sighand(child, &flags); unlock_task_sighand(child, &flags);
ret = 0; ret = 0;
@@ -755,7 +755,7 @@ int ptrace_request(struct task_struct *child, long request,
* start of this trap and now. Trigger re-trap. * start of this trap and now. Trigger re-trap.
*/ */
if (child->jobctl & JOBCTL_TRAP_NOTIFY) if (child->jobctl & JOBCTL_TRAP_NOTIFY)
ptrace_signal_wake_up(child, true); signal_wake_up(child, true);
ret = 0; ret = 0;
} }
unlock_task_sighand(child, &flags); unlock_task_sighand(child, &flags);

14
kernel/signal.c
View File

@@ -680,17 +680,23 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
* No need to set need_resched since signal event passing * No need to set need_resched since signal event passing
* goes through ->blocked * goes through ->blocked
*/ */
void signal_wake_up_state(struct task_struct *t, unsigned int state) void signal_wake_up(struct task_struct *t, int resume)
{ {
unsigned int mask;
set_tsk_thread_flag(t, TIF_SIGPENDING); set_tsk_thread_flag(t, TIF_SIGPENDING);
/* /*
* TASK_WAKEKILL also means wake it up in the stopped/traced/killable * For SIGKILL, we want to wake it up in the stopped/traced/killable
* case. We don't check t->state here because there is a race with it * case. We don't check t->state here because there is a race with it
* executing another processor and just now entering stopped state. * executing another processor and just now entering stopped state.
* By using wake_up_state, we ensure the process will wake up and * By using wake_up_state, we ensure the process will wake up and
* handle its death signal. * handle its death signal.
*/ */
if (!wake_up_state(t, state | TASK_INTERRUPTIBLE)) mask = TASK_INTERRUPTIBLE;
if (resume)
mask |= TASK_WAKEKILL;
if (!wake_up_state(t, mask))
kick_process(t); kick_process(t);
} }
@@ -839,7 +845,7 @@ static void ptrace_trap_notify(struct task_struct *t)
assert_spin_locked(&t->sighand->siglock); assert_spin_locked(&t->sighand->siglock);
task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY); task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY);
ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING); signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
} }
/* /*