From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail203.messagelabs.com (mail203.messagelabs.com [216.82.254.243]) by kanga.kvack.org (Postfix) with ESMTP id 323E49000BD for ; Sun, 18 Sep 2011 20:59:03 -0400 (EDT) From: Glauber Costa Subject: [PATCH v3 7/7] Display current tcp memory allocation in kmem cgroup Date: Sun, 18 Sep 2011 21:56:45 -0300 Message-Id: <1316393805-3005-8-git-send-email-glommer@parallels.com> In-Reply-To: <1316393805-3005-1-git-send-email-glommer@parallels.com> References: <1316393805-3005-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, 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 | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 1ffde3e..f5a539d 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.max_memory # set/show hard limit for tcp buf memory + memory.kmem.tcp.current_memory # show current tcp buf memory allocation 1. History diff --git a/mm/memcontrol.c b/mm/memcontrol.c index be5ab89..8c015b0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -514,12 +514,29 @@ static u64 tcp_read_maxmem(struct cgroup *cgrp, struct cftype *cft) return ret; } +static u64 tcp_read_curmem(struct cgroup *cgrp, struct cftype *cft) +{ + struct mem_cgroup *sg = mem_cgroup_from_cont(cgrp); + u64 ret; + + if (!cgroup_lock_live_group(cgrp)) + return -ENODEV; + ret = atomic_long_read(&sg->tcp_memory_allocated); + + cgroup_unlock(); + return ret; +} + static struct cftype tcp_files[] = { { .name = "kmem.tcp.max_memory", .write_u64 = tcp_write_maxmem, .read_u64 = tcp_read_maxmem, }, + { + .name = "kmem.tcp.current_memory", + .read_u64 = tcp_read_curmem, + }, }; /* -- 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