2013-04-17 00:18:28 -06:00
|
|
|
/*
|
|
|
|
* net/tipc/ib_media.c: Infiniband bearer support for TIPC
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013 Patrick McHardy <kaber@trash.net>
|
|
|
|
*
|
|
|
|
* Based on eth_media.c, which carries the following copyright notice:
|
|
|
|
*
|
|
|
|
* Copyright (c) 2001-2007, Ericsson AB
|
|
|
|
* Copyright (c) 2005-2008, 2011, Wind River Systems
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived from
|
|
|
|
* this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
|
|
* Software Foundation.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/if_infiniband.h>
|
|
|
|
#include "core.h"
|
|
|
|
#include "bearer.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ib_media_addr_set - initialize Infiniband media address structure
|
|
|
|
*
|
|
|
|
* Media-dependent "value" field stores MAC address in first 6 bytes
|
|
|
|
* and zeroes out the remaining bytes.
|
|
|
|
*/
|
|
|
|
static void ib_media_addr_set(const struct tipc_bearer *tb_ptr,
|
|
|
|
struct tipc_media_addr *a, char *mac)
|
|
|
|
{
|
|
|
|
BUILD_BUG_ON(sizeof(a->value) < INFINIBAND_ALEN);
|
|
|
|
memcpy(a->value, mac, INFINIBAND_ALEN);
|
|
|
|
a->media_id = TIPC_MEDIA_TYPE_IB;
|
|
|
|
a->broadcast = !memcmp(mac, tb_ptr->bcast_addr.value, INFINIBAND_ALEN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* send_msg - send a TIPC message out over an InfiniBand interface
|
|
|
|
*/
|
|
|
|
static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
|
|
|
|
struct tipc_media_addr *dest)
|
|
|
|
{
|
|
|
|
struct sk_buff *clone;
|
|
|
|
int delta;
|
tipc: relocate common functions from media to bearer
Currently, registering a TIPC stack handler in the network device layer
is done twice, once for Ethernet (eth_media) and Infiniband (ib_media)
repectively. But, as this registration is not media specific, we can
avoid some code duplication by moving the registering function to
the generic bearer layer, to the file bearer.c, and call it only once.
The same is true for the network device event notifier.
As a side effect, the two workqueues we are using for for setting up/
cleaning up media can now be eliminated. Furthermore, the array for
storing the specific media type structs, media_array[], can be entirely
deleted.
Note that the eth_started and ib_started flags were removed during the
code relocation. There is now only one call to bearer_setup and
bearer_cleanup, and these can logically not race against each other.
Despite its size, this cleanup work incurs no functional changes in TIPC.
In particular, it should be noted that the sequence ordering of received
packets is unaffected by this change, since packet reception never was
subject to any work queue handling in the first place.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:42 -07:00
|
|
|
struct net_device *dev = tb_ptr->dev;
|
2013-04-17 00:18:28 -06:00
|
|
|
|
|
|
|
clone = skb_clone(buf, GFP_ATOMIC);
|
|
|
|
if (!clone)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
delta = dev->hard_header_len - skb_headroom(buf);
|
|
|
|
if ((delta > 0) &&
|
|
|
|
pskb_expand_head(clone, SKB_DATA_ALIGN(delta), 0, GFP_ATOMIC)) {
|
|
|
|
kfree_skb(clone);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb_reset_network_header(clone);
|
|
|
|
clone->dev = dev;
|
|
|
|
clone->protocol = htons(ETH_P_TIPC);
|
|
|
|
dev_hard_header(clone, dev, ETH_P_TIPC, dest->value,
|
|
|
|
dev->dev_addr, clone->len);
|
|
|
|
dev_queue_xmit(clone);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2013-10-17 23:23:17 -06:00
|
|
|
* enable_media - attach TIPC bearer to an InfiniBand interface
|
2013-04-17 00:18:28 -06:00
|
|
|
*/
|
2013-10-17 23:23:17 -06:00
|
|
|
static int enable_media(struct tipc_bearer *tb_ptr)
|
2013-04-17 00:18:28 -06:00
|
|
|
{
|
2013-06-17 08:54:51 -06:00
|
|
|
struct net_device *dev;
|
2013-04-17 00:18:28 -06:00
|
|
|
char *driver_name = strchr((const char *)tb_ptr->name, ':') + 1;
|
|
|
|
|
|
|
|
/* Find device with specified name */
|
2013-06-17 08:54:51 -06:00
|
|
|
dev = dev_get_by_name(&init_net, driver_name);
|
2013-04-17 00:18:28 -06:00
|
|
|
if (!dev)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
/* Associate TIPC bearer with InfiniBand bearer */
|
tipc: remove TIPC usage of field af_packet_priv in struct net_device
TIPC is currently using the field 'af_packet_priv' in struct net_device
as a handle to find the bearer instance associated to the given network
device. But, by doing so it is blocking other networking cleanups, such
as the one discussed here:
http://patchwork.ozlabs.org/patch/178044/
This commit removes this usage from TIPC. Instead, we introduce a new
field, 'tipc_ptr', to the net_device structure, to serve this purpose.
When TIPC bearer is enabled, the bearer object is associated to
'tipc_ptr'. When a TIPC packet arrives in the recv_msg() upcall
from a networking device, the bearer object can now be obtained from
'tipc_ptr'. When a bearer is disabled, the bearer object is detached
from its underlying network device by setting 'tipc_ptr' to NULL.
Additionally, an RCU lock is used to protect the new pointer.
Henceforth, the existing tipc_net_lock is used in write mode to
serialize write accesses to this pointer, while the new RCU lock is
applied on the read side to ensure that the pointer is 100% valid
within its wrapped area for all readers.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:41 -07:00
|
|
|
tb_ptr->dev = dev;
|
tipc: relocate common functions from media to bearer
Currently, registering a TIPC stack handler in the network device layer
is done twice, once for Ethernet (eth_media) and Infiniband (ib_media)
repectively. But, as this registration is not media specific, we can
avoid some code duplication by moving the registering function to
the generic bearer layer, to the file bearer.c, and call it only once.
The same is true for the network device event notifier.
As a side effect, the two workqueues we are using for for setting up/
cleaning up media can now be eliminated. Furthermore, the array for
storing the specific media type structs, media_array[], can be entirely
deleted.
Note that the eth_started and ib_started flags were removed during the
code relocation. There is now only one call to bearer_setup and
bearer_cleanup, and these can logically not race against each other.
Despite its size, this cleanup work incurs no functional changes in TIPC.
In particular, it should be noted that the sequence ordering of received
packets is unaffected by this change, since packet reception never was
subject to any work queue handling in the first place.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:42 -07:00
|
|
|
tb_ptr->usr_handle = NULL;
|
2013-04-17 00:18:28 -06:00
|
|
|
memset(tb_ptr->bcast_addr.value, 0, sizeof(tb_ptr->bcast_addr.value));
|
|
|
|
memcpy(tb_ptr->bcast_addr.value, dev->broadcast, INFINIBAND_ALEN);
|
|
|
|
tb_ptr->bcast_addr.media_id = TIPC_MEDIA_TYPE_IB;
|
|
|
|
tb_ptr->bcast_addr.broadcast = 1;
|
|
|
|
tb_ptr->mtu = dev->mtu;
|
|
|
|
ib_media_addr_set(tb_ptr, &tb_ptr->addr, (char *)dev->dev_addr);
|
tipc: remove TIPC usage of field af_packet_priv in struct net_device
TIPC is currently using the field 'af_packet_priv' in struct net_device
as a handle to find the bearer instance associated to the given network
device. But, by doing so it is blocking other networking cleanups, such
as the one discussed here:
http://patchwork.ozlabs.org/patch/178044/
This commit removes this usage from TIPC. Instead, we introduce a new
field, 'tipc_ptr', to the net_device structure, to serve this purpose.
When TIPC bearer is enabled, the bearer object is associated to
'tipc_ptr'. When a TIPC packet arrives in the recv_msg() upcall
from a networking device, the bearer object can now be obtained from
'tipc_ptr'. When a bearer is disabled, the bearer object is detached
from its underlying network device by setting 'tipc_ptr' to NULL.
Additionally, an RCU lock is used to protect the new pointer.
Henceforth, the existing tipc_net_lock is used in write mode to
serialize write accesses to this pointer, while the new RCU lock is
applied on the read side to ensure that the pointer is 100% valid
within its wrapped area for all readers.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:41 -07:00
|
|
|
rcu_assign_pointer(dev->tipc_ptr, tb_ptr);
|
2013-04-17 00:18:28 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2013-10-17 23:23:17 -06:00
|
|
|
* disable_media - detach TIPC bearer from an InfiniBand interface
|
2013-04-17 00:18:28 -06:00
|
|
|
*
|
|
|
|
* Mark InfiniBand 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.)
|
|
|
|
*/
|
2013-10-17 23:23:17 -06:00
|
|
|
static void disable_media(struct tipc_bearer *tb_ptr)
|
2013-04-17 00:18:28 -06:00
|
|
|
{
|
tipc: remove TIPC usage of field af_packet_priv in struct net_device
TIPC is currently using the field 'af_packet_priv' in struct net_device
as a handle to find the bearer instance associated to the given network
device. But, by doing so it is blocking other networking cleanups, such
as the one discussed here:
http://patchwork.ozlabs.org/patch/178044/
This commit removes this usage from TIPC. Instead, we introduce a new
field, 'tipc_ptr', to the net_device structure, to serve this purpose.
When TIPC bearer is enabled, the bearer object is associated to
'tipc_ptr'. When a TIPC packet arrives in the recv_msg() upcall
from a networking device, the bearer object can now be obtained from
'tipc_ptr'. When a bearer is disabled, the bearer object is detached
from its underlying network device by setting 'tipc_ptr' to NULL.
Additionally, an RCU lock is used to protect the new pointer.
Henceforth, the existing tipc_net_lock is used in write mode to
serialize write accesses to this pointer, while the new RCU lock is
applied on the read side to ensure that the pointer is 100% valid
within its wrapped area for all readers.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:41 -07:00
|
|
|
RCU_INIT_POINTER(tb_ptr->dev->tipc_ptr, NULL);
|
tipc: relocate common functions from media to bearer
Currently, registering a TIPC stack handler in the network device layer
is done twice, once for Ethernet (eth_media) and Infiniband (ib_media)
repectively. But, as this registration is not media specific, we can
avoid some code duplication by moving the registering function to
the generic bearer layer, to the file bearer.c, and call it only once.
The same is true for the network device event notifier.
As a side effect, the two workqueues we are using for for setting up/
cleaning up media can now be eliminated. Furthermore, the array for
storing the specific media type structs, media_array[], can be entirely
deleted.
Note that the eth_started and ib_started flags were removed during the
code relocation. There is now only one call to bearer_setup and
bearer_cleanup, and these can logically not race against each other.
Despite its size, this cleanup work incurs no functional changes in TIPC.
In particular, it should be noted that the sequence ordering of received
packets is unaffected by this change, since packet reception never was
subject to any work queue handling in the first place.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-10 21:45:42 -07:00
|
|
|
dev_put(tb_ptr->dev);
|
2013-04-17 00:18:28 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ib_addr2str - convert InfiniBand address to string
|
|
|
|
*/
|
|
|
|
static int ib_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size)
|
|
|
|
{
|
|
|
|
if (str_size < 60) /* 60 = 19 * strlen("xx:") + strlen("xx\0") */
|
|
|
|
return 1;
|
|
|
|
|
2013-07-10 08:30:34 -06:00
|
|
|
sprintf(str_buf, "%20phC", a->value);
|
2013-04-17 00:18:28 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ib_addr2msg - convert InfiniBand address format to message header format
|
|
|
|
*/
|
|
|
|
static int ib_addr2msg(struct tipc_media_addr *a, char *msg_area)
|
|
|
|
{
|
|
|
|
memset(msg_area, 0, TIPC_MEDIA_ADDR_SIZE);
|
|
|
|
msg_area[TIPC_MEDIA_TYPE_OFFSET] = TIPC_MEDIA_TYPE_IB;
|
|
|
|
memcpy(msg_area, a->value, INFINIBAND_ALEN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ib_msg2addr - convert message header address format to InfiniBand format
|
|
|
|
*/
|
|
|
|
static int ib_msg2addr(const struct tipc_bearer *tb_ptr,
|
|
|
|
struct tipc_media_addr *a, char *msg_area)
|
|
|
|
{
|
|
|
|
ib_media_addr_set(tb_ptr, a, msg_area);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* InfiniBand media registration info
|
|
|
|
*/
|
2013-12-10 21:45:39 -07:00
|
|
|
struct tipc_media ib_media_info = {
|
2013-04-17 00:18:28 -06:00
|
|
|
.send_msg = send_msg,
|
2013-10-17 23:23:17 -06:00
|
|
|
.enable_media = enable_media,
|
|
|
|
.disable_media = disable_media,
|
2013-04-17 00:18:28 -06:00
|
|
|
.addr2str = ib_addr2str,
|
|
|
|
.addr2msg = ib_addr2msg,
|
|
|
|
.msg2addr = ib_msg2addr,
|
|
|
|
.priority = TIPC_DEF_LINK_PRI,
|
|
|
|
.tolerance = TIPC_DEF_LINK_TOL,
|
|
|
|
.window = TIPC_DEF_LINK_WIN,
|
|
|
|
.type_id = TIPC_MEDIA_TYPE_IB,
|
|
|
|
.name = "ib"
|
|
|
|
};
|
|
|
|
|