Skip to content

Commit

Permalink
cgroup: freezer: call cgroup_enter_frozen() with preemption disabled …
Browse files Browse the repository at this point in the history
…in ptrace_stop()

ptrace_stop() does preempt_enable_no_resched() to avoid the preemption,
but after that cgroup_enter_frozen() does spin_lock/unlock and this adds
another preemption point.

Reported-and-tested-by: Bruce Ashfield <[email protected]>
Fixes: 76f969e ("cgroup: cgroup v2 freezer")
Cc: [email protected] # v5.2+
Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: Roman Gushchin <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
  • Loading branch information
oleg-nesterov authored and htejun committed Oct 11, 2019
1 parent 9e208aa commit 937c6b2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -2205,8 +2205,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t
*/
preempt_disable();
read_unlock(&tasklist_lock);
preempt_enable_no_resched();
cgroup_enter_frozen();
preempt_enable_no_resched();
freezable_schedule();
cgroup_leave_frozen(true);
} else {
Expand Down

0 comments on commit 937c6b2

Please sign in to comment.