From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 9 Oct 2019 15:02:30 +0000 (+0200)
Subject: cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop()
X-Git-Tag: v5.4-rc8~29^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=937c6b27c73e02cd4114f95f5c37ba2c29fadba1;p=platform%2Fkernel%2Flinux-rpi.git

cgroup: freezer: call cgroup_enter_frozen() with preemption disabled 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 <bruce.ashfield@gmail.com>
Fixes: 76f969e8948d ("cgroup: cgroup v2 freezer")
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index c4da1ef..bcd46f5 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -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 {