IB/mlx4: Add support for blocking multicast loopback packets

Add support for handling the IB_QP_CREATE_MULTICAST_BLOCK_LOOPBACK
flag by using the per-multicast group loopback blocking feature of
mlx4 hardware.

Signed-off-by: Ron Livne <ronli@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 44bbd6c2e315..91590e7fba0c 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -511,6 +511,9 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
         } else {
                 qp->sq_no_prefetch = 0;
 
+                if (init_attr->create_flags & IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK)
+                        qp->flags |= MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK;
+
                 if (init_attr->create_flags & IB_QP_CREATE_IPOIB_UD_LSO)
                         qp->flags |= MLX4_IB_QP_LSO;
 
@@ -684,10 +687,15 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
         struct mlx4_ib_qp *qp;
         int err;
 
-        /* We only support LSO, and only for kernel UD QPs. */
-        if (init_attr->create_flags & ~IB_QP_CREATE_IPOIB_UD_LSO)
+        /*
+         * We only support LSO and multicast loopback blocking, and
+         * only for kernel UD QPs.
+         */
+        if (init_attr->create_flags & ~(IB_QP_CREATE_IPOIB_UD_LSO |
+                                        IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK))
                 return ERR_PTR(-EINVAL);
-        if (init_attr->create_flags & IB_QP_CREATE_IPOIB_UD_LSO &&
+
+        if (init_attr->create_flags &&
             (pd->uobject || init_attr->qp_type != IB_QPT_UD))
                 return ERR_PTR(-EINVAL);
 
@@ -1844,6 +1852,13 @@ done:
 
         qp_init_attr->cap            = qp_attr->cap;
 
+        qp_init_attr->create_flags = 0;
+        if (qp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK)
+                qp_init_attr->create_flags |= IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK;
+
+        if (qp->flags & MLX4_IB_QP_LSO)
+                qp_init_attr->create_flags |= IB_QP_CREATE_IPOIB_UD_LSO;
+
 out:
         mutex_unlock(&qp->mutex);
         return err;