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

tipc: add new function for sending multiple small messages 



We see an increasing need to send multiple single-buffer messages
of TIPC_SYSTEM_IMPORTANCE to different individual destination nodes.
Instead of looping over the send queue and sending each buffer
individually, as we do now, we add a new help function
tipc_node_distr_xmit() to do this.

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

net/tipc/node.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -1254,6 +1254,22 @@ int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dnode, 
	return 0;

	return 0;

}

}





/* tipc_node_distr_xmit(): send single buffer msgs to individual destinations

 * Note: this is only for SYSTEM_IMPORTANCE messages, which cannot be rejected

 */

int tipc_node_distr_xmit(struct net *net, struct sk_buff_head *xmitq)

{

	struct sk_buff *skb;

	u32 selector, dnode;



	while ((skb = __skb_dequeue(xmitq))) {

		selector = msg_origport(buf_msg(skb));

		dnode = msg_destnode(buf_msg(skb));

		tipc_node_xmit_skb(net, skb, dnode, selector);

	}

	return 0;

}



void tipc_node_broadcast(struct net *net, struct sk_buff *skb)

void tipc_node_broadcast(struct net *net, struct sk_buff *skb)

{

{

	struct sk_buff *txskb;

	struct sk_buff *txskb;

net/tipc/node.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 node, 
			   char *linkname, size_t len);

			   char *linkname, size_t len);

int tipc_node_xmit(struct net *net, struct sk_buff_head *list, u32 dnode,

int tipc_node_xmit(struct net *net, struct sk_buff_head *list, u32 dnode,

		   int selector);

		   int selector);

int tipc_node_distr_xmit(struct net *net, struct sk_buff_head *list);

int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest,

int tipc_node_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest,

		       u32 selector);

		       u32 selector);

void tipc_node_subscribe(struct net *net, struct list_head *subscr, u32 addr);

void tipc_node_subscribe(struct net *net, struct list_head *subscr, u32 addr);

net/tipc/socket.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -1740,14 +1740,11 @@ static void tipc_sk_filter_rcv(struct sock *sk, struct sk_buff *skb, 
 * @skb: message

 * @skb: message

 *

 *

 * Caller must hold socket lock

 * Caller must hold socket lock

 *

 * Returns 0

 */

 */

static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)

static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)

{

{

	unsigned int before = sk_rmem_alloc_get(sk);

	unsigned int before = sk_rmem_alloc_get(sk);

	struct sk_buff_head xmitq;

	struct sk_buff_head xmitq;

	u32 dnode, selector;

	unsigned int added;

	unsigned int added;





	__skb_queue_head_init(&xmitq);

	__skb_queue_head_init(&xmitq);
@@ -1757,11 +1754,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) 
	atomic_add(added, &tipc_sk(sk)->dupl_rcvcnt);

	atomic_add(added, &tipc_sk(sk)->dupl_rcvcnt);





	/* Send pending response/rejected messages, if any */

	/* Send pending response/rejected messages, if any */

	while ((skb = __skb_dequeue(&xmitq))) {

	tipc_node_distr_xmit(sock_net(sk), &xmitq);

		selector = msg_origport(buf_msg(skb));

		dnode = msg_destnode(buf_msg(skb));

		tipc_node_xmit_skb(sock_net(sk), skb, dnode, selector);

	}

	return 0;

	return 0;

}

}
@@ -1840,10 +1833,7 @@ void tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq) 
				spin_unlock_bh(&sk->sk_lock.slock);

				spin_unlock_bh(&sk->sk_lock.slock);

			}

			}

			/* Send pending response/rejected messages, if any */

			/* Send pending response/rejected messages, if any */

			while ((skb = __skb_dequeue(&xmitq))) {

			tipc_node_distr_xmit(sock_net(sk), &xmitq);

				dnode = msg_destnode(buf_msg(skb));

				tipc_node_xmit_skb(net, skb, dnode, dport);

			}

			sock_put(sk);

			sock_put(sk);

			continue;

			continue;

		}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE