[STABLE,5.10] RDMA/restrack: Release MR/QP restrack when delete

Commit Message

[e-mail] Nov. 16, 2024, 9:57 a.m. UTC

From: tuqiang <[e-mail]>

The MR/QP restrack also needs to be released when delete it, otherwise it
cause memory leak as the task struct won't be released.

This problem has been fixed by the commit <dac153f2802d>
("RDMA/restrack: Release MR restrack when delete"), but still exists in the
linux-5.10.y branch.

Fixes: 13ef5539def7 ("RDMA/restrack: Count references to the verbs objects")
Signed-off-by: tuqiang <[e-mail]>
Signed-off-by: Jiang Kun <[e-mail]>
Cc: [e-mail]
Cc: xu xin <[e-mail]>
Cc: Doug Ledford <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Leon Romanovsky <[e-mail]>
---
 drivers/infiniband/core/restrack.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Greg Kroah-Hartman Nov. 16, 2024, 10:25 a.m. UTC | #1

On Sat, Nov 16, 2024 at 05:57:48PM +0800, [e-mail] wrote:
> From: tuqiang <[e-mail]>
> 
> The MR/QP restrack also needs to be released when delete it, otherwise it
> cause memory leak as the task struct won't be released.
> 
> This problem has been fixed by the commit <dac153f2802d>
> ("RDMA/restrack: Release MR restrack when delete"), but still exists in the
> linux-5.10.y branch.

Why don't we just take the correct fix?  Why is this needed instead?

thanks,

greg k-h

Patch

diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index bbbbec5b1593..d5a69c4a1891 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -326,8 +326,6 @@  void rdma_restrack_del(struct rdma_restrack_entry *res)
 	rt = &dev->res[res->type];

 	old = xa_erase(&rt->xa, res->id);
-	if (res->type == RDMA_RESTRACK_MR || res->type == RDMA_RESTRACK_QP)
-		return;
 	WARN_ON(old != res);
 	res->valid = false;