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

Merge branch 'tipc-next' 



Jon Maloy says:

====================
tipc: bug fixes and improvements

Intensive and extensive testing has revealed some rather infrequent
problems related to flow control, buffer handling and link
establishment. Commits ##1 to 4 deal with these problems.

The remaining four commits are just code improvments, aiming at
making the code more comprehensible and maintainable. There are
no functional enhancements in this series.

v2: Fixed a typo in commit log #2. Otherwise no changes from v1.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3fdddd85 9816f061

net/tipc/bcast.c

+3 −7
Original line number Diff line number Diff line
@@ -506,18 +506,14 @@ receive: 
			tipc_node_unlock(node);

			tipc_link_bundle_rcv(buf);

		} else if (msg_user(msg) == MSG_FRAGMENTER) {

			int ret;

			ret = tipc_link_frag_rcv(&node->bclink.reasm_head,

						 &node->bclink.reasm_tail,

						 &buf);

			if (ret == LINK_REASM_ERROR)

			tipc_buf_append(&node->bclink.reasm_buf, &buf);

			if (unlikely(!buf && !node->bclink.reasm_buf))

				goto unlock;

			tipc_bclink_lock();

			bclink_accept_pkt(node, seqno);

			bcl->stats.recv_fragments++;

			if (ret == LINK_REASM_COMPLETE) {

			if (buf) {

				bcl->stats.recv_fragmented++;

				/* Point msg to inner header */

				msg = buf_msg(buf);

				tipc_bclink_unlock();

				goto receive;

net/tipc/bearer.c

+7 −29
Original line number Diff line number Diff line
@@ -411,28 +411,6 @@ int tipc_disable_bearer(const char *name) 
	return res;

}





/* tipc_l2_media_addr_set - initialize Ethernet media address structure

 *

 * Media-dependent "value" field stores MAC address in first 6 bytes

 * and zeroes out the remaining bytes.

 */

void tipc_l2_media_addr_set(const struct tipc_bearer *b,

			    struct tipc_media_addr *a, char *mac)

{

	int len = b->media->hwaddr_len;



	if (unlikely(sizeof(a->value) < len)) {

		WARN_ONCE(1, "Media length invalid\n");

		return;

	}



	memcpy(a->value, mac, len);

	memset(a->value + len, 0, sizeof(a->value) - len);

	a->media_id = b->media->type_id;

	a->broadcast = !memcmp(mac, b->bcast_addr.value, len);

}



int tipc_enable_l2_media(struct tipc_bearer *b)

{

	struct net_device *dev;
@@ -443,21 +421,21 @@ int tipc_enable_l2_media(struct tipc_bearer *b) 
	if (!dev)

		return -ENODEV;



	/* Associate TIPC bearer with Ethernet bearer */

	/* Associate TIPC bearer with L2 bearer */

	rcu_assign_pointer(b->media_ptr, dev);

	memset(b->bcast_addr.value, 0, sizeof(b->bcast_addr.value));

	memset(&b->bcast_addr, 0, sizeof(b->bcast_addr));

	memcpy(b->bcast_addr.value, dev->broadcast, b->media->hwaddr_len);

	b->bcast_addr.media_id = b->media->type_id;

	b->bcast_addr.broadcast = 1;

	b->mtu = dev->mtu;

	tipc_l2_media_addr_set(b, &b->addr, (char *)dev->dev_addr);

	b->media->raw2addr(b, &b->addr, (char *)dev->dev_addr);

	rcu_assign_pointer(dev->tipc_ptr, b);

	return 0;

}



/* tipc_disable_l2_media - detach TIPC bearer from an Ethernet interface

/* tipc_disable_l2_media - detach TIPC bearer from an L2 interface

 *

 * Mark Ethernet bearer as inactive so that incoming buffers are thrown away,

 * Mark L2 bearer as inactive so that incoming buffers are thrown away,

 * then get worker thread to complete bearer cleanup.  (Can't do cleanup

 * here because cleanup code needs to sleep and caller holds spinlocks.)

 */
@@ -473,7 +451,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b) 
}



