Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA changes from Roland Dreier:
 - XRC transport fixes
 - Fix DHCP on IPoIB
 - mlx4 preparations for flow steering
 - iSER fixes
 - miscellaneous other fixes

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (23 commits)
  IB/iser: Add support for iser CM REQ additional info
  IB/iser: Return error to upper layers on EAGAIN registration failures
  IB/iser: Move informational messages from error to info level
  IB/iser: Add module version
  mlx4_core: Expose a few helpers to fill DMFS HW strucutures
  mlx4_core: Directly expose fields of DMFS HW rule control segment
  mlx4_core: Change a few DMFS fields names to match firmare spec
  mlx4: Match DMFS promiscuous field names to firmware spec
  mlx4_core: Move DMFS HW structs to common header file
  IB/mlx4: Set link type for RAW PACKET QPs in the QP context
  IB/mlx4: Disable VLAN stripping for RAW PACKET QPs
  mlx4_core: Reduce warning message for SRQ_LIMIT event to debug level
  RDMA/iwcm: Don't touch cmid after dropping reference
  IB/qib: Correct qib_verbs_register_sysfs() error handling
  IB/ipath: Correct ipath_verbs_register_sysfs() error handling
  RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled
  SRPT: Fix odd use of WARN_ON()
  IPoIB: Fix ipoib_hard_header() return value
  RDMA: Rename random32() to prandom_u32()
  RDMA/cxgb3: Fix uninitialized variable
  ...

6 files changed, 102 insertions, 134 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index bcf4d118e98c..c9e6b62dd000 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -889,7 +889,7 @@ static int mlx4_en_flow_replace(struct net_device *dev,
                 .queue_mode = MLX4_NET_TRANS_Q_FIFO,
                 .exclusive = 0,
                 .allow_loopback = 1,
-                .promisc_mode = MLX4_FS_PROMISC_NONE,
+                .promisc_mode = MLX4_FS_REGULAR,
         };
 
         rule.port = priv->port;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index a69a908614e6..b35f94700093 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -127,7 +127,7 @@ static void mlx4_en_filter_work(struct work_struct *work)
                 .queue_mode = MLX4_NET_TRANS_Q_LIFO,
                 .exclusive = 1,
                 .allow_loopback = 1,
-                .promisc_mode = MLX4_FS_PROMISC_NONE,
+                .promisc_mode = MLX4_FS_REGULAR,
                 .port = priv->port,
                 .priority = MLX4_DOMAIN_RFS,
         };
@@ -448,7 +448,7 @@ static int mlx4_en_uc_steer_add(struct mlx4_en_priv *priv,
                         .queue_mode = MLX4_NET_TRANS_Q_FIFO,
                         .exclusive = 0,
                         .allow_loopback = 1,
-                        .promisc_mode = MLX4_FS_PROMISC_NONE,
+                        .promisc_mode = MLX4_FS_REGULAR,
                         .priority = MLX4_DOMAIN_NIC,
                 };
 
@@ -795,7 +795,7 @@ static void mlx4_en_set_promisc_mode(struct mlx4_en_priv *priv,
                         err = mlx4_flow_steer_promisc_add(mdev->dev,
                                                           priv->port,
                                                           priv->base_qpn,
-                                                          MLX4_FS_PROMISC_UPLINK);
+                                                          MLX4_FS_ALL_DEFAULT);
                         if (err)
                                 en_err(priv, "Failed enabling promiscuous mode\n");
                         priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
@@ -858,7 +858,7 @@ static void mlx4_en_clear_promisc_mode(struct mlx4_en_priv *priv,
         case MLX4_STEERING_MODE_DEVICE_MANAGED:
                 err = mlx4_flow_steer_promisc_remove(mdev->dev,
                                                      priv->port,
-                                                     MLX4_FS_PROMISC_UPLINK);
+                                                     MLX4_FS_ALL_DEFAULT);
                 if (err)
                         en_err(priv, "Failed disabling promiscuous mode\n");
                 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
@@ -919,7 +919,7 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv *priv,
                                 err = mlx4_flow_steer_promisc_add(mdev->dev,
                                                                   priv->port,
                                                                   priv->base_qpn,
-                                                                  MLX4_FS_PROMISC_ALL_MULTI);
+                                                                  MLX4_FS_MC_DEFAULT);
                                 break;
 
                         case MLX4_STEERING_MODE_B0:
@@ -942,7 +942,7 @@ static void mlx4_en_do_multicast(struct mlx4_en_priv *priv,
                         case MLX4_STEERING_MODE_DEVICE_MANAGED:
                                 err = mlx4_flow_steer_promisc_remove(mdev->dev,
                                                                      priv->port,
-                                                                     MLX4_FS_PROMISC_ALL_MULTI);
+                                                                     MLX4_FS_MC_DEFAULT);
                                 break;
 
                         case MLX4_STEERING_MODE_B0:
