evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: b9c5d6a643 ('IB/mlx4: Add multicast group (MCG) paravirtualization for SR-IOV')
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Jack Morgenstein 2015-07-30 17:34:21 +03:00 • committed by Doug Ledford
parent b8071ad893
commit 90c1d8b635
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/infiniband/hw/mlx4/mcg.c
View file

@ -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 mlx4_ib_dev *dev = ctx->dev;
struct ib_ah_attr ah_attr; 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]) { if (!dev->sm_ah[ctx->port - 1]) {
/* port is not yet Active, sm_ah not ready */ /* port is not yet Active, sm_ah not ready */
spin_unlock(&dev->sm_lock); spin_unlock_irqrestore(&dev->sm_lock, flags);
return -EAGAIN; return -EAGAIN;
} }
mlx4_ib_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr); 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), return mlx4_ib_send_to_wire(dev, mlx4_master_func_num(dev->dev),
ctx->port, IB_QPT_GSI, 0, 1, IB_QP1_QKEY, ctx->port, IB_QPT_GSI, 0, 1, IB_QP1_QKEY,
&ah_attr, NULL, mad); &ah_attr, NULL, mad);