Commit 7b1a74fd authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NETNS]: Refactor fib initialization so it can handle multiple namespaces. 



This patch makes the fib to be initialized as a subsystem for the
network namespaces. The code does not handle several namespaces yet,
so in case of a creation of a network namespace, the
creation/initialization will not occur.

Acked-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Acked-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbb50165

include/net/ip_fib.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,8 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result 
}

}





#else /* CONFIG_IP_MULTIPLE_TABLES */

#else /* CONFIG_IP_MULTIPLE_TABLES */

extern int __init fib4_rules_init(void);

extern int __net_init fib4_rules_init(struct net *net);

extern void __net_exit fib4_rules_exit(struct net *net);





#ifdef CONFIG_NET_CLS_ROUTE

#ifdef CONFIG_NET_CLS_ROUTE

extern u32 fib_rules_tclass(struct fib_result *res);

extern u32 fib_rules_tclass(struct fib_result *res);

net/ipv4/af_inet.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1475,15 +1475,11 @@ static int __init ipv4_proc_init(void) 
		goto out_tcp;

		goto out_tcp;

	if (udp4_proc_init())

	if (udp4_proc_init())

		goto out_udp;

		goto out_udp;

	if (fib_proc_init(&init_net))

		goto out_fib;

	if (ip_misc_proc_init())

	if (ip_misc_proc_init())

		goto out_misc;

		goto out_misc;

out:

out:

	return rc;

	return rc;

out_misc:

out_misc:

	fib_proc_exit(&init_net);

out_fib:

	udp4_proc_exit();

	udp4_proc_exit();

out_udp:

out_udp:

	tcp4_proc_exit();

	tcp4_proc_exit();

net/ipv4/fib_frontend.c

+80 −8
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ struct fib_table *ip_fib_main_table; 
#define FIB_TABLE_HASHSZ 1

#define FIB_TABLE_HASHSZ 1

static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];

static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];





static int __init fib4_rules_init(void)

static int __net_init fib4_rules_init(struct net *net)

{

{

	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);

	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);

	if (ip_fib_local_table == NULL)

	if (ip_fib_local_table == NULL)
@@ -863,10 +863,18 @@ static void nl_fib_input(struct sk_buff *skb) 
	netlink_unicast(fibnl, skb, pid, MSG_DONTWAIT);

	netlink_unicast(fibnl, skb, pid, MSG_DONTWAIT);

}

}





static void nl_fib_lookup_init(void)

static int nl_fib_lookup_init(struct net *net)

{

{

	fibnl = netlink_kernel_create(&init_net, NETLINK_FIB_LOOKUP, 0,

	fibnl = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, 0,

				      nl_fib_input, NULL, THIS_MODULE);

				      nl_fib_input, NULL, THIS_MODULE);

	if (fibnl == NULL)

		return -EAFNOSUPPORT;

	return 0;

}



static void nl_fib_lookup_exit(struct net *net)

{

	sock_put(fibnl);

}

}





static void fib_disable_ip(struct net_device *dev, int force)

static void fib_disable_ip(struct net_device *dev, int force)
@@ -949,22 +957,86 @@ static struct notifier_block fib_netdev_notifier = { 
	.notifier_call =fib_netdev_event,

	.notifier_call =fib_netdev_event,

};

};





void __init ip_fib_init(void)

static int __net_init ip_fib_net_init(struct net *net)

{

{

	unsigned int i;

	unsigned int i;





	for (i = 0; i < FIB_TABLE_HASHSZ; i++)

	for (i = 0; i < FIB_TABLE_HASHSZ; i++)

		INIT_HLIST_HEAD(&fib_table_hash[i]);

		INIT_HLIST_HEAD(&fib_table_hash[i]);





	BUG_ON(fib4_rules_init());

	return fib4_rules_init(net);

}





	register_netdevice_notifier(&fib_netdev_notifier);

static void __net_exit ip_fib_net_exit(struct net *net)

	register_inetaddr_notifier(&fib_inetaddr_notifier);

{

	nl_fib_lookup_init();

	unsigned int i;





#ifdef CONFIG_IP_MULTIPLE_TABLES

	fib4_rules_exit(net);

#endif



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

		struct fib_table *tb;

		struct hlist_head *head;

		struct hlist_node *node, *tmp;



		head = &fib_table_hash[i];

		hlist_for_each_entry_safe(tb, node, tmp, head, tb_hlist) {

			hlist_del(node);

			tb->tb_flush(tb);

			kfree(tb);

		}

	}

}



static int __net_init fib_net_init(struct net *net)

{

	int error;



	error = 0;

	if (net != &init_net)

		goto out;



	error = ip_fib_net_init(net);

	if (error < 0)

		goto out;

	error = nl_fib_lookup_init(net);

	if (error < 0)

		goto out_nlfl;

	error = fib_proc_init(net);

	if (error < 0)

		goto out_proc;

out:

	return error;



out_proc:

	nl_fib_lookup_exit(net);

out_nlfl:

	ip_fib_net_exit(net);

	goto out;

}



static void __net_exit fib_net_exit(struct net *net)

{

	fib_proc_exit(net);

	nl_fib_lookup_exit(net);

	ip_fib_net_exit(net);

}



static struct pernet_operations fib_net_ops = {

	.init = fib_net_init,

	.exit = fib_net_exit,

};



void __init ip_fib_init(void)

{

	rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL);

	rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL);

	rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL);

	rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL);

	rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib);

	rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib);



	register_pernet_subsys(&fib_net_ops);

	register_netdevice_notifier(&fib_netdev_notifier);

	register_inetaddr_notifier(&fib_inetaddr_notifier);

}

}





EXPORT_SYMBOL(inet_addr_type);

EXPORT_SYMBOL(inet_addr_type);

net/ipv4/fib_hash.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -746,11 +746,7 @@ static int fn_hash_dump(struct fib_table *tb, struct sk_buff *skb, struct netlin 
	return skb->len;

	return skb->len;

}

}





#ifdef CONFIG_IP_MULTIPLE_TABLES

struct fib_table *fib_hash_init(u32 id)

struct fib_table *fib_hash_init(u32 id)

#else

struct fib_table * __init fib_hash_init(u32 id)

#endif

{

{

	struct fib_table *tb;

	struct fib_table *tb;

net/ipv4/fib_rules.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -311,11 +311,11 @@ static int __init fib_default_rules_init(void) 
	return 0;

	return 0;

}

}





int __init fib4_rules_init()

int __net_init fib4_rules_init(struct net *net)

{

{

	int err;

	int err;





	fib_rules_register(&init_net, &fib4_rules_ops);

	fib_rules_register(net, &fib4_rules_ops);

	err = fib_default_rules_init();

	err = fib_default_rules_init();

	if (err < 0)

	if (err < 0)

		goto fail;

		goto fail;
@@ -323,6 +323,11 @@ int __init fib4_rules_init() 




fail:

fail:

	/* also cleans all rules already added */

	/* also cleans all rules already added */

	fib_rules_unregister(&init_net, &fib4_rules_ops);

	fib_rules_unregister(net, &fib4_rules_ops);

	return err;

	return err;

}

}



void __net_exit fib4_rules_exit(struct net *net)

{

	fib_rules_unregister(net, &fib4_rules_ops);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE