RDMA/rxe: Fix double free in rxe_qp.c
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix double free in rxe_qp.c
A recent patch can cause a double spin_unlock_bh() in rxe_qp_to_attr() at line 715 in rxe_qp.c. This patch corrects that behavior.
A newer patch from Guoqing Jiang recommends replacing all spin_lock calls for qp->state_lock to spin_(un)lock_irqsave(restore)() since apparently the blktests test suite can call the kernel verbs APIs while in hard interrupt state. This patch needs to be applied first and Guoqing's patch modified to accommodate this small change.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_qp.c +2 -1
@@ -712,8 +712,9 @@ int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask)if (qp->attr.sq_draining) {spin_unlock_bh (&qp->state_lock);cond_resched (); + }else { +spin_unlock_bh (&qp->state_lock); } -spin_unlock_bh (&qp->state_lock);return 0 ; }
Signature · 1 line
2.37.2
Hello,
Quoted 8 lines · Bob Pearson
A recent patch can cause a double
spin_unlock_bh()inrxe_qp_to_attr()at line 715 inrxe_qp.c. This patch corrects that behavior.A newer patch from Guoqing Jiang recommends replacing all
spin_lockcalls forqp->state_lockto spin_(un)lock_irqsave(restore)() since apparently the blktests test suite can call the kernel verbs APIs while in hard interrupt state. This patch needs to be applied first and Guoqing's patch modified to accommodate this small change.
If you don't mind, I will send a patch set with your patch as first one, then refresh mine. Which means we don't need to keep the second paragraph in commit message, what do you think?
Quoted 13 lines
Fixes f605f26ea196 ("RDMA/rxe: Protect QP state with qp->state_lock")Reported-by Dan Carpenter <[email protected]>Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_qp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/infiniband/sw/rxe/rxe_qp.c +0
-0
drivers/infiniband/sw/rxe/rxe_qp.c int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask) · line 720
Quoted 10 lines
drivers/infiniband/sw/rxe/rxe_qp.c +2
-1@@ -712,8 +712,9 @@ int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask)if (qp->attr.sq_draining) {spin_unlock_bh (&qp->state_lock);cond_resched (); + }else { +spin_unlock_bh (&qp->state_lock); } -spin_unlock_bh (&qp->state_lock);return 0 ; }
Looks good, Acked-by: Guoqing Jiang <[email protected]>
Thanks,
Guoqing
Quoted 41 lines · Guoqing Jiang
Hello,
Quoted 8 lines · Bob Pearson
A recent patch can cause a double
spin_unlock_bh()inrxe_qp_to_attr()at line 715 inrxe_qp.c. This patch corrects that behavior.A newer patch from Guoqing Jiang recommends replacing all
spin_lockcalls forqp->state_lockto spin_(un)lock_irqsave(restore)() since apparently the blktests test suite can call the kernel verbs APIs while in hard interrupt state. This patch needs to be applied first and Guoqing's patch modified to accommodate this small change.If you don't mind, I will send a patch set with your patch as first one, then refresh mine. Which means we don't need to keep the second paragraph in commit message, what do you think?
Quoted 13 lines
Fixes f605f26ea196 ("RDMA/rxe: Protect QP state with qp->state_lock")Reported-by Dan Carpenter <[email protected]>Signed-off-by Bob Pearson <[email protected]>---
drivers/infiniband/sw/rxe/rxe_qp.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)drivers/infiniband/sw/rxe/rxe_qp.c +0
-0drivers/infiniband/sw/rxe/rxe_qp.c int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask) · line 719
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_qp.c +2
-1@@ -712,8 +712,9 @@ int rxe_qp_to_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask) if (qp->attr.sq_draining) { spin_unlock_bh(&qp->state_lock); cond_resched(); + } else { + spin_unlock_bh(&qp->state_lock); } - spin_unlock_bh(&qp->state_lock); return 0; }Looks good, Acked-by: Guoqing Jiang <[email protected]>
Quoted 2 lines
Thanks,
Guoqing
Guoqing,
I don't care how we do it. Perhaps we should leave it up to the maintainers. Just needs to be done.
Bob
Quoted 9 lines · Bob Pearson
A recent patch can cause a double
spin_unlock_bh()inrxe_qp_to_attr()at line 715 inrxe_qp.c. This patch corrects that behavior.A newer patch from Guoqing Jiang recommends replacing all
spin_lockcalls forqp->state_lockto spin_(un)lock_irqsave(restore)() since apparently the blktests test suite can call the kernel verbs APIs while in hard interrupt state. This patch needs to be applied first and Guoqing's patch modified to accommodate this small change.
Quoted 7 lines
Fixes f605f26ea196 ("RDMA/rxe: Protect QP state with qp->state_lock")Reported-by Dan Carpenter <[email protected]>Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_qp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to for-rc, thanks
Jason
Quoted 18 lines · Jason Gunthorpe
Quoted 9 lines · Bob Pearson
A recent patch can cause a double
spin_unlock_bh()inrxe_qp_to_attr()at line 715 inrxe_qp.c. This patch corrects that behavior.A newer patch from Guoqing Jiang recommends replacing all
spin_lockcalls forqp->state_lockto spin_(un)lock_irqsave(restore)() since apparently the blktests test suite can call the kernel verbs APIs while in hard interrupt state. This patch needs to be applied first and Guoqing's patch modified to accommodate this small change.Quoted 7 lines
Fixes f605f26ea196 ("RDMA/rxe: Protect QP state with qp->state_lock")Reported-by Dan Carpenter <[email protected]>Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_qp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 3 lines
Applied to for-rc, thanks
Jason
Thanks