Commit c956940a authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Jason Gunthorpe
Browse files

RDMA/umem: Use dma-buf locked API to solve deadlock 

The cited commit moves umem to call the unlocked versions of dmabuf
unmap/map attachment, but the lock is held while calling to these
functions, hence move back to the locked versions of these APIs.

Fixes: 21c9c5c0 ("RDMA/umem: Prepare to dynamic dma-buf locking specification")
Link: https://lore.kernel.org/r/311c2cb791f8af75486df446819071357353db1b.1675088709.git.leon@kernel.org


Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent b7e08a5a

drivers/infiniband/core/umem_dmabuf.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int ib_umem_dmabuf_map_pages(struct ib_umem_dmabuf *umem_dmabuf) 
	if (umem_dmabuf->sgt)

		goto wait_fence;



	sgt = dma_buf_map_attachment_unlocked(umem_dmabuf->attach,

	sgt = dma_buf_map_attachment(umem_dmabuf->attach,

				     DMA_BIDIRECTIONAL);

	if (IS_ERR(sgt))

		return PTR_ERR(sgt);
@@ -103,7 +103,7 @@ void ib_umem_dmabuf_unmap_pages(struct ib_umem_dmabuf *umem_dmabuf) 
		umem_dmabuf->last_sg_trim = 0;

	}



	dma_buf_unmap_attachment_unlocked(umem_dmabuf->attach, umem_dmabuf->sgt,

	dma_buf_unmap_attachment(umem_dmabuf->attach, umem_dmabuf->sgt,

				 DMA_BIDIRECTIONAL);



	umem_dmabuf->sgt = NULL;