tipc: create broadcast transmission link at namespace init The broadcast transmission link is currently instantiated when the network subsystem is started, i.e., on order from user space via netlink. This forces the broadcast transmission code to do unnecessary tests for the existence of the transmission link, as well in single mode node as in network mode. In this commit, we do instead create the link during initialization of the name space, and remove it when it is stopped. The fact that the transmission link now has a guaranteed longer life cycle than any of its potential clients paves the way for further code simplifcations and optimizations. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index ebf4fd7..c6f0d1d 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c
@@ -106,6 +106,11 @@ struct tipc_node *retransmit_to; }; +static struct tipc_bc_base *tipc_bc_base(struct net *net) +{ + return tipc_net(net)->bcbase; +} + /** * tipc_nmap_equal - test for equality of node maps */ @@ -1041,7 +1046,7 @@ bcl->bearer_id = MAX_BEARERS; rcu_assign_pointer(tn->bearer_list[MAX_BEARERS], &bcbearer->bearer); bcl->pmsg = (struct tipc_msg *)&bcl->proto_msg; - msg_set_prevnode(bcl->pmsg, tn->own_addr); + strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME); tn->bcbearer = bcbearer; tn->bcbase = bclink; @@ -1049,6 +1054,13 @@ return 0; } +void tipc_bcast_reinit(struct net *net) +{ + struct tipc_bc_base *b = tipc_bc_base(net); + + msg_set_prevnode(b->link.pmsg, tipc_own_addr(net)); +} + void tipc_bcast_stop(struct net *net) { struct tipc_net *tn = net_generic(net, tipc_net_id); @@ -1056,7 +1068,6 @@ tipc_bclink_lock(net); tipc_link_purge_queues(tn->bcl); tipc_bclink_unlock(net); - RCU_INIT_POINTER(tn->bearer_list[BCBEARER], NULL); synchronize_net(); kfree(tn->bcbearer);
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index eac912a..041935d 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h
@@ -47,6 +47,7 @@ extern const char tipc_bclink_name[]; int tipc_bcast_init(struct net *net); +void tipc_bcast_reinit(struct net *net); void tipc_bcast_stop(struct net *net); void tipc_bclink_add_node(struct net *net, u32 addr); void tipc_bclink_remove_node(struct net *net, u32 addr);
diff --git a/net/tipc/core.c b/net/tipc/core.c index 005ba5e..03a8428 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c
@@ -42,6 +42,7 @@ #include "bearer.h" #include "net.h" #include "socket.h" +#include "bcast.h" #include <linux/module.h> @@ -71,8 +72,15 @@ err = tipc_topsrv_start(net); if (err) goto out_subscr; + + err = tipc_bcast_init(net); + if (err) + goto out_bclink; + return 0; +out_bclink: + tipc_bcast_stop(net); out_subscr: tipc_nametbl_stop(net); out_nametbl: @@ -85,6 +93,7 @@ { tipc_topsrv_stop(net); tipc_net_stop(net); + tipc_bcast_stop(net); tipc_nametbl_stop(net); tipc_sk_rht_destroy(net); }
diff --git a/net/tipc/net.c b/net/tipc/net.c index dc623d5..77bf911 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c
@@ -112,14 +112,11 @@ { struct tipc_net *tn = net_generic(net, tipc_net_id); char addr_string[16]; - int res; tn->own_addr = addr; tipc_named_reinit(net); tipc_sk_reinit(net); - res = tipc_bcast_init(net); - if (res) - return res; + tipc_bcast_reinit(net); tipc_nametbl_publish(net, TIPC_CFG_SRV, tn->own_addr, tn->own_addr, TIPC_ZONE_SCOPE, 0, tn->own_addr); @@ -142,7 +139,6 @@ tn->own_addr); rtnl_lock(); tipc_bearer_stop(net); - tipc_bcast_stop(net); tipc_node_stop(net); rtnl_unlock();