Commit 901bca71 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/qedr: Use ib_umem_num_dma_blocks() instead of ib_umem_page_count() 

The length of the list populated by qedr_populate_pbls() should be
calculated using ib_umem_num_dma_blocks() with the same size/shift passed
to qedr_populate_pbls().

Link: https://lore.kernel.org/r/10-v2-270386b7e60b+28f4-umem_1_jgg@nvidia.com


Acked-by: default avatarMichal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 68363052

drivers/infiniband/hw/qedr/verbs.c

+3 −4
Original line number Diff line number Diff line
@@ -784,9 +784,7 @@ static inline int qedr_init_user_queue(struct ib_udata *udata, 
		return PTR_ERR(q->umem);

	}



	fw_pages = ib_umem_page_count(q->umem) <<

	    (PAGE_SHIFT - FW_PAGE_SHIFT);



	fw_pages = ib_umem_num_dma_blocks(q->umem, 1 << FW_PAGE_SHIFT);

	rc = qedr_prepare_pbl_tbl(dev, &q->pbl_info, fw_pages, 0);

	if (rc)

		goto err0;
@@ -2856,7 +2854,8 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, 
		goto err0;

	}



	rc = init_mr_info(dev, &mr->info, ib_umem_page_count(mr->umem), 1);

	rc = init_mr_info(dev, &mr->info,

			  ib_umem_num_dma_blocks(mr->umem, PAGE_SIZE), 1);

	if (rc)

		goto err1;