History

Merge branch 'for-5.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup fix from Tejun Heo: "There's an inadvertent preemption point in ptrace_stop() which was reliably triggering for a test scenario significantly slowing it down. This contains Oleg's fix to remove the unwanted preemption point" * 'for-5.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop()

Linus Torvalds committed 7 years ago

Commit de620fb2 parents 72d5ac6 937c6b21 file · +1 −1Browse files

Unified · Split

kernel/signal.c+1−1
@@ -2205,8 +2205,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t · 2204 unmodified lines
2205 */2205 */
2206 preempt_disable();2206 preempt_disable();
2207 read_unlock(&tasklist_lock);2207 read_unlock(&tasklist_lock);
2208 preempt_enable_no_resched();
2209 cgroup_enter_frozen();2208 cgroup_enter_frozen();
2209 preempt_enable_no_resched();
2210 freezable_schedule();2210 freezable_schedule();
2211 cgroup_leave_frozen(true);2211 cgroup_leave_frozen(true);
2212 } else {2212 } else {