2006-06-17 21:37:28 -06:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2005 Voltaire Inc. All rights reserved.
|
|
|
|
* Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
|
|
|
|
* Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
|
|
|
|
* Copyright (c) 2005 Intel Corporation. All rights reserved.
|
|
|
|
*
|
2008-07-15 00:48:43 -06:00
|
|
|
* This software is available to you under a choice of one of two
|
|
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
|
|
* General Public License (GPL) Version 2, available from the file
|
|
|
|
* COPYING in the main directory of this source tree, or the
|
|
|
|
* OpenIB.org BSD license below:
|
2006-06-17 21:37:28 -06:00
|
|
|
*
|
2008-07-15 00:48:43 -06:00
|
|
|
* Redistribution and use in source and binary forms, with or
|
|
|
|
* without modification, are permitted provided that the following
|
|
|
|
* conditions are met:
|
2006-06-17 21:37:28 -06:00
|
|
|
*
|
2008-07-15 00:48:43 -06:00
|
|
|
* - Redistributions of source code must retain the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer.
|
2006-06-17 21:37:28 -06:00
|
|
|
*
|
2008-07-15 00:48:43 -06:00
|
|
|
* - 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.
|
2006-06-17 21:37:28 -06:00
|
|
|
*
|
2008-07-15 00:48:43 -06:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
2006-06-17 21:37:28 -06:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/inetdevice.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2006-06-17 21:37:28 -06:00
|
|
|
#include <linux/workqueue.h>
|
2011-05-27 13:35:46 -06:00
|
|
|
#include <linux/module.h>
|
2006-06-17 21:37:28 -06:00
|
|
|
#include <net/arp.h>
|
|
|
|
#include <net/neighbour.h>
|
|
|
|
#include <net/route.h>
|
2006-07-30 21:44:19 -06:00
|
|
|
#include <net/netevent.h>
|
2008-12-24 11:16:37 -07:00
|
|
|
#include <net/addrconf.h>
|
|
|
|
#include <net/ip6_route.h>
|
2006-06-17 21:37:28 -06:00
|
|
|
#include <rdma/ib_addr.h>
|
2013-05-29 11:09:10 -06:00
|
|
|
#include <rdma/ib.h>
|
2016-05-19 08:12:36 -06:00
|
|
|
#include <rdma/rdma_netlink.h>
|
|
|
|
#include <net/netlink.h>
|
|
|
|
|
|
|
|
#include "core_priv.h"
|
2006-06-17 21:37:28 -06:00
|
|
|
|
|
|
|
struct addr_req {
|
|
|
|
struct list_head list;
|
2008-12-24 11:16:37 -07:00
|
|
|
struct sockaddr_storage src_addr;
|
|
|
|
struct sockaddr_storage dst_addr;
|
2006-06-17 21:37:28 -06:00
|
|
|
struct rdma_dev_addr *addr;
|
2006-10-31 12:12:59 -07:00
|
|
|
struct rdma_addr_client *client;
|
2006-06-17 21:37:28 -06:00
|
|
|
void *context;
|
|
|
|
void (*callback)(int status, struct sockaddr *src_addr,
|
|
|
|
struct rdma_dev_addr *addr, void *context);
|
|
|
|
unsigned long timeout;
|
|
|
|
int status;
|
2016-05-19 08:12:36 -06:00
|
|
|
u32 seq;
|
2006-06-17 21:37:28 -06:00
|
|
|
};
|
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
static atomic_t ib_nl_addr_request_seq = ATOMIC_INIT(0);
|
|
|
|
|
2006-11-22 07:57:56 -07:00
|
|
|
static void process_req(struct work_struct *work);
|
2006-06-17 21:37:28 -06:00
|
|
|
|
|
|
|
static DEFINE_MUTEX(lock);
|
|
|
|
static LIST_HEAD(req_list);
|
2006-11-22 07:57:56 -07:00
|
|
|
static DECLARE_DELAYED_WORK(work, process_req);
|
2006-06-17 21:37:28 -06:00
|
|
|
static struct workqueue_struct *addr_wq;
|
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
static const struct nla_policy ib_nl_addr_policy[LS_NLA_TYPE_MAX] = {
|
|
|
|
[LS_NLA_TYPE_DGID] = {.type = NLA_BINARY,
|
|
|
|
.len = sizeof(struct rdma_nla_ls_gid)},
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline bool ib_nl_is_good_ip_resp(const struct nlmsghdr *nlh)
|
|
|
|
{
|
|
|
|
struct nlattr *tb[LS_NLA_TYPE_MAX] = {};
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (nlh->nlmsg_flags & RDMA_NL_LS_F_ERR)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
ret = nla_parse(tb, LS_NLA_TYPE_MAX - 1, nlmsg_data(nlh),
|
|
|
|
nlmsg_len(nlh), ib_nl_addr_policy);
|
|
|
|
if (ret)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ib_nl_process_good_ip_rsep(const struct nlmsghdr *nlh)
|
|
|
|
{
|
|
|
|
const struct nlattr *head, *curr;
|
|
|
|
union ib_gid gid;
|
|
|
|
struct addr_req *req;
|
|
|
|
int len, rem;
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
head = (const struct nlattr *)nlmsg_data(nlh);
|
|
|
|
len = nlmsg_len(nlh);
|
|
|
|
|
|
|
|
nla_for_each_attr(curr, head, len, rem) {
|
|
|
|
if (curr->nla_type == LS_NLA_TYPE_DGID)
|
|
|
|
memcpy(&gid, nla_data(curr), nla_len(curr));
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_lock(&lock);
|
|
|
|
list_for_each_entry(req, &req_list, list) {
|
|
|
|
if (nlh->nlmsg_seq != req->seq)
|
|
|
|
continue;
|
|
|
|
/* We set the DGID part, the rest was set earlier */
|
|
|
|
rdma_addr_set_dgid(req->addr, &gid);
|
|
|
|
req->status = 0;
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mutex_unlock(&lock);
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
pr_info("Couldn't find request waiting for DGID: %pI6\n",
|
|
|
|
&gid);
|
|
|
|
}
|
|
|
|
|
|
|
|
int ib_nl_handle_ip_res_resp(struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb)
|
|
|
|
{
|
|
|
|
const struct nlmsghdr *nlh = (struct nlmsghdr *)cb->nlh;
|
|
|
|
|
|
|
|
if ((nlh->nlmsg_flags & NLM_F_REQUEST) ||
|
|
|
|
!(NETLINK_CB(skb).sk) ||
|
|
|
|
!netlink_capable(skb, CAP_NET_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
if (ib_nl_is_good_ip_resp(nlh))
|
|
|
|
ib_nl_process_good_ip_rsep(nlh);
|
|
|
|
|
|
|
|
return skb->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr,
|
|
|
|
const void *daddr,
|
|
|
|
u32 seq, u16 family)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb = NULL;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
struct rdma_ls_ip_resolve_header *header;
|
|
|
|
void *data;
|
|
|
|
size_t size;
|
|
|
|
int attrtype;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (family == AF_INET) {
|
|
|
|
size = sizeof(struct in_addr);
|
|
|
|
attrtype = RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_IPV4;
|
|
|
|
} else {
|
|
|
|
size = sizeof(struct in6_addr);
|
|
|
|
attrtype = RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_IPV6;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = nla_total_size(sizeof(size));
|
|
|
|
len += NLMSG_ALIGN(sizeof(*header));
|
|
|
|
|
|
|
|
skb = nlmsg_new(len, GFP_KERNEL);
|
|
|
|
if (!skb)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
data = ibnl_put_msg(skb, &nlh, seq, 0, RDMA_NL_LS,
|
|
|
|
RDMA_NL_LS_OP_IP_RESOLVE, NLM_F_REQUEST);
|
|
|
|
if (!data) {
|
|
|
|
nlmsg_free(skb);
|
|
|
|
return -ENODATA;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Construct the family header first */
|
|
|
|
header = (struct rdma_ls_ip_resolve_header *)
|
|
|
|
skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
|
|
|
|
header->ifindex = dev_addr->bound_dev_if;
|
|
|
|
nla_put(skb, attrtype, size, daddr);
|
|
|
|
|
|
|
|
/* Repair the nlmsg header length */
|
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
ibnl_multicast(skb, nlh, RDMA_NL_GROUP_LS, GFP_KERNEL);
|
|
|
|
|
|
|
|
/* Make the request retry, so when we get the response from userspace
|
|
|
|
* we will have something.
|
|
|
|
*/
|
|
|
|
return -ENODATA;
|
|
|
|
}
|
|
|
|
|
2013-05-29 11:09:10 -06:00
|
|
|
int rdma_addr_size(struct sockaddr *addr)
|
|
|
|
{
|
|
|
|
switch (addr->sa_family) {
|
|
|
|
case AF_INET:
|
|
|
|
return sizeof(struct sockaddr_in);
|
|
|
|
case AF_INET6:
|
|
|
|
return sizeof(struct sockaddr_in6);
|
|
|
|
case AF_IB:
|
|
|
|
return sizeof(struct sockaddr_ib);
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_addr_size);
|
|
|
|
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
static struct rdma_addr_client self;
|
|
|
|
|
2006-10-31 12:12:59 -07:00
|
|
|
void rdma_addr_register_client(struct rdma_addr_client *client)
|
|
|
|
{
|
|
|
|
atomic_set(&client->refcount, 1);
|
|
|
|
init_completion(&client->comp);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_addr_register_client);
|
|
|
|
|
|
|
|
static inline void put_client(struct rdma_addr_client *client)
|
|
|
|
{
|
|
|
|
if (atomic_dec_and_test(&client->refcount))
|
|
|
|
complete(&client->comp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void rdma_addr_unregister_client(struct rdma_addr_client *client)
|
|
|
|
{
|
|
|
|
put_client(client);
|
|
|
|
wait_for_completion(&client->comp);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_addr_unregister_client);
|
|
|
|
|
2006-08-03 15:02:42 -06:00
|
|
|
int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
|
|
|
|
const unsigned char *dst_dev_addr)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
2009-11-19 13:57:18 -07:00
|
|
|
dev_addr->dev_type = dev->type;
|
2006-06-17 21:37:28 -06:00
|
|
|
memcpy(dev_addr->src_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
|
|
|
|
memcpy(dev_addr->broadcast, dev->broadcast, MAX_ADDR_LEN);
|
|
|
|
if (dst_dev_addr)
|
|
|
|
memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
|
2009-11-19 13:55:22 -07:00
|
|
|
dev_addr->bound_dev_if = dev->ifindex;
|
2006-06-17 21:37:28 -06:00
|
|
|
return 0;
|
|
|
|
}
|
2006-08-03 15:02:42 -06:00
|
|
|
EXPORT_SYMBOL(rdma_copy_addr);
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
int rdma_translate_ip(const struct sockaddr *addr,
|
|
|
|
struct rdma_dev_addr *dev_addr,
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
u16 *vlan_id)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
|
|
|
struct net_device *dev;
|
2008-12-24 11:16:37 -07:00
|
|
|
int ret = -EADDRNOTAVAIL;
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2009-11-19 13:55:22 -07:00
|
|
|
if (dev_addr->bound_dev_if) {
|
2015-10-22 06:20:08 -06:00
|
|
|
dev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
|
2009-11-19 13:55:22 -07:00
|
|
|
if (!dev)
|
|
|
|
return -ENODEV;
|
|
|
|
ret = rdma_copy_addr(dev_addr, dev, NULL);
|
|
|
|
dev_put(dev);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-12-24 11:16:37 -07:00
|
|
|
switch (addr->sa_family) {
|
|
|
|
case AF_INET:
|
2015-10-22 06:20:08 -06:00
|
|
|
dev = ip_dev_find(dev_addr->net,
|
2015-12-23 05:56:53 -07:00
|
|
|
((const struct sockaddr_in *)addr)->sin_addr.s_addr);
|
2008-12-24 11:16:37 -07:00
|
|
|
|
|
|
|
if (!dev)
|
|
|
|
return ret;
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2008-12-24 11:16:37 -07:00
|
|
|
ret = rdma_copy_addr(dev_addr, dev, NULL);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
if (vlan_id)
|
|
|
|
*vlan_id = rdma_vlan_dev_vlan_id(dev);
|
2008-12-24 11:16:37 -07:00
|
|
|
dev_put(dev);
|
|
|
|
break;
|
2012-07-05 23:39:34 -06:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2008-12-24 11:16:37 -07:00
|
|
|
case AF_INET6:
|
2010-11-24 12:41:56 -07:00
|
|
|
rcu_read_lock();
|
2015-10-22 06:20:08 -06:00
|
|
|
for_each_netdev_rcu(dev_addr->net, dev) {
|
|
|
|
if (ipv6_chk_addr(dev_addr->net,
|
2015-12-23 05:56:53 -07:00
|
|
|
&((const struct sockaddr_in6 *)addr)->sin6_addr,
|
2008-12-24 11:16:37 -07:00
|
|
|
dev, 1)) {
|
|
|
|
ret = rdma_copy_addr(dev_addr, dev, NULL);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
if (vlan_id)
|
|
|
|
*vlan_id = rdma_vlan_dev_vlan_id(dev);
|
2008-12-24 11:16:37 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2010-11-24 12:41:56 -07:00
|
|
|
rcu_read_unlock();
|
2008-12-24 11:16:37 -07:00
|
|
|
break;
|
2008-12-30 00:37:14 -07:00
|
|
|
#endif
|
2008-12-24 11:16:37 -07:00
|
|
|
}
|
2006-06-17 21:37:28 -06:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_translate_ip);
|
|
|
|
|
|
|
|
static void set_timeout(unsigned long time)
|
|
|
|
{
|
|
|
|
unsigned long delay;
|
|
|
|
|
|
|
|
delay = time - jiffies;
|
2014-10-29 08:32:04 -06:00
|
|
|
if ((long)delay < 0)
|
|
|
|
delay = 0;
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2012-08-03 11:30:47 -06:00
|
|
|
mod_delayed_work(addr_wq, &work, delay);
|
2006-06-17 21:37:28 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void queue_req(struct addr_req *req)
|
|
|
|
{
|
|
|
|
struct addr_req *temp_req;
|
|
|
|
|
|
|
|
mutex_lock(&lock);
|
|
|
|
list_for_each_entry_reverse(temp_req, &req_list, list) {
|
2006-10-16 22:39:09 -06:00
|
|
|
if (time_after_eq(req->timeout, temp_req->timeout))
|
2006-06-17 21:37:28 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
list_add(&req->list, &temp_req->list);
|
|
|
|
|
|
|
|
if (req_list.next == &req->list)
|
|
|
|
set_timeout(req->timeout);
|
|
|
|
mutex_unlock(&lock);
|
|
|
|
}
|
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
static int ib_nl_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr,
|
|
|
|
const void *daddr, u32 seq, u16 family)
|
|
|
|
{
|
|
|
|
if (ibnl_chk_listeners(RDMA_NL_GROUP_LS))
|
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
|
|
/* We fill in what we can, the response will fill the rest */
|
|
|
|
rdma_copy_addr(dev_addr, dst->dev, NULL);
|
|
|
|
return ib_nl_ip_send_msg(dev_addr, daddr, seq, family);
|
|
|
|
}
|
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr,
|
|
|
|
const void *daddr)
|
2011-12-02 09:52:14 -07:00
|
|
|
{
|
|
|
|
struct neighbour *n;
|
|
|
|
int ret;
|
|
|
|
|
2012-01-24 06:15:52 -07:00
|
|
|
n = dst_neigh_lookup(dst, daddr);
|
|
|
|
|
2011-12-02 09:52:14 -07:00
|
|
|
rcu_read_lock();
|
|
|
|
if (!n || !(n->nud_state & NUD_VALID)) {
|
|
|
|
if (n)
|
|
|
|
neigh_event_send(n, NULL);
|
|
|
|
ret = -ENODATA;
|
|
|
|
} else {
|
2012-01-24 06:15:52 -07:00
|
|
|
ret = rdma_copy_addr(dev_addr, dst->dev, n->ha);
|
2011-12-02 09:52:14 -07:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2012-01-24 06:15:52 -07:00
|
|
|
if (n)
|
|
|
|
neigh_release(n);
|
|
|
|
|
2011-12-02 09:52:14 -07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
static bool has_gateway(struct dst_entry *dst, sa_family_t family)
|
|
|
|
{
|
|
|
|
struct rtable *rt;
|
|
|
|
struct rt6_info *rt6;
|
|
|
|
|
|
|
|
if (family == AF_INET) {
|
|
|
|
rt = container_of(dst, struct rtable, dst);
|
|
|
|
return rt->rt_uses_gateway;
|
|
|
|
}
|
|
|
|
|
|
|
|
rt6 = container_of(dst, struct rt6_info, dst);
|
|
|
|
return rt6->rt6i_flags & RTF_GATEWAY;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr,
|
|
|
|
const struct sockaddr *dst_in, u32 seq)
|
|
|
|
{
|
|
|
|
const struct sockaddr_in *dst_in4 =
|
|
|
|
(const struct sockaddr_in *)dst_in;
|
|
|
|
const struct sockaddr_in6 *dst_in6 =
|
|
|
|
(const struct sockaddr_in6 *)dst_in;
|
|
|
|
const void *daddr = (dst_in->sa_family == AF_INET) ?
|
|
|
|
(const void *)&dst_in4->sin_addr.s_addr :
|
|
|
|
(const void *)&dst_in6->sin6_addr;
|
|
|
|
sa_family_t family = dst_in->sa_family;
|
|
|
|
|
|
|
|
/* Gateway + ARPHRD_INFINIBAND -> IB router */
|
|
|
|
if (has_gateway(dst, family) && dst->dev->type == ARPHRD_INFINIBAND)
|
|
|
|
return ib_nl_fetch_ha(dst, dev_addr, daddr, seq, family);
|
|
|
|
else
|
|
|
|
return dst_fetch_ha(dst, dev_addr, daddr);
|
|
|
|
}
|
|
|
|
|
2009-11-19 14:26:51 -07:00
|
|
|
static int addr4_resolve(struct sockaddr_in *src_in,
|
2015-12-23 05:56:53 -07:00
|
|
|
const struct sockaddr_in *dst_in,
|
|
|
|
struct rdma_dev_addr *addr,
|
|
|
|
struct rtable **prt)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
2008-03-28 21:10:28 -06:00
|
|
|
__be32 src_ip = src_in->sin_addr.s_addr;
|
|
|
|
__be32 dst_ip = dst_in->sin_addr.s_addr;
|
2006-06-17 21:37:28 -06:00
|
|
|
struct rtable *rt;
|
2011-05-09 15:52:02 -06:00
|
|
|
struct flowi4 fl4;
|
2006-06-17 21:37:28 -06:00
|
|
|
int ret;
|
|
|
|
|
2011-05-09 15:52:02 -06:00
|
|
|
memset(&fl4, 0, sizeof(fl4));
|
|
|
|
fl4.daddr = dst_ip;
|
|
|
|
fl4.saddr = src_ip;
|
|
|
|
fl4.flowi4_oif = addr->bound_dev_if;
|
2015-10-22 06:20:08 -06:00
|
|
|
rt = ip_route_output_key(addr->net, &fl4);
|
2011-03-02 15:31:35 -07:00
|
|
|
if (IS_ERR(rt)) {
|
|
|
|
ret = PTR_ERR(rt);
|
2006-06-17 21:37:28 -06:00
|
|
|
goto out;
|
2011-03-02 15:31:35 -07:00
|
|
|
}
|
2009-11-19 14:26:51 -07:00
|
|
|
src_in->sin_family = AF_INET;
|
2011-05-09 15:52:02 -06:00
|
|
|
src_in->sin_addr.s_addr = fl4.saddr;
|
2009-11-19 14:26:51 -07:00
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
/* If there's a gateway and type of device not ARPHRD_INFINIBAND, we're
|
|
|
|
* definitely in RoCE v2 (as RoCE v1 isn't routable) set the network
|
|
|
|
* type accordingly.
|
2015-12-23 05:56:51 -07:00
|
|
|
*/
|
2016-05-19 08:12:36 -06:00
|
|
|
if (rt->rt_uses_gateway && rt->dst.dev->type != ARPHRD_INFINIBAND)
|
2015-12-23 05:56:51 -07:00
|
|
|
addr->network = RDMA_NETWORK_IPV4;
|
|
|
|
|
2016-01-04 01:49:54 -07:00
|
|
|
addr->hoplimit = ip4_dst_hoplimit(&rt->dst);
|
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
*prt = rt;
|
|
|
|
return 0;
|
2006-06-17 21:37:28 -06:00
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-07-05 23:39:34 -06:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2009-11-19 17:46:25 -07:00
|
|
|
static int addr6_resolve(struct sockaddr_in6 *src_in,
|
2015-12-23 05:56:53 -07:00
|
|
|
const struct sockaddr_in6 *dst_in,
|
|
|
|
struct rdma_dev_addr *addr,
|
|
|
|
struct dst_entry **pdst)
|
2008-12-24 11:16:37 -07:00
|
|
|
{
|
2011-03-12 14:22:43 -07:00
|
|
|
struct flowi6 fl6;
|
2008-12-24 11:16:37 -07:00
|
|
|
struct dst_entry *dst;
|
2015-12-23 05:56:51 -07:00
|
|
|
struct rt6_info *rt;
|
2009-11-19 17:46:25 -07:00
|
|
|
int ret;
|
2008-12-24 11:16:37 -07:00
|
|
|
|
2011-03-12 14:22:43 -07:00
|
|
|
memset(&fl6, 0, sizeof fl6);
|
2011-11-20 20:39:03 -07:00
|
|
|
fl6.daddr = dst_in->sin6_addr;
|
|
|
|
fl6.saddr = src_in->sin6_addr;
|
2011-03-12 14:22:43 -07:00
|
|
|
fl6.flowi6_oif = addr->bound_dev_if;
|
2008-12-24 11:16:37 -07:00
|
|
|
|
2015-10-22 06:20:08 -06:00
|
|
|
dst = ip6_route_output(addr->net, NULL, &fl6);
|
2009-11-19 17:46:25 -07:00
|
|
|
if ((ret = dst->error))
|
|
|
|
goto put;
|
|
|
|
|
2015-12-23 05:56:51 -07:00
|
|
|
rt = (struct rt6_info *)dst;
|
2011-03-12 14:22:43 -07:00
|
|
|
if (ipv6_addr_any(&fl6.saddr)) {
|
2015-10-22 06:20:08 -06:00
|
|
|
ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
|
2011-03-12 14:22:43 -07:00
|
|
|
&fl6.daddr, 0, &fl6.saddr);
|
2009-11-19 17:46:25 -07:00
|
|
|
if (ret)
|
|
|
|
goto put;
|
2008-12-24 11:16:37 -07:00
|
|
|
|
2009-11-19 17:46:25 -07:00
|
|
|
src_in->sin6_family = AF_INET6;
|
2011-11-20 20:39:03 -07:00
|
|
|
src_in->sin6_addr = fl6.saddr;
|
2009-11-19 17:46:25 -07:00
|
|
|
}
|
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
/* If there's a gateway and type of device not ARPHRD_INFINIBAND, we're
|
|
|
|
* definitely in RoCE v2 (as RoCE v1 isn't routable) set the network
|
|
|
|
* type accordingly.
|
2015-12-23 05:56:51 -07:00
|
|
|
*/
|
2016-05-19 08:12:36 -06:00
|
|
|
if (rt->rt6i_flags & RTF_GATEWAY &&
|
|
|
|
ip6_dst_idev(dst)->dev->type != ARPHRD_INFINIBAND)
|
2015-12-23 05:56:51 -07:00
|
|
|
addr->network = RDMA_NETWORK_IPV6;
|
|
|
|
|
2016-01-04 01:49:54 -07:00
|
|
|
addr->hoplimit = ip6_dst_hoplimit(dst);
|
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
*pdst = dst;
|
|
|
|
return 0;
|
2009-11-19 17:46:25 -07:00
|
|
|
put:
|
2008-12-24 11:16:37 -07:00
|
|
|
dst_release(dst);
|
|
|
|
return ret;
|
|
|
|
}
|
2008-12-30 00:37:14 -07:00
|
|
|
#else
|
2009-11-19 17:46:25 -07:00
|
|
|
static int addr6_resolve(struct sockaddr_in6 *src_in,
|
2015-12-23 05:56:53 -07:00
|
|
|
const struct sockaddr_in6 *dst_in,
|
|
|
|
struct rdma_dev_addr *addr,
|
|
|
|
struct dst_entry **pdst)
|
2008-12-30 00:37:14 -07:00
|
|
|
{
|
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
#endif
|
2008-12-24 11:16:37 -07:00
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
static int addr_resolve_neigh(struct dst_entry *dst,
|
|
|
|
const struct sockaddr *dst_in,
|
2016-05-19 08:12:36 -06:00
|
|
|
struct rdma_dev_addr *addr,
|
|
|
|
u32 seq)
|
2015-12-23 05:56:53 -07:00
|
|
|
{
|
|
|
|
if (dst->dev->flags & IFF_LOOPBACK) {
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = rdma_translate_ip(dst_in, addr, NULL);
|
|
|
|
if (!ret)
|
|
|
|
memcpy(addr->dst_dev_addr, addr->src_dev_addr,
|
|
|
|
MAX_ADDR_LEN);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the device doesn't do ARP internally */
|
2016-05-19 08:12:36 -06:00
|
|
|
if (!(dst->dev->flags & IFF_NOARP))
|
|
|
|
return fetch_ha(dst, addr, dst_in, seq);
|
2015-12-23 05:56:53 -07:00
|
|
|
|
|
|
|
return rdma_copy_addr(addr, dst->dev, NULL);
|
|
|
|
}
|
|
|
|
|
2009-11-19 14:26:51 -07:00
|
|
|
static int addr_resolve(struct sockaddr *src_in,
|
2015-12-23 05:56:53 -07:00
|
|
|
const struct sockaddr *dst_in,
|
|
|
|
struct rdma_dev_addr *addr,
|
2016-05-19 08:12:36 -06:00
|
|
|
bool resolve_neigh,
|
|
|
|
u32 seq)
|
2008-12-24 11:16:37 -07:00
|
|
|
{
|
2015-12-23 05:56:53 -07:00
|
|
|
struct net_device *ndev;
|
|
|
|
struct dst_entry *dst;
|
|
|
|
int ret;
|
|
|
|
|
2008-12-24 11:16:37 -07:00
|
|
|
if (src_in->sa_family == AF_INET) {
|
2015-12-23 05:56:53 -07:00
|
|
|
struct rtable *rt = NULL;
|
|
|
|
const struct sockaddr_in *dst_in4 =
|
|
|
|
(const struct sockaddr_in *)dst_in;
|
|
|
|
|
|
|
|
ret = addr4_resolve((struct sockaddr_in *)src_in,
|
|
|
|
dst_in4, addr, &rt);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (resolve_neigh)
|
2016-05-19 08:12:36 -06:00
|
|
|
ret = addr_resolve_neigh(&rt->dst, dst_in, addr, seq);
|
2015-12-23 05:56:53 -07:00
|
|
|
|
|
|
|
ndev = rt->dst.dev;
|
|
|
|
dev_hold(ndev);
|
|
|
|
|
|
|
|
ip_rt_put(rt);
|
|
|
|
} else {
|
|
|
|
const struct sockaddr_in6 *dst_in6 =
|
|
|
|
(const struct sockaddr_in6 *)dst_in;
|
|
|
|
|
|
|
|
ret = addr6_resolve((struct sockaddr_in6 *)src_in,
|
|
|
|
dst_in6, addr,
|
|
|
|
&dst);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (resolve_neigh)
|
2016-05-19 08:12:36 -06:00
|
|
|
ret = addr_resolve_neigh(dst, dst_in, addr, seq);
|
2015-12-23 05:56:53 -07:00
|
|
|
|
|
|
|
ndev = dst->dev;
|
|
|
|
dev_hold(ndev);
|
|
|
|
|
|
|
|
dst_release(dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
addr->bound_dev_if = ndev->ifindex;
|
|
|
|
addr->net = dev_net(ndev);
|
|
|
|
dev_put(ndev);
|
|
|
|
|
|
|
|
return ret;
|
2008-12-24 11:16:37 -07:00
|
|
|
}
|
|
|
|
|
2006-11-22 07:57:56 -07:00
|
|
|
static void process_req(struct work_struct *work)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
|
|
|
struct addr_req *req, *temp_req;
|
2008-12-24 11:16:37 -07:00
|
|
|
struct sockaddr *src_in, *dst_in;
|
2006-06-17 21:37:28 -06:00
|
|
|
struct list_head done_list;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&done_list);
|
|
|
|
|
|
|
|
mutex_lock(&lock);
|
|
|
|
list_for_each_entry_safe(req, temp_req, &req_list, list) {
|
2006-11-24 03:32:34 -07:00
|
|
|
if (req->status == -ENODATA) {
|
2008-12-24 11:16:37 -07:00
|
|
|
src_in = (struct sockaddr *) &req->src_addr;
|
|
|
|
dst_in = (struct sockaddr *) &req->dst_addr;
|
2015-12-23 05:56:53 -07:00
|
|
|
req->status = addr_resolve(src_in, dst_in, req->addr,
|
2016-05-19 08:12:36 -06:00
|
|
|
true, req->seq);
|
2006-11-24 03:32:34 -07:00
|
|
|
if (req->status && time_after_eq(jiffies, req->timeout))
|
|
|
|
req->status = -ETIMEDOUT;
|
|
|
|
else if (req->status == -ENODATA)
|
|
|
|
continue;
|
2006-06-17 21:37:28 -06:00
|
|
|
}
|
2006-11-29 16:33:09 -07:00
|
|
|
list_move_tail(&req->list, &done_list);
|
2006-06-17 21:37:28 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!list_empty(&req_list)) {
|
|
|
|
req = list_entry(req_list.next, struct addr_req, list);
|
|
|
|
set_timeout(req->timeout);
|
|
|
|
}
|
|
|
|
mutex_unlock(&lock);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(req, temp_req, &done_list, list) {
|
|
|
|
list_del(&req->list);
|
2008-12-24 11:16:37 -07:00
|
|
|
req->callback(req->status, (struct sockaddr *) &req->src_addr,
|
|
|
|
req->addr, req->context);
|
2006-10-31 12:12:59 -07:00
|
|
|
put_client(req->client);
|
2006-06-17 21:37:28 -06:00
|
|
|
kfree(req);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-31 12:12:59 -07:00
|
|
|
int rdma_resolve_ip(struct rdma_addr_client *client,
|
|
|
|
struct sockaddr *src_addr, struct sockaddr *dst_addr,
|
2006-06-17 21:37:28 -06:00
|
|
|
struct rdma_dev_addr *addr, int timeout_ms,
|
|
|
|
void (*callback)(int status, struct sockaddr *src_addr,
|
|
|
|
struct rdma_dev_addr *addr, void *context),
|
|
|
|
void *context)
|
|
|
|
{
|
2008-12-24 11:16:37 -07:00
|
|
|
struct sockaddr *src_in, *dst_in;
|
2006-06-17 21:37:28 -06:00
|
|
|
struct addr_req *req;
|
|
|
|
int ret = 0;
|
|
|
|
|
some kmalloc/memset ->kzalloc (tree wide)
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc).
Here is a short excerpt of the semantic patch performing
this transformation:
@@
type T2;
expression x;
identifier f,fld;
expression E;
expression E1,E2;
expression e1,e2,e3,y;
statement S;
@@
x =
- kmalloc
+ kzalloc
(E1,E2)
... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\)
- memset((T2)x,0,E1);
@@
expression E1,E2,E3;
@@
- kzalloc(E1 * E2,E3)
+ kcalloc(E1,E2,E3)
[akpm@linux-foundation.org: get kcalloc args the right way around]
Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Bryan Wu <bryan.wu@analog.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Dave Airlie <airlied@linux.ie>
Acked-by: Roland Dreier <rolandd@cisco.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Greg KH <greg@kroah.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-19 02:49:03 -06:00
|
|
|
req = kzalloc(sizeof *req, GFP_KERNEL);
|
2006-06-17 21:37:28 -06:00
|
|
|
if (!req)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-11-19 13:55:22 -07:00
|
|
|
src_in = (struct sockaddr *) &req->src_addr;
|
|
|
|
dst_in = (struct sockaddr *) &req->dst_addr;
|
|
|
|
|
|
|
|
if (src_addr) {
|
|
|
|
if (src_addr->sa_family != dst_addr->sa_family) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2013-05-29 11:09:10 -06:00
|
|
|
memcpy(src_in, src_addr, rdma_addr_size(src_addr));
|
2009-11-19 13:55:22 -07:00
|
|
|
} else {
|
|
|
|
src_in->sa_family = dst_addr->sa_family;
|
|
|
|
}
|
|
|
|
|
2013-05-29 11:09:10 -06:00
|
|
|
memcpy(dst_in, dst_addr, rdma_addr_size(dst_addr));
|
2006-06-17 21:37:28 -06:00
|
|
|
req->addr = addr;
|
|
|
|
req->callback = callback;
|
|
|
|
req->context = context;
|
2006-10-31 12:12:59 -07:00
|
|
|
req->client = client;
|
|
|
|
atomic_inc(&client->refcount);
|
2016-05-19 08:12:36 -06:00
|
|
|
req->seq = (u32)atomic_inc_return(&ib_nl_addr_request_seq);
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
req->status = addr_resolve(src_in, dst_in, addr, true, req->seq);
|
2006-06-17 21:37:28 -06:00
|
|
|
switch (req->status) {
|
|
|
|
case 0:
|
|
|
|
req->timeout = jiffies;
|
|
|
|
queue_req(req);
|
|
|
|
break;
|
|
|
|
case -ENODATA:
|
|
|
|
req->timeout = msecs_to_jiffies(timeout_ms) + jiffies;
|
|
|
|
queue_req(req);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = req->status;
|
2006-10-31 12:12:59 -07:00
|
|
|
atomic_dec(&client->refcount);
|
2009-11-19 13:55:22 -07:00
|
|
|
goto err;
|
2006-06-17 21:37:28 -06:00
|
|
|
}
|
|
|
|
return ret;
|
2009-11-19 13:55:22 -07:00
|
|
|
err:
|
|
|
|
kfree(req);
|
|
|
|
return ret;
|
2006-06-17 21:37:28 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_resolve_ip);
|
|
|
|
|
2015-12-23 05:56:53 -07:00
|
|
|
int rdma_resolve_ip_route(struct sockaddr *src_addr,
|
|
|
|
const struct sockaddr *dst_addr,
|
|
|
|
struct rdma_dev_addr *addr)
|
|
|
|
{
|
|
|
|
struct sockaddr_storage ssrc_addr = {};
|
|
|
|
struct sockaddr *src_in = (struct sockaddr *)&ssrc_addr;
|
|
|
|
|
2015-12-30 07:14:18 -07:00
|
|
|
if (src_addr) {
|
|
|
|
if (src_addr->sa_family != dst_addr->sa_family)
|
|
|
|
return -EINVAL;
|
2015-12-23 05:56:53 -07:00
|
|
|
|
|
|
|
memcpy(src_in, src_addr, rdma_addr_size(src_addr));
|
2015-12-30 07:14:18 -07:00
|
|
|
} else {
|
2015-12-23 05:56:53 -07:00
|
|
|
src_in->sa_family = dst_addr->sa_family;
|
2015-12-30 07:14:18 -07:00
|
|
|
}
|
2015-12-23 05:56:53 -07:00
|
|
|
|
2016-05-19 08:12:36 -06:00
|
|
|
return addr_resolve(src_in, dst_addr, addr, false, 0);
|
2015-12-23 05:56:53 -07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_resolve_ip_route);
|
|
|
|
|
2006-06-17 21:37:28 -06:00
|
|
|
void rdma_addr_cancel(struct rdma_dev_addr *addr)
|
|
|
|
{
|
|
|
|
struct addr_req *req, *temp_req;
|
|
|
|
|
|
|
|
mutex_lock(&lock);
|
|
|
|
list_for_each_entry_safe(req, temp_req, &req_list, list) {
|
|
|
|
if (req->addr == addr) {
|
|
|
|
req->status = -ECANCELED;
|
|
|
|
req->timeout = jiffies;
|
2006-11-29 16:33:09 -07:00
|
|
|
list_move(&req->list, &req_list);
|
2006-06-17 21:37:28 -06:00
|
|
|
set_timeout(req->timeout);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&lock);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_addr_cancel);
|
|
|
|
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
struct resolve_cb_context {
|
|
|
|
struct rdma_dev_addr *addr;
|
|
|
|
struct completion comp;
|
2016-10-27 07:36:29 -06:00
|
|
|
int status;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
static void resolve_cb(int status, struct sockaddr *src_addr,
|
|
|
|
struct rdma_dev_addr *addr, void *context)
|
|
|
|
{
|
2016-10-27 07:36:29 -06:00
|
|
|
if (!status)
|
|
|
|
memcpy(((struct resolve_cb_context *)context)->addr,
|
|
|
|
addr, sizeof(struct rdma_dev_addr));
|
|
|
|
((struct resolve_cb_context *)context)->status = status;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
complete(&((struct resolve_cb_context *)context)->comp);
|
|
|
|
}
|
|
|
|
|
2016-01-04 01:49:53 -07:00
|
|
|
int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
|
|
|
|
const union ib_gid *dgid,
|
2016-01-04 01:49:54 -07:00
|
|
|
u8 *dmac, u16 *vlan_id, int *if_index,
|
|
|
|
int *hoplimit)
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
struct rdma_dev_addr dev_addr;
|
|
|
|
struct resolve_cb_context ctx;
|
|
|
|
struct net_device *dev;
|
|
|
|
|
|
|
|
union {
|
|
|
|
struct sockaddr _sockaddr;
|
|
|
|
struct sockaddr_in _sockaddr_in;
|
|
|
|
struct sockaddr_in6 _sockaddr_in6;
|
|
|
|
} sgid_addr, dgid_addr;
|
|
|
|
|
|
|
|
|
2015-04-29 03:40:44 -06:00
|
|
|
rdma_gid2ip(&sgid_addr._sockaddr, sgid);
|
|
|
|
rdma_gid2ip(&dgid_addr._sockaddr, dgid);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
|
|
|
|
memset(&dev_addr, 0, sizeof(dev_addr));
|
2015-12-23 05:56:53 -07:00
|
|
|
if (if_index)
|
|
|
|
dev_addr.bound_dev_if = *if_index;
|
2015-10-22 06:20:08 -06:00
|
|
|
dev_addr.net = &init_net;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
|
|
|
|
ctx.addr = &dev_addr;
|
|
|
|
init_completion(&ctx.comp);
|
|
|
|
ret = rdma_resolve_ip(&self, &sgid_addr._sockaddr, &dgid_addr._sockaddr,
|
|
|
|
&dev_addr, 1000, resolve_cb, &ctx);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
wait_for_completion(&ctx.comp);
|
|
|
|
|
2016-10-27 07:36:29 -06:00
|
|
|
ret = ctx.status;
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
memcpy(dmac, dev_addr.dst_dev_addr, ETH_ALEN);
|
|
|
|
dev = dev_get_by_index(&init_net, dev_addr.bound_dev_if);
|
|
|
|
if (!dev)
|
|
|
|
return -ENODEV;
|
2015-12-23 05:56:53 -07:00
|
|
|
if (if_index)
|
|
|
|
*if_index = dev_addr.bound_dev_if;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
if (vlan_id)
|
|
|
|
*vlan_id = rdma_vlan_dev_vlan_id(dev);
|
2016-01-04 01:49:54 -07:00
|
|
|
if (hoplimit)
|
|
|
|
*hoplimit = dev_addr.hoplimit;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
dev_put(dev);
|
|
|
|
return ret;
|
|
|
|
}
|
2016-01-04 01:49:53 -07:00
|
|
|
EXPORT_SYMBOL(rdma_addr_find_l2_eth_by_grh);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
|
|
|
|
int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
struct rdma_dev_addr dev_addr;
|
|
|
|
union {
|
|
|
|
struct sockaddr _sockaddr;
|
|
|
|
struct sockaddr_in _sockaddr_in;
|
|
|
|
struct sockaddr_in6 _sockaddr_in6;
|
|
|
|
} gid_addr;
|
|
|
|
|
2015-04-29 03:40:44 -06:00
|
|
|
rdma_gid2ip(&gid_addr._sockaddr, sgid);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
|
|
|
|
memset(&dev_addr, 0, sizeof(dev_addr));
|
2015-10-22 06:20:08 -06:00
|
|
|
dev_addr.net = &init_net;
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
memcpy(smac, dev_addr.src_dev_addr, ETH_ALEN);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rdma_addr_find_smac_by_sgid);
|
|
|
|
|
2006-09-22 16:22:46 -06:00
|
|
|
static int netevent_callback(struct notifier_block *self, unsigned long event,
|
2006-07-30 21:44:19 -06:00
|
|
|
void *ctx)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
2006-09-22 16:22:46 -06:00
|
|
|
if (event == NETEVENT_NEIGH_UPDATE) {
|
2006-07-30 21:44:19 -06:00
|
|
|
struct neighbour *neigh = ctx;
|
2006-06-17 21:37:28 -06:00
|
|
|
|
2007-01-23 18:03:17 -07:00
|
|
|
if (neigh->nud_state & NUD_VALID) {
|
2006-07-30 21:44:19 -06:00
|
|
|
set_timeout(jiffies);
|
|
|
|
}
|
|
|
|
}
|
2006-06-17 21:37:28 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-30 21:44:19 -06:00
|
|
|
static struct notifier_block nb = {
|
|
|
|
.notifier_call = netevent_callback
|
2006-06-17 21:37:28 -06:00
|
|
|
};
|
|
|
|
|
2016-05-19 08:12:31 -06:00
|
|
|
int addr_init(void)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
2016-08-15 12:00:32 -06:00
|
|
|
addr_wq = alloc_workqueue("ib_addr", WQ_MEM_RECLAIM, 0);
|
2006-06-17 21:37:28 -06:00
|
|
|
if (!addr_wq)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2006-07-30 21:44:19 -06:00
|
|
|
register_netevent_notifier(&nb);
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
rdma_addr_register_client(&self);
|
2016-05-19 08:12:36 -06:00
|
|
|
|
2006-06-17 21:37:28 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-19 08:12:31 -06:00
|
|
|
void addr_cleanup(void)
|
2006-06-17 21:37:28 -06:00
|
|
|
{
|
IB/core: Ethernet L2 attributes in verbs/cm structures
This patch add the support for Ethernet L2 attributes in the
verbs/cm/cma structures.
When dealing with L2 Ethernet, we should use smac, dmac, vlan ID and priority
in a similar manner that the IB L2 (and the L4 PKEY) attributes are used.
Thus, those attributes were added to the following structures:
* ib_ah_attr - added dmac
* ib_qp_attr - added smac and vlan_id, (sl remains vlan priority)
* ib_wc - added smac, vlan_id
* ib_sa_path_rec - added smac, dmac, vlan_id
* cm_av - added smac and vlan_id
For the path record structure, extra care was taken to avoid the new
fields when packing it into wire format, so we don't break the IB CM
and SA wire protocol.
On the active side, the CM fills. its internal structures from the
path provided by the ULP. We add there taking the ETH L2 attributes
and placing them into the CM Address Handle (struct cm_av).
On the passive side, the CM fills its internal structures from the WC
associated with the REQ message. We add there taking the ETH L2
attributes from the WC.
When the HW driver provides the required ETH L2 attributes in the WC,
they set the IB_WC_WITH_SMAC and IB_WC_WITH_VLAN flags. The IB core
code checks for the presence of these flags, and in their absence does
address resolution from the ib_init_ah_from_wc() helper function.
ib_modify_qp_is_ok is also updated to consider the link layer. Some
parameters are mandatory for Ethernet link layer, while they are
irrelevant for IB. Vendor drivers are modified to support the new
function signature.
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
2013-12-12 09:03:11 -07:00
|
|
|
rdma_addr_unregister_client(&self);
|
2006-07-30 21:44:19 -06:00
|
|
|
unregister_netevent_notifier(&nb);
|
2006-06-17 21:37:28 -06:00
|
|
|
destroy_workqueue(addr_wq);
|
|
|
|
}
|