@@ -1621,10 +1621,10 @@ void mlx4_en_stop_port(struct net_device *dev, int detach)
                                  MLX4_EN_FLAG_MC_PROMISC);
                 mlx4_flow_steer_promisc_remove(mdev->dev,
                                                priv->port,
-                                               MLX4_FS_PROMISC_UPLINK);
+                                               MLX4_FS_ALL_DEFAULT);
                 mlx4_flow_steer_promisc_remove(mdev->dev,
                                                priv->port,
-                                               MLX4_FS_PROMISC_ALL_MULTI);
+                                               MLX4_FS_MC_DEFAULT);
         } else if (priv->flags & MLX4_EN_FLAG_PROMISC) {
                 priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 8e3123a1df88..6000342f9725 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -497,8 +497,8 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                         break;
 
                 case MLX4_EVENT_TYPE_SRQ_LIMIT:
-                        mlx4_warn(dev, "%s: MLX4_EVENT_TYPE_SRQ_LIMIT\n",
-                                  __func__);
+                        mlx4_dbg(dev, "%s: MLX4_EVENT_TYPE_SRQ_LIMIT\n",
+                                 __func__);
                 case MLX4_EVENT_TYPE_SRQ_CATAS_ERROR:
                         if (mlx4_is_master(dev)) {
                                 /* forward only to slave owning the SRQ */
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index ffc78d2cb0cf..f3e804f2a35f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -645,25 +645,37 @@ static int find_entry(struct mlx4_dev *dev, u8 port,
         return err;
 }
 
+static const u8 __promisc_mode[] = {
+        [MLX4_FS_REGULAR]   = 0x0,
+        [MLX4_FS_ALL_DEFAULT] = 0x1,
+        [MLX4_FS_MC_DEFAULT] = 0x3,
+        [MLX4_FS_UC_SNIFFER] = 0x4,
+        [MLX4_FS_MC_SNIFFER] = 0x5,
+};
+
+int mlx4_map_sw_to_hw_steering_mode(struct mlx4_dev *dev,
+                                    enum mlx4_net_trans_promisc_mode flow_type)
+{
+        if (flow_type >= MLX4_FS_MODE_NUM || flow_type < 0) {
+                mlx4_err(dev, "Invalid flow type. type = %d\n", flow_type);
+                return -EINVAL;
+        }
+        return __promisc_mode[flow_type];
+}
+EXPORT_SYMBOL_GPL(mlx4_map_sw_to_hw_steering_mode);
+
 static void trans_rule_ctrl_to_hw(struct mlx4_net_trans_rule *ctrl,
                                   struct mlx4_net_trans_rule_hw_ctrl *hw)
 {
-        static const u8 __promisc_mode[] = {
-                [MLX4_FS_PROMISC_NONE]   = 0x0,
-                [MLX4_FS_PROMISC_UPLINK] = 0x1,
-                [MLX4_FS_PROMISC_FUNCTION_PORT] = 0x2,
-                [MLX4_FS_PROMISC_ALL_MULTI] = 0x3,
-        };
-
-        u32 dw = 0;
-
-        dw = ctrl->queue_mode == MLX4_NET_TRANS_Q_LIFO ? 1 : 0;
-        dw |= ctrl->exclusive ? (1 << 2) : 0;
-        dw |= ctrl->allow_loopback ? (1 << 3) : 0;
-        dw |= __promisc_mode[ctrl->promisc_mode] << 8;
-        dw |= ctrl->priority << 16;
-
-        hw->ctrl = cpu_to_be32(dw);
+        u8 flags = 0;
+
+        flags = ctrl->queue_mode == MLX4_NET_TRANS_Q_LIFO ? 1 : 0;
+        flags |= ctrl->exclusive ? (1 << 2) : 0;
+        flags |= ctrl->allow_loopback ? (1 << 3) : 0;
+
+        hw->flags = flags;
+        hw->type = __promisc_mode[ctrl->promisc_mode];
+        hw->prio = cpu_to_be16(ctrl->priority);
         hw->port = ctrl->port;
         hw->qpn = cpu_to_be32(ctrl->qpn);
 }
@@ -677,29 +689,51 @@ const u16 __sw_id_hw[] = {
         [MLX4_NET_TRANS_RULE_ID_UDP]     = 0xE006
 };
 
+int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev,
+                                  enum mlx4_net_trans_rule_id id)
+{
+        if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+                mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
+                return -EINVAL;
+        }
+        return __sw_id_hw[id];
+}
+EXPORT_SYMBOL_GPL(mlx4_map_sw_to_hw_steering_id);
+
+static const int __rule_hw_sz[] = {
+        [MLX4_NET_TRANS_RULE_ID_ETH] =
+                sizeof(struct mlx4_net_trans_rule_hw_eth),
+        [MLX4_NET_TRANS_RULE_ID_IB] =
+                sizeof(struct mlx4_net_trans_rule_hw_ib),
+        [MLX4_NET_TRANS_RULE_ID_IPV6] = 0,
+        [MLX4_NET_TRANS_RULE_ID_IPV4] =
+                sizeof(struct mlx4_net_trans_rule_hw_ipv4),
+        [MLX4_NET_TRANS_RULE_ID_TCP] =
+                sizeof(struct mlx4_net_trans_rule_hw_tcp_udp),
+        [MLX4_NET_TRANS_RULE_ID_UDP] =
+                sizeof(struct mlx4_net_trans_rule_hw_tcp_udp)
+};
+
+int mlx4_hw_rule_sz(struct mlx4_dev *dev,
+               enum mlx4_net_trans_rule_id id)
+{
+        if (id >= MLX4_NET_TRANS_RULE_NUM || id < 0) {
+                mlx4_err(dev, "Invalid network rule id. id = %d\n", id);
+                return -EINVAL;
+        }
+
+        return __rule_hw_sz[id];
+}
+EXPORT_SYMBOL_GPL(mlx4_hw_rule_sz);
+
 static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec,
                             struct _rule_hw *rule_hw)
 {
-        static const size_t __rule_hw_sz[] = {
-                [MLX4_NET_TRANS_RULE_ID_ETH] =
-                        sizeof(struct mlx4_net_trans_rule_hw_eth),
-                [MLX4_NET_TRANS_RULE_ID_IB] =
-                        sizeof(struct mlx4_net_trans_rule_hw_ib),
-                [MLX4_NET_TRANS_RULE_ID_IPV6] = 0,
-                [MLX4_NET_TRANS_RULE_ID_IPV4] =
-                        sizeof(struct mlx4_net_trans_rule_hw_ipv4),
-                [MLX4_NET_TRANS_RULE_ID_TCP] =
-                        sizeof(struct mlx4_net_trans_rule_hw_tcp_udp),
-                [MLX4_NET_TRANS_RULE_ID_UDP] =
-                        sizeof(struct mlx4_net_trans_rule_hw_tcp_udp)
-        };
-        if (spec->id >= MLX4_NET_TRANS_RULE_NUM) {
-                mlx4_err(dev, "Invalid network rule id. id = %d\n", spec->id);
+        if (mlx4_hw_rule_sz(dev, spec->id) < 0)
                 return -EINVAL;
-        }
-        memset(rule_hw, 0, __rule_hw_sz[spec->id]);
+        memset(rule_hw, 0, mlx4_hw_rule_sz(dev, spec->id));
         rule_hw->id = cpu_to_be16(__sw_id_hw[spec->id]);
-        rule_hw->size = __rule_hw_sz[spec->id] >> 2;
+        rule_hw->size = mlx4_hw_rule_sz(dev, spec->id) >> 2;
 
         switch (spec->id) {
         case MLX4_NET_TRANS_RULE_ID_ETH:
@@ -713,12 +747,12 @@ static int parse_trans_rule(struct mlx4_dev *dev, struct mlx4_spec_list *spec,
                         rule_hw->eth.ether_type_enable = 1;
                         rule_hw->eth.ether_type = spec->eth.ether_type;
                 }
-                rule_hw->eth.vlan_id = spec->eth.vlan_id;
-                rule_hw->eth.vlan_id_msk = spec->eth.vlan_id_msk;
+                rule_hw->eth.vlan_tag = spec->eth.vlan_id;
+                rule_hw->eth.vlan_tag_msk = spec->eth.vlan_id_msk;
                 break;
 
         case MLX4_NET_TRANS_RULE_ID_IB:
-                rule_hw->ib.qpn = spec->ib.r_qpn;
+                rule_hw->ib.l3_qpn = spec->ib.l3_qpn;
                 rule_hw->ib.qpn_mask = spec->ib.qpn_msk;
                 memcpy(&rule_hw->ib.dst_gid, &spec->ib.dst_gid, 16);
                 memcpy(&rule_hw->ib.dst_gid_msk, &spec->ib.dst_gid_msk, 16);
@@ -1136,7 +1170,7 @@ int mlx4_trans_to_dmfs_attach(struct mlx4_dev *dev, struct mlx4_qp *qp,
                 struct mlx4_net_trans_rule rule = {
                         .queue_mode = MLX4_NET_TRANS_Q_FIFO,
                         .exclusive = 0,
-                        .promisc_mode = MLX4_FS_PROMISC_NONE,
+                        .promisc_mode = MLX4_FS_REGULAR,
                         .priority = MLX4_DOMAIN_NIC,
                 };
 
@@ -1229,11 +1263,10 @@ int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port,
         u64 *regid_p;
 
         switch (mode) {
-        case MLX4_FS_PROMISC_UPLINK:
-        case MLX4_FS_PROMISC_FUNCTION_PORT:
+        case MLX4_FS_ALL_DEFAULT:
                 regid_p = &dev->regid_promisc_array[port];
                 break;
-        case MLX4_FS_PROMISC_ALL_MULTI:
+        case MLX4_FS_MC_DEFAULT:
                 regid_p = &dev->regid_allmulti_array[port];
                 break;
         default:
@@ -1260,11 +1293,10 @@ int mlx4_flow_steer_promisc_remove(struct mlx4_dev *dev, u8 port,
         u64 *regid_p;
 
         switch (mode) {
-        case MLX4_FS_PROMISC_UPLINK:
-        case MLX4_FS_PROMISC_FUNCTION_PORT:
+        case MLX4_FS_ALL_DEFAULT:
                 regid_p = &dev->regid_promisc_array[port];
                 break;
-        case MLX4_FS_PROMISC_ALL_MULTI:
+        case MLX4_FS_MC_DEFAULT:
                 regid_p = &dev->regid_allmulti_array[port];
                 break;
         default:
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index eac3dae10efe..df15bb6631cc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -730,85 +730,6 @@ struct mlx4_steer {
         struct list_head steer_entries[MLX4_NUM_STEERS];
 };
 
-struct mlx4_net_trans_rule_hw_ctrl {
-        __be32 ctrl;
-        u8 rsvd1;
-        u8 funcid;
-        u8 vep;
-        u8 port;
-        __be32 qpn;
-        __be32 rsvd2;
-};
-
-struct mlx4_net_trans_rule_hw_ib {
-        u8 size;
-        u8 rsvd1;
-        __be16 id;
-        u32 rsvd2;
-        __be32 qpn;
-        __be32 qpn_mask;
-        u8 dst_gid[16];
-        u8 dst_gid_msk[16];
-} __packed;
-
-struct mlx4_net_trans_rule_hw_eth {
-        u8      size;
-        u8      rsvd;
-        __be16  id;
-        u8      rsvd1[6];
-        u8      dst_mac[6];
-        u16     rsvd2;
-        u8      dst_mac_msk[6];
-        u16     rsvd3;
-        u8      src_mac[6];
-        u16     rsvd4;
-        u8      src_mac_msk[6];
-        u8      rsvd5;
-        u8      ether_type_enable;
-        __be16  ether_type;
-        __be16  vlan_id_msk;
-        __be16  vlan_id;
-} __packed;
-
-struct mlx4_net_trans_rule_hw_tcp_udp {
-        u8      size;
-        u8      rsvd;
-        __be16  id;
-        __be16  rsvd1[3];
-        __be16  dst_port;
-        __be16  rsvd2;
-        __be16  dst_port_msk;
-        __be16  rsvd3;
-        __be16  src_port;
-        __be16  rsvd4;
-        __be16  src_port_msk;
-} __packed;
-
-struct mlx4_net_trans_rule_hw_ipv4 {
-        u8      size;
-        u8      rsvd;
-        __be16  id;
-        __be32  rsvd1;
-        __be32  dst_ip;
-        __be32  dst_ip_msk;
-        __be32  src_ip;
-        __be32  src_ip_msk;
-} __packed;
-
-struct _rule_hw {
-        union {
-                struct {
-                        u8 size;
-                        u8 rsvd;
-                        __be16 id;
-                };
-                struct mlx4_net_trans_rule_hw_eth eth;
-                struct mlx4_net_trans_rule_hw_ib ib;
-                struct mlx4_net_trans_rule_hw_ipv4 ipv4;
-                struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
-        };
-};
-
 enum {
         MLX4_PCI_DEV_IS_VF              = 1 << 0,
         MLX4_PCI_DEV_FORCE_SENSE_PORT   = 1 << 1,
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index e329fe1f11b7..79fd269e2c54 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -298,3 +298,18 @@ void mlx4_cleanup_srq_table(struct mlx4_dev *dev)
                 return;
         mlx4_bitmap_cleanup(&mlx4_priv(dev)->srq_table.bitmap);
 }
+
+struct mlx4_srq *mlx4_srq_lookup(struct mlx4_dev *dev, u32 srqn)
+{
+        struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
+        struct mlx4_srq *srq;
+        unsigned long flags;
+
+        spin_lock_irqsave(&srq_table->lock, flags);
+        srq = radix_tree_lookup(&srq_table->tree,
+                                srqn & (dev->caps.num_srqs - 1));
+        spin_unlock_irqrestore(&srq_table->lock, flags);
+
+        return srq;
+}
+EXPORT_SYMBOL_GPL(mlx4_srq_lookup);