linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Glauber Costa <glommer@parallels.com>
To: linux-kernel@vger.kernel.org
Cc: 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, eric.dumazet@gmail.com,
	cgroups@vger.kernel.org, hannes@cmpxchg.org, mhocko@suse.cz,
	Glauber Costa <glommer@parallels.com>
Subject: [PATCH v8 8/9] Display current tcp failcnt in kmem cgroup
Date: Mon,  5 Dec 2011 19:35:02 -0200	[thread overview]
Message-ID: <1323120903-2831-9-git-send-email-glommer@parallels.com> (raw)
In-Reply-To: <1323120903-2831-1-git-send-email-glommer@parallels.com>

This patch introduces kmem.tcp.failcnt file, living in the
kmem_cgroup filesystem. Following the pattern in the other
memcg resources, this files keeps a counter of how many times
allocation failed due to limits being hit in this cgroup.
The root cgroup will always show a failcnt of 0.

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>
---
 net/ipv4/tcp_memcontrol.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index 9481f23..d438fba 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -9,6 +9,7 @@
 static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft);
 static int tcp_cgroup_write(struct cgroup *cont, struct cftype *cft,
 			    const char *buffer);
+static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event);
 
 static struct cftype tcp_files[] = {
 	{
@@ -22,6 +23,12 @@ static struct cftype tcp_files[] = {
 		.read_u64 = tcp_cgroup_read,
 		.private = RES_USAGE,
 	},
+	{
+		.name = "kmem.tcp.failcnt",
+		.private = RES_FAILCNT,
+		.trigger = tcp_cgroup_reset,
+		.read_u64 = tcp_cgroup_read,
+	},
 };
 
 static inline struct tcp_memcontrol *tcp_from_cgproto(struct cg_proto *cg_proto)
@@ -197,12 +204,36 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft)
 	case RES_USAGE:
 		val = tcp_read_usage(memcg);
 		break;
+	case RES_FAILCNT:
+		val = tcp_read_stat(memcg, RES_FAILCNT, 0);
+		break;
 	default:
 		BUG();
 	}
 	return val;
 }
 
+static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event)
+{
+	struct mem_cgroup *memcg;
+	struct tcp_memcontrol *tcp;
+	struct cg_proto *cg_proto;
+
+	memcg = mem_cgroup_from_cont(cont);
+	cg_proto = tcp_prot.proto_cgroup(memcg);
+	if (!cg_proto)
+		return 0;
+	tcp = tcp_from_cgproto(cg_proto);
+
+	switch (event) {
+	case RES_FAILCNT:
+		res_counter_reset_failcnt(&tcp->tcp_memory_allocated);
+		break;
+	}
+
+	return 0;
+}
+
 unsigned long long tcp_max_memory(const struct mem_cgroup *memcg)
 {
 	struct tcp_memcontrol *tcp;
-- 
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>

  parent reply	other threads:[~2011-12-05 21:39 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-05 21:34 [PATCH v8 0/9] per-cgroup tcp memory pressure controls Glauber Costa
2011-12-05 21:34 ` [PATCH v8 1/9] Basic kernel memory functionality for the Memory Controller Glauber Costa
2011-12-09  1:21   ` KAMEZAWA Hiroyuki
2011-12-09 12:40     ` Glauber Costa
2011-12-09 14:37     ` Glauber Costa
2011-12-09 14:44       ` David Laight
2011-12-09 14:48         ` Glauber Costa
2011-12-12  0:34       ` KAMEZAWA Hiroyuki
2011-12-05 21:34 ` [PATCH v8 2/9] foundations of per-cgroup memory pressure controlling Glauber Costa
2011-12-09  1:24   ` KAMEZAWA Hiroyuki
2011-12-09 12:41     ` Glauber Costa
2011-12-05 21:34 ` [PATCH v8 3/9] socket: initial cgroup code Glauber Costa
2011-12-09  1:49   ` KAMEZAWA Hiroyuki
2011-12-09  2:05   ` KAMEZAWA Hiroyuki
2011-12-09 12:43     ` Glauber Costa
2011-12-12  0:33       ` KAMEZAWA Hiroyuki
2011-12-05 21:34 ` [PATCH v8 4/9] tcp memory pressure controls Glauber Costa
2011-12-09  1:51   ` KAMEZAWA Hiroyuki
2011-12-05 21:34 ` [PATCH v8 5/9] per-netns ipv4 sysctl_tcp_mem Glauber Costa
2011-12-09  1:54   ` KAMEZAWA Hiroyuki
2011-12-05 21:35 ` [PATCH v8 6/9] tcp buffer limitation: per-cgroup limit Glauber Costa
2011-12-09  1:55   ` KAMEZAWA Hiroyuki
2011-12-05 21:35 ` [PATCH v8 7/9] Display current tcp memory allocation in kmem cgroup Glauber Costa
2011-12-09  1:56   ` KAMEZAWA Hiroyuki
2011-12-05 21:35 ` Glauber Costa [this message]
2011-12-05 21:35 ` [PATCH v8 9/9] Display maximum " Glauber Costa
2011-12-09  1:57   ` KAMEZAWA Hiroyuki
2011-12-07 11:06 ` [PATCH v8 0/9] per-cgroup tcp memory pressure controls Glauber Costa
2011-12-09  1:04   ` KAMEZAWA Hiroyuki

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=1323120903-2831-9-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=hannes@cmpxchg.org \
    --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=mhocko@suse.cz \
    --cc=netdev@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox