All of lore.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizefan@huawei.com>
To: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Glauber Costa <glommer@parallels.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Michal Hocko <mhocko@suse.cz>,
	Johannes Weiner <hannes@cmpxchg.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Cgroups <cgroups@vger.kernel.org>,
	linux-mm@kvack.org
Subject: [PATCH v2 6/8] memcg: fail to create cgroup if the cgroup id is too big
Date: Wed, 24 Jul 2013 18:02:19 +0800	[thread overview]
Message-ID: <51EFA62B.3020508@huawei.com> (raw)
In-Reply-To: <51EFA554.6080801@huawei.com>

memcg requires the cgroup id to be smaller than 65536.

Signed-off-by: Li Zefan <lizefan@huawei.com>
---
 mm/memcontrol.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 35d8286..403c8d9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -512,6 +512,12 @@ static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg)
 	return (memcg == root_mem_cgroup);
 }
 
+/*
+ * We restrict the id in the range of [1, 65535], so it can fit into
+ * an unsigned short.
+ */
+#define MEM_CGROUP_ID_MAX	(65535)
+
 static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg)
 {
 	/*
@@ -6243,6 +6249,9 @@ mem_cgroup_css_alloc(struct cgroup *cont)
 	long error = -ENOMEM;
 	int node;
 
+	if (cont->id > MEM_CGROUP_ID_MAX)
+		return ERR_PTR(-ENOSPC);
+
 	memcg = mem_cgroup_alloc();
 	if (!memcg)
 		return ERR_PTR(error);
-- 
1.8.0.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

WARNING: multiple messages have this Message-ID (diff)
From: Li Zefan <lizefan@huawei.com>
To: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Glauber Costa <glommer@parallels.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Michal Hocko <mhocko@suse.cz>,
	Johannes Weiner <hannes@cmpxchg.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Cgroups <cgroups@vger.kernel.org>, <linux-mm@kvack.org>
Subject: [PATCH v2 6/8] memcg: fail to create cgroup if the cgroup id is too big
Date: Wed, 24 Jul 2013 18:02:19 +0800	[thread overview]
Message-ID: <51EFA62B.3020508@huawei.com> (raw)
In-Reply-To: <51EFA554.6080801@huawei.com>

memcg requires the cgroup id to be smaller than 65536.

Signed-off-by: Li Zefan <lizefan@huawei.com>
---
 mm/memcontrol.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 35d8286..403c8d9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -512,6 +512,12 @@ static inline bool mem_cgroup_is_root(struct mem_cgroup *memcg)
 	return (memcg == root_mem_cgroup);
 }
 
+/*
+ * We restrict the id in the range of [1, 65535], so it can fit into
+ * an unsigned short.
+ */
+#define MEM_CGROUP_ID_MAX	(65535)
+
 static inline unsigned short mem_cgroup_id(struct mem_cgroup *memcg)
 {
 	/*
@@ -6243,6 +6249,9 @@ mem_cgroup_css_alloc(struct cgroup *cont)
 	long error = -ENOMEM;
 	int node;
 
+	if (cont->id > MEM_CGROUP_ID_MAX)
+		return ERR_PTR(-ENOSPC);
+
 	memcg = mem_cgroup_alloc();
 	if (!memcg)
 		return ERR_PTR(error);
-- 
1.8.0.2

  parent reply	other threads:[~2013-07-24 10:02 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-24  9:58 [PATCH v2 0/8] memcg, cgroup: kill css_id Li Zefan
2013-07-24  9:58 ` Li Zefan
2013-07-24 10:00 ` [PATCH v2 3/8] cgroup: implement cgroup_from_id() Li Zefan
2013-07-24 10:00   ` Li Zefan
2013-07-24 14:10   ` Michal Hocko
2013-07-24 14:10     ` Michal Hocko
     [not found] ` <51EFA554.6080801-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-07-24  9:59   ` [PATCH v2 1/8] cgroup: convert cgroup_ida to cgroup_idr Li Zefan
2013-07-24  9:59     ` Li Zefan
2013-07-24  9:59     ` Li Zefan
2013-07-24 14:07     ` Michal Hocko
2013-07-24 14:07       ` Michal Hocko
2013-07-25  1:08       ` Li Zefan
2013-07-25  1:08         ` Li Zefan
2013-07-24  9:59   ` [PATCH v2 2/8] cgroup: document how cgroup IDs are assigned Li Zefan
2013-07-24  9:59     ` Li Zefan
2013-07-24  9:59     ` Li Zefan
2013-07-24 14:07     ` Michal Hocko
2013-07-24 14:07       ` Michal Hocko
2013-07-24 10:01   ` [PATCH v2 4/8] memcg: convert to use cgroup_is_descendant() Li Zefan
2013-07-24 10:01     ` Li Zefan
2013-07-24 10:01     ` Li Zefan
2013-07-24 14:20     ` Michal Hocko
2013-07-24 14:20       ` Michal Hocko
2013-07-24 10:03   ` [PATCH v2 7/8] memcg: stop using css id Li Zefan
2013-07-24 10:03     ` Li Zefan
2013-07-24 10:03     ` Li Zefan
2013-07-24 14:30     ` Michal Hocko
2013-07-24 14:30       ` Michal Hocko
2013-07-24 10:01 ` [PATCH v2 5/8] memcg: convert to use cgroup id Li Zefan
2013-07-24 10:01   ` Li Zefan
2013-07-24 14:25   ` Michal Hocko
2013-07-24 14:25     ` Michal Hocko
2013-07-24 10:02 ` Li Zefan [this message]
2013-07-24 10:02   ` [PATCH v2 6/8] memcg: fail to create cgroup if the cgroup id is too big Li Zefan
2013-07-24 14:27   ` Michal Hocko
2013-07-24 14:27     ` Michal Hocko
2013-07-24 10:03 ` [PATCH v2 8/8] cgroup: kill css_id Li Zefan
2013-07-24 10:03   ` Li Zefan
2013-07-24 14:31   ` Michal Hocko
2013-07-24 14:31     ` Michal Hocko
2013-07-24 14:32 ` [PATCH v2 0/8] memcg, " Michal Hocko
2013-07-24 14:32   ` Michal Hocko
2013-07-24 16:14   ` Tejun Heo
2013-07-24 16:14     ` Tejun Heo
     [not found]     ` <20130724161407.GD20377-9pTldWuhBndy/B6EtB590w@public.gmane.org>
2013-07-25  7:40       ` Michal Hocko
2013-07-25  7:40         ` Michal Hocko
2013-07-25  7:40         ` Michal Hocko
2013-07-25  0:59   ` Li Zefan
2013-07-25  0:59     ` Li Zefan
     [not found]     ` <51F07863.2070705-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-07-25  7:41       ` Michal Hocko
2013-07-25  7:41         ` Michal Hocko
2013-07-25  7:41         ` Michal Hocko

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=51EFA62B.3020508@huawei.com \
    --to=lizefan@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=cgroups@vger.kernel.org \
    --cc=glommer@parallels.com \
    --cc=hannes@cmpxchg.org \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.cz \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.