Commit 229bf0cb authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

proc: create /proc/net/snmp file in each net 



All the statistics shown in this file have been made per-net already.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b7a9dfd

net/ipv4/proc.c

+50 −20
Original line number Diff line number Diff line
@@ -266,11 +266,12 @@ static void icmpmsg_put(struct seq_file *seq) 


	int j, i, count;

	static int out[PERLINE];

	struct net *net = seq->private;



	count = 0;

	for (i = 0; i < ICMPMSG_MIB_MAX; i++) {



		if (snmp_fold_field((void **) init_net.mib.icmpmsg_statistics, i))

		if (snmp_fold_field((void **) net->mib.icmpmsg_statistics, i))

			out[count++] = i;

		if (count < PERLINE)

			continue;
@@ -282,7 +283,7 @@ static void icmpmsg_put(struct seq_file *seq) 
		seq_printf(seq, "\nIcmpMsg: ");

		for (j = 0; j < PERLINE; ++j)

			seq_printf(seq, " %lu",

				snmp_fold_field((void **) init_net.mib.icmpmsg_statistics,

				snmp_fold_field((void **) net->mib.icmpmsg_statistics,

				out[j]));

		seq_putc(seq, '\n');

	}
@@ -294,7 +295,7 @@ static void icmpmsg_put(struct seq_file *seq) 
		seq_printf(seq, "\nIcmpMsg:");

		for (j = 0; j < count; ++j)

			seq_printf(seq, " %lu", snmp_fold_field((void **)

				init_net.mib.icmpmsg_statistics, out[j]));

				net->mib.icmpmsg_statistics, out[j]));

	}



#undef PERLINE
@@ -303,6 +304,7 @@ static void icmpmsg_put(struct seq_file *seq) 
static void icmp_put(struct seq_file *seq)

