From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09D9FC32792 for ; Thu, 3 Oct 2019 12:06:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5B2920700 for ; Thu, 3 Oct 2019 12:06:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="yL+vDFHp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbfJCMGR (ORCPT ); Thu, 3 Oct 2019 08:06:17 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:50222 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726523AbfJCMGR (ORCPT ); Thu, 3 Oct 2019 08:06:17 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x93C63h8029794; Thu, 3 Oct 2019 05:06:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=mgfHy6VkEs1C9hOuMhxqlYbIqYiLsat3yG9A9AqDa/o=; b=yL+vDFHpL275nfWZR9fdm7Wsk8RCyHK0TJLpr3TUFMO/kHY2g45QKoEZ5vNfPTnTu4y7 JnFhUd6IJHtZoheAUmhfi0Yo/d2wTGYOXffVJFUPXDkS4fLTlW+Xa3ekoDJCYpKqkwkS 0vZhGFU2UWm/opg0TnSnTFH4cFj5y+5nJP17vnTOGhafXuDrUeByClVa9VaamvnmmIcK Ht8E/8/4Lfl+rvZKpQ4zLpAqddi1sw96DAGMEUOxoExJaFb/xgMF5A6rFVzbg5zrIDuS 7S/zqGeQw6G9QrJUny8yIXH9V5noptaLRbk8pfYo4WsO+W7SfFm7LhGreKyAFWyjsxSP pg== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2vd0y73b0g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 03 Oct 2019 05:06:14 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 3 Oct 2019 05:06:13 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 3 Oct 2019 05:06:13 -0700 Received: from lb-tlvb-michal.il.qlogic.org (unknown [10.5.220.215]) by maili.marvell.com (Postfix) with ESMTP id 04D863F7043; Thu, 3 Oct 2019 05:06:11 -0700 (PDT) From: Michal Kalderon To: , , , CC: , Ariel Elior Subject: [PATCH rdma-next 2/2] RDMA/qedr: Fix memory leak in user qp and mr Date: Thu, 3 Oct 2019 15:03:42 +0300 Message-ID: <20191003120342.16926-3-michal.kalderon@marvell.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20191003120342.16926-1-michal.kalderon@marvell.com> References: <20191003120342.16926-1-michal.kalderon@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-03_05:2019-10-03,2019-10-03 signatures=0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org User QPs pbl's won't freed properly. MR pbls won't freed properly. Fixes: e0290cce6ac0 ("qedr: Add support for memory registeration verbs") Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/infiniband/hw/qedr/verbs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c index dbb0b0000594..8d4164380984 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -1581,6 +1581,14 @@ static void qedr_cleanup_user(struct qedr_dev *dev, struct qedr_qp *qp) ib_umem_release(qp->urq.umem); qp->urq.umem = NULL; + + if (rdma_protocol_roce(&dev->ibdev, 1)) { + qedr_free_pbl(dev, &qp->usq.pbl_info, qp->usq.pbl_tbl); + qedr_free_pbl(dev, &qp->urq.pbl_info, qp->urq.pbl_tbl); + } else { + kfree(qp->usq.pbl_tbl); + kfree(qp->urq.pbl_tbl); + } } static int qedr_create_user_qp(struct qedr_dev *dev, @@ -2671,8 +2679,8 @@ int qedr_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata) dev->ops->rdma_free_tid(dev->rdma_ctx, mr->hw_mr.itid); - if ((mr->type != QEDR_MR_DMA) && (mr->type != QEDR_MR_FRMR)) - qedr_free_pbl(dev, &mr->info.pbl_info, mr->info.pbl_table); + if (mr->type != QEDR_MR_DMA) + free_mr_info(dev, &mr->info); /* it could be user registered memory. */ ib_umem_release(mr->umem); -- 2.14.5