aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2011-12-11 16:47:09 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-12 19:04:11 -0500
commit0850f0f5c54261a6236f013e8bac154bcce424d6 (patch)
treeb35c273a600f29b971c92bbc7c3ae8ad1f133c28 /net
parentffea59e50494198a0db4d6ad8f6721b8fd994f65 (diff)
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: Glauber Costa <glommer@parallels.com> Reviewed-by: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com> CC: David S. Miller <davem@davemloft.net> CC: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_memcontrol.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index d438fba31ba8..171d7b64f803 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -29,6 +29,12 @@ static struct cftype tcp_files[] = {
29 .trigger = tcp_cgroup_reset, 29 .trigger = tcp_cgroup_reset,
30 .read_u64 = tcp_cgroup_read, 30 .read_u64 = tcp_cgroup_read,
31 }, 31 },
32 {
33 .name = "kmem.tcp.max_usage_in_bytes",
34 .private = RES_MAX_USAGE,
35 .trigger = tcp_cgroup_reset,
36 .read_u64 = tcp_cgroup_read,
37 },
32}; 38};
33 39
34static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto) 40static 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 val = tcp_read_usage(memcg); 211 val = tcp_read_usage(memcg);
206 break; 212 break;
207 case RES_FAILCNT: 213 case RES_FAILCNT:
208 val = tcp_read_stat(memcg, RES_FAILCNT, 0); 214 case RES_MAX_USAGE:
215 val = tcp_read_stat(memcg, cft->private, 0);
209 break; 216 break;
210 default: 217 default:
211 BUG(); 218 BUG();
@@ -226,6 +233,9 @@ static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event)
226 tcp = tcp_from_cgproto(cg_proto); 233 tcp = tcp_from_cgproto(cg_proto);
227 234
228 switch (event) { 235 switch (event) {
236 case RES_MAX_USAGE:
237 res_counter_reset_max(&tcp->tcp_memory_allocated);
238 break;
229 case RES_FAILCNT: 239 case RES_FAILCNT:
230 res_counter_reset_failcnt(&tcp->tcp_memory_allocated); 240 res_counter_reset_failcnt(&tcp->tcp_memory_allocated);
231 break; 241 break;