From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by kanga.kvack.org (Postfix) with ESMTP id 0B98D90014B for ; Tue, 4 Oct 2011 08:19:45 -0400 (EDT) From: Glauber Costa Subject: [PATCH v5 7/8] Display current tcp memory allocation in kmem cgroup Date: Tue, 4 Oct 2011 16:17:59 +0400 Message-Id: <1317730680-24352-8-git-send-email-glommer@parallels.com> In-Reply-To: <1317730680-24352-1-git-send-email-glommer@parallels.com> References: <1317730680-24352-1-git-send-email-glommer@parallels.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: paul@paulmenage.org, lizf@cn.fujitsu.com, kamezawa.hiroyu@jp.fujitsu.com, ebiederm@xmission.com, davem@davemloft.net, gthelen@google.com, netdev@vger.kernel.org, linux-mm@kvack.org, kirill@shutemov.name, avagin@parallels.com, devel@openvz.org, Glauber Costa This patch introduces kmem.tcp_current_memory 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 CC: David S. Miller CC: Hiroyouki Kamezawa CC: Eric W. Biederman --- Documentation/cgroups/memory.txt | 1 + mm/memcontrol.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index c1db134..00f1a88 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/mm/memcontrol.c b/mm/memcontrol.c index 6fb14bb..f178a64 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -465,12 +465,23 @@ static u64 tcp_read_limit(struct cgroup *cgrp, struct cftype *cft) return memcg->tcp.tcp_max_memory << PAGE_SHIFT; } +static u64 tcp_usage_in_bytes(struct cgroup *cgrp, struct cftype *cft) +{ + struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); + + return atomic_long_read(&memcg->tcp.tcp_memory_allocated) << PAGE_SHIFT; +} + static struct cftype tcp_files[] = { { .name = "kmem.tcp.limit_in_bytes", .write_u64 = tcp_write_limit, .read_u64 = tcp_read_limit, }, + { + .name = "kmem.tcp.usage_in_bytes", + .read_u64 = tcp_usage_in_bytes, + }, }; static void tcp_create_cgroup(struct mem_cgroup *cg, struct cgroup_subsys *ss) -- 1.7.6 -- 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: email@kvack.org