Commit 7781e5d1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tipc-separate-link-and-aggregation' 



Jon Maloy says:

====================
tipc: separate link and link aggregation layer

This is the first batch of a longer series that has two main objectives:

o Finer lock granularity during message sending and reception,
  especially regarding usage of the node spinlock.

o Better separation between the link layer implementation and the link
  aggregation layer, represented by node.c::struct tipc_node.

Hopefully these changes also make this part of code somewhat easier
to comprehend and maintain.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6acc2326 d999297c

net/tipc/bcast.c

+26 −5
Original line number Diff line number Diff line
@@ -316,6 +316,29 @@ void tipc_bclink_update_link_state(struct tipc_node *n_ptr, 
	}

}



void tipc_bclink_sync_state(struct tipc_node *n, struct tipc_msg *hdr)

{

	u16 last = msg_last_bcast(hdr);

	int mtyp = msg_type(hdr);



	if (unlikely(msg_user(hdr) != LINK_PROTOCOL))

		return;

	if (mtyp == STATE_MSG) {

		tipc_bclink_update_link_state(n, last);

		return;

	}

	/* Compatibility: older nodes don't know BCAST_PROTOCOL synchronization,

	 * and transfer synch info in LINK_PROTOCOL messages.

	 */

	if (tipc_node_is_up(n))

		return;

	if ((mtyp != RESET_MSG) && (mtyp != ACTIVATE_MSG))

		return;

	n->bclink.last_sent = last;

	n->bclink.last_in = last;

	n->bclink.oos_state = 0;

}



/**

 * bclink_peek_nack - monitor retransmission requests sent by other nodes

 *
@@ -358,10 +381,9 @@ int tipc_bclink_xmit(struct net *net, struct sk_buff_head *list) 


	/* Prepare clone of message for local node */

	skb = tipc_msg_reassemble(list);

	if (unlikely(!skb)) {

		__skb_queue_purge(list);

	if (unlikely(!skb))

		return -EHOSTUNREACH;

	}



	/* Broadcast to all nodes */

	if (likely(bclink)) {

		tipc_bclink_lock(net);
@@ -413,7 +435,7 @@ static void bclink_accept_pkt(struct tipc_node *node, u32 seqno) 
	 * all nodes in the cluster don't ACK at the same time

	 */

	if (((seqno - tn->own_addr) % TIPC_MIN_LINK_WIN) == 0) {

		tipc_link_proto_xmit(node->active_links[node->addr & 1],

		tipc_link_proto_xmit(node_active_link(node, node->addr),

				     STATE_MSG, 0, 0, 0, 0);

		tn->bcl->stats.sent_acks++;

	}
@@ -925,7 +947,6 @@ int tipc_bclink_init(struct net *net) 
	tipc_link_set_queue_limits(bcl, BCLINK_WIN_DEFAULT);

	bcl->bearer_id = MAX_BEARERS;

	rcu_assign_pointer(tn->bearer_list[MAX_BEARERS], &bcbearer->bearer);

	bcl->state = WORKING_WORKING;

	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);

net/tipc/bcast.h

+1 −0
Original line number Diff line number Diff line
@@ -133,5 +133,6 @@ void tipc_bclink_wakeup_users(struct net *net); 
int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg);

int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[]);

void tipc_bclink_input(struct net *net);

void tipc_bclink_sync_state(struct tipc_node *n, struct tipc_msg *msg);



#endif

net/tipc/bearer.c

+26 −0
Original line number Diff line number Diff line
@@ -470,6 +470,32 @@ void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf, 
	rcu_read_unlock();

}



/* tipc_bearer_xmit() -send buffer to destination over bearer

 */

void tipc_bearer_xmit(struct net *net, u32 bearer_id,

		      struct sk_buff_head *xmitq,

		      struct tipc_media_addr *dst)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	struct tipc_bearer *b;

	struct sk_buff *skb, *tmp;



	if (skb_queue_empty(xmitq))

		return;



	rcu_read_lock();

	b = rcu_dereference_rtnl(tn->bearer_list[bearer_id]);

	if (likely(b)) {

		skb_queue_walk_safe(xmitq, skb, tmp) {

			__skb_dequeue(xmitq);

			b->media->send_msg(net, skb, b, dst);

			/* Until we remove cloning in tipc_l2_send_msg(): */

			kfree_skb(skb);

		}

	}

	rcu_read_unlock();

}



/**

 * tipc_l2_rcv_msg - handle incoming TIPC message from an interface

 * @buf: the received packet

net/tipc/bearer.h

+3 −0
Original line number Diff line number Diff line
@@ -217,5 +217,8 @@ void tipc_bearer_cleanup(void); 
void tipc_bearer_stop(struct net *net);

void tipc_bearer_send(struct net *net, u32 bearer_id, struct sk_buff *buf,

		      struct tipc_media_addr *dest);

void tipc_bearer_xmit(struct net *net, u32 bearer_id,

		      struct sk_buff_head *xmitq,

		      struct tipc_media_addr *dst);



#endif	/* _TIPC_BEARER_H */

net/tipc/core.h

+5 −0
Original line number Diff line number Diff line
@@ -129,6 +129,11 @@ static inline int less(u16 left, u16 right) 
	return less_eq(left, right) && (mod(right) != mod(left));

}



static inline int in_range(u16 val, u16 min, u16 max)

{

	return !less(val, min) && !more(val, max);

}



#ifdef CONFIG_SYSCTL

int tipc_register_sysctl(void);

void tipc_unregister_sysctl(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE