From: Waiman Long <longman@redhat.com>
To: Tejun Heo <tj@kernel.org>, Li Zefan <lizefan@huawei.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>
Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@fb.com, pjt@google.com, luto@amacapital.net,
efault@gmx.de, torvalds@linux-foundation.org,
Waiman Long <longman@redhat.com>
Subject: [RFC PATCH-cgroup 5/6] cgroup: Skip dying css in cgroup_apply_control_{enable,disable}
Date: Wed, 14 Jun 2017 11:05:36 -0400 [thread overview]
Message-ID: <1497452737-11125-6-git-send-email-longman@redhat.com> (raw)
In-Reply-To: <1497452737-11125-1-git-send-email-longman@redhat.com>
While constantly turning on and off controllers, it is possible to
trigger the dying CSS warnings in cgroup_apply_control_enable() and
cgroup_apply_control_disable(). The current code, however, proceeds
after the warning leading to other secondary warnings and maybe even
data corruption, like
cgroup: cgroup_addrm_files: failed to add current, err=-17
To avoid the secondary errors, the dying CSS is now ignored or skipped
so as not to cause other problem.
Signed-off-by: Waiman Long <longman@redhat.com>
---
kernel/cgroup/cgroup.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index f0bea32..2a5bd49 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -2846,12 +2846,24 @@ static int cgroup_apply_control_enable(struct cgroup *cgrp)
for_each_subsys(ss, ssid) {
struct cgroup_subsys_state *css = cgroup_css(dsct, ss);
- WARN_ON_ONCE(css && percpu_ref_is_dying(&css->refcnt));
-
if (!(cgroup_ss_mask(dsct, false) & (1 << ss->id)) ||
(dsct->bypass_ss_mask & (1 << ss->id)))
continue;
+ /*
+ * If the css is dying, we will just skip it after
+ * warning.
+ */
+ if (css && (css->flags & CSS_DYING)) {
+ char name[NAME_MAX+1];
+
+ cgroup_name(cgrp, name, NAME_MAX);
+ pr_warn("%s: %s css of cgroup %s is dying!\n",
+ __func__, ss->name, name);
+ WARN_ON_ONCE(1);
+ continue;
+ }
+
if (!css) {
css = css_create(dsct, ss);
if (IS_ERR(css))
@@ -2893,9 +2905,7 @@ static void cgroup_apply_control_disable(struct cgroup *cgrp)
for_each_subsys(ss, ssid) {
struct cgroup_subsys_state *css = cgroup_css(dsct, ss);
- WARN_ON_ONCE(css && percpu_ref_is_dying(&css->refcnt));
-
- if (!css)
+ if (!css || (css->flags & CSS_DYING))
continue;
if (css->parent &&
--
1.8.3.1
next prev parent reply other threads:[~2017-06-14 15:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 15:05 [RFC PATCH-cgroup 0/6] cgroup: bypass and subtree root modes Waiman Long
2017-06-14 15:05 ` [RFC PATCH-cgroup 1/6] cgroup: Relax the no internal process constraint Waiman Long
2017-06-21 20:40 ` Tejun Heo
2017-06-21 21:37 ` Waiman Long
2017-06-21 21:39 ` Tejun Heo
2017-06-21 21:50 ` Waiman Long
2017-06-21 22:02 ` Tejun Heo
2017-06-14 15:05 ` [RFC PATCH-cgroup 2/6] cgroup: Enable bypass mode in cgroup v2 Waiman Long
2017-06-21 21:17 ` Tejun Heo
2017-06-22 20:07 ` Waiman Long
2017-06-14 15:05 ` [RFC PATCH-cgroup 3/6] cgroup: Allow bypss mode in subtree_control Waiman Long
2017-06-14 15:05 ` [RFC PATCH-cgroup 4/6] cgroup: Introduce subtree root mode Waiman Long
2017-06-21 21:38 ` Tejun Heo
2017-06-22 20:27 ` Waiman Long
2017-06-14 15:05 ` Waiman Long [this message]
2017-06-21 21:42 ` [RFC PATCH-cgroup 5/6] cgroup: Skip dying css in cgroup_apply_control_{enable,disable} Tejun Heo
2017-06-21 22:01 ` Waiman Long
2017-06-21 22:04 ` Tejun Heo
2017-06-21 22:19 ` Waiman Long
2017-06-14 15:05 ` [RFC PATCH-cgroup 6/6] cgroup: Make debug controller display bypass and subtree root modes info Waiman Long
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=1497452737-11125-6-git-send-email-longman@redhat.com \
--to=longman@redhat.com \
--cc=cgroups@vger.kernel.org \
--cc=efault@gmx.de \
--cc=hannes@cmpxchg.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).