From: Glauber Costa <glommer@parallels.com> To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, paul@paulmenage.org, lizf@cn.fujitsu.com, kamezawa.hiroyu@jp.fujitsu.com, ebiederm@xmission.com, gthelen@google.com, netdev@vger.kernel.org, linux-mm@kvack.org, kirill@shutemov.name, avagin@parallels.com, devel@openvz.org, eric.dumazet@gmail.com, cgroups@vger.kernel.org, Glauber Costa <glommer@parallels.com> Subject: [PATCH v9 7/9] Display current tcp memory allocation in kmem cgroup Date: Mon, 12 Dec 2011 11:47:07 +0400 [thread overview] Message-ID: <1323676029-5890-8-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1323676029-5890-1-git-send-email-glommer@parallels.com> This patch introduces kmem.tcp.usage_in_bytes file, living in the kmem_cgroup filesystem. It is a simple read-only file that displays the amount of kernel memory currently consumed by the 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> --- Documentation/cgroups/memory.txt | 1 + net/ipv4/tcp_memcontrol.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 1c9779a..6922b6c 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -79,6 +79,7 @@ Brief summary of control files. memory.independent_kmem_limit # select whether or not kernel memory limits are independent of user limits memory.kmem.tcp.limit_in_bytes # set/show hard limit for tcp buf memory + memory.kmem.tcp.usage_in_bytes # show current tcp buf memory allocation 1. History diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index e353390..9481f23 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c @@ -17,6 +17,11 @@ static struct cftype tcp_files[] = { .read_u64 = tcp_cgroup_read, .private = RES_LIMIT, }, + { + .name = "kmem.tcp.usage_in_bytes", + .read_u64 = tcp_cgroup_read, + .private = RES_USAGE, + }, }; static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto) @@ -167,6 +172,19 @@ static u64 tcp_read_stat(struct mem_cgroup *memcg, int type, u64 default_val) return res_counter_read_u64(&tcp->tcp_memory_allocated, type); } +static u64 tcp_read_usage(struct mem_cgroup *memcg) +{ + struct tcp_memcontrol *tcp; + struct cg_proto *cg_proto; + + cg_proto = tcp_prot.proto_cgroup(memcg); + if (!cg_proto) + return atomic_long_read(&tcp_memory_allocated) << PAGE_SHIFT; + + tcp = tcp_from_cgproto(cg_proto); + return res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE); +} + static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); @@ -176,6 +194,9 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) case RES_LIMIT: val = tcp_read_stat(memcg, RES_LIMIT, RESOURCE_MAX); break; + case RES_USAGE: + val = tcp_read_usage(memcg); + break; default: BUG(); } -- 1.7.6.4
WARNING: multiple messages have this Message-ID (diff)
From: Glauber Costa <glommer@parallels.com> To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, paul@paulmenage.org, lizf@cn.fujitsu.com, kamezawa.hiroyu@jp.fujitsu.com, ebiederm@xmission.com, gthelen@google.com, netdev@vger.kernel.org, linux-mm@kvack.org, kirill@shutemov.name, avagin@parallels.com, devel@openvz.org, eric.dumazet@gmail.com, cgroups@vger.kernel.org, Glauber Costa <glommer@parallels.com> Subject: [PATCH v9 7/9] Display current tcp memory allocation in kmem cgroup Date: Mon, 12 Dec 2011 11:47:07 +0400 [thread overview] Message-ID: <1323676029-5890-8-git-send-email-glommer@parallels.com> (raw) In-Reply-To: <1323676029-5890-1-git-send-email-glommer@parallels.com> This patch introduces kmem.tcp.usage_in_bytes file, living in the kmem_cgroup filesystem. It is a simple read-only file that displays the amount of kernel memory currently consumed by the 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> --- Documentation/cgroups/memory.txt | 1 + net/ipv4/tcp_memcontrol.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 1c9779a..6922b6c 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -79,6 +79,7 @@ Brief summary of control files. memory.independent_kmem_limit # select whether or not kernel memory limits are independent of user limits memory.kmem.tcp.limit_in_bytes # set/show hard limit for tcp buf memory + memory.kmem.tcp.usage_in_bytes # show current tcp buf memory allocation 1. History diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index e353390..9481f23 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c @@ -17,6 +17,11 @@ static struct cftype tcp_files[] = { .read_u64 = tcp_cgroup_read, .private = RES_LIMIT, }, + { + .name = "kmem.tcp.usage_in_bytes", + .read_u64 = tcp_cgroup_read, + .private = RES_USAGE, + }, }; static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto) @@ -167,6 +172,19 @@ static u64 tcp_read_stat(struct mem_cgroup *memcg, int type, u64 default_val) return res_counter_read_u64(&tcp->tcp_memory_allocated, type); } +static u64 tcp_read_usage(struct mem_cgroup *memcg) +{ + struct tcp_memcontrol *tcp; + struct cg_proto *cg_proto; + + cg_proto = tcp_prot.proto_cgroup(memcg); + if (!cg_proto) + return atomic_long_read(&tcp_memory_allocated) << PAGE_SHIFT; + + tcp = tcp_from_cgproto(cg_proto); + return res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE); +} + static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) { struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); @@ -176,6 +194,9 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) case RES_LIMIT: val = tcp_read_stat(memcg, RES_LIMIT, RESOURCE_MAX); break; + case RES_USAGE: + val = tcp_read_usage(memcg); + break; default: BUG(); } -- 1.7.6.4 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-12-12 7:49 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-12-12 7:47 [PATCH v9 0/9] Request for inclusion: per-cgroup tcp memory pressure controls Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 1/9] Basic kernel memory functionality for the Memory Controller Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-14 17:04 ` Michal Hocko 2011-12-14 17:04 ` Michal Hocko 2011-12-15 12:29 ` Glauber Costa 2011-12-15 12:29 ` Glauber Costa 2011-12-15 12:29 ` Glauber Costa 2011-12-15 12:29 ` Glauber Costa 2011-12-16 12:32 ` Michal Hocko 2011-12-16 12:32 ` Michal Hocko 2011-12-16 13:02 ` Glauber Costa 2011-12-16 13:02 ` Glauber Costa 2011-12-16 13:02 ` Glauber Costa 2011-12-16 13:30 ` Michal Hocko 2011-12-16 13:30 ` Michal Hocko 2011-12-16 13:30 ` Michal Hocko 2011-12-16 6:20 ` Greg Thelen 2011-12-16 6:20 ` Greg Thelen 2011-12-16 6:20 ` Greg Thelen 2011-12-12 7:47 ` [PATCH v9 2/9] foundations of per-cgroup memory pressure controlling Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 3/9] socket: initial cgroup code Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-22 21:10 ` Jason Baron 2011-12-22 21:10 ` Jason Baron 2011-12-23 8:57 ` Glauber Costa 2011-12-23 8:57 ` Glauber Costa 2011-12-23 8:57 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 4/9] tcp memory pressure controls Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 5/9] per-netns ipv4 sysctl_tcp_mem Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 6/9] tcp buffer limitation: per-cgroup limit Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` Glauber Costa [this message] 2011-12-12 7:47 ` [PATCH v9 7/9] Display current tcp memory allocation in kmem cgroup Glauber Costa 2011-12-12 7:47 ` [PATCH v9 8/9] Display current tcp failcnt " Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-12 7:47 ` [PATCH v9 9/9] Display maximum tcp memory allocation " Glauber Costa 2011-12-12 7:47 ` Glauber Costa 2011-12-13 0:07 ` [PATCH v9 0/9] Request for inclusion: per-cgroup tcp memory pressure controls David Miller 2011-12-13 0:07 ` David Miller 2011-12-13 13:49 ` Christoph Paasch 2011-12-13 13:49 ` Christoph Paasch 2011-12-13 13:49 ` Christoph Paasch 2011-12-13 13:59 ` Eric Dumazet 2011-12-13 13:59 ` Eric Dumazet 2011-12-13 13:59 ` Eric Dumazet 2011-12-13 18:45 ` David Miller 2011-12-13 18:45 ` David Miller 2011-12-13 20:11 ` Glauber Costa 2011-12-13 20:11 ` Glauber Costa 2011-12-13 20:11 ` Glauber Costa 2011-12-15 5:40 ` KAMEZAWA Hiroyuki 2011-12-15 5:40 ` KAMEZAWA Hiroyuki 2011-12-15 5:40 ` KAMEZAWA Hiroyuki 2011-12-15 5:48 ` David Miller 2011-12-15 5:48 ` David Miller 2011-12-15 6:48 ` Glauber Costa 2011-12-15 6:48 ` Glauber Costa 2011-12-15 6:48 ` Glauber Costa
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=1323676029-5890-8-git-send-email-glommer@parallels.com \ --to=glommer@parallels.com \ --cc=avagin@parallels.com \ --cc=cgroups@vger.kernel.org \ --cc=davem@davemloft.net \ --cc=devel@openvz.org \ --cc=ebiederm@xmission.com \ --cc=eric.dumazet@gmail.com \ --cc=gthelen@google.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=kirill@shutemov.name \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=lizf@cn.fujitsu.com \ --cc=netdev@vger.kernel.org \ --cc=paul@paulmenage.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: linkBe 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.