Commit fd556f20 authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller
Browse files

tipc: introduce capability bit for broadcast synchronization 



Until now, we have tried to support both the newer, dedicated broadcast
synchronization mechanism along with the older, less safe, RESET_MSG/
ACTIVATE_MSG based one. The latter method has turned out to be a hazard
in a highly dynamic cluster, so we find it safer to disable it completely
when we find that the former mechanism is supported by the peer node.

For this purpose, we now introduce a new capabability bit,
TIPC_BCAST_SYNCH, to inform any peer nodes that dedicated broadcast
syncronization is supported by the present node. The new bit is conveyed
between peers in the 'capabilities' field of neighbor discovery messages.

Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f566124

net/tipc/bcast.c

+1 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ int tipc_bcast_init(struct net *net) 
	if (!tipc_link_bc_create(&bb->node,

				 MAX_PKT_DEFAULT_MCAST,

				 BCLINK_WIN_DEFAULT,

				 0,

				 &bb->inputq,

				 &bb->namedq,

				 &l))

net/tipc/discover.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void tipc_disc_init_msg(struct net *net, struct sk_buff *buf, u32 type, 
		      MAX_H_SIZE, dest_domain);

	msg_set_non_seq(msg, 1);

	msg_set_node_sig(msg, tn->random);

	msg_set_node_capabilities(msg, 0);

	msg_set_node_capabilities(msg, TIPC_NODE_CAPABILITIES);

	msg_set_dest_domain(msg, dest_domain);

	msg_set_bc_netid(msg, tn->net_id);

	b_ptr->media->addr2msg(msg_media_addr(msg), &b_ptr->addr);

net/tipc/link.c

+5 −2
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static u32 link_own_addr(struct tipc_link *l) 
 * @session: session to be used by link

 * @ownnode: identity of own node

 * @peer: node id of peer node

 * @peer_caps: bitmap describing peer node capabilities

 * @maddr: media address to be used

 * @inputq: queue to put messages ready for delivery

 * @namedq: queue to put binding table update messages ready for delivery
@@ -201,7 +202,7 @@ static u32 link_own_addr(struct tipc_link *l) 
bool tipc_link_create(struct tipc_node *n, char *if_name, int bearer_id,

		      int tolerance, char net_plane, u32 mtu, int priority,

		      int window, u32 session, u32 ownnode, u32 peer,

		      struct tipc_media_addr *maddr,

		      u16 peer_caps, struct tipc_media_addr *maddr,

		      struct sk_buff_head *inputq, struct sk_buff_head *namedq,

		      struct tipc_link **link)

{
@@ -226,6 +227,7 @@ bool tipc_link_create(struct tipc_node *n, char *if_name, int bearer_id, 
	strcpy((char *)msg_data(hdr), if_name);



	l->addr = peer;

	l->peer_caps = peer_caps;

	l->media_addr = maddr;

	l->owner = n;

	l->peer_session = WILDCARD_SESSION;
@@ -260,6 +262,7 @@ bool tipc_link_create(struct tipc_node *n, char *if_name, int bearer_id, 
 * Returns true if link was created, otherwise false

 */

bool tipc_link_bc_create(struct tipc_node *n, int mtu, int window,

			 u16 peer_caps,

			 struct sk_buff_head *inputq,

			 struct sk_buff_head *namedq,

			 struct tipc_link **link)
@@ -267,7 +270,7 @@ bool tipc_link_bc_create(struct tipc_node *n, int mtu, int window, 
	struct tipc_link *l;



	if (!tipc_link_create(n, "", MAX_BEARERS, 0, 'Z', mtu, 0, window,

			      0, 0, 0, NULL, inputq, namedq, link))

			      0, 0, 0, peer_caps, NULL, inputq, namedq, link))

		return false;



	l = *link;

net/tipc/link.h

+4 −2
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct tipc_stats { 
 * @keepalive_intv: link keepalive timer interval

 * @abort_limit: # of unacknowledged continuity probes needed to reset link

 * @state: current state of link FSM

 * @peer_caps: bitmap describing capabilities of peer node

 * @silent_intv_cnt: # of timer intervals without any reception from peer

 * @proto_msg: template for control messages generated by link

 * @pmsg: convenience pointer to "proto_msg" field
@@ -162,6 +163,7 @@ struct tipc_link { 
	unsigned long keepalive_intv;

	u32 abort_limit;

	u32 state;

	u16 peer_caps;

	u32 silent_intv_cnt;

	struct {

		unchar hdr[INT_H_SIZE];
@@ -215,11 +217,11 @@ struct tipc_link { 
bool tipc_link_create(struct tipc_node *n, char *if_name, int bearer_id,

		      int tolerance, char net_plane, u32 mtu, int priority,

		      int window, u32 session, u32 ownnode, u32 peer,

		      struct tipc_media_addr *maddr,

		      u16 peer_caps, struct tipc_media_addr *maddr,

		      struct sk_buff_head *inputq, struct sk_buff_head *namedq,

		      struct tipc_link **link);

bool tipc_link_bc_create(struct tipc_node *n, int mtu, int window,

			 struct sk_buff_head *inputq,

			 u16 peer_caps, struct sk_buff_head *inputq,

			 struct sk_buff_head *namedq,

			 struct tipc_link **link);

void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl,

net/tipc/node.c

+4 −2
Original line number Diff line number Diff line
@@ -584,8 +584,10 @@ void tipc_node_check_dest(struct net *net, u32 onode, 
		if (!tipc_link_create(n, if_name, b->identity, b->tolerance,

				      b->net_plane, b->mtu, b->priority,

				      b->window, mod(tipc_net(net)->random),

				      tipc_own_addr(net), onode, &le->maddr,

				      &le->inputq, &n->bclink.namedq, &l)) {

				      tipc_own_addr(net), onode,

				      n->capabilities,

				      &le->maddr, &le->inputq,

				      &n->bclink.namedq, &l)) {

			*respond = false;

			goto exit;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE