[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of a
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of an error |
Date: |
Sat, 22 Dec 2018 11:50:34 +0200 |
From: Prasad J Pandit <address@hidden>
create_cq and create_qp routines allocate ring object, but it's
not released in case of an error, leading to memory leakage.
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Yuval Shaia <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/rdma/vmw/pvrdma_cmd.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index f236ac4795..89920887bf 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -313,6 +313,14 @@ out:
return rc;
}
+static void destroy_cq_ring(PvrdmaRing *ring)
+{
+ pvrdma_ring_free(ring);
+ /* ring_state was in slot 1, not 0 so need to jump back */
+ rdma_pci_dma_unmap(ring->dev, --ring->ring_state, TARGET_PAGE_SIZE);
+ g_free(ring);
+}
+
static int create_cq(PVRDMADev *dev, union pvrdma_cmd_req *req,
union pvrdma_cmd_resp *rsp)
{
@@ -335,6 +343,10 @@ static int create_cq(PVRDMADev *dev, union pvrdma_cmd_req
*req,
rc = rdma_rm_alloc_cq(&dev->rdma_dev_res, &dev->backend_dev, cmd->cqe,
&resp->cq_handle, ring);
+ if (rc) {
+ destroy_cq_ring(ring);
+ }
+
resp->cqe = cmd->cqe;
return rc;
@@ -356,10 +368,7 @@ static int destroy_cq(PVRDMADev *dev, union pvrdma_cmd_req
*req,
}
ring = (PvrdmaRing *)cq->opaque;
- pvrdma_ring_free(ring);
- /* ring_state was in slot 1, not 0 so need to jump back */
- rdma_pci_dma_unmap(PCI_DEVICE(dev), --ring->ring_state, TARGET_PAGE_SIZE);
- g_free(ring);
+ destroy_cq_ring(ring);
rdma_rm_dealloc_cq(&dev->rdma_dev_res, cmd->cq_handle);
@@ -457,6 +466,17 @@ out:
return rc;
}
+static void destroy_qp_rings(PvrdmaRing *ring)
+{
+ pr_dbg("sring=%p\n", &ring[0]);
+ pvrdma_ring_free(&ring[0]);
+ pr_dbg("rring=%p\n", &ring[1]);
+ pvrdma_ring_free(&ring[1]);
+
+ rdma_pci_dma_unmap(ring->dev, ring->ring_state, TARGET_PAGE_SIZE);
+ g_free(ring);
+}
+
static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req *req,
union pvrdma_cmd_resp *rsp)
{
@@ -486,6 +506,7 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_req
*req,
cmd->max_recv_sge, cmd->recv_cq_handle, rings,
&resp->qpn);
if (rc) {
+ destroy_qp_rings(rings);
return rc;
}
@@ -558,13 +579,7 @@ static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_req
*req,
rdma_rm_dealloc_qp(&dev->rdma_dev_res, cmd->qp_handle);
ring = (PvrdmaRing *)qp->opaque;
- pr_dbg("sring=%p\n", &ring[0]);
- pvrdma_ring_free(&ring[0]);
- pr_dbg("rring=%p\n", &ring[1]);
- pvrdma_ring_free(&ring[1]);
-
- rdma_pci_dma_unmap(PCI_DEVICE(dev), ring->ring_state, TARGET_PAGE_SIZE);
- g_free(ring);
+ destroy_qp_rings(ring);
return 0;
}
--
2.17.1
- [Qemu-devel] [PATCH PULL 18/31] hw/pvrdma: Fill error code in command's response, (continued)
- [Qemu-devel] [PATCH PULL 18/31] hw/pvrdma: Fill error code in command's response, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 19/31] hw/rdma: Remove unneeded code that handles more that one port, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 21/31] hw/pvrdma: Clean device's resource when system is shutdown, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 20/31] vl: Introduce shutdown_notifiers, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 22/31] hw/rdma: Do not use bitmap_zero_extend to free bitmap, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 27/31] pvrdma: add uar_read routine, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 26/31] rdma: check num_sge does not exceed MAX_SGE, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 31/31] pvrdma: check return value from pvrdma_idx_ring_has_ routines, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 23/31] hw/rdma: Do not call rdma_backend_del_gid on an empty gid, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 25/31] pvrdma: release device resources in case of an error, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of an error,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 30/31] rdma: remove unused VENDOR_ERR_NO_SGE macro, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 28/31] pvrdma: check number of pages when creating rings, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 24/31] docs: Update pvrdma device documentation, Marcel Apfelbaum, 2018/12/22
- Re: [Qemu-devel] [PATCH PULL 00/31] RDMA queue, Peter Maydell, 2018/12/22