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
  ...

8 files changed, 88 insertions, 58 deletions

diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
index b9bf0759f10a..077c33d2dc75 100644
--- a/drivers/infiniband/hw/mlx4/ah.c
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -114,7 +114,9 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
                        !(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.
          */
@@ -122,12 +124,14 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
                 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);
+        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_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;
diff --git a/drivers/infiniband/hw/mlx4/alias_GUID.c b/drivers/infiniband/hw/mlx4/alias_GUID.c
index 5e9939045852..06020c54db20 100644
--- a/drivers/infiniband/hw/mlx4/alias_GUID.c
+++ b/drivers/infiniband/hw/mlx4/alias_GUID.c
@@ -755,10 +755,8 @@ static void alias_guid_work(struct work_struct *work)
         struct mlx4_ib_dev *dev = container_of(ib_sriov, struct mlx4_ib_dev, sriov);
 
         rec = kzalloc(sizeof *rec, GFP_KERNEL);
-        if (!rec) {
-                pr_err("alias_guid_work: No Memory\n");
+        if (!rec)
                 return;
-        }
 
         pr_debug("starting [port: %d]...\n", sriov_alias_port->port + 1);
         ret = get_next_record_to_update(dev, sriov_alias_port->port, rec);
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index 39a488889fc7..d64845335e87 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -247,10 +247,8 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
         struct mlx4_ib_sriov *sriov = &to_mdev(ibdev)->sriov;
 
         ent = kmalloc(sizeof (struct id_map_entry), GFP_KERNEL);
-        if (!ent) {
-                mlx4_ib_warn(ibdev, "Couldn't allocate id cache entry - out of memory\n");
+        if (!ent)
                 return ERR_PTR(-ENOMEM);
-        }
 
         ent->sl_cm_id = sl_cm_id;
         ent->slave_id = slave_id;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 1672907ff219..db564ccc0f92 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -39,6 +39,8 @@
 #include <linux/mlx4/cmd.h>
 #include <linux/gfp.h>
 #include <rdma/ib_pma.h>
+#include <linux/ip.h>
+#include <net/ipv6.h>
 
 #include <linux/mlx4/driver.h>
 #include "mlx4_ib.h"
@@ -480,6 +482,23 @@ static int find_slave_port_pkey_ix(struct mlx4_ib_dev *dev, int slave,
         return -EINVAL;
 }
 
+static int get_gids_from_l3_hdr(struct ib_grh *grh, union ib_gid *sgid,
+                                union ib_gid *dgid)
+{
+        int version = ib_get_rdma_header_version((const union rdma_network_hdr *)grh);
+        enum rdma_network_type net_type;
+
+        if (version == 4)
+                net_type = RDMA_NETWORK_IPV4;
+        else if (version == 6)
+                net_type = RDMA_NETWORK_IPV6;
+        else
+                return -EINVAL;
+
+        return ib_get_gids_from_rdma_hdr((union rdma_network_hdr *)grh, net_type,
+                                         sgid, dgid);
+}
+
 int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
                           enum ib_qp_type dest_qpt, struct ib_wc *wc,
                           struct ib_grh *grh, struct ib_mad *mad)
@@ -538,7 +557,10 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
         memset(&attr, 0, sizeof attr);
         attr.port_num = port;
         if (is_eth) {
-                memcpy(&attr.grh.dgid.raw[0], &grh->dgid.raw[0], 16);
+                union ib_gid sgid;
+
+                if (get_gids_from_l3_hdr(grh, &sgid, &attr.grh.dgid))
+                        return -EINVAL;
                 attr.ah_flags = IB_AH_GRH;
         }
         ah = ib_create_ah(tun_ctx->pd, &attr);
