AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-18 19:26:54 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

RDMA/vmw_pvrdma: Do not re-calculate npages

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

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Acked-by: Adit Ranadive <aditr@vmware.com>
Tested-by: Adit Ranadive <aditr@vmware.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Yuval Shaia 2017-11-26 13:51:35 +02:00 committed by Jason Gunthorpe
parent 1c3081a8ad
commit 5b8a3b08b3
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
View File

@ -119,10 +119,7 @@ struct ib_mr *pvrdma_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
union pvrdma_cmd_resp rsp; union pvrdma_cmd_resp rsp;
struct pvrdma_cmd_create_mr *cmd = &req.create_mr; struct pvrdma_cmd_create_mr *cmd = &req.create_mr;
struct pvrdma_cmd_create_mr_resp *resp = &rsp.create_mr_resp; struct pvrdma_cmd_create_mr_resp *resp = &rsp.create_mr_resp;
int nchunks;
int ret; int ret;
int entry;
struct scatterlist *sg;
if (length == 0 || length > dev->dsr->caps.max_mr_size) { if (length == 0 || length > dev->dsr->caps.max_mr_size) {
dev_warn(&dev->pdev->dev, "invalid mem region length\n"); 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); return ERR_CAST(umem);
} }
nchunks = 0; if (umem->npages < 0 || umem->npages > PVRDMA_PAGE_DIR_MAX_PAGES) {
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) {
dev_warn(&dev->pdev->dev, "overflow %d pages in mem region\n", dev_warn(&dev->pdev->dev, "overflow %d pages in mem region\n",
nchunks); umem->npages);
ret = -EINVAL; ret = -EINVAL;
goto err_umem; 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->mmr.size = length;
mr->umem = umem; 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) { if (ret) {
dev_warn(&dev->pdev->dev, dev_warn(&dev->pdev->dev,
"could not allocate page directory\n"); "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->length = length;
cmd->pd_handle = to_vpd(pd)->pd_handle; cmd->pd_handle = to_vpd(pd)->pd_handle;
cmd->access_flags = access_flags; cmd->access_flags = access_flags;
cmd->nchunks = nchunks; cmd->nchunks = umem->npages;
cmd->pdir_dma = mr->pdir.dir_dma; cmd->pdir_dma = mr->pdir.dir_dma;
ret = pvrdma_cmd_post(dev, &req, &rsp, PVRDMA_CMD_CREATE_MR_RESP); ret = pvrdma_cmd_post(dev, &req, &rsp, PVRDMA_CMD_CREATE_MR_RESP);