Commit 386019d3 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

mib: put udplite statistics on struct net 



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

include/net/netns/mib.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ struct netns_mib { 
	DEFINE_SNMP_STAT(struct ipstats_mib, ip_statistics);

	DEFINE_SNMP_STAT(struct linux_mib, net_statistics);

	DEFINE_SNMP_STAT(struct udp_mib, udp_statistics);

	DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics);

};



#endif

include/net/udp.h

+2 −3
Original line number Diff line number Diff line
@@ -151,17 +151,16 @@ extern int udp_lib_setsockopt(struct sock *sk, int level, int optname, 
DECLARE_SNMP_STAT(struct udp_mib, udp_stats_in6);



/* UDP-Lite does not have a standardized MIB yet, so we inherit from UDP */

DECLARE_SNMP_STAT(struct udp_mib, udplite_statistics);

DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);



/*

 * 	SNMP statistics for UDP and UDP-Lite

 */

#define UDP_INC_STATS_USER(net, field, is_udplite)	      do { \

	if (is_udplite) SNMP_INC_STATS_USER(udplite_statistics, field);       \

	if (is_udplite) SNMP_INC_STATS_USER((net)->mib.udplite_statistics, field);       \

	else		SNMP_INC_STATS_USER((net)->mib.udp_statistics, field);  }  while(0)

#define UDP_INC_STATS_BH(net, field, is_udplite) 	      do { \

	if (is_udplite) SNMP_INC_STATS_BH(udplite_statistics, field);         \

	if (is_udplite) SNMP_INC_STATS_BH((net)->mib.udplite_statistics, field);         \

	else		SNMP_INC_STATS_BH((net)->mib.udp_statistics, field);    }  while(0)



#define UDP6_INC_STATS_BH(net, field, is_udplite) 	    do { (void)net;  \

net/ipv4/af_inet.c

+6 −5
Original line number Diff line number Diff line
@@ -1352,10 +1352,15 @@ static __net_init int ipv4_mib_init_net(struct net *net) 
	if (snmp_mib_init((void **)net->mib.udp_statistics,

			  sizeof(struct udp_mib)) < 0)

		goto err_udp_mib;

	if (snmp_mib_init((void **)net->mib.udplite_statistics,

			  sizeof(struct udp_mib)) < 0)

		goto err_udplite_mib;



	tcp_mib_init(net);

	return 0;



err_udplite_mib:

	snmp_mib_free((void **)net->mib.udp_statistics);

err_udp_mib:

	snmp_mib_free((void **)net->mib.net_statistics);

err_net_mib:
@@ -1368,6 +1373,7 @@ static __net_init int ipv4_mib_init_net(struct net *net) 


static __net_exit void ipv4_mib_exit_net(struct net *net)

{

	snmp_mib_free((void **)net->mib.udplite_statistics);

	snmp_mib_free((void **)net->mib.udp_statistics);

	snmp_mib_free((void **)net->mib.net_statistics);

	snmp_mib_free((void **)net->mib.ip_statistics);
@@ -1387,9 +1393,6 @@ static int __init init_ipv4_mibs(void) 
	if (snmp_mib_init((void **)icmpmsg_statistics,

			  sizeof(struct icmpmsg_mib)) < 0)

		goto err_icmpmsg_mib;

	if (snmp_mib_init((void **)udplite_statistics,

			  sizeof(struct udp_mib)) < 0)

		goto err_udplite_mib;



	if (register_pernet_subsys(&ipv4_mib_ops))

		goto err_net;
@@ -1397,8 +1400,6 @@ static int __init init_ipv4_mibs(void) 
	return 0;



err_net:

	snmp_mib_free((void **)udplite_statistics);

err_udplite_mib:

	snmp_mib_free((void **)icmpmsg_statistics);

err_icmpmsg_mib:

	snmp_mib_free((void **)icmp_statistics);

net/ipv4/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,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 **)udplite_statistics,

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

					   snmp4_udp_list[i].entry));



	seq_putc(seq, '\n');

net/ipv4/udplite.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 *		2 of the License, or (at your option) any later version.

 */

#include "udp_impl.h"

DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics)	__read_mostly;



struct hlist_head 	udplite_hash[UDP_HTABLE_SIZE];