Skip to content

Commit 4891f4f

Browse files
Bob Pearsonjgunthorpe
authored andcommitted
RDMA/rxe: Don't schedule rxe_completer from rxe_requester
Now that rxe_completer() is always called serially after rxe_requester() there is no reason to schedule rxe_completer() from rxe_requester(). Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bob Pearson <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent cd8aadd commit 4891f4f

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

drivers/infiniband/sw/rxe/rxe_net.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,12 +440,6 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,
440440
return err;
441441
}
442442

443-
if ((qp_type(qp) != IB_QPT_RC) &&
444-
(pkt->mask & RXE_END_MASK)) {
445-
pkt->wqe->state = wqe_state_done;
446-
rxe_sched_task(&qp->send_task);
447-
}
448-
449443
rxe_counter_inc(rxe, RXE_CNT_SENT_PKTS);
450444
goto done;
451445

drivers/infiniband/sw/rxe/rxe_req.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,8 @@ static void update_wqe_state(struct rxe_qp *qp,
545545
if (pkt->mask & RXE_END_MASK) {
546546
if (qp_type(qp) == IB_QPT_RC)
547547
wqe->state = wqe_state_pending;
548+
else
549+
wqe->state = wqe_state_done;
548550
} else {
549551
wqe->state = wqe_state_processing;
550552
}
@@ -631,12 +633,6 @@ static int rxe_do_local_ops(struct rxe_qp *qp, struct rxe_send_wqe *wqe)
631633
wqe->status = IB_WC_SUCCESS;
632634
qp->req.wqe_index = queue_next_index(qp->sq.queue, qp->req.wqe_index);
633635

634-
/* There is no ack coming for local work requests
635-
* which can lead to a deadlock. So go ahead and complete
636-
* it now.
637-
*/
638-
rxe_sched_task(&qp->send_task);
639-
640636
return 0;
641637
}
642638

@@ -760,7 +756,6 @@ int rxe_requester(struct rxe_qp *qp)
760756
qp->req.wqe_index);
761757
wqe->state = wqe_state_done;
762758
wqe->status = IB_WC_SUCCESS;
763-
rxe_sched_task(&qp->send_task);
764759
goto done;
765760
}
766761
payload = mtu;

0 commit comments

Comments
 (0)