{

	int i;

	struct net *net = seq->private;



	seq_puts(seq, "\nIcmp: InMsgs InErrors");

	for (i=0; icmpmibmap[i].name != NULL; i++)
@@ -311,18 +313,18 @@ static void icmp_put(struct seq_file *seq) 
	for (i=0; icmpmibmap[i].name != NULL; i++)

		seq_printf(seq, " Out%s", icmpmibmap[i].name);

	seq_printf(seq, "\nIcmp: %lu %lu",

		snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_INMSGS),

		snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_INERRORS));

		snmp_fold_field((void **) net->mib.icmp_statistics, ICMP_MIB_INMSGS),

		snmp_fold_field((void **) net->mib.icmp_statistics, ICMP_MIB_INERRORS));

	for (i=0; icmpmibmap[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			snmp_fold_field((void **) init_net.mib.icmpmsg_statistics,

			snmp_fold_field((void **) net->mib.icmpmsg_statistics,

				icmpmibmap[i].index));

	seq_printf(seq, " %lu %lu",

		snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_OUTMSGS),

		snmp_fold_field((void **) init_net.mib.icmp_statistics, ICMP_MIB_OUTERRORS));

		snmp_fold_field((void **) net->mib.icmp_statistics, ICMP_MIB_OUTMSGS),

		snmp_fold_field((void **) net->mib.icmp_statistics, ICMP_MIB_OUTERRORS));

	for (i=0; icmpmibmap[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			snmp_fold_field((void **) init_net.mib.icmpmsg_statistics,

			snmp_fold_field((void **) net->mib.icmpmsg_statistics,

				icmpmibmap[i].index | 0x100));

}
@@ -332,6 +334,7 @@ static void icmp_put(struct seq_file *seq) 
static int snmp_seq_show(struct seq_file *seq, void *v)

{

	int i;

	struct net *net = seq->private;



	seq_puts(seq, "Ip: Forwarding DefaultTTL");
@@ -344,7 +347,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 


	for (i = 0; snmp4_ipstats_list[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			   snmp_fold_field((void **)init_net.mib.ip_statistics,

			   snmp_fold_field((void **)net->mib.ip_statistics,

					   snmp4_ipstats_list[i].entry));



	icmp_put(seq);	/* RFC 2011 compatibility */
@@ -359,11 +362,11 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 
		/* MaxConn field is signed, RFC 2012 */

		if (snmp4_tcp_list[i].entry == TCP_MIB_MAXCONN)

			seq_printf(seq, " %ld",

				   snmp_fold_field((void **)init_net.mib.tcp_statistics,

				   snmp_fold_field((void **)net->mib.tcp_statistics,

						   snmp4_tcp_list[i].entry));

		else

			seq_printf(seq, " %lu",

				   snmp_fold_field((void **)init_net.mib.tcp_statistics,

				   snmp_fold_field((void **)net->mib.tcp_statistics,

						   snmp4_tcp_list[i].entry));

	}
@@ -374,7 +377,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 
	seq_puts(seq, "\nUdp:");

	for (i = 0; snmp4_udp_list[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			   snmp_fold_field((void **)init_net.mib.udp_statistics,

			   snmp_fold_field((void **)net->mib.udp_statistics,

					   snmp4_udp_list[i].entry));



	/* the UDP and UDP-Lite MIBs are the same */
@@ -385,7 +388,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 
	seq_puts(seq, "\nUdpLite:");

	for (i = 0; snmp4_udp_list[i].name != NULL; i++)

		seq_printf(seq, " %lu",

			   snmp_fold_field((void **)init_net.mib.udplite_statistics,

			   snmp_fold_field((void **)net->mib.udplite_statistics,

					   snmp4_udp_list[i].entry));



	seq_putc(seq, '\n');
@@ -394,7 +397,32 @@ static int snmp_seq_show(struct seq_file *seq, void *v) 


static int snmp_seq_open(struct inode *inode, struct file *file)

{

	return single_open(file, snmp_seq_show, NULL);

	int err;

	struct net *net;



	err = -ENXIO;

	net = get_proc_net(inode);

	if (net == NULL)

		goto err_net;



	err = single_open(file, snmp_seq_show, net);

	if (err < 0)

		goto err_open;



	return 0;



err_open:

	put_net(net);

err_net:

	return err;

}



static int snmp_seq_release(struct inode *inode, struct file *file)

{

	struct net *net = ((struct seq_file *)file->private_data)->private;



	put_net(net);

	return single_release(inode, file);

}



static const struct file_operations snmp_seq_fops = {
@@ -402,7 +430,7 @@ static const struct file_operations snmp_seq_fops = { 
	.open	 = snmp_seq_open,

	.read	 = seq_read,

	.llseek	 = seq_lseek,

	.release = single_release,

	.release = snmp_seq_release,

};
@@ -483,9 +511,13 @@ static __net_init int ip_proc_init_net(struct net *net) 
		return -ENOMEM;

	if (!proc_net_fops_create(net, "netstat", S_IRUGO, &netstat_seq_fops))

		goto out_netstat;

	if (!proc_net_fops_create(net, "snmp", S_IRUGO, &snmp_seq_fops))

		goto out_snmp;



	return 0;



out_snmp:

	proc_net_remove(net, "netstat");

out_netstat:

	proc_net_remove(net, "sockstat");

	return -ENOMEM;
@@ -493,6 +525,7 @@ static __net_init int ip_proc_init_net(struct net *net) 


static __net_exit void ip_proc_exit_net(struct net *net)

{

	proc_net_remove(net, "snmp");

	proc_net_remove(net, "netstat");

	proc_net_remove(net, "sockstat");

}
@@ -509,12 +542,9 @@ int __init ip_misc_proc_init(void) 
	if (register_pernet_subsys(&ip_proc_ops))

		goto out_pernet;



	if (!proc_net_fops_create(&init_net, "snmp", S_IRUGO, &snmp_seq_fops))

		goto out_snmp;

out:

	return rc;

out_snmp:

	unregister_pernet_subsys(&ip_proc_ops);



out_pernet:

	rc = -ENOMEM;

	goto out;