IB/mlx4: Always use the correct port for mirrored multicast attachments

When attaching a QP to a multicast address in bonded mode, there was an
assumption that the port of the QP must be #1. This assumption isn't the
case under the flow which enables maximal usage of the physical ports.

Fix it by always checking the port of the original flow and create the
mirrored flow on the other port.

Fixes: c6215745b66a ('IB/mlx4: Load balance ports in port aggregation mode')
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 2ed5b996b2f43611584c1d7328bd8b839a0e8f9b..3140da518a07c985df488cb9aadebe8d76eff728 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1186,6 +1186,9 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
                        goto err_create_flow;
                i++;
                if (is_bonded) {
+                       /* Application always sees one port so the mirror rule
+                        * must be on port #2
+                        */
                        flow_attr->port = 2;
                        err = __mlx4_ib_create_flow(qp, flow_attr,
                                                    domain, type[j],
@@ -1286,7 +1289,8 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
        reg_id.mirror = 0;
        if (mlx4_is_bonded(dev)) {
-               err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, 2,
+               err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
+                                           (mqp->port == 1) ? 2 : 1,
                                            !!(mqp->flags &
                                            MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
                                            prot, &reg_id.mirror);