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

Merge branch 'tipc-ipoib' 



Patrick McHardy says:

====================
The following patchset adds support for running TIPC over InfiniBand.
The patchset consists of three parts (+ a minor fix for the ethernet media
type):

- Preparation: removal of an the unused str2addr callback and move of the
  bcast_addr from struct tipc_media to struct tipc_bearer. This is necessary
  because InfiniBand doesn't have a fixed broadcast address like ethernet,
  so it needs to be initialized with the device's broadcast address when
  the bearer is enabled

- Introduction of a TIPC InfiniBand media type. A new media type is needed
  to deal with the different address sizes

- Support for ETH_P_TIPC in IPoIB

Since the last posting I've addressed all feedback I received and rebased
to the current net-next tree.

I consider these patches ready for merging. Since they mainly affect TIPC
code, I'd propose to have them either go through the TIPC tree or through
Dave directly (not sure how TIPC patches are managed).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a6bda459 dc850b0e

drivers/infiniband/ulp/ipoib/ipoib_main.c

+3 −1
Original line number Diff line number Diff line
@@ -730,7 +730,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		if ((header->proto != htons(ETH_P_IP)) &&

		    (header->proto != htons(ETH_P_IPV6)) &&

		    (header->proto != htons(ETH_P_ARP)) &&

		    (header->proto != htons(ETH_P_RARP))) {

		    (header->proto != htons(ETH_P_RARP)) &&

		    (header->proto != htons(ETH_P_TIPC))) {

			/* ethertype not supported by IPoIB */

			++dev->stats.tx_dropped;

			dev_kfree_skb_any(skb);
@@ -751,6 +752,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	switch (header->proto) {

	case htons(ETH_P_IP):

	case htons(ETH_P_IPV6):

	case htons(ETH_P_TIPC):

		neigh = ipoib_neigh_get(dev, cb->hwaddr);

		if (unlikely(!neigh)) {

			neigh_add_path(skb, cb->hwaddr, dev);

net/tipc/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -31,3 +31,10 @@ config TIPC_PORTS 


	  Setting this to a smaller value saves some memory,

	  setting it to higher allows for more ports.



config TIPC_MEDIA_IB

	bool "InfiniBand media type support"

	depends on TIPC && INFINIBAND_IPOIB

	help

	  Saying Y here will enable support for running TIPC on

	  IP-over-InfiniBand devices.

net/tipc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ tipc-y += addr.o bcast.o bearer.o config.o \ 
	   name_distr.o  subscr.o name_table.o net.o  \

	   netlink.o node.o node_subscr.o port.o ref.o  \

	   socket.o log.o eth_media.o



tipc-$(CONFIG_TIPC_MEDIA_IB)	+= ib_media.o

net/tipc/bcast.c

+2 −2
Original line number Diff line number Diff line
@@ -620,10 +620,10 @@ static int tipc_bcbearer_send(struct sk_buff *buf, 
			continue;	/* bearer pair doesn't add anything */



		if (!tipc_bearer_blocked(p))

			tipc_bearer_send(p, buf, &p->media->bcast_addr);

			tipc_bearer_send(p, buf, &p->bcast_addr);

		else if (s && !tipc_bearer_blocked(s))

			/* unable to send on primary bearer */

			tipc_bearer_send(s, buf, &s->media->bcast_addr);

			tipc_bearer_send(s, buf, &s->bcast_addr);

		else

			/* unable to send on either bearer */

			continue;

net/tipc/bearer.c

+2 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "bearer.h"

#include "discover.h"



#define MAX_ADDR_STR 32

#define MAX_ADDR_STR 60



static struct tipc_media *media_list[MAX_MEDIA];

static u32 media_count;
@@ -89,9 +89,6 @@ int tipc_register_media(struct tipc_media *m_ptr) 


	if ((strlen(m_ptr->name) + 1) > TIPC_MAX_MEDIA_NAME)

		goto exit;

	if ((m_ptr->bcast_addr.media_id != m_ptr->type_id) ||

	    !m_ptr->bcast_addr.broadcast)

		goto exit;

	if (m_ptr->priority > TIPC_MAX_LINK_PRI)

		goto exit;

	if ((m_ptr->tolerance < TIPC_MIN_LINK_TOL) ||
@@ -407,7 +404,7 @@ restart: 
	INIT_LIST_HEAD(&b_ptr->links);

	spin_lock_init(&b_ptr->lock);



	res = tipc_disc_create(b_ptr, &m_ptr->bcast_addr, disc_domain);

	res = tipc_disc_create(b_ptr, &b_ptr->bcast_addr, disc_domain);

	if (res) {

		bearer_disable(b_ptr);

		pr_warn("Bearer <%s> rejected, discovery object creation failed\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE