Skip to contentSkip to conversation

RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"

PATCH Applied Zhu Yanjun 2 participants 2 messages Apr 13, 2023 – Apr 16, 2023

Subsystems (2)
lore
Share & tools
lore

Zhu Yanjun

author
#0 lore raw

PATCH v4 1/1 RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"

From: Zhu Yanjun <[email protected]>

In the function rxe_create_qp(), rxe_qp_from_init() is called to initialize qp, internally things like rxe_init_task are not setup until rxe_qp_init_req().

If an error occures before this point then the unwind will call rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task() which will oops when trying to access the uninitialized spinlock.

If rxe_init_task is not executed, rxe_cleanup_task will not be called.

Fixes 8700e3e7c485 ("Soft RoCE driver")
Fixes 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP")

---
V3 -> V4: Remove the wrong signature;
V2 -> V3: Rebase to rdma-next;
V1 -> V2: Remove memset functions;

---
 drivers/infiniband/sw/rxe/rxe_qp.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +8 -3
index 49891f8ed4e6..d5de5ba6940f 100644
@@ -761,9 +761,14 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
 		del_timer_sync(&qp->rnr_nak_timer);
 	}
 
-	rxe_cleanup_task(&qp->resp.task);
-	rxe_cleanup_task(&qp->req.task);
-	rxe_cleanup_task(&qp->comp.task);
+	if (qp->resp.task.func)
+		rxe_cleanup_task(&qp->resp.task);
+
+	if (qp->req.task.func)
+		rxe_cleanup_task(&qp->req.task);
+
+	if (qp->comp.task.func)
+		rxe_cleanup_task(&qp->comp.task);
 
 	/* flush out any receive wr's or pending requests */
 	rxe_requester(qp);
Signature · 1 line
2.27.0
#1 lore raw
Quoted 9 lines · Zhu Yanjun

In the function rxe_create_qp(), rxe_qp_from_init() is called to initialize qp, internally things like rxe_init_task are not setup until rxe_qp_init_req().

If an error occures before this point then the unwind will call rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task() which will oops when trying to access the uninitialized spinlock.

[...]

Applied, thanks!

[1/1] RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"

      https://git.kernel.org/rdma/rdma/c/b2b1ddc457458f

Best regards,

Signature · 1 line
Leon Romanovsky <[email protected]>