Commit 0850f0f5 authored by Glauber Costa's avatar Glauber Costa Committed by David S. Miller

Display maximum tcp memory allocation in kmem cgroup

This patch introduces kmem.tcp.max_usage_in_bytes file, living in the
kmem_cgroup filesystem. The root cgroup will display a value equal
to RESOURCE_MAX. This is to avoid introducing any locking schemes in
the network paths when cgroups are not being actively used.

All others, will see the maximum memory ever used by this cgroup.
Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
Reviewed-by: default avatarHiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
CC: David S. Miller <davem@davemloft.net>
CC: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffea59e5
...@@ -29,6 +29,12 @@ static struct cftype tcp_files[] = { ...@@ -29,6 +29,12 @@ static struct cftype tcp_files[] = {
.trigger = tcp_cgroup_reset, .trigger = tcp_cgroup_reset,
.read_u64 = tcp_cgroup_read, .read_u64 = tcp_cgroup_read,
}, },
{
.name = "kmem.tcp.max_usage_in_bytes",
.private = RES_MAX_USAGE,
.trigger = tcp_cgroup_reset,
.read_u64 = tcp_cgroup_read,
},
}; };
static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto) static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto)
...@@ -205,7 +211,8 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) ...@@ -205,7 +211,8 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft)
val = tcp_read_usage(memcg); val = tcp_read_usage(memcg);
break; break;
case RES_FAILCNT: case RES_FAILCNT:
val = tcp_read_stat(memcg, RES_FAILCNT, 0); case RES_MAX_USAGE:
val = tcp_read_stat(memcg, cft->private, 0);
break; break;
default: default:
BUG(); BUG();
...@@ -226,6 +233,9 @@ static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event) ...@@ -226,6 +233,9 @@ static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event)
tcp = tcp_from_cgproto(cg_proto); tcp = tcp_from_cgproto(cg_proto);
switch (event) { switch (event) {
case RES_MAX_USAGE:
res_counter_reset_max(&tcp->tcp_memory_allocated);
break;
case RES_FAILCNT: case RES_FAILCNT:
res_counter_reset_failcnt(&tcp->tcp_memory_allocated); res_counter_reset_failcnt(&tcp->tcp_memory_allocated);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment