hw/rdma: Do not allocate memory for non-dma MR
There is no use in the memory allocated for non-dma MR. Delete the code that allocates it. Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Message-Id: <20180805153518.2983-8-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
This commit is contained in:
parent
7f99daadbd
commit
4c408c9d5b
|
@ -144,8 +144,6 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle,
|
||||||
RdmaRmMR *mr;
|
RdmaRmMR *mr;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
RdmaRmPD *pd;
|
RdmaRmPD *pd;
|
||||||
void *addr;
|
|
||||||
size_t length;
|
|
||||||
|
|
||||||
pd = rdma_rm_get_pd(dev_res, pd_handle);
|
pd = rdma_rm_get_pd(dev_res, pd_handle);
|
||||||
if (!pd) {
|
if (!pd) {
|
||||||
|
@ -158,40 +156,29 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint32_t pd_handle,
|
||||||
pr_dbg("Failed to allocate obj in table\n");
|
pr_dbg("Failed to allocate obj in table\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
pr_dbg("mr_handle=%d\n", *mr_handle);
|
||||||
|
|
||||||
if (!host_virt) {
|
pr_dbg("host_virt=0x%p\n", host_virt);
|
||||||
/* TODO: This is my guess but not so sure that this needs to be
|
pr_dbg("guest_start=0x%" PRIx64 "\n", guest_start);
|
||||||
* done */
|
pr_dbg("length=%zu\n", guest_length);
|
||||||
length = TARGET_PAGE_SIZE;
|
|
||||||
addr = g_malloc(length);
|
if (host_virt) {
|
||||||
} else {
|
|
||||||
mr->virt = host_virt;
|
mr->virt = host_virt;
|
||||||
pr_dbg("host_virt=0x%p\n", mr->virt);
|
|
||||||
mr->length = guest_length;
|
|
||||||
pr_dbg("length=%zu\n", guest_length);
|
|
||||||
mr->start = guest_start;
|
mr->start = guest_start;
|
||||||
pr_dbg("guest_start=0x%" PRIx64 "\n", mr->start);
|
mr->length = guest_length;
|
||||||
|
|
||||||
length = mr->length;
|
ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, mr->virt,
|
||||||
addr = mr->virt;
|
mr->length, access_flags);
|
||||||
|
if (ret) {
|
||||||
|
pr_dbg("Fail in rdma_backend_create_mr, err=%d\n", ret);
|
||||||
|
ret = -EIO;
|
||||||
|
goto out_dealloc_mr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, addr, length,
|
/* We keep mr_handle in lkey so send and recv get get mr ptr */
|
||||||
access_flags);
|
*lkey = *mr_handle;
|
||||||
if (ret) {
|
*rkey = -1;
|
||||||
pr_dbg("Fail in rdma_backend_create_mr, err=%d\n", ret);
|
|
||||||
ret = -EIO;
|
|
||||||
goto out_dealloc_mr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!host_virt) {
|
|
||||||
*lkey = mr->lkey = rdma_backend_mr_lkey(&mr->backend_mr);
|
|
||||||
*rkey = mr->rkey = rdma_backend_mr_rkey(&mr->backend_mr);
|
|
||||||
} else {
|
|
||||||
/* We keep mr_handle in lkey so send and recv get get mr ptr */
|
|
||||||
*lkey = *mr_handle;
|
|
||||||
*rkey = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
mr->pd_handle = pd_handle;
|
mr->pd_handle = pd_handle;
|
||||||
|
|
||||||
|
@ -214,7 +201,10 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle)
|
||||||
|
|
||||||
if (mr) {
|
if (mr) {
|
||||||
rdma_backend_destroy_mr(&mr->backend_mr);
|
rdma_backend_destroy_mr(&mr->backend_mr);
|
||||||
munmap(mr->virt, mr->length);
|
pr_dbg("start=0x%" PRIx64 "\n", mr->start);
|
||||||
|
if (mr->start) {
|
||||||
|
munmap(mr->virt, mr->length);
|
||||||
|
}
|
||||||
res_tbl_dealloc(&dev_res->mr_tbl, mr_handle);
|
res_tbl_dealloc(&dev_res->mr_tbl, mr_handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue