diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-10-26 22:46:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-26 22:46:08 -0400 |
| commit | aa9c5579153535fb317a9d34c7d8eaf02b7ef4cd (patch) | |
| tree | 2243934db57482a50d163c53db8cf7f5836dac22 | |
| parent | drivers: net: xgene: Rewrite buggy loop in xgene_enet_ecc_init() (diff) | |
| parent | net/mlx4_core: Call synchronize_irq() before freeing EQ buffer (diff) | |
| download | linux-dev-aa9c5579153535fb317a9d34c7d8eaf02b7ef4cd.tar.xz linux-dev-aa9c5579153535fb317a9d34c7d8eaf02b7ef4cd.zip | |
Merge branch 'mellanox'
Eli Cohen says:
====================
irq sync fixes
This two patch series fixes a race where an interrupt handler could access a
freed memory.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/eq.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eq.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index a49c9d11d8a5..49290a405903 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -1026,6 +1026,7 @@ static void mlx4_free_eq(struct mlx4_dev *dev, pr_cont("\n"); } } + synchronize_irq(eq->irq); mlx4_mtt_cleanup(dev, &eq->mtt); for (i = 0; i < npages; ++i) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index ed53291468f3..a278238a2db6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c @@ -420,6 +420,7 @@ int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq) if (err) mlx5_core_warn(dev, "failed to destroy a previously created eq: eqn %d\n", eq->eqn); + synchronize_irq(table->msix_arr[eq->irqn].vector); mlx5_buf_free(dev, &eq->buf); return err; |