Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netns: make udpv6 mib per/namespace

Browse source 
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-10-07 14:49:36 -07:00 • committed by David S. Miller
parent e43291cb37
commit 0c7ed677fb
5 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/netns/mib.h
View file

@ -14,6 +14,7 @@ struct netns_mib {
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
struct proc_dir_entry *proc_net_devsnmp6; struct proc_dir_entry *proc_net_devsnmp6;
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6);
#endif #endif
}; };

12
include/net/udp.h
View file

@ -152,8 +152,6 @@ extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
__be32 daddr, __be16 dport, __be32 daddr, __be16 dport,
int dif); int dif);
DECLARE_SNMP_STAT(struct udp_mib, udp_stats_in6);
/* UDP-Lite does not have a standardized MIB yet, so we inherit from UDP */ /* UDP-Lite does not have a standardized MIB yet, so we inherit from UDP */
DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
@ -167,12 +165,14 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
if (is_udplite) SNMP_INC_STATS_BH((net)->mib.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) else SNMP_INC_STATS_BH((net)->mib.udp_statistics, field); } while(0)
#define UDP6_INC_STATS_BH(net, field, is_udplite) do { (void)net; \ #define UDP6_INC_STATS_BH(net, field, is_udplite) do { \
if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field); \ if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field); \
else SNMP_INC_STATS_BH(udp_stats_in6, field); } while(0) else SNMP_INC_STATS_BH((net)->mib.udp_stats_in6, field); \
#define UDP6_INC_STATS_USER(net, field, is_udplite) do { (void)net; \ } while(0)
#define UDP6_INC_STATS_USER(net, field, is_udplite) do { \
if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field); \ if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field); \
else SNMP_INC_STATS_USER(udp_stats_in6, field); } while(0) else SNMP_INC_STATS_USER((net)->mib.udp_stats_in6, field); \
} while(0)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
#define UDPX_INC_STATS_BH(sk, field) \ #define UDPX_INC_STATS_BH(sk, field) \

3
net/ipv4/udp.c
View file

@ -108,9 +108,6 @@
* Snmp MIB for the UDP layer * Snmp MIB for the UDP layer
*/ */
DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
EXPORT_SYMBOL(udp_stats_in6);
struct hlist_head udp_hash[UDP_HTABLE_SIZE]; struct hlist_head udp_hash[UDP_HTABLE_SIZE];
DEFINE_RWLOCK(udp_hash_lock); DEFINE_RWLOCK(udp_hash_lock);

9
net/ipv6/af_inet6.c
View file

@ -806,16 +806,12 @@ static int __init init_ipv6_mibs(void)
if (snmp_mib_init((void **)icmpv6msg_statistics, if (snmp_mib_init((void **)icmpv6msg_statistics,
sizeof(struct icmpv6msg_mib)) < 0) sizeof(struct icmpv6msg_mib)) < 0)
goto err_icmpmsg_mib; goto err_icmpmsg_mib;
if (snmp_mib_init((void **)udp_stats_in6, sizeof (struct udp_mib)) < 0)
goto err_udp_mib;
if (snmp_mib_init((void **)udplite_stats_in6, if (snmp_mib_init((void **)udplite_stats_in6,
sizeof (struct udp_mib)) < 0) sizeof (struct udp_mib)) < 0)
goto err_udplite_mib; goto err_udplite_mib;
return 0; return 0;
err_udplite_mib: err_udplite_mib:
snmp_mib_free((void **)udp_stats_in6);
err_udp_mib:
snmp_mib_free((void **)icmpv6msg_statistics); snmp_mib_free((void **)icmpv6msg_statistics);
err_icmpmsg_mib: err_icmpmsg_mib:
snmp_mib_free((void **)icmpv6_statistics); snmp_mib_free((void **)icmpv6_statistics);
@ -831,17 +827,20 @@ static void cleanup_ipv6_mibs(void)
snmp_mib_free((void **)ipv6_statistics); snmp_mib_free((void **)ipv6_statistics);
snmp_mib_free((void **)icmpv6_statistics); snmp_mib_free((void **)icmpv6_statistics);
snmp_mib_free((void **)icmpv6msg_statistics); snmp_mib_free((void **)icmpv6msg_statistics);
snmp_mib_free((void **)udp_stats_in6);
snmp_mib_free((void **)udplite_stats_in6); snmp_mib_free((void **)udplite_stats_in6);
} }
static int __net_init ipv6_init_mibs(struct net *net) static int __net_init ipv6_init_mibs(struct net *net)
{ {
if (snmp_mib_init((void **)net->mib.udp_stats_in6,
sizeof (struct udp_mib)) < 0)
return -ENOMEM;
return 0; return 0;
} }
static void __net_exit ipv6_cleanup_mibs(struct net *net) static void __net_exit ipv6_cleanup_mibs(struct net *net)
{ {
snmp_mib_free((void **)net->mib.udp_stats_in6);
} }
static int inet6_net_init(struct net *net) static int inet6_net_init(struct net *net)

3
net/ipv6/proc.c
View file

@ -180,7 +180,8 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)
snmp6_seq_show_item(seq, (void **)ipv6_statistics, snmp6_ipstats_list); snmp6_seq_show_item(seq, (void **)ipv6_statistics, snmp6_ipstats_list);
snmp6_seq_show_item(seq, (void **)icmpv6_statistics, snmp6_icmp6_list); snmp6_seq_show_item(seq, (void **)icmpv6_statistics, snmp6_icmp6_list);
snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics); snmp6_seq_show_icmpv6msg(seq, (void **)icmpv6msg_statistics);
snmp6_seq_show_item(seq, (void **)udp_stats_in6, snmp6_udp6_list); snmp6_seq_show_item(seq, (void **)net->mib.udp_stats_in6,
snmp6_udp6_list);
snmp6_seq_show_item(seq, (void **)udplite_stats_in6, snmp6_udplite6_list); snmp6_seq_show_item(seq, (void **)udplite_stats_in6, snmp6_udplite6_list);
return 0; return 0;
} }