From: Oleg Nesterov <oleg@redhat.com>
To: Tejun Heo <tj@kernel.org>
Cc: linux-kernel@vger.kernel.org, Roman Gushchin <guro@fb.com>,
Richard Purdie <richard.purdie@linuxfoundation.org>,
Bruce Ashfield <bruce.ashfield@gmail.com>
Subject: [PATCH] cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop()
Date: Wed, 9 Oct 2019 17:02:30 +0200 [thread overview]
Message-ID: <20191009150230.GB12511@redhat.com> (raw)
In-Reply-To: <CADkTA4PBT374CY+UNb85WjQEaNCDodMZu=MgpG8aMYbAu2eOGA@mail.gmail.com>
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>
---
kernel/signal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 534fec2..f8eed86 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 {
--
2.5.0
next prev parent reply other threads:[~2019-10-09 15:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 16:14 ptrace/strace and freezer oddities and v5.2+ kernels Bruce Ashfield
2019-10-02 2:01 ` Roman Gushchin
2019-10-02 4:18 ` Bruce Ashfield
2019-10-02 18:19 ` Roman Gushchin
2019-10-02 21:59 ` Bruce Ashfield
2019-10-04 0:09 ` Roman Gushchin
2019-10-07 12:54 ` Bruce Ashfield
2019-10-07 20:11 ` Bruce Ashfield
2019-10-07 23:27 ` Roman Gushchin
2019-10-08 12:13 ` Bruce Ashfield
2019-10-08 12:36 ` Oleg Nesterov
2019-10-08 12:58 ` Bruce Ashfield
2019-10-08 17:27 ` Roman Gushchin
2019-10-09 15:02 ` Oleg Nesterov [this message]
2019-10-09 15:21 ` [PATCH] cgroup: freezer: call cgroup_enter_frozen() with preemption disabled in ptrace_stop() Roman Gushchin
2019-10-11 16:52 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191009150230.GB12511@redhat.com \
--to=oleg@redhat.com \
--cc=bruce.ashfield@gmail.com \
--cc=guro@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richard.purdie@linuxfoundation.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox