RDMA/qedr: Fix memory leak in user qp and mr

This change “RDMA/qedr: Fix memory leak in user qp and mr” (commit 24e412c) in Linux kernel is authored by Michal Kalderon <michal.kalderon [at] marvell.com> on Sun Oct 27 22:04:51 2019 +0200.

Description of "RDMA/qedr: Fix memory leak in user qp and mr"

The change “RDMA/qedr: Fix memory leak in user qp and mr” introduces changes as follows.

RDMA/qedr: Fix memory leak in user qp and mr

User QPs pbl's weren't freed properly.
MR pbls weren't freed properly.

Fixes: e0290cce6ac0 ("qedr: Add support for memory registeration verbs")
Link: https://lore.kernel.org/r/20191027200451.28187-5-michal.kalderon@marvell.com
Signed-off-by: Ariel Elior <ariel.elior@marvell.com>
Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

Linux kernel releases containing commit 24e412c

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "RDMA/qedr: Fix memory leak in user qp and mr"

There are 12 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 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 a17b388ee3b3..8b4240c1cc76 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)
 	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,
@@ -2689,8 +2697,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. */

The commit for this change in Linux stable tree is 24e412c (patch).

Last modified: 2020/02/08