linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "苏辉(Robert Su)" <suhui@zeku.com>
To: "tj@kernel.org" <tj@kernel.org>,
	"lizefan.x@bytedance.com" <lizefan.x@bytedance.com>,
	"hannes@cmpxchg.org" <hannes@cmpxchg.org>,
	"cgroups@vger.kernel.org" <cgroups@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: 回复: [PATCH] cgroup/pid: fix the pid_cgrp attach bug in cgroup v2
Date: Fri, 2 Jul 2021 09:22:54 +0000	[thread overview]
Message-ID: <KL1PR02MB4788DAF33A1D396F51609C22C61F9@KL1PR02MB4788.apcprd02.prod.outlook.com> (raw)
In-Reply-To: <20210702091844.737784-1-suhui@zeku.com>

Sorry, please ignore this change...

-----邮件原件-----
发件人: 苏辉(Robert Su) <suhui@zeku.com> 
发送时间: 2021年7月2日 17:19
收件人: tj@kernel.org; lizefan.x@bytedance.com; hannes@cmpxchg.org; cgroups@vger.kernel.org; linux-kernel@vger.kernel.org
抄送: 苏辉(Robert Su) <suhui@zeku.com>
主题: [PATCH] cgroup/pid: fix the pid_cgrp attach bug in cgroup v2

pids_can_attach() should make sure the pids->counter not bigger than pids->limit, so we should use pids_try_charge() here.

without the change:
root@test:/sys/fs/cgroup/test# cat pids.max
3
root@test:/sys/fs/cgroup/test# sleep 1000 & [1] 3379 root@test:/sys/fs/cgroup/test# sleep 1000 & [2] 3380 root@test:/sys/fs/cgroup/test# sleep 1000 & [3] 3381 root@test:/sys/fs/cgroup/test# sleep 1000 & [4] 3382 root@test:/sys/fs/cgroup/test# echo 3379 > cgroup.procs root@test:/sys/fs/cgroup/test# echo 3380 > cgroup.procs root@test:/sys/fs/cgroup/test# echo 3381 > cgroup.procs root@test:/sys/fs/cgroup/test# echo 3382 > cgroup.procs root@test:/sys/fs/cgroup/test# cat pids.max
3
root@test:/sys/fs/cgroup/test# cat pids.current
4
root@test:/sys/fs/cgroup/test# cat cgroup.procs
3379
3380
3381
3382
root@test:/sys/fs/cgroup/test#

with this change:
root@test:/sys/fs/cgroup/test# cat pids.current
3
root@test:/sys/fs/cgroup/test# cat pids.max
3
root@test:/sys/fs/cgroup/test# cat cgroup.procs
2614
3683
3684
root@test:/sys/fs/cgroup/test# sleep 10000 & [5] 3733 root@test:/sys/fs/cgroup/test# echo 3733 > cgroup.procs
bash: echo: write error: Resource temporarily unavailable root@test:/sys/fs/cgroup/test# cat cgroup.procs
2614
3683
3684
root@test:/sys/fs/cgroup/test# cat pids.current
3
root@test:/sys/fs/cgroup/test# dmesg |tail -n 1 [  863.612162] cgroup: attach rejected by pids controller in /test

Signed-off-by: Hui Su <suhui@zeku.com>
---
 kernel/cgroup/pids.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup/pids.c b/kernel/cgroup/pids.c index 511af87f685e..5e24990f28de 100644
--- a/kernel/cgroup/pids.c
+++ b/kernel/cgroup/pids.c
@@ -172,6 +172,7 @@ static int pids_can_attach(struct cgroup_taskset *tset)  {
 	struct task_struct *task;
 	struct cgroup_subsys_state *dst_css;
+	int ret = 0;
 
 	cgroup_taskset_for_each(task, dst_css, tset) {
 		struct pids_cgroup *pids = css_pids(dst_css); @@ -186,11 +187,17 @@ static int pids_can_attach(struct cgroup_taskset *tset)
 		old_css = task_css(task, pids_cgrp_id);
 		old_pids = css_pids(old_css);
 
-		pids_charge(pids, 1);
+		ret = pids_try_charge(pids, 1);
+		if (ret) {
+			pr_info("cgroup: attach rejected by pids controller in ");
+			pr_cont_cgroup_path(dst_css->cgroup);
+			pr_cont("\n");
+			break;
+		}
 		pids_uncharge(old_pids, 1);
 	}
 
-	return 0;
+	return ret;
 }
 
 static void pids_cancel_attach(struct cgroup_taskset *tset)
--
2.25.1


      reply	other threads:[~2021-07-02  9:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02  9:18 Hui Su
2021-07-02  9:22 ` 苏辉(Robert Su) [this message]

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=KL1PR02MB4788DAF33A1D396F51609C22C61F9@KL1PR02MB4788.apcprd02.prod.outlook.com \
    --to=suhui@zeku.com \
    --cc=cgroups@vger.kernel.org \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan.x@bytedance.com \
    --cc=tj@kernel.org \
    --subject='Re: 回复: [PATCH] cgroup/pid: fix the pid_cgrp attach bug in cgroup v2' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox