diff options
| author | Leon Romanovsky <leonro@nvidia.com> | 2022-09-27 12:56:24 +0300 |
|---|---|---|
| committer | Leon Romanovsky <leonro@nvidia.com> | 2022-09-27 12:56:24 +0300 |
| commit | 70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b (patch) | |
| tree | ed0c455d401d55ab30a251662f90a2ab41cae794 /drivers/infiniband/core/umem_dmabuf.c | |
| parent | 8a2dd123f12f69e5373d3103da2c97fc36223e0c (diff) | |
| parent | 939838632b9119614128028eaea3b1d7bf29f16f (diff) | |
| download | linux-70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b.tar.xz | |
Merge branch 'mlx5-vfio' into mlx5-next
Merge net/mlx5 dependencies for device DMA logging.
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Diffstat (limited to 'drivers/infiniband/core/umem_dmabuf.c')
| -rw-r--r-- | drivers/infiniband/core/umem_dmabuf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/core/umem_dmabuf.c index fce80a4a5147..04c04e6d24c3 100644 --- a/drivers/infiniband/core/umem_dmabuf.c +++ b/drivers/infiniband/core/umem_dmabuf.c @@ -18,6 +18,7 @@ int ib_umem_dmabuf_map_pages(struct ib_umem_dmabuf *umem_dmabuf) struct scatterlist *sg; unsigned long start, end, cur = 0; unsigned int nmap = 0; + long ret; int i; dma_resv_assert_held(umem_dmabuf->attach->dmabuf->resv); @@ -67,9 +68,14 @@ wait_fence: * may be not up-to-date. Wait for the exporter to finish * the migration. */ - return dma_resv_wait_timeout(umem_dmabuf->attach->dmabuf->resv, + ret = dma_resv_wait_timeout(umem_dmabuf->attach->dmabuf->resv, DMA_RESV_USAGE_KERNEL, false, MAX_SCHEDULE_TIMEOUT); + if (ret < 0) + return ret; + if (ret == 0) + return -ETIMEDOUT; + return 0; } EXPORT_SYMBOL(ib_umem_dmabuf_map_pages); |