From: Li Zefan <lizf@cn.fujitsu.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Paul Menage <menage@google.com>,
Pavel Emelianov <xemul@openvz.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-mm@kvack.org, Linux Containers <containers@lists.osdl.org>
Subject: [PATCH 2/3] memcg: put a restriction on writing memory.force_empty
Date: Tue, 11 Mar 2008 19:08:54 +0900 [thread overview]
Message-ID: <47D65A36.4020008@cn.fujitsu.com> (raw)
We can write whatever to memory.force_empty:
echo 999 > memory.force_empty
echo wow > memory.force_empty
This is odd, so let's make '1' to be the only valid value.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
mm/memcontrol.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index eb681a6..6145031 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -868,15 +868,18 @@ static ssize_t mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
mem_cgroup_write_strategy);
}
-static ssize_t mem_force_empty_write(struct cgroup *cont,
- struct cftype *cft, struct file *file,
- const char __user *userbuf,
- size_t nbytes, loff_t *ppos)
+static int mem_force_empty_write(struct cgroup *cont, struct cftype *cft,
+ u64 val)
{
- struct mem_cgroup *mem = mem_cgroup_from_cont(cont);
- int ret = mem_cgroup_force_empty(mem);
- if (!ret)
- ret = nbytes;
+ struct mem_cgroup *mem;
+ int ret;
+
+ if (val != 1)
+ return -EINVAL;
+
+ mem = mem_cgroup_from_cont(cont);
+ ret = mem_cgroup_force_empty(mem);
+
return ret;
}
@@ -935,7 +938,7 @@ static struct cftype mem_cgroup_files[] = {
},
{
.name = "force_empty",
- .write = mem_force_empty_write,
+ .write_u64 = mem_force_empty_write,
},
{
.name = "stat",
--
1.5.4.rc3
WARNING: multiple messages have this Message-ID (diff)
From: Li Zefan <lizf@cn.fujitsu.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Paul Menage <menage@google.com>,
Pavel Emelianov <xemul@openvz.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-mm@kvack.org, Linux Containers <containers@lists.osdl.org>
Subject: [PATCH 2/3] memcg: put a restriction on writing memory.force_empty
Date: Tue, 11 Mar 2008 19:08:54 +0900 [thread overview]
Message-ID: <47D65A36.4020008@cn.fujitsu.com> (raw)
We can write whatever to memory.force_empty:
echo 999 > memory.force_empty
echo wow > memory.force_empty
This is odd, so let's make '1' to be the only valid value.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
mm/memcontrol.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index eb681a6..6145031 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -868,15 +868,18 @@ static ssize_t mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
mem_cgroup_write_strategy);
}
-static ssize_t mem_force_empty_write(struct cgroup *cont,
- struct cftype *cft, struct file *file,
- const char __user *userbuf,
- size_t nbytes, loff_t *ppos)
+static int mem_force_empty_write(struct cgroup *cont, struct cftype *cft,
+ u64 val)
{
- struct mem_cgroup *mem = mem_cgroup_from_cont(cont);
- int ret = mem_cgroup_force_empty(mem);
- if (!ret)
- ret = nbytes;
+ struct mem_cgroup *mem;
+ int ret;
+
+ if (val != 1)
+ return -EINVAL;
+
+ mem = mem_cgroup_from_cont(cont);
+ ret = mem_cgroup_force_empty(mem);
+
return ret;
}
@@ -935,7 +938,7 @@ static struct cftype mem_cgroup_files[] = {
},
{
.name = "force_empty",
- .write = mem_force_empty_write,
+ .write_u64 = mem_force_empty_write,
},
{
.name = "stat",
--
1.5.4.rc3
--
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>
next reply other threads:[~2008-03-11 10:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-11 10:08 Li Zefan [this message]
2008-03-11 10:08 ` [PATCH 2/3] memcg: put a restriction on writing memory.force_empty Li Zefan
2008-03-11 10:15 ` Balbir Singh
2008-03-11 10:15 ` Balbir Singh
2008-03-11 10:23 ` KAMEZAWA Hiroyuki
2008-03-11 10:23 ` KAMEZAWA Hiroyuki
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=47D65A36.4020008@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=balbir@linux.vnet.ibm.com \
--cc=containers@lists.osdl.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=menage@google.com \
--cc=xemul@openvz.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.