1 files changed, 39 insertions, 23 deletions

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index efb9eff8906c..9c5150c3cb31 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -964,9 +964,10 @@ static void destroy_qp_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp,
                                    MLX4_QP_STATE_RST, NULL, 0, 0, &qp->mqp))
                         pr_warn("modify QP %06x to RESET failed.\n",
                                qp->mqp.qpn);
-                if (qp->pri.smac) {
+                if (qp->pri.smac || (!qp->pri.smac && qp->pri.smac_port)) {
                         mlx4_unregister_mac(dev->dev, qp->pri.smac_port, qp->pri.smac);
                         qp->pri.smac = 0;
+                        qp->pri.smac_port = 0;
                 }
                 if (qp->alt.smac) {
                         mlx4_unregister_mac(dev->dev, qp->alt.smac_port, qp->alt.smac);
@@ -1325,7 +1326,8 @@ static int _mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
                  * If one was already assigned, but the new mac differs,
                  * unregister the old one and register the new one.
                 */
-                if (!smac_info->smac || smac_info->smac != smac) {
+                if ((!smac_info->smac && !smac_info->smac_port) ||
+                    smac_info->smac != smac) {
                         /* register candidate now, unreg if needed, after success */
                         smac_index = mlx4_register_mac(dev->dev, port, smac);
                         if (smac_index >= 0) {
@@ -1390,21 +1392,13 @@ static void update_mcg_macs(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp)
 static int handle_eth_ud_smac_index(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp, u8 *smac,
                                     struct mlx4_qp_context *context)
 {
-        struct net_device *ndev;
         u64 u64_mac;
         int smac_index;
 
-
-        ndev = dev->iboe.netdevs[qp->port - 1];
-        if (ndev) {
-                smac = ndev->dev_addr;
-                u64_mac = mlx4_mac_to_u64(smac);
-        } else {
-                u64_mac = dev->dev->caps.def_mac[qp->port];
-        }
+        u64_mac = atomic64_read(&dev->iboe.mac[qp->port - 1]);
 
         context->pri_path.sched_queue = MLX4_IB_DEFAULT_SCHED_QUEUE | ((qp->port - 1) << 6);
-        if (!qp->pri.smac) {
+        if (!qp->pri.smac && !qp->pri.smac_port) {
                 smac_index = mlx4_register_mac(dev->dev, qp->port, u64_mac);
                 if (smac_index >= 0) {
                         qp->pri.candidate_smac_index = smac_index;
@@ -1432,6 +1426,12 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
         int steer_qp = 0;
         int err = -EINVAL;
 
+        /* APM is not supported under RoCE */
+        if (attr_mask & IB_QP_ALT_PATH &&
+            rdma_port_get_link_layer(&dev->ib_dev, qp->port) ==
+            IB_LINK_LAYER_ETHERNET)
+                return -ENOTSUPP;
+
         context = kzalloc(sizeof *context, GFP_KERNEL);
         if (!context)
                 return -ENOMEM;
@@ -1682,7 +1682,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                                         MLX4_IB_LINK_TYPE_ETH;
                 if (dev->dev->caps.tunnel_offload_mode ==  MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
                         /* set QP to receive both tunneled & non-tunneled packets */
-                        if (!(context->flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET)))
+                        if (!(context->flags & cpu_to_be32(1 << MLX4_RSS_QPC_FLAG_OFFSET)))
                                 context->srqn = cpu_to_be32(7 << 28);
                 }
         }
@@ -1786,9 +1786,10 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                         if (qp->flags & MLX4_IB_QP_NETIF)
                                 mlx4_ib_steer_qp_reg(dev, qp, 0);
                 }
-                if (qp->pri.smac) {
+                if (qp->pri.smac || (!qp->pri.smac && qp->pri.smac_port)) {
                         mlx4_unregister_mac(dev->dev, qp->pri.smac_port, qp->pri.smac);
                         qp->pri.smac = 0;
+                        qp->pri.smac_port = 0;
                 }
                 if (qp->alt.smac) {
                         mlx4_unregister_mac(dev->dev, qp->alt.smac_port, qp->alt.smac);
@@ -1812,11 +1813,12 @@ out:
         if (err && steer_qp)
                 mlx4_ib_steer_qp_reg(dev, qp, 0);
         kfree(context);
-        if (qp->pri.candidate_smac) {
+        if (qp->pri.candidate_smac ||
+            (!qp->pri.candidate_smac && qp->pri.candidate_smac_port)) {
                 if (err) {
                         mlx4_unregister_mac(dev->dev, qp->pri.candidate_smac_port, qp->pri.candidate_smac);
                 } else {
-                        if (qp->pri.smac)
+                        if (qp->pri.smac || (!qp->pri.smac && qp->pri.smac_port))
                                 mlx4_unregister_mac(dev->dev, qp->pri.smac_port, qp->pri.smac);
                         qp->pri.smac = qp->pri.candidate_smac;
                         qp->pri.smac_index = qp->pri.candidate_smac_index;
@@ -2089,6 +2091,16 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp,
         return 0;
 }
 
+static void mlx4_u64_to_smac(u8 *dst_mac, u64 src_mac)
+{
+        int i;
+
+        for (i = ETH_ALEN; i; i--) {
+                dst_mac[i - 1] = src_mac & 0xff;
+                src_mac >>= 8;
+        }
+}
+
 static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
                             void *wqe, unsigned *mlx_seg_len)
 {
@@ -2203,7 +2215,6 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
         }
 
         if (is_eth) {
-                u8 *smac;
                 struct in6_addr in6;
 
                 u16 pcp = (be32_to_cpu(ah->av.ib.sl_tclass_flowlabel) >> 29) << 13;
@@ -2216,12 +2227,17 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
                 memcpy(&ctrl->imm, ah->av.eth.mac + 2, 4);
                 memcpy(&in6, sgid.raw, sizeof(in6));
 
-                if (!mlx4_is_mfunc(to_mdev(ib_dev)->dev))
-                        smac = to_mdev(sqp->qp.ibqp.device)->
-                                iboe.netdevs[sqp->qp.port - 1]->dev_addr;
-                else    /* use the src mac of the tunnel */
-                        smac = ah->av.eth.s_mac;
-                memcpy(sqp->ud_header.eth.smac_h, smac, 6);
+                if (!mlx4_is_mfunc(to_mdev(ib_dev)->dev)) {
+                        u64 mac = atomic64_read(&to_mdev(ib_dev)->iboe.mac[sqp->qp.port - 1]);
+                        u8 smac[ETH_ALEN];
+
+                        mlx4_u64_to_smac(smac, mac);
+                        memcpy(sqp->ud_header.eth.smac_h, smac, ETH_ALEN);
+                } else {
+                        /* use the src mac of the tunnel */
+                        memcpy(sqp->ud_header.eth.smac_h, ah->av.eth.s_mac, ETH_ALEN);
+                }
+
                 if (!memcmp(sqp->ud_header.eth.smac_h, sqp->ud_header.eth.dmac_h, 6))
                         mlx->flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK);
                 if (!is_vlan) {