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

Commit b9332dad authored by Yishai Hadas's avatar Yishai Hadas Committed by Jason Gunthorpe
Browse files

IB/mlx5: Fix clean_mr() to work in the expected order 

Any dma map underlying the MR should only be freed once the MR is fenced
at the hardware.

As of the above we first destroy the MKEY and just after that can safely
call to dma_unmap_single().

Link: https://lore.kernel.org/r/20190723065733.4899-6-leon@kernel.org


Cc: <stable@vger.kernel.org> # 4.3
Fixes: 8a187ee5 ("IB/mlx5: Support the new memory registration API")
Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Reviewed-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 9ec4483a

drivers/infiniband/hw/mlx5/mr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1582,10 +1582,10 @@ static void clean_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) 
		mr->sig = NULL;

		mr->sig = NULL;

	}

	}





	mlx5_free_priv_descs(mr);

	if (!allocated_from_cache) {



	if (!allocated_from_cache)

		destroy_mkey(dev, mr);

		destroy_mkey(dev, mr);

		mlx5_free_priv_descs(mr);

	}

}

}





static void dereg_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)

static void dereg_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)