diff mbox

net: make /proc/net/protocols namespace aware

Message ID 4921551B.4000102@cosmosbay.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet Nov. 17, 2008, 11:27 a.m. UTC 
Alexey Dobriyan a écrit :
> On Mon, Nov 17, 2008 at 11:53:43AM +0100, Eric Dumazet wrote:
>> --- a/net/core/sock.c
>> +++ b/net/core/sock.c
> 
>> @@ -2230,7 +2230,8 @@ static const struct seq_operations proto_seq_ops = {
>>  
>>  static int proto_seq_open(struct inode *inode, struct file *file)
>>  {
>> -	return seq_open(file, &proto_seq_ops);
>> +	return seq_open_net(inode, file, &proto_seq_ops,
>> +			    sizeof(struct seq_net_private));
> 
> You have to hook seq_release_net if you do this.
> 
>>  }
>>  
>>  static const struct file_operations proto_seq_fops = {
>> @@ -2241,10 +2242,28 @@ static const struct file_operations proto_seq_fops = {
>>  	.release	= seq_release,
> 	+.release	= seq_release_net,
> 
> 

Good catch, thanks Alexey

[PATCH] net: make /proc/net/protocols namespace aware
Converting /proc/net/protocols to be namespace aware is quite easy
and permits us to use sock_prot_inuse_get().

This provides seperate counters for each protocol. For example
we can really count TCPv6 sockets and TCPv4 sockets, while previously,
we had the same value, and this value was not namespace aware.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 net/core/sock.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

Comments

David Miller Nov. 19, 2008, 11:14 p.m. UTC | #1 
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Mon, 17 Nov 2008 12:27:23 +0100

> Good catch, thanks Alexey
> 
> [PATCH] net: make /proc/net/protocols namespace aware
> Converting /proc/net/protocols to be namespace aware is quite easy
> and permits us to use sock_prot_inuse_get().
> 
> This provides seperate counters for each protocol. For example
> we can really count TCPv6 sockets and TCPv4 sockets, while previously,
> we had the same value, and this value was not namespace aware.
> 
> Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Applied to net-next-2.6, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/core/sock.c b/net/core/sock.c
index 38de9c3..244d8fb 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2176,7 +2176,7 @@  static void proto_seq_printf(struct seq_file *seq, struct proto *proto)
 			"%2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c %2c\n",
 		   proto->name,
 		   proto->obj_size,
-		   proto->sockets_allocated != NULL ? atomic_read(proto->sockets_allocated) : -1,
+		   sock_prot_inuse_get(seq_file_net(seq), proto),
 		   proto->memory_allocated != NULL ? atomic_read(proto->memory_allocated) : -1,
 		   proto->memory_pressure != NULL ? *proto->memory_pressure ? "yes" : "no" : "NI",
 		   proto->max_header,
@@ -2230,7 +2230,8 @@  static const struct seq_operations proto_seq_ops = {
 
 static int proto_seq_open(struct inode *inode, struct file *file)
 {
-	return seq_open(file, &proto_seq_ops);
+	return seq_open_net(inode, file, &proto_seq_ops,
+			    sizeof(struct seq_net_private));
 }
 
 static const struct file_operations proto_seq_fops = {
@@ -2238,13 +2239,31 @@  static const struct file_operations proto_seq_fops = {
 	.open		= proto_seq_open,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
-	.release	= seq_release,
+	.release	= seq_release_net,
+};
+
+static __net_init int proto_init_net(struct net *net)
+{
+	if (!proc_net_fops_create(net, "protocols", S_IRUGO, &proto_seq_fops))
+		return -ENOMEM;
+
+	return 0;
+}
+
+static __net_exit void proto_exit_net(struct net *net)
+{
+	proc_net_remove(net, "protocols");
+}
+
+
+static __net_initdata struct pernet_operations proto_net_ops = {
+	.init = proto_init_net,
+	.exit = proto_exit_net,
 };
 
 static int __init proto_init(void)
 {
-	/* register /proc/net/protocols */
-	return proc_net_fops_create(&init_net, "protocols", S_IRUGO, &proto_seq_fops) == NULL ? -ENOBUFS : 0;
+	return register_pernet_subsys(&proto_net_ops);
 }
 
 subsys_initcall(proto_init);