IB/rxe: fix for duplicate request processing and ack psns

[ Upstream commit b97db58557f4aa6d9903f8e1deea6b3d1ed0ba43 ]

Don't reset the resp opcode for a replayed read response.
The resp opcode could be in the middle of a write or send
sequence, when the duplicate read request was received.
An example sequence is as follows:
- Receive read request for 12KB PSN 20. Transmit read response
  first, middle and last with PSNs 20,21,22.
- Receive write first PSN 23.
  At this point the resp psn is 24 and resp opcode is write first.
- The sender notices that PSN 20 is dropped and retransmits.
  Receive read request for 12KB PSN 20. Transmit read response
  first, middle and last with PSNs 20,21,22. The resp opcode is
  set to -1, the resp psn remains 24.
- Receive write first PSN 23. This is processed by duplicate_request().
  The resp opcode remains -1 and resp psn remains 24.
- Receive write middle PSN 24. check_op_seq() reports a missing
  first error since the resp opcode is -1.

When sending an ack for a duplicate send or write request,
use the psn of the previous ack sent. Do not use the psn
of a read response for the ack.
An example sequence is as follows:
- Receive write PSN 30. Transmit ACK for PSN 30.
- Receive read request 4KB PSN 31. Transmit read response with
  PSN 31. The resp psn is now 32.
- The sender notices that PSN 30 is dropped and retransmits.
  Receive write PSN 30. duplicate_request() sends an ACK with
  PSN 31. That is incorrect since PSN 31 was a read request.

Signed-off-by: Vijay Immanuel <vijayi@attalasystems.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index bd43c1c7a42fdb3938d04b8bfefa7fcd63550942..4d84b010b3ee200c2e82999688f4297a697ce899 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -683,6 +683,7 @@ static enum resp_states read_reply(struct rxe_qp *qp,
                rxe_advance_resp_resource(qp);
 
                res->type               = RXE_READ_MASK;
+               res->replay             = 0;
 
                res->read.va            = qp->resp.va;
                res->read.va_org        = qp->resp.va;
@@ -753,7 +754,8 @@ static enum resp_states read_reply(struct rxe_qp *qp,
                state = RESPST_DONE;
        } else {
                qp->resp.res = NULL;
-               qp->resp.opcode = -1;
+               if (!res->replay)
+                       qp->resp.opcode = -1;
                if (psn_compare(res->cur_psn, qp->resp.psn) >= 0)
                        qp->resp.psn = res->cur_psn;
                state = RESPST_CLEANUP;
@@ -815,6 +817,7 @@ static enum resp_states execute(struct rxe_qp *qp, struct rxe_pkt_info *pkt)
 
        /* next expected psn, read handles this separately */
        qp->resp.psn = (pkt->psn + 1) & BTH_PSN_MASK;
+       qp->resp.ack_psn = qp->resp.psn;
 
        qp->resp.opcode = pkt->opcode;
        qp->resp.status = IB_WC_SUCCESS;
@@ -1071,7 +1074,7 @@ static enum resp_states duplicate_request(struct rxe_qp *qp,
                                          struct rxe_pkt_info *pkt)
 {
        enum resp_states rc;
-       u32 prev_psn = (qp->resp.psn - 1) & BTH_PSN_MASK;
+       u32 prev_psn = (qp->resp.ack_psn - 1) & BTH_PSN_MASK;
 
        if (pkt->mask & RXE_SEND_MASK ||
            pkt->mask & RXE_WRITE_MASK) {
@@ -1114,6 +1117,7 @@ static enum resp_states duplicate_request(struct rxe_qp *qp,
                        res->state = (pkt->psn == res->first_psn) ?
                                        rdatm_res_state_new :
                                        rdatm_res_state_replay;
+                       res->replay = 1;
 
                        /* Reset the resource, except length. */
                        res->read.va_org = iova;

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index 1019f5e7dbddd2199b8c9e420159dfe9a7775683..59f6a24db064b690abf3766aa008ebcd855850a3 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -173,6 +173,7 @@ enum rdatm_res_state {
 
 struct resp_res {
        int                     type;
+       int                     replay;
        u32                     first_psn;
        u32                     last_psn;
        u32                     cur_psn;
@@ -197,6 +198,7 @@ struct rxe_resp_info {
        enum rxe_qp_state       state;
        u32                     msn;
        u32                     psn;
+       u32                     ack_psn;
        int                     opcode;
        int                     drop_msg;
        int                     goto_error;