@@ -651,6 +673,11 @@ static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port,
                 is_eth = 1;
 
         if (is_eth) {
+                union ib_gid dgid;
+                union ib_gid sgid;
+
+                if (get_gids_from_l3_hdr(grh, &sgid, &dgid))
+                        return -EINVAL;
                 if (!(wc->wc_flags & IB_WC_GRH)) {
                         mlx4_ib_warn(ibdev, "RoCE grh not present.\n");
                         return -EINVAL;
@@ -659,10 +686,10 @@ static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port,
                         mlx4_ib_warn(ibdev, "RoCE mgmt class is not CM\n");
                         return -EINVAL;
                 }
-                err = mlx4_get_slave_from_roce_gid(dev->dev, port, grh->dgid.raw, &slave);
+                err = mlx4_get_slave_from_roce_gid(dev->dev, port, dgid.raw, &slave);
                 if (err && mlx4_is_mf_bonded(dev->dev)) {
                         other_port = (port == 1) ? 2 : 1;
-                        err = mlx4_get_slave_from_roce_gid(dev->dev, other_port, grh->dgid.raw, &slave);
+                        err = mlx4_get_slave_from_roce_gid(dev->dev, other_port, dgid.raw, &slave);
                         if (!err) {
                                 port = other_port;
                                 pr_debug("resolved slave %d from gid %pI6 wire port %d other %d\n",
@@ -702,10 +729,18 @@ static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port,
 
         /* If a grh is present, we demux according to it */
         if (wc->wc_flags & IB_WC_GRH) {
-                slave = mlx4_ib_find_real_gid(ibdev, port, grh->dgid.global.interface_id);
-                if (slave < 0) {
-                        mlx4_ib_warn(ibdev, "failed matching grh\n");
-                        return -ENOENT;
+                if (grh->dgid.global.interface_id ==
+                        cpu_to_be64(IB_SA_WELL_KNOWN_GUID) &&
+                    grh->dgid.global.subnet_prefix == cpu_to_be64(
+                        atomic64_read(&dev->sriov.demux[port - 1].subnet_prefix))) {
+                        slave = 0;
+                } else {
+                        slave = mlx4_ib_find_real_gid(ibdev, port,
+                                                      grh->dgid.global.interface_id);
+                        if (slave < 0) {
+                                mlx4_ib_warn(ibdev, "failed matching grh\n");
+                                return -ENOENT;
+                        }
                 }
         }
         /* Class-specific handling */
@@ -1102,10 +1137,8 @@ static void handle_slaves_guid_change(struct mlx4_ib_dev *dev, u8 port_num,
 
         in_mad  = kmalloc(sizeof *in_mad, GFP_KERNEL);
         out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
-        if (!in_mad || !out_mad) {
-                mlx4_ib_warn(&dev->ib_dev, "failed to allocate memory for guid info mads\n");
+        if (!in_mad || !out_mad)
                 goto out;
-        }
 
         guid_tbl_blk_num  *= 4;
 
@@ -1916,11 +1949,8 @@ static int alloc_pv_object(struct mlx4_ib_dev *dev, int slave, int port,
 
         *ret_ctx = NULL;
         ctx = kzalloc(sizeof (struct mlx4_ib_demux_pv_ctx), GFP_KERNEL);
-        if (!ctx) {
-                pr_err("failed allocating pv resource context "
-                       "for port %d, slave %d\n", port, slave);
+        if (!ctx)
                 return -ENOMEM;
-        }
 
         ctx->ib_dev = &dev->ib_dev;
         ctx->port = port;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index b597e8227591..c8413fc120e6 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -430,7 +430,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
         struct mlx4_ib_dev *dev = to_mdev(ibdev);
         struct ib_smp *in_mad  = NULL;
         struct ib_smp *out_mad = NULL;
-        int err = -ENOMEM;
+        int err;
         int have_ib_ports;
         struct mlx4_uverbs_ex_query_device cmd;
         struct mlx4_uverbs_ex_query_device_resp resp = {.comp_mask = 0};
@@ -455,6 +455,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
                 sizeof(resp.response_length);
         in_mad  = kzalloc(sizeof *in_mad, GFP_KERNEL);
         out_mad = kmalloc(sizeof *out_mad, GFP_KERNEL);
+        err = -ENOMEM;
         if (!in_mad || !out_mad)
                 goto out;
 
@@ -547,6 +548,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
         props->max_map_per_fmr = dev->dev->caps.max_fmr_maps;
         props->hca_core_clock = dev->dev->caps.hca_core_clock * 1000UL;
         props->timestamp_mask = 0xFFFFFFFFFFFFULL;
+        props->max_ah = INT_MAX;
 
         if (!mlx4_is_slave(dev->dev))
                 err = mlx4_get_internal_clock_params(dev->dev, &clock_params);
@@ -697,9 +699,11 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port,
         if (err)
                 goto out;
 
-        props->active_width     =  (((u8 *)mailbox->buf)[5] == 0x40) ?
-                                                IB_WIDTH_4X : IB_WIDTH_1X;
-        props->active_speed     = IB_SPEED_QDR;
+        props->active_width     =  (((u8 *)mailbox->buf)[5] == 0x40) ||
+                                   (((u8 *)mailbox->buf)[5] == 0x20 /*56Gb*/) ?
+                                           IB_WIDTH_4X : IB_WIDTH_1X;
+        props->active_speed     =  (((u8 *)mailbox->buf)[5] == 0x20 /*56Gb*/) ?
+                                           IB_SPEED_FDR : IB_SPEED_QDR;
         props->port_cap_flags   = IB_PORT_CM_SUP | IB_PORT_IP_BASED_GIDS;
         props->gid_tbl_len      = mdev->dev->caps.gid_table_len[port];
         props->max_msg_sz       = mdev->dev->caps.max_msg_sz;
@@ -2814,20 +2818,22 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                         kmalloc(BITS_TO_LONGS(ibdev->steer_qpn_count) *
                                 sizeof(long),
                                 GFP_KERNEL);
-                if (!ibdev->ib_uc_qpns_bitmap) {
-                        dev_err(&dev->persist->pdev->dev,
-                                "bit map alloc failed\n");
+                if (!ibdev->ib_uc_qpns_bitmap)
                         goto err_steer_qp_release;
-                }
 
-                bitmap_zero(ibdev->ib_uc_qpns_bitmap, ibdev->steer_qpn_count);
-
-                err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
-                                dev, ibdev->steer_qpn_base,
-                                ibdev->steer_qpn_base +
-                                ibdev->steer_qpn_count - 1);
-                if (err)
-                        goto err_steer_free_bitmap;
+                if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DMFS_IPOIB) {
+                        bitmap_zero(ibdev->ib_uc_qpns_bitmap,
+                                    ibdev->steer_qpn_count);
+                        err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
+                                        dev, ibdev->steer_qpn_base,
+                                        ibdev->steer_qpn_base +
+                                        ibdev->steer_qpn_count - 1);
+                        if (err)
+                                goto err_steer_free_bitmap;
+                } else {
+                        bitmap_fill(ibdev->ib_uc_qpns_bitmap,
+                                    ibdev->steer_qpn_count);
+                }
         }
 
         for (j = 1; j <= ibdev->dev->caps.num_ports; j++)
@@ -3055,15 +3061,12 @@ static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init)
         first_port = find_first_bit(actv_ports.ports, dev->caps.num_ports);
 
         dm = kcalloc(ports, sizeof(*dm), GFP_ATOMIC);
-        if (!dm) {
-                pr_err("failed to allocate memory for tunneling qp update\n");
+        if (!dm)
                 return;
-        }
 
         for (i = 0; i < ports; i++) {
                 dm[i] = kmalloc(sizeof (struct mlx4_ib_demux_work), GFP_ATOMIC);
                 if (!dm[i]) {
-                        pr_err("failed to allocate memory for tunneling qp update work struct\n");
                         while (--i >= 0)
                                 kfree(dm[i]);
                         goto out;
@@ -3223,8 +3226,6 @@ void mlx4_sched_ib_sl2vl_update_work(struct mlx4_ib_dev *ibdev,
                 ew->port = port;
                 ew->ib_dev = ibdev;
                 queue_work(wq, &ew->work);
-        } else {
-                pr_err("failed to allocate memory for sl2vl update work\n");
         }
 }
 
@@ -3284,10 +3285,8 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,
 
         case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:
                 ew = kmalloc(sizeof *ew, GFP_ATOMIC);
-                if (!ew) {
-                        pr_err("failed to allocate memory for events work\n");
+                if (!ew)
                         break;
-                }
 
                 INIT_WORK(&ew->work, handle_port_mgmt_change_event);
                 memcpy(&ew->ib_eqe, eqe, sizeof *eqe);
diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
index a21d37f02f35..e010fe459e67 100644
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
@@ -1142,7 +1142,6 @@ void mlx4_ib_mcg_port_cleanup(struct mlx4_ib_demux_ctx *ctx, int destroy_wq)
         work = kmalloc(sizeof *work, GFP_KERNEL);
         if (!work) {
                 ctx->flushing = 0;
-                mcg_warn("failed allocating work for cleanup\n");
                 return;
         }
 
@@ -1202,10 +1201,8 @@ static int push_deleteing_req(struct mcast_group *group, int slave)
                 return 0;
 
         req = kzalloc(sizeof *req, GFP_KERNEL);
-        if (!req) {
-                mcg_warn_group(group, "failed allocation - may leave stall groups\n");
+        if (!req)
                 return -ENOMEM;
-        }
 
         if (!list_empty(&group->func[slave].pending)) {
                 pend_req = list_entry(group->func[slave].pending.prev, struct mcast_req, group_list);
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index 35141f451e5c..7f3d976d81ed 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -742,7 +742,8 @@ int mlx4_ib_arm_cq(struct ib_cq *cq, enum ib_cq_notify_flags flags);
 void __mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq);
 void mlx4_ib_cq_clean(struct mlx4_ib_cq *cq, u32 qpn, struct mlx4_ib_srq *srq);
 
-struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
+struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
+                                struct ib_udata *udata);
 int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);
 int mlx4_ib_destroy_ah(struct ib_ah *ah);
 
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 570bc866b1d6..c068add8838b 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -644,7 +644,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
         int qpn;
         int err;
         struct ib_qp_cap backup_cap;
-        struct mlx4_ib_sqp *sqp;
+        struct mlx4_ib_sqp *sqp = NULL;
         struct mlx4_ib_qp *qp;
         enum mlx4_ib_qp_type qp_type = (enum mlx4_ib_qp_type) init_attr->qp_type;
         struct mlx4_ib_cq *mcq;
@@ -933,7 +933,9 @@ err_db:
                 mlx4_db_free(dev->dev, &qp->db);
 
 err:
-        if (!*caller_qp)
+        if (sqp)
+                kfree(sqp);
+        else if (!*caller_qp)
                 kfree(qp);
         return err;
 }
