In untrusted environments, a strict upper memory limit on a cgroup can
be necessary, to protect against bugs or malicious users.
Provide memory.max, a limit that can not be breached and will trigger
group-internal OOM killing once page reclaim can no longer enforce it.
Signed-off-by: Johannes Weiner <han...@cmpxchg.org>
---
Documentation/cgroups/unified-hierarchy.txt | 5 +++++
mm/memcontrol.c | 35 +++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/Documentation/cgroups/unified-hierarchy.txt
b/Documentation/cgroups/unified-hierarchy.txt
index 2d91530b8d6c..ef1db728a035 100644
--- a/Documentation/cgroups/unified-hierarchy.txt
+++ b/Documentation/cgroups/unified-hierarchy.txt
@@ -372,6 +372,10 @@ estimate of the average working set size and then make
upward
adjustments based on monitoring high limit excess, workload
performance, and the global memory situation.
+In untrusted environments, users may wish to limit the amount of high
+limit excess in order to contain buggy or malicious workloads. For
+that purpose, a hard upper limit can be set through 'memory.max'.
+
4.3.3.2 Misc changes
- use_hierarchy is on by default and the cgroup file for the flag is
@@ -380,6 +384,7 @@ performance, and the global memory situation.
- memory.usage_in_bytes is renamed to memory.current to be in line
with the new limit naming scheme
+
5. Planned Changes
5-1. CAP for resource control
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 81627387fbd7..a69ff21c8a9a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6253,6 +6253,36 @@ static ssize_t memory_high_write(struct kernfs_open_file
*of,
return nbytes;
}
+static u64 memory_max_read(struct cgroup_subsys_state *css,
+ struct cftype *cft)
+{
+ struct mem_cgroup *memcg = mem_cgroup_from_css(css);
+
+ return res_counter_read_u64(&memcg->res, RES_LIMIT);
+}
+
+static ssize_t memory_max_write(struct kernfs_open_file *of,
+ char *buf, size_t nbytes, loff_t off)
+{
+ struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of));
+ u64 max;
+ int ret;
+
+ if (mem_cgroup_is_root(memcg))
+ return -EINVAL;
+
+ buf = strim(buf);
+ ret = res_counter_memparse_write_strategy(buf, &max);
+ if (ret)
+ return ret;
+
+ ret = mem_cgroup_resize_limit(memcg, max);
+ if (ret)
+ return ret;
+
+ return nbytes;
+}
+
static struct cftype memory_files[] = {
{
.name = "current",
@@ -6263,6 +6293,11 @@ static struct cftype memory_files[] = {
.read_u64 = memory_high_read,
.write = memory_high_write,
},
+ {
+ .name = "max",
+ .read_u64 = memory_max_read,
+ .write = memory_max_write,
+ },
};
struct cgroup_subsys memory_cgrp_subsys = {
--
2.0.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
