diff options
| author | Glauber Costa <glommer@parallels.com> | 2011-12-11 21:47:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-12 19:04:10 -0500 |
| commit | d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7 (patch) | |
| tree | 5c3675582cbbdc99f720aa1dcc1821e26c2be1ab /include/net | |
| parent | e1aab161e0135aafcd439be20b4f35e4b0922d95 (diff) | |
| download | linux-3.10-d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7.tar.gz linux-3.10-d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7.tar.bz2 linux-3.10-d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7.zip | |
tcp memory pressure controls
This patch introduces memory pressure controls for the tcp
protocol. It uses the generic socket memory pressure code
introduced in earlier patches, and fills in the
necessary data in cg_proto struct.
Signed-off-by: Glauber Costa <glommer@parallels.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujtisu.com>
CC: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | include/net/tcp_memcontrol.h | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index d5eab256167..18ecc9919d2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -64,6 +64,8 @@ #include <net/dst.h> #include <net/checksum.h> +int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss); +void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss); /* * This structure really needs to be cleaned up. * Most of it is for TCP, and not used by any of diff --git a/include/net/tcp_memcontrol.h b/include/net/tcp_memcontrol.h new file mode 100644 index 00000000000..5f5e1582d76 --- /dev/null +++ b/include/net/tcp_memcontrol.h @@ -0,0 +1,17 @@ +#ifndef _TCP_MEMCG_H +#define _TCP_MEMCG_H + +struct tcp_memcontrol { + struct cg_proto cg_proto; + /* per-cgroup tcp memory pressure knobs */ + struct res_counter tcp_memory_allocated; + struct percpu_counter tcp_sockets_allocated; + /* those two are read-mostly, leave them at the end */ + long tcp_prot_mem[3]; + int tcp_memory_pressure; +}; + +struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg); +int tcp_init_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss); +void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss); +#endif /* _TCP_MEMCG_H */ |