mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
- Shared mlx5 updates with net stack (will drop out on merge if Dave's
tree has already been merged)
- Driver updates: cxgb4, hfi1, hns-roce, i40iw, mlx4, mlx5, qedr, rxe
- Debug cleanups
- New connection rejection helpers
- SRP updates
- Various misc fixes
- New paravirt driver from vmware
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJYUbAPAAoJELgmozMOVy/dMXcP/iuG5MNzfN8Ny1JftyBQGWg3
cqoQ2OLj9CsXjwVB+5EqbcZHRZY852lKONaLoDKkIOx4YAXO2YuIKOp944vN7EQx
96wfqzT1F5jzAcy5mYZXgLaStGFDAwejKMqeHd0LfJj3OEtemGnVPWYzyqSQmSKo
dzJraS1Z9GIRppzU5WaRpB9PtRBkqIqGJ5vZ0EKLGhed5hYY5r0iMJB0GfriMRDO
lJ4UUVfpsAoLPnqDBFH6IMn2V2UeAw9IR5zNa1mrM1RBfvt/uYTxrw1w3p9WoaNs
GRodhk4DCeAfeyqzVPNBLyXZ4Zq4FzGe3UWM4qysJ1RR4oFNw9Cuw0Fqk8mrfznr
7hv5TpGIckRZiKf8l6e+qLirF0qGtXJg29j2vPVQI9i5nSj95g1agA81PnLQlLLb
flWyxeMj81my7lfMHN1xcV6pqPEKMCOysZmfcvVfJd2XxpjuVD7ekl/YXWp8o8kU
YPdQMqPD626XsD8VpPdMszb9FPmx0JD0HEv+Y1rIFX8JegEI+c3H2X0dqC27T/Ou
FEPWOy025EgHm0Fh/7eIzkG6tjZ4JHoCugJAcxNZGj2XW4eB6r5vY8UwJ8iQRv+n
PVYHiy0UoIRePh0mrdOSSphGZMi/GO/DsqKwCtAMEK43WqZQju6wR7QSIGkh66mp
4uSHJqpf3YEYylxGMhk3
=QeGy
-----END PGP SIGNATURE-----
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma updates from Doug Ledford:
"This is the complete update for the rdma stack for this release cycle.
Most of it is typical driver and core updates, but there is the
entirely new VMWare pvrdma driver. You may have noticed that there
were changes in DaveM's pull request to the bnxt Ethernet driver to
support a RoCE RDMA driver. The bnxt_re driver was tentatively set to
be pulled in this release cycle, but it simply wasn't ready in time
and was dropped (a few review comments still to address, and some
multi-arch build issues like prefetch() not working across all
arches).
Summary:
- shared mlx5 updates with net stack (will drop out on merge if
Dave's tree has already been merged)
- driver updates: cxgb4, hfi1, hns-roce, i40iw, mlx4, mlx5, qedr, rxe
- debug cleanups
- new connection rejection helpers
- SRP updates
- various misc fixes
- new paravirt driver from vmware"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (210 commits)
IB: Add vmw_pvrdma driver
IB/mlx4: fix improper return value
IB/ocrdma: fix bad initialization
infiniband: nes: return value of skb_linearize should be handled
MAINTAINERS: Update Intel RDMA RNIC driver maintainers
MAINTAINERS: Remove Mitesh Ahuja from emulex maintainers
IB/core: fix unmap_sg argument
qede: fix general protection fault may occur on probe
IB/mthca: Replace pci_pool_alloc by pci_pool_zalloc
mlx5, calc_sq_size(): Make a debug message more informative
mlx5: Remove a set-but-not-used variable
mlx5: Use { } instead of { 0 } to init struct
IB/srp: Make writing the add_target sysfs attr interruptible
IB/srp: Make mapping failures easier to debug
IB/srp: Make login failures easier to debug
IB/srp: Introduce a local variable in srp_add_one()
IB/srp: Fix CONFIG_DYNAMIC_DEBUG=n build
IB/multicast: Check ib_find_pkey() return value
IPoIB: Avoid reading an uninitialized member variable
IB/mad: Fix an array index check
...
204 lines
6.5 KiB
C
204 lines
6.5 KiB
C
/*
|
|
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
|
|
*
|
|
* 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:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - 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.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <rdma/ib_addr.h>
|
|
#include <rdma/ib_cache.h>
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mlx4/driver.h>
|
|
|
|
#include "mlx4_ib.h"
|
|
|
|
static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
|
|
struct mlx4_ib_ah *ah)
|
|
{
|
|
struct mlx4_dev *dev = to_mdev(pd->device)->dev;
|
|
|
|
ah->av.ib.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
|
|
ah->av.ib.g_slid = ah_attr->src_path_bits;
|
|
ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28);
|
|
if (ah_attr->ah_flags & IB_AH_GRH) {
|
|
ah->av.ib.g_slid |= 0x80;
|
|
ah->av.ib.gid_index = ah_attr->grh.sgid_index;
|
|
ah->av.ib.hop_limit = ah_attr->grh.hop_limit;
|
|
ah->av.ib.sl_tclass_flowlabel |=
|
|
cpu_to_be32((ah_attr->grh.traffic_class << 20) |
|
|
ah_attr->grh.flow_label);
|
|
memcpy(ah->av.ib.dgid, ah_attr->grh.dgid.raw, 16);
|
|
}
|
|
|
|
ah->av.ib.dlid = cpu_to_be16(ah_attr->dlid);
|
|
if (ah_attr->static_rate) {
|
|
ah->av.ib.stat_rate = ah_attr->static_rate + MLX4_STAT_RATE_OFFSET;
|
|
while (ah->av.ib.stat_rate > IB_RATE_2_5_GBPS + MLX4_STAT_RATE_OFFSET &&
|
|
!(1 << ah->av.ib.stat_rate & dev->caps.stat_rate_support))
|
|
--ah->av.ib.stat_rate;
|
|
}
|
|
|
|
return &ah->ibah;
|
|
}
|
|
|
|
static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
|
|
struct mlx4_ib_ah *ah)
|
|
{
|
|
struct mlx4_ib_dev *ibdev = to_mdev(pd->device);
|
|
struct mlx4_dev *dev = ibdev->dev;
|
|
int is_mcast = 0;
|
|
struct in6_addr in6;
|
|
u16 vlan_tag = 0xffff;
|
|
union ib_gid sgid;
|
|
struct ib_gid_attr gid_attr;
|
|
int ret;
|
|
|
|
memcpy(&in6, ah_attr->grh.dgid.raw, sizeof(in6));
|
|
if (rdma_is_multicast_addr(&in6)) {
|
|
is_mcast = 1;
|
|
rdma_get_mcast_mac(&in6, ah->av.eth.mac);
|
|
} else {
|
|
memcpy(ah->av.eth.mac, ah_attr->dmac, ETH_ALEN);
|
|
}
|
|
ret = ib_get_cached_gid(pd->device, ah_attr->port_num,
|
|
ah_attr->grh.sgid_index, &sgid, &gid_attr);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
eth_zero_addr(ah->av.eth.s_mac);
|
|
if (gid_attr.ndev) {
|
|
if (is_vlan_dev(gid_attr.ndev))
|
|
vlan_tag = vlan_dev_vlan_id(gid_attr.ndev);
|
|
memcpy(ah->av.eth.s_mac, gid_attr.ndev->dev_addr, ETH_ALEN);
|
|
dev_put(gid_attr.ndev);
|
|
}
|
|
if (vlan_tag < 0x1000)
|
|
vlan_tag |= (ah_attr->sl & 7) << 13;
|
|
ah->av.eth.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
|
|
ret = mlx4_ib_gid_index_to_real_index(ibdev, ah_attr->port_num, ah_attr->grh.sgid_index);
|
|
if (ret < 0)
|
|
return ERR_PTR(ret);
|
|
ah->av.eth.gid_index = ret;
|
|
ah->av.eth.vlan = cpu_to_be16(vlan_tag);
|
|
ah->av.eth.hop_limit = ah_attr->grh.hop_limit;
|
|
if (ah_attr->static_rate) {
|
|
ah->av.eth.stat_rate = ah_attr->static_rate + MLX4_STAT_RATE_OFFSET;
|
|
while (ah->av.eth.stat_rate > IB_RATE_2_5_GBPS + MLX4_STAT_RATE_OFFSET &&
|
|
!(1 << ah->av.eth.stat_rate & dev->caps.stat_rate_support))
|
|
--ah->av.eth.stat_rate;
|
|
}
|
|
ah->av.eth.sl_tclass_flowlabel |=
|
|
cpu_to_be32((ah_attr->grh.traffic_class << 20) |
|
|
ah_attr->grh.flow_label);
|
|
/*
|
|
* HW requires multicast LID so we just choose one.
|
|
*/
|
|
if (is_mcast)
|
|
ah->av.ib.dlid = cpu_to_be16(0xc000);
|
|
|
|
memcpy(ah->av.eth.dgid, ah_attr->grh.dgid.raw, 16);
|
|
ah->av.eth.sl_tclass_flowlabel |= cpu_to_be32(ah_attr->sl << 29);
|
|
|
|
return &ah->ibah;
|
|
}
|
|
|
|
struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
|
|
struct ib_udata *udata)
|
|
|
|
{
|
|
struct mlx4_ib_ah *ah;
|
|
struct ib_ah *ret;
|
|
|
|
ah = kzalloc(sizeof *ah, GFP_ATOMIC);
|
|
if (!ah)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
if (rdma_port_get_link_layer(pd->device, ah_attr->port_num) == IB_LINK_LAYER_ETHERNET) {
|
|
if (!(ah_attr->ah_flags & IB_AH_GRH)) {
|
|
ret = ERR_PTR(-EINVAL);
|
|
} else {
|
|
/*
|
|
* TBD: need to handle the case when we get
|
|
* called in an atomic context and there we
|
|
* might sleep. We don't expect this
|
|
* currently since we're working with link
|
|
* local addresses which we can translate
|
|
* without going to sleep.
|
|
*/
|
|
ret = create_iboe_ah(pd, ah_attr, ah);
|
|
}
|
|
|
|
if (IS_ERR(ret))
|
|
kfree(ah);
|
|
|
|
return ret;
|
|
} else
|
|
return create_ib_ah(pd, ah_attr, ah); /* never fails */
|
|
}
|
|
|
|
int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)
|
|
{
|
|
struct mlx4_ib_ah *ah = to_mah(ibah);
|
|
enum rdma_link_layer ll;
|
|
|
|
memset(ah_attr, 0, sizeof *ah_attr);
|
|
ah_attr->port_num = be32_to_cpu(ah->av.ib.port_pd) >> 24;
|
|
ll = rdma_port_get_link_layer(ibah->device, ah_attr->port_num);
|
|
if (ll == IB_LINK_LAYER_ETHERNET)
|
|
ah_attr->sl = be32_to_cpu(ah->av.eth.sl_tclass_flowlabel) >> 29;
|
|
else
|
|
ah_attr->sl = be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 28;
|
|
|
|
ah_attr->dlid = ll == IB_LINK_LAYER_INFINIBAND ? be16_to_cpu(ah->av.ib.dlid) : 0;
|
|
if (ah->av.ib.stat_rate)
|
|
ah_attr->static_rate = ah->av.ib.stat_rate - MLX4_STAT_RATE_OFFSET;
|
|
ah_attr->src_path_bits = ah->av.ib.g_slid & 0x7F;
|
|
|
|
if (mlx4_ib_ah_grh_present(ah)) {
|
|
ah_attr->ah_flags = IB_AH_GRH;
|
|
|
|
ah_attr->grh.traffic_class =
|
|
be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 20;
|
|
ah_attr->grh.flow_label =
|
|
be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) & 0xfffff;
|
|
ah_attr->grh.hop_limit = ah->av.ib.hop_limit;
|
|
ah_attr->grh.sgid_index = ah->av.ib.gid_index;
|
|
memcpy(ah_attr->grh.dgid.raw, ah->av.ib.dgid, 16);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int mlx4_ib_destroy_ah(struct ib_ah *ah)
|
|
{
|
|
kfree(to_mah(ah));
|
|
return 0;
|
|
}
|