/**

 * tipc_l2_send_msg - send a TIPC packet out over an Ethernet interface

 * tipc_l2_send_msg - send a TIPC packet out over an L2 interface

 * @buf: the packet to be sent

 * @b_ptr: the bearer through which the packet is to be sent

 * @dest: peer destination address
@@ -597,7 +575,7 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt, 
		tipc_reset_bearer(b_ptr);

		break;

	case NETDEV_CHANGEADDR:

		tipc_l2_media_addr_set(b_ptr, &b_ptr->addr,

		b_ptr->media->raw2addr(b_ptr, &b_ptr->addr,

				       (char *)dev->dev_addr);

		tipc_reset_bearer(b_ptr);

		break;

net/tipc/bearer.h

+19 −16
Original line number Diff line number Diff line
@@ -42,14 +42,12 @@ 
#define MAX_BEARERS	2

#define MAX_MEDIA	2



/*

 * Identifiers associated with TIPC message header media address info

 *

 * - address info field is 20 bytes long

 * - media type identifier located at offset 3

 * - remaining bytes vary according to media type

/* Identifiers associated with TIPC message header media address info

 * - address info field is 32 bytes long

 * - the field's actual content and length is defined per media

 * - remaining unused bytes in the field are set to zero

 */

#define TIPC_MEDIA_ADDR_SIZE	20

#define TIPC_MEDIA_ADDR_SIZE	32

#define TIPC_MEDIA_TYPE_OFFSET	3



/*
@@ -77,9 +75,10 @@ struct tipc_bearer; 
 * @send_msg: routine which handles buffer transmission

 * @enable_media: routine which enables a media

 * @disable_media: routine which disables a media

 * @addr2str: routine which converts media address to string

 * @addr2msg: routine which converts media address to protocol message area

 * @msg2addr: routine which converts media address from protocol message area

 * @addr2str: convert media address format to string

 * @addr2msg: convert from media addr format to discovery msg addr format

 * @msg2addr: convert from discovery msg addr format to media addr format

 * @raw2addr: convert from raw addr format to media addr format

 * @priority: default link (and bearer) priority

 * @tolerance: default time (in ms) before declaring link failure

 * @window: default window (in packets) before declaring link congestion
@@ -93,10 +92,16 @@ struct tipc_media { 
			struct tipc_media_addr *dest);

	int (*enable_media)(struct tipc_bearer *b_ptr);

	void (*disable_media)(struct tipc_bearer *b_ptr);

	int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size);

	int (*addr2msg)(struct tipc_media_addr *a, char *msg_area);

	int (*msg2addr)(const struct tipc_bearer *b_ptr,

			struct tipc_media_addr *a, char *msg_area);

	int (*addr2str)(struct tipc_media_addr *addr,

			char *strbuf,

			int bufsz);

	int (*addr2msg)(char *msg, struct tipc_media_addr *addr);

	int (*msg2addr)(struct tipc_bearer *b,

			struct tipc_media_addr *addr,

			char *msg);

	int (*raw2addr)(struct tipc_bearer *b,

			struct tipc_media_addr *addr,

			char *raw);

	u32 priority;

	u32 tolerance;

	u32 window;
@@ -175,8 +180,6 @@ int tipc_media_set_priority(const char *name, u32 new_value); 
int tipc_media_set_window(const char *name, u32 new_value);

void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);

struct sk_buff *tipc_media_get_names(void);

void tipc_l2_media_addr_set(const struct tipc_bearer *b,

			    struct tipc_media_addr *a, char *mac);

int tipc_enable_l2_media(struct tipc_bearer *b);

void tipc_disable_l2_media(struct tipc_bearer *b);

int tipc_l2_send_msg(struct sk_buff *buf, struct tipc_bearer *b,

net/tipc/core.c

+4 −3
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ static int __init tipc_init(void) 
	tipc_max_ports = CONFIG_TIPC_PORTS;

	tipc_net_id = 4711;



	sysctl_tipc_rmem[0] = CONN_OVERLOAD_LIMIT >> 4 << TIPC_LOW_IMPORTANCE;

	sysctl_tipc_rmem[1] = CONN_OVERLOAD_LIMIT >> 4 <<

	sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_LOW_IMPORTANCE;

	sysctl_tipc_rmem[1] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<

			      TIPC_CRITICAL_IMPORTANCE;

	sysctl_tipc_rmem[2] = CONN_OVERLOAD_LIMIT;

	sysctl_tipc_rmem[2] = TIPC_CONN_OVERLOAD_LIMIT;



	res = tipc_core_start();

	if (res)

net/tipc/core.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/rtnetlink.h>

#include <linux/etherdevice.h>



#define TIPC_MOD_VER "2.0.0"
@@ -187,6 +188,7 @@ static inline void k_term_timer(struct timer_list *timer) 
struct tipc_skb_cb {

	void *handle;

	bool deferred;

	struct sk_buff *tail;

};



#define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0]))

CRA Git | Maintained and supported by SUSTech CRA and CCSE