Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caf7caca authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Marco Ballesio
Browse files

UPSTREAM: 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: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
Fixes: 76f969e8948d ("cgroup: cgroup v2 freezer")
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>

Change-Id: Ic53e0f2d6624b0bb90817b0c57060fb7db971348
(cherry picked from commit 937c6b27c73e02cd4114f95f5c37ba2c29fadba1)
Bug: 154548692
Signed-off-by: default avatarMarco Ballesio <balejs@google.com>
parent fe5770ae
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2131,8 +2131,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
		 */
		preempt_disable();
		read_unlock(&tasklist_lock);
		preempt_enable_no_resched();
		cgroup_enter_frozen();
		preempt_enable_no_resched();
		freezable_schedule();
		cgroup_leave_frozen(true);
	} else {