2014-07-15 08:43:20

by Or Gerlitz

[permalink] [raw]
Subject: Re: [PATCH for 3.16] IB/mlx5: Enable block multicast loopback for kernel consumers too

On 25/06/2014 16:44, Or Gerlitz wrote:
> Under commit f360d88 we advertize blocking multicast loopback to both
> kernel and user-space consumers, but disallow the kernel ones (e.g IPoIB)
> to use it with their UD QPs, fix that.
>
> Fixes: f360d88 ('IB/mlx5: Add block multicast loopback support')
> Reported-by: Haggai Eran <[email protected]>
> Signed-off-by: Eli Cohen <[email protected]>
> Signed-off-by: Or Gerlitz <[email protected]>
> ---

Roland, this needs to go into 3.16 and 3.15-stable too as the bug was
introduced in 3.15-rc2, please make sure to add it to your 3.16 rc pull
request, OK?

Or.

> drivers/infiniband/hw/mlx5/qp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
> index d13ddf1..bbbcf38 100644
> --- a/drivers/infiniband/hw/mlx5/qp.c
> +++ b/drivers/infiniband/hw/mlx5/qp.c
> @@ -675,7 +675,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
> int err;
>
> uuari = &dev->mdev.priv.uuari;
> - if (init_attr->create_flags & ~IB_QP_CREATE_SIGNATURE_EN)
> + if (init_attr->create_flags & ~(IB_QP_CREATE_SIGNATURE_EN | IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK))
> return -EINVAL;
>
> if (init_attr->qp_type == MLX5_IB_QPT_REG_UMR)
>