Commit c572872f authored by Benjamin Thery's avatar Benjamin Thery Committed by David S. Miller
Browse files

[NETNS][IPV6] rt6_stats - make the stats per network namespace 



The rt6_stats is now per namespace with this patch. It is allocated
when a network namespace is created and freed when the network
namespace exits and references are relative to the network namespace.

Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cc118bd

include/net/ipv6.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,6 @@ extern void ipv6_misc_proc_exit(void); 
extern int snmp6_register_dev(struct inet6_dev *idev);

extern int snmp6_register_dev(struct inet6_dev *idev);

extern int snmp6_unregister_dev(struct inet6_dev *idev);

extern int snmp6_unregister_dev(struct inet6_dev *idev);





extern struct rt6_statistics *rt6_stats;

#else

#else

static inline int snmp6_register_dev(struct inet6_dev *idev)

static inline int snmp6_register_dev(struct inet6_dev *idev)

{

{

include/net/netns/ipv6.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ struct netns_ipv6 { 
	struct xt_table		*ip6table_mangle;

	struct xt_table		*ip6table_mangle;

	struct xt_table		*ip6table_raw;

	struct xt_table		*ip6table_raw;

#endif

#endif

	struct rt6_statistics   *rt6_stats;

	struct timer_list       *ip6_fib_timer;

	struct timer_list       *ip6_fib_timer;

	struct hlist_head       *fib_table_hash;

	struct hlist_head       *fib_table_hash;

	struct fib6_table       *fib6_main_tbl;

	struct fib6_table       *fib6_main_tbl;

net/ipv6/ip6_fib.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -48,8 +48,6 @@ 
#define RT6_TRACE(x...) do { ; } while (0)

#define RT6_TRACE(x...) do { ; } while (0)

#endif

#endif





struct rt6_statistics *rt6_stats;



static struct kmem_cache * fib6_node_kmem __read_mostly;

static struct kmem_cache * fib6_node_kmem __read_mostly;





enum fib_walk_state_t

enum fib_walk_state_t
@@ -653,10 +651,10 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 
	rt->rt6i_node = fn;

	rt->rt6i_node = fn;

	atomic_inc(&rt->rt6i_ref);

	atomic_inc(&rt->rt6i_ref);

	inet6_rt_notify(RTM_NEWROUTE, rt, info);

	inet6_rt_notify(RTM_NEWROUTE, rt, info);

	rt6_stats->fib_rt_entries++;

	info->nl_net->ipv6.rt6_stats->fib_rt_entries++;





	if ((fn->fn_flags & RTN_RTINFO) == 0) {

	if ((fn->fn_flags & RTN_RTINFO) == 0) {

		rt6_stats->fib_route_nodes++;

		info->nl_net->ipv6.rt6_stats->fib_route_nodes++;

		fn->fn_flags |= RTN_RTINFO;

		fn->fn_flags |= RTN_RTINFO;

	}

	}
@@ -1087,14 +1085,15 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp, 
{

{

	struct fib6_walker_t *w;

	struct fib6_walker_t *w;

	struct rt6_info *rt = *rtp;

	struct rt6_info *rt = *rtp;

	struct net *net = info->nl_net;





	RT6_TRACE("fib6_del_route\n");

	RT6_TRACE("fib6_del_route\n");





	/* Unlink it */

	/* Unlink it */

	*rtp = rt->u.dst.rt6_next;

	*rtp = rt->u.dst.rt6_next;

	rt->rt6i_node = NULL;

	rt->rt6i_node = NULL;

	rt6_stats->fib_rt_entries--;

	net->ipv6.rt6_stats->fib_rt_entries--;

	rt6_stats->fib_discarded_routes++;

	net->ipv6.rt6_stats->fib_discarded_routes++;





	/* Reset round-robin state, if necessary */

	/* Reset round-robin state, if necessary */

	if (fn->rr_ptr == rt)

	if (fn->rr_ptr == rt)
@@ -1117,7 +1116,7 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp, 
	/* If it was last route, expunge its radix tree node */

	/* If it was last route, expunge its radix tree node */

	if (fn->leaf == NULL) {

	if (fn->leaf == NULL) {

		fn->fn_flags &= ~RTN_RTINFO;

		fn->fn_flags &= ~RTN_RTINFO;

		rt6_stats->fib_route_nodes--;

		net->ipv6.rt6_stats->fib_route_nodes--;

		fn = fib6_repair_tree(fn);

		fn = fib6_repair_tree(fn);

	}

	}
@@ -1486,11 +1485,15 @@ static int fib6_net_init(struct net *net) 
	setup_timer(timer, fib6_gc_timer_cb, (unsigned long)net);

	setup_timer(timer, fib6_gc_timer_cb, (unsigned long)net);

	net->ipv6.ip6_fib_timer = timer;

	net->ipv6.ip6_fib_timer = timer;





	net->ipv6.rt6_stats = kzalloc(sizeof(*net->ipv6.rt6_stats), GFP_KERNEL);

	if (!net->ipv6.rt6_stats)

		goto out_timer;



	net->ipv6.fib_table_hash =

	net->ipv6.fib_table_hash =

		kzalloc(sizeof(*net->ipv6.fib_table_hash)*FIB_TABLE_HASHSZ,

		kzalloc(sizeof(*net->ipv6.fib_table_hash)*FIB_TABLE_HASHSZ,

			GFP_KERNEL);

			GFP_KERNEL);

	if (!net->ipv6.fib_table_hash)

	if (!net->ipv6.fib_table_hash)

		goto out_timer;

		goto out_rt6_stats;





	net->ipv6.fib6_main_tbl = kzalloc(sizeof(*net->ipv6.fib6_main_tbl),

	net->ipv6.fib6_main_tbl = kzalloc(sizeof(*net->ipv6.fib6_main_tbl),

					  GFP_KERNEL);

					  GFP_KERNEL);
@@ -1524,6 +1527,8 @@ out_fib6_main_tbl: 
#endif

#endif

out_fib_table_hash:

out_fib_table_hash:

	kfree(net->ipv6.fib_table_hash);

	kfree(net->ipv6.fib_table_hash);

out_rt6_stats:

	kfree(net->ipv6.rt6_stats);

out_timer:

out_timer:

	kfree(timer);

	kfree(timer);

	goto out;

	goto out;
@@ -1538,6 +1543,7 @@ static void fib6_net_exit(struct net *net) 
#endif

#endif

	kfree(net->ipv6.fib6_main_tbl);

	kfree(net->ipv6.fib6_main_tbl);

	kfree(net->ipv6.fib_table_hash);

	kfree(net->ipv6.fib_table_hash);

	kfree(net->ipv6.rt6_stats);

}

}





static struct pernet_operations fib6_net_ops = {

static struct pernet_operations fib6_net_ops = {
@@ -1556,14 +1562,9 @@ int __init fib6_init(void) 
	if (!fib6_node_kmem)

	if (!fib6_node_kmem)

		goto out;

		goto out;





	ret = -ENOMEM;

	rt6_stats = kzalloc(sizeof(*rt6_stats), GFP_KERNEL);

	if (!rt6_stats)

		goto out_kmem_cache_create;



	ret = register_pernet_subsys(&fib6_net_ops);

	ret = register_pernet_subsys(&fib6_net_ops);

	if (ret)

	if (ret)

		goto out_rt6_stats;

		goto out_kmem_cache_create;





	ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib);

	ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib);

	if (ret)

	if (ret)
@@ -1573,8 +1574,6 @@ out: 




out_unregister_subsys:

out_unregister_subsys:

	unregister_pernet_subsys(&fib6_net_ops);

	unregister_pernet_subsys(&fib6_net_ops);

out_rt6_stats:

	kfree(rt6_stats);

out_kmem_cache_create:

out_kmem_cache_create:

	kmem_cache_destroy(fib6_node_kmem);

	kmem_cache_destroy(fib6_node_kmem);

	goto out;

	goto out;
@@ -1583,6 +1582,5 @@ out_kmem_cache_create: 
void fib6_gc_cleanup(void)

void fib6_gc_cleanup(void)

{

{

	unregister_pernet_subsys(&fib6_net_ops);

	unregister_pernet_subsys(&fib6_net_ops);

	kfree(rt6_stats);

	kmem_cache_destroy(fib6_node_kmem);

	kmem_cache_destroy(fib6_node_kmem);

}
 
}

net/ipv6/route.c

+7 −5
Original line number Original line Diff line number Diff line
@@ -2354,11 +2354,13 @@ static const struct file_operations ipv6_route_proc_fops = { 
static int rt6_stats_seq_show(struct seq_file *seq, void *v)

static int rt6_stats_seq_show(struct seq_file *seq, void *v)

{

{

	seq_printf(seq, "%04x %04x %04x %04x %04x %04x %04x\n",

	seq_printf(seq, "%04x %04x %04x %04x %04x %04x %04x\n",

		      rt6_stats->fib_nodes, rt6_stats->fib_route_nodes,

		   init_net.ipv6.rt6_stats->fib_nodes,

		      rt6_stats->fib_rt_alloc, rt6_stats->fib_rt_entries,

		   init_net.ipv6.rt6_stats->fib_route_nodes,

		      rt6_stats->fib_rt_cache,

		   init_net.ipv6.rt6_stats->fib_rt_alloc,

		   init_net.ipv6.rt6_stats->fib_rt_entries,

		   init_net.ipv6.rt6_stats->fib_rt_cache,

		   atomic_read(&ip6_dst_ops.entries),

		   atomic_read(&ip6_dst_ops.entries),

		      rt6_stats->fib_discarded_routes);

		   init_net.ipv6.rt6_stats->fib_discarded_routes);





	return 0;

	return 0;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE