tipc: add new functions for multicast and broadcast distribution (078bec82) · Commits · 戴 / test

net/tipc/bcast.c

+54 −1

Original line number	Diff line number	Diff line
		/*
		* net/tipc/bcast.c: TIPC broadcast code
		*
		* Copyright (c) 2004-2006, Ericsson AB
		* Copyright (c) 2004-2006, 2014, Ericsson AB
		* Copyright (c) 2004, Intel Corporation.
		* Copyright (c) 2005, 2010-2011, Wind River Systems
		* All rights reserved.
		@@ -38,6 +38,8 @@
		#include "core.h"
		#include "link.h"
		#include "port.h"
		#include "socket.h"
		#include "msg.h"
		#include "bcast.h"
		#include "name_distr.h"

		@@ -138,6 +140,11 @@ static void tipc_bclink_unlock(void)
		tipc_link_reset_all(node);
		}

		uint tipc_bclink_get_mtu(void)
		{
		return MAX_PKT_DEFAULT_MCAST;
		}

		void tipc_bclink_set_flags(unsigned int flags)
		{
		bclink->flags \|= flags;
		@@ -408,6 +415,52 @@ exit:
		return res;
		}

		/* tipc_bclink_xmit2 - broadcast buffer chain to all nodes in cluster
		* and to identified node local sockets
		* @buf: chain of buffers containing message
		* Consumes the buffer chain, except when returning -ELINKCONG
		* Returns 0 if success, otherwise errno: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE
		*/
		int tipc_bclink_xmit2(struct sk_buff *buf)
		{
		int rc = 0;
		int bc = 0;
		struct sk_buff *clbuf;

		/* Prepare clone of message for local node */
		clbuf = tipc_msg_reassemble(buf);
		if (unlikely(!clbuf)) {
		kfree_skb_list(buf);
		return -EHOSTUNREACH;
		}

		/* Broadcast to all other nodes */
		if (likely(bclink)) {
		tipc_bclink_lock();
		if (likely(bclink->bcast_nodes.count)) {
		rc = __tipc_link_xmit(bcl, buf);
		if (likely(!rc)) {
		bclink_set_last_sent();
		bcl->stats.queue_sz_counts++;
		bcl->stats.accu_queue_sz += bcl->out_queue_size;
		}
		bc = 1;
		}
		tipc_bclink_unlock();
		}

		if (unlikely(!bc))
		kfree_skb_list(buf);

		/* Deliver message clone */
		if (likely(!rc))
		tipc_sk_mcast_rcv(clbuf);
		else
		kfree_skb(clbuf);

		return rc;
		}

		/**
		* bclink_accept_pkt - accept an incoming, in-sequence broadcast packet
		*

net/tipc/bcast.h

+3 −1

Original line number	Diff line number	Diff line
		/*
		* net/tipc/bcast.h: Include file for TIPC broadcast code
		*
		* Copyright (c) 2003-2006, Ericsson AB
		* Copyright (c) 2003-2006, 2014, Ericsson AB
		* Copyright (c) 2005, 2010-2011, Wind River Systems
		* All rights reserved.
		*
		@@ -98,5 +98,7 @@ int tipc_bclink_stats(char *stats_buf, const u32 buf_size);
		int tipc_bclink_reset_stats(void);
		int tipc_bclink_set_queue_limits(u32 limit);
		void tipc_bcbearer_sort(struct tipc_node_map *nm_ptr, u32 node, bool action);
		uint tipc_bclink_get_mtu(void);
		int tipc_bclink_xmit2(struct sk_buff *buf);

		#endif

net/tipc/msg.c

+35 −0

Original line number	Diff line number	Diff line
		@@ -417,3 +417,38 @@ int tipc_msg_eval(struct sk_buff buf, u32 dnode)
		msg_set_destport(msg, dport);
		return TIPC_OK;
		}

		/* tipc_msg_reassemble() - clone a buffer chain of fragments and
		* reassemble the clones into one message
		*/
		struct sk_buff tipc_msg_reassemble(struct sk_buff chain)
		{
		struct sk_buff *buf = chain;
		struct sk_buff *frag = buf;
		struct sk_buff *head = NULL;
		int hdr_sz;

		/* Copy header if single buffer */
		if (!buf->next) {
		hdr_sz = skb_headroom(buf) + msg_hdr_sz(buf_msg(buf));
		return __pskb_copy(buf, hdr_sz, GFP_ATOMIC);
		}

		/* Clone all fragments and reassemble */
		while (buf) {
		frag = skb_clone(buf, GFP_ATOMIC);
		if (!frag)
		goto error;
		frag->next = NULL;
		if (tipc_buf_append(&head, &frag))
		break;
		if (!head)
		goto error;
		buf = buf->next;
		}
		return frag;
		error:
		pr_warn("Failed do clone local mcast rcv buffer\n");
		kfree_skb(head);
		return NULL;
		}

net/tipc/msg.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -744,4 +744,6 @@ bool tipc_msg_make_bundle(struct sk_buff **buf, u32 mtu, u32 dnode);
		int tipc_msg_build2(struct tipc_msg mhdr, struct iovec const iov,
		int offset, int dsz, int mtu , struct sk_buff **chain);

		struct sk_buff tipc_msg_reassemble(struct sk_buff chain);

		#endif

net/tipc/socket.c

+40 −0

Original line number	Diff line number	Diff line
		@@ -534,6 +534,46 @@ static unsigned int tipc_poll(struct file file, struct socket sock,
		return mask;
		}

		/* tipc_sk_mcast_rcv - Deliver multicast message to all destination sockets
		*/
		void tipc_sk_mcast_rcv(struct sk_buff *buf)
		{
		struct tipc_msg *msg = buf_msg(buf);
		struct tipc_port_list dports = {0, NULL, };
		struct tipc_port_list *item;
		struct sk_buff *b;
		uint i, last, dst = 0;
		u32 scope = TIPC_CLUSTER_SCOPE;

		if (in_own_node(msg_orignode(msg)))
		scope = TIPC_NODE_SCOPE;

		/* Create destination port list: */
		tipc_nametbl_mc_translate(msg_nametype(msg),
		msg_namelower(msg),
		msg_nameupper(msg),
		scope,
		&dports);
		last = dports.count;
		if (!last) {
		kfree_skb(buf);
		return;
		}

		for (item = &dports; item; item = item->next) {
		for (i = 0; i < PLSIZE && ++dst <= last; i++) {
		b = (dst != last) ? skb_clone(buf, GFP_ATOMIC) : buf;
		if (!b) {
		pr_warn("Failed do clone mcast rcv buffer\n");
		continue;
		}
		msg_set_destport(msg, item->ports[i]);
		tipc_sk_rcv(b);
		}
		}
		tipc_port_list_free(&dports);
		}

		/**
		* tipc_sk_proto_rcv - receive a connection mng protocol message
		* @tsk: receiving socket

Admin message