From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753809Ab1IOBtG (ORCPT ); Wed, 14 Sep 2011 21:49:06 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:26695 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116Ab1IOBsZ (ORCPT ); Wed, 14 Sep 2011 21:48:25 -0400 From: Glauber Costa 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, Glauber Costa Subject: [PATCH v2 7/7] Display current tcp memory allocation in kmem cgroup Date: Wed, 14 Sep 2011 22:46:15 -0300 Message-Id: <1316051175-17780-8-git-send-email-glommer@parallels.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1316051175-17780-1-git-send-email-glommer@parallels.com> References: <1316051175-17780-1-git-send-email-glommer@parallels.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 ce825ee..59d9416 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 b48e517..dd0121f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -482,12 +482,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH v2 7/7] Display current tcp memory allocation in kmem cgroup Date: Wed, 14 Sep 2011 22:46:15 -0300 Message-ID: <1316051175-17780-8-git-send-email-glommer@parallels.com> References: <1316051175-17780-1-git-send-email-glommer@parallels.com> 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, Glauber Costa To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1316051175-17780-1-git-send-email-glommer@parallels.com> Sender: owner-linux-mm@kvack.org List-Id: netdev.vger.kernel.org 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 ce825ee..59d9416 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 b48e517..dd0121f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -482,12 +482,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