RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"
Subsystems (2)
PATCH v2 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.
---
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
@@ -773,15 +773,20 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->valid =0 ; qp->qp_timeout_jiffies =0 ; -rxe_cleanup_task (&qp->resp.task); + +if (qp->resp.task.func) +rxe_cleanup_task (&qp->resp.task);if (qp_type (qp) ==IB_QPT_RC ) {del_timer_sync (&qp->retrans_timer);del_timer_sync (&qp->rnr_nak_timer); } -rxe_cleanup_task (&qp->req.task); -rxe_cleanup_task (&qp->comp.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 */ if (qp->req.task.func)
Signature · 1 line
2.27.0
Quoted 12 lines · Zhu Yanjun
From: Zhu Yanjun <[email protected]>
In the function
rxe_create_qp(),rxe_qp_from_init()is called to initialize qp, internally things likerxe_init_taskare not setup untilrxe_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_taskis not executed,rxe_cleanup_taskwill not be called.
Quoted 8 lines
Reported-by [email protected]Fixes 8700e3e7c485 ("Soft RoCE driver")Fixes 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP")Signed-off-by Zhu Yanjun <[email protected]>---
V1 -> V2: Remove memset functions;
Gently ping
Zhu Yanjun
Quoted 32 lines
--- drivers/infiniband/sw/rxe/rxe_qp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)drivers/infiniband/sw/rxe/rxe_qp.c +8
-3@@ -773,15 +773,20 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->valid =0 ; qp->qp_timeout_jiffies =0 ; -rxe_cleanup_task (&qp->resp.task); + +if (qp->resp.task.func) +rxe_cleanup_task (&qp->resp.task);if (qp_type (qp) ==IB_QPT_RC ) {del_timer_sync (&qp->retrans_timer);del_timer_sync (&qp->rnr_nak_timer); } -rxe_cleanup_task (&qp->req.task); -rxe_cleanup_task (&qp->comp.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 */ if (qp->req.task.func)
Quoted 16 lines · Zhu Yanjun
Quoted 15 lines · Zhu Yanjun
From: Zhu Yanjun <[email protected]>
In the function
rxe_create_qp(),rxe_qp_from_init()is called to initialize qp, internally things likerxe_init_taskare not setup untilrxe_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_taskis not executed,rxe_cleanup_taskwill not be called.
Quoted 7 lines
Quoted 5 lines
Fixes 8700e3e7c485 ("Soft RoCE driver")Fixes 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP")Signed-off-by Zhu Yanjun <[email protected]>---
V1 -> V2: Remove memset functions;Gently ping
It doesn't apply to rdma-next.
Thanks
Quoted 17 lines · Leon Romanovsky
Quoted 16 lines · Zhu Yanjun
Quoted 15 lines · Zhu Yanjun
From: Zhu Yanjun <[email protected]>
In the function
rxe_create_qp(),rxe_qp_from_init()is called to initialize qp, internally things likerxe_init_taskare not setup untilrxe_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_taskis not executed,rxe_cleanup_taskwill not be called.
Quoted 7 lines
Quoted 6 lines
Quoted 5 lines
Fixes 8700e3e7c485 ("Soft RoCE driver")Fixes 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP")Signed-off-by Zhu Yanjun <[email protected]>---
V1 -> V2: Remove memset functions;Gently ping
It doesn't apply to rdma-next.
The latest commit is based on rdma-next: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Branch: remotes/origin/wip/leon-for-next
Thanks,
Zhu Yanjun
Quoted 2 lines
Thanks