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

Commit 5b8a3b08 authored by Yuval Shaia's avatar Yuval Shaia Committed by Jason Gunthorpe
Browse files

RDMA/vmw_pvrdma: Do not re-calculate npages 



There is no need to re-calculate the number of pages since it is already
done in ib_umem_get.

Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Acked-by: default avatarAdit Ranadive <aditr@vmware.com>
Tested-by: default avatarAdit Ranadive <aditr@vmware.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 1c3081a8

drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c

+4 −11
Original line number Diff line number Diff line
@@ -119,10 +119,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	union pvrdma_cmd_resp rsp;

	struct pvrdma_cmd_create_mr *cmd = &req.create_mr;

	struct pvrdma_cmd_create_mr_resp *resp = &rsp.create_mr_resp;

	int nchunks;

	int ret;

	int entry;

	struct scatterlist *sg;



	if (length == 0 || length > dev->dsr->caps.max_mr_size) {

		dev_warn(&dev->pdev->dev, "invalid mem region length\n");
@@ -137,13 +134,9 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
		return ERR_CAST(umem);

	}



	nchunks = 0;

	for_each_sg(umem->sg_head.sgl, sg, umem->nmap, entry)

		nchunks += sg_dma_len(sg) >> PAGE_SHIFT;



	if (nchunks < 0 || nchunks > PVRDMA_PAGE_DIR_MAX_PAGES) {

	if (umem->npages < 0 || umem->npages > PVRDMA_PAGE_DIR_MAX_PAGES) {

		dev_warn(&dev->pdev->dev, "overflow %d pages in mem region\n",

			 nchunks);

			 umem->npages);

		ret = -EINVAL;

		goto err_umem;

	}
@@ -158,7 +151,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	mr->mmr.size = length;

	mr->umem = umem;



	ret = pvrdma_page_dir_init(dev, &mr->pdir, nchunks, false);

	ret = pvrdma_page_dir_init(dev, &mr->pdir, umem->npages, false);

	if (ret) {

		dev_warn(&dev->pdev->dev,

			 "could not allocate page directory\n");
@@ -175,7 +168,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	cmd->length = length;

	cmd->pd_handle = to_vpd(pd)->pd_handle;

	cmd->access_flags = access_flags;

	cmd->nchunks = nchunks;

	cmd->nchunks = umem->npages;

	cmd->pdir_dma = mr->pdir.dir_dma;



	ret = pvrdma_cmd_post(dev, &req, &rsp, PVRDMA_CMD_CREATE_MR_RESP);