LU-6215 lnet: split struct ib_send_wr

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 1917dc4..1dbd518 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -834,33 +834,26 @@ __must_hold(&conn->ibc_lock)
                 rc = -ENETDOWN;
         } else {
                struct kib_fast_reg_descriptor *frd = tx->fmr.fmr_frd;
-               struct ib_send_wr *bad = &tx->tx_wrq[tx->tx_nwrq - 1];
-               struct ib_send_wr *wrq = tx->tx_wrq;
+               struct ib_send_wr *bad = &tx->tx_wrq[tx->tx_nwrq - 1].wr;
+               struct ib_send_wr *wr  = &tx->tx_wrq[0].wr;
 
                if (frd != NULL) {
                        if (!frd->frd_valid) {
-                               wrq = &frd->frd_inv_wr;
-#ifdef HAVE_IB_MAP_MR_SG
-                               wrq->next = &frd->frd_fastreg_wr.wr;
+                               wr = &frd->frd_inv_wr.wr;
+                               wr->next = &frd->frd_fastreg_wr.wr;
                        } else {
-                               wrq = &frd->frd_fastreg_wr.wr;
+                               wr = &frd->frd_fastreg_wr.wr;
                        }
-                       frd->frd_fastreg_wr.wr.next = tx->tx_wrq;
-#else
-                               wrq->next = &frd->frd_fastreg_wr;
-                       } else {
-                               wrq = &frd->frd_fastreg_wr;
-                       }
-                       frd->frd_fastreg_wr.next = tx->tx_wrq;
-#endif
+                       frd->frd_fastreg_wr.wr.next = &tx->tx_wrq[0].wr;
                }
 
                LASSERTF(bad->wr_id == kiblnd_ptr2wreqid(tx, IBLND_WID_TX),
                         "bad wr_id "LPX64", opc %d, flags %d, peer: %s\n",
                         bad->wr_id, bad->opcode, bad->send_flags,
                         libcfs_nid2str(conn->ibc_peer->ibp_nid));
+
                bad = NULL;
-               rc = ib_post_send(conn->ibc_cmid->qp, wrq, &bad);
+               rc = ib_post_send(conn->ibc_cmid->qp, wr, &bad);
        }
 
         conn->ibc_last_send = jiffies;
@@ -1030,11 +1023,11 @@ kiblnd_tx_complete (kib_tx_t *tx, int status)
 static void
 kiblnd_init_tx_msg (lnet_ni_t *ni, kib_tx_t *tx, int type, int body_nob)
 {
-        kib_hca_dev_t     *hdev = tx->tx_pool->tpo_hdev;
-        struct ib_sge     *sge = &tx->tx_sge[tx->tx_nwrq];
-        struct ib_send_wr *wrq = &tx->tx_wrq[tx->tx_nwrq];
-        int                nob = offsetof (kib_msg_t, ibm_u) + body_nob;
-       struct ib_mr      *mr = hdev->ibh_mrs;
+       kib_hca_dev_t *hdev = tx->tx_pool->tpo_hdev;
+       struct ib_sge *sge = &tx->tx_sge[tx->tx_nwrq];
+       struct ib_rdma_wr *wrq;
+       int nob = offsetof(kib_msg_t, ibm_u) + body_nob;
+       struct ib_mr *mr = hdev->ibh_mrs;
 
        LASSERT(tx->tx_nwrq >= 0);
        LASSERT(tx->tx_nwrq < IBLND_MAX_RDMA_FRAGS + 1);
@@ -1047,16 +1040,17 @@ kiblnd_init_tx_msg (lnet_ni_t *ni, kib_tx_t *tx, int type, int body_nob)
         sge->addr   = tx->tx_msgaddr;
         sge->length = nob;
 
-        memset(wrq, 0, sizeof(*wrq));
+       wrq = &tx->tx_wrq[tx->tx_nwrq];
+       memset(wrq, 0, sizeof(*wrq));
 
-        wrq->next       = NULL;
-        wrq->wr_id      = kiblnd_ptr2wreqid(tx, IBLND_WID_TX);
-        wrq->sg_list    = sge;
-        wrq->num_sge    = 1;
-        wrq->opcode     = IB_WR_SEND;
-        wrq->send_flags = IB_SEND_SIGNALED;
+       wrq->wr.next            = NULL;
+       wrq->wr.wr_id           = kiblnd_ptr2wreqid(tx, IBLND_WID_TX);
+       wrq->wr.sg_list         = sge;
+       wrq->wr.num_sge         = 1;
+       wrq->wr.opcode          = IB_WR_SEND;
+       wrq->wr.send_flags      = IB_SEND_SIGNALED;
 
-        tx->tx_nwrq++;
+       tx->tx_nwrq++;
 }
 
 static int
@@ -1066,7 +1060,7 @@ kiblnd_init_rdma(kib_conn_t *conn, kib_tx_t *tx, int type,
        kib_msg_t         *ibmsg = tx->tx_msg;
        kib_rdma_desc_t   *srcrd = tx->tx_rd;
        struct ib_sge     *sge = &tx->tx_sge[0];
-       struct ib_send_wr *wrq = &tx->tx_wrq[0];
+       struct ib_rdma_wr *wrq;
        int                rc  = resid;
        int                srcidx;
        int                dstidx;
@@ -1113,15 +1107,20 @@ kiblnd_init_rdma(kib_conn_t *conn, kib_tx_t *tx, int type,
 
                 wrq = &tx->tx_wrq[tx->tx_nwrq];
 
-                wrq->next       = wrq + 1;
-                wrq->wr_id      = kiblnd_ptr2wreqid(tx, IBLND_WID_RDMA);
-                wrq->sg_list    = sge;
-                wrq->num_sge    = 1;
-                wrq->opcode     = IB_WR_RDMA_WRITE;
-                wrq->send_flags = 0;
+               wrq->wr.next            = &(wrq + 1)->wr;
+               wrq->wr.wr_id           = kiblnd_ptr2wreqid(tx, IBLND_WID_RDMA);
+               wrq->wr.sg_list         = sge;
+               wrq->wr.num_sge         = 1;
+               wrq->wr.opcode          = IB_WR_RDMA_WRITE;
+               wrq->wr.send_flags      = 0;
 
-                wrq->wr.rdma.remote_addr = kiblnd_rd_frag_addr(dstrd, dstidx);
-                wrq->wr.rdma.rkey        = kiblnd_rd_frag_key(dstrd, dstidx);
+#ifdef HAVE_IB_RDMA_WR
+               wrq->remote_addr        = kiblnd_rd_frag_addr(dstrd, dstidx);
+               wrq->rkey               = kiblnd_rd_frag_key(dstrd, dstidx);
+#else
+               wrq->wr.wr.rdma.remote_addr = kiblnd_rd_frag_addr(dstrd, dstidx);
+               wrq->wr.wr.rdma.rkey    = kiblnd_rd_frag_key(dstrd, dstidx);
+#endif
 
                 srcidx = kiblnd_rd_consume_frag(srcrd, srcidx, wrknob);
                 dstidx = kiblnd_rd_consume_frag(dstrd, dstidx, wrknob);