@@ -1280,7 +1282,8 @@ static int _mlx4_ib_destroy_qp(struct ib_qp *qp)
         if (is_qp0(dev, mqp))
                 mlx4_CLOSE_PORT(dev->dev, mqp->port);
 
-        if (dev->qp1_proxy[mqp->port - 1] == mqp) {
+        if (mqp->mlx4_ib_qp_type == MLX4_IB_QPT_PROXY_GSI &&
+            dev->qp1_proxy[mqp->port - 1] == mqp) {
                 mutex_lock(&dev->qp1_proxy_lock[mqp->port - 1]);
                 dev->qp1_proxy[mqp->port - 1] = NULL;
                 mutex_unlock(&dev->qp1_proxy_lock[mqp->port - 1]);
@@ -1764,14 +1767,14 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                 u8 port_num = mlx4_is_bonded(to_mdev(ibqp->device)->dev) ? 1 :
                         attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
                 union ib_gid gid;
-                struct ib_gid_attr gid_attr;
+                struct ib_gid_attr gid_attr = {.gid_type = IB_GID_TYPE_IB};
                 u16 vlan = 0xffff;
                 u8 smac[ETH_ALEN];
                 int status = 0;
                 int is_eth = rdma_cap_eth_ah(&dev->ib_dev, port_num) &&
                         attr->ah_attr.ah_flags & IB_AH_GRH;
 
-                if (is_eth) {
+                if (is_eth && attr->ah_attr.ah_flags & IB_AH_GRH) {
                         int index = attr->ah_attr.grh.sgid_index;
 
                         status = ib_get_cached_gid(ibqp->device, port_num,