Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90c1d8b6 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Doug Ledford
Browse files

IB/mlx4: Fix potential deadlock when sending mad to wire 



send_mad_to_wire takes the same spinlock that is taken in
the interrupt context.  Therefore, it needs irqsave/restore.

Fixes: b9c5d6a6 ('IB/mlx4: Add multicast group (MCG) paravirtualization for SR-IOV')
Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b8071ad8

drivers/infiniband/hw/mlx4/mcg.c

+4 −3
Original line number Diff line number Diff line
@@ -206,15 +206,16 @@ static int send_mad_to_wire(struct mlx4_ib_demux_ctx *ctx, struct ib_mad *mad) 
{

	struct mlx4_ib_dev *dev = ctx->dev;

	struct ib_ah_attr	ah_attr;

	unsigned long flags;



	spin_lock(&dev->sm_lock);

	spin_lock_irqsave(&dev->sm_lock, flags);

	if (!dev->sm_ah[ctx->port - 1]) {

		/* port is not yet Active, sm_ah not ready */

		spin_unlock(&dev->sm_lock);

		spin_unlock_irqrestore(&dev->sm_lock, flags);

		return -EAGAIN;

	}

	mlx4_ib_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr);

	spin_unlock(&dev->sm_lock);

	spin_unlock_irqrestore(&dev->sm_lock, flags);

	return mlx4_ib_send_to_wire(dev, mlx4_master_func_num(dev->dev),

				    ctx->port, IB_QPT_GSI, 0, 1, IB_QP1_QKEY,

				    &ah_attr, NULL, mad);