public inbox for cgroups@vger.kernel.org
 help / color / mirror / Atom feed
From: Chen Zhou <chenzhou10-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
To: tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org,
	hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org
Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	chenzhou10-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
Subject: [PATCH v2] cgroup-v1: add disabled controller check in cgroup1_parse_param()
Date: Fri, 18 Dec 2020 14:17:55 +0800	[thread overview]
Message-ID: <20201218061755.121205-1-chenzhou10@huawei.com> (raw)

When mounting a cgroup hierarchy with disabled controller in cgroup v1,
all available controllers will be attached.

Add disabled controller check in cgroup1_parse_param() and return directly
if the specified controller is disabled.

Signed-off-by: Chen Zhou <chenzhou10-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
Changes in v2:
- Fix line over 80 characters warning.
---
 kernel/cgroup/cgroup-v1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 191c329e482a..5190c42fea8b 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -915,6 +915,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
 		for_each_subsys(ss, i) {
 			if (strcmp(param->key, ss->legacy_name))
 				continue;
+			if (!cgroup_ssid_enabled(i) || cgroup1_ssid_disabled(i))
+				return invalfc(fc, "Disabled controller '%s'",
+					       param->key);
 			ctx->subsys_mask |= (1 << i);
 			return 0;
 		}
-- 
2.20.1


             reply	other threads:[~2020-12-18  6:17 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18  6:17 Chen Zhou [this message]
     [not found] ` <20201218061755.121205-1-chenzhou10-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2020-12-18  7:02   ` [PATCH v2] cgroup-v1: add disabled controller check in cgroup1_parse_param() Zefan Li
2021-01-14 13:12 ` Michal Koutný
2021-01-14 14:08   ` chenzhou
     [not found]     ` <d4ba14b0-ee06-b793-a840-2c2ff369d890-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2021-01-14 16:54       ` Michal Koutný
2021-01-15  1:55         ` chenzhou
2021-01-15  3:17           ` Tejun Heo
     [not found]             ` <YAEJPs4DJIgAXWul-qYNAdHglDFBN0TnZuCh8vA@public.gmane.org>
2021-01-15  5:58               ` chenzhou
     [not found]           ` <7804658e-7644-8edb-5ca8-0c97389c8c62-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2021-01-15 10:08             ` Michal Koutný
2021-01-15 11:09               ` chenzhou

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=20201218061755.121205-1-chenzhou10@huawei.com \
    --to=chenzhou10-hv44wf8li93qt0dzr+alfa@public.gmane.org \
    --cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \
    --cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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