From patchwork Sat Dec 22 09:50:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1017825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::12; helo=lists.nongnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kA72H5P5"; dkim-atps=neutral Received: from lists.nongnu.org (lists.nongnu.org [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43MLlm3RHMz9sPd for ; Sat, 22 Dec 2018 21:07:48 +1100 (AEDT) Received: from localhost ([::1]:57935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaeCA-0002A2-2P for incoming@patchwork.ozlabs.org; Sat, 22 Dec 2018 05:07:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadwN-0006Zh-Nd for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gadwM-0006ke-NW for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:27 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35373) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadwM-0006h6-Hf for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:26 -0500 Received: by mail-wm1-x330.google.com with SMTP id c126so7866321wmh.0 for ; Sat, 22 Dec 2018 01:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PEoOOEXeOr5vMltwtegCHT2dihgZRrLbSSSTOix5F/A=; b=kA72H5P51yh6DrjOOTTT7hxxci9DgRUMeyrMrF6dHQohT5RoE/kzcjJ6fktOZorGGI yCgdxBVv0hOCRTuuRyROxyHCcZxcz1FCUanJwI210jJCE3xKIXOJTaTmCaVuhFi1HMi2 T33gndNAIUDuRUU/EQZLELBMdyFadm/ebZL+OdTZ30CeWvMAipFDlENXkO1Kp1dW5b1U ujdyv9XI31bPYuuwN+TPRKEYH4aQha4hPdqPkLoZ/m1gCfCkKMNH2SZVKg1/q5xl9drI oRVfKmFkw+MZy+LdXZM/9inpd3jJgFAHufbBWbQBByGJrVGl8JvvSam0uSY6PZuDmyaW UDKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PEoOOEXeOr5vMltwtegCHT2dihgZRrLbSSSTOix5F/A=; b=LF2/rylRrvUh+RKBp7+EKAI10khQ/rZ5PnaTHOHfCH77Ir4yrctcmA/dAChvtRA4GR qnhZk898iSWeCgPOwG6HFExqAvdpLhP7dfVU2v6dKejOsClSaeveBwruielBqW6/hlbI bTocbMlX6O84luoel6AywLomtoHOGUXFVpiUsLLjeG/PmxfeoUUUlFZ9ujMT9q0b9R/8 SFhfoTo66F8P4jDJm71sCunoeL6bNLqG4BvXKxG7D4MelA1pCSl0C3Fx+zkFY1pItPs4 PJ4KJWgy1mGKa6AbIo6pijDqnJJweDW8UAiabnHcu4SBV53fQMg4oANlNpxQbKKxsqHS rq0Q== X-Gm-Message-State: AA+aEWZ9tCbIptX9nLWnYKbYDz1uIbwb41XEH8TLpEWs8s+8fStI/XqY 6B8DS8QPoF3lcYtEqR+g1sGCxmfR X-Google-Smtp-Source: AFSGD/WpDjm91bepbRKPCfNrqgN+8VlXIQcxSof/sd8udHgDnmQ8FL5x0IohObw60muRz8wOnUf3PA== X-Received: by 2002:a1c:e287:: with SMTP id z129mr5886722wmg.71.1545472280975; Sat, 22 Dec 2018 01:51:20 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.51.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:51:20 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:34 +0200 Message-Id: <20181222095036.29743-30-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> References: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH PULL 29/31] pvrdma: release ring object in case of an error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yuval.shaia@oracle.com, pjp@fedoraproject.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit 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 Signed-off-by: Prasad J Pandit Reviewed-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum --- 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; }