Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull rdma updates from Doug Ledford:
 "This is my initial round of 4.4 merge window patches.  There are a few
  other things I wish to get in for 4.4 that aren't in this pull, as
  this represents what has gone through merge/build/run testing and not
  what is the last few items for which testing is not yet complete.

   - "Checksum offload support in user space" enablement
   - Misc cxgb4 fixes, add T6 support
   - Misc usnic fixes
   - 32 bit build warning fixes
   - Misc ocrdma fixes
   - Multicast loopback prevention extension
   - Extend the GID cache to store and return attributes of GIDs
   - Misc iSER updates
   - iSER clustering update
   - Network NameSpace support for rdma CM
   - Work Request cleanup series
   - New Memory Registration API"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (76 commits)
  IB/core, cma: Make __attribute_const__ declarations sparse-friendly
  IB/core: Remove old fast registration API
  IB/ipath: Remove fast registration from the code
  IB/hfi1: Remove fast registration from the code
  RDMA/nes: Remove old FRWR API
  IB/qib: Remove old FRWR API
  iw_cxgb4: Remove old FRWR API
  RDMA/cxgb3: Remove old FRWR API
  RDMA/ocrdma: Remove old FRWR API
  IB/mlx4: Remove old FRWR API support
  IB/mlx5: Remove old FRWR API support
  IB/srp: Dont allocate a page vector when using fast_reg
  IB/srp: Remove srp_finish_mapping
  IB/srp: Convert to new registration API
  IB/srp: Split srp_map_sg
  RDS/IW: Convert to new memory registration API
  svcrdma: Port to new memory registration API
  xprtrdma: Port to new memory registration API
  iser-target: Port to new memory registration API
  IB/iser: Port to new fast registration API
  ...

1 files changed, 97 insertions, 172 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index aa59037d7504..dfbbbb28090b 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -473,10 +473,8 @@ isert_conn_free_fastreg_pool(struct isert_conn *isert_conn)
         list_for_each_entry_safe(fr_desc, tmp,
                                  &isert_conn->fr_pool, list) {
                 list_del(&fr_desc->list);
-                ib_free_fast_reg_page_list(fr_desc->data_frpl);
                 ib_dereg_mr(fr_desc->data_mr);
                 if (fr_desc->pi_ctx) {
-                        ib_free_fast_reg_page_list(fr_desc->pi_ctx->prot_frpl);
                         ib_dereg_mr(fr_desc->pi_ctx->prot_mr);
                         ib_dereg_mr(fr_desc->pi_ctx->sig_mr);
                         kfree(fr_desc->pi_ctx);
@@ -504,22 +502,13 @@ isert_create_pi_ctx(struct fast_reg_descriptor *desc,
                 return -ENOMEM;
         }
 
-        pi_ctx->prot_frpl = ib_alloc_fast_reg_page_list(device,
-                                            ISCSI_ISER_SG_TABLESIZE);
-        if (IS_ERR(pi_ctx->prot_frpl)) {
-                isert_err("Failed to allocate prot frpl err=%ld\n",
-                          PTR_ERR(pi_ctx->prot_frpl));
-                ret = PTR_ERR(pi_ctx->prot_frpl);
-                goto err_pi_ctx;
-        }
-
         pi_ctx->prot_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG,
                                       ISCSI_ISER_SG_TABLESIZE);
         if (IS_ERR(pi_ctx->prot_mr)) {
                 isert_err("Failed to allocate prot frmr err=%ld\n",
                           PTR_ERR(pi_ctx->prot_mr));
                 ret = PTR_ERR(pi_ctx->prot_mr);
-                goto err_prot_frpl;
+                goto err_pi_ctx;
         }
         desc->ind |= ISERT_PROT_KEY_VALID;
 
@@ -539,8 +528,6 @@ isert_create_pi_ctx(struct fast_reg_descriptor *desc,
 
 err_prot_mr:
         ib_dereg_mr(pi_ctx->prot_mr);
-err_prot_frpl:
-        ib_free_fast_reg_page_list(pi_ctx->prot_frpl);
 err_pi_ctx:
         kfree(pi_ctx);
 
@@ -551,34 +538,18 @@ static int
 isert_create_fr_desc(struct ib_device *ib_device, struct ib_pd *pd,
                      struct fast_reg_descriptor *fr_desc)
 {
-        int ret;
-
-        fr_desc->data_frpl = ib_alloc_fast_reg_page_list(ib_device,
-                                                         ISCSI_ISER_SG_TABLESIZE);
-        if (IS_ERR(fr_desc->data_frpl)) {
-                isert_err("Failed to allocate data frpl err=%ld\n",
-                          PTR_ERR(fr_desc->data_frpl));
-                return PTR_ERR(fr_desc->data_frpl);
-        }
-
         fr_desc->data_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG,
                                        ISCSI_ISER_SG_TABLESIZE);
         if (IS_ERR(fr_desc->data_mr)) {
                 isert_err("Failed to allocate data frmr err=%ld\n",
                           PTR_ERR(fr_desc->data_mr));
-                ret = PTR_ERR(fr_desc->data_mr);
-                goto err_data_frpl;
+                return PTR_ERR(fr_desc->data_mr);
         }
         fr_desc->ind |= ISERT_DATA_KEY_VALID;
 
         isert_dbg("Created fr_desc %p\n", fr_desc);
 
         return 0;
-
-err_data_frpl:
-        ib_free_fast_reg_page_list(fr_desc->data_frpl);
-
-        return ret;
 }
 
 static int
@@ -1579,7 +1550,6 @@ isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn)
         struct iser_hdr *iser_hdr = &rx_desc->iser_header;
         uint64_t read_va = 0, write_va = 0;
         uint32_t read_stag = 0, write_stag = 0;
-        int rc;
 
         switch (iser_hdr->flags & 0xF0) {
         case ISCSI_CTRL:
@@ -1606,8 +1576,8 @@ isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn)
                 break;
         }
 
-        rc = isert_rx_opcode(isert_conn, rx_desc,
-                             read_stag, read_va, write_stag, write_va);
+        isert_rx_opcode(isert_conn, rx_desc,
+                        read_stag, read_va, write_stag, write_va);
 }
 
 static void
@@ -1716,10 +1686,10 @@ isert_unmap_cmd(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
                 isert_unmap_data_buf(isert_conn, &wr->data);
         }
 
-        if (wr->send_wr) {
+        if (wr->rdma_wr) {
                 isert_dbg("Cmd %p free send_wr\n", isert_cmd);
-                kfree(wr->send_wr);
-                wr->send_wr = NULL;
+                kfree(wr->rdma_wr);
+                wr->rdma_wr = NULL;
         }
 
         if (wr->ib_sge) {
@@ -1754,7 +1724,7 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
         }
 
         wr->ib_sge = NULL;
-        wr->send_wr = NULL;
+        wr->rdma_wr = NULL;
 }
 
 static void
@@ -1923,7 +1893,7 @@ isert_completion_rdma_write(struct iser_tx_desc *tx_desc,
         }
 
         device->unreg_rdma_mem(isert_cmd, isert_conn);
-        wr->send_wr_num = 0;
+        wr->rdma_wr_num = 0;
         if (ret)
                 transport_send_check_condition_and_sense(se_cmd,
                                                          se_cmd->pi_err, 0);
@@ -1951,7 +1921,7 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
         iscsit_stop_dataout_timer(cmd);
         device->unreg_rdma_mem(isert_cmd, isert_conn);
         cmd->write_data_done = wr->data.len;
-        wr->send_wr_num = 0;
+        wr->rdma_wr_num = 0;
 
         isert_dbg("Cmd: %p RDMA_READ comp calling execute_cmd\n", isert_cmd);
         spin_lock_bh(&cmd->istate_lock);
@@ -2403,7 +2373,7 @@ isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
 
 static int
 isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
-                    struct ib_sge *ib_sge, struct ib_send_wr *send_wr,
+                    struct ib_sge *ib_sge, struct ib_rdma_wr *rdma_wr,
                     u32 data_left, u32 offset)
 {
         struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
@@ -2418,8 +2388,8 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
         sg_nents = min(cmd->se_cmd.t_data_nents - sg_off, isert_conn->max_sge);
         page_off = offset % PAGE_SIZE;
 
-        send_wr->sg_list = ib_sge;
-        send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
+        rdma_wr->wr.sg_list = ib_sge;
+        rdma_wr->wr.wr_id = (uintptr_t)&isert_cmd->tx_desc;
         /*
          * Perform mapping of TCM scatterlist memory ib_sge dma_addr.
          */
@@ -2444,11 +2414,11 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
                 isert_dbg("Incrementing ib_sge pointer to %p\n", ib_sge);
         }
 
-        send_wr->num_sge = ++i;
+        rdma_wr->wr.num_sge = ++i;
         isert_dbg("Set outgoing sg_list: %p num_sg: %u from TCM SGLs\n",
-                  send_wr->sg_list, send_wr->num_sge);
+                  rdma_wr->wr.sg_list, rdma_wr->wr.num_sge);
 
-        return send_wr->num_sge;
+        return rdma_wr->wr.num_sge;
 }
 
 static int
@@ -2459,7 +2429,7 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
         struct isert_conn *isert_conn = conn->context;
         struct isert_data_buf *data = &wr->data;
-        struct ib_send_wr *send_wr;
+        struct ib_rdma_wr *rdma_wr;
         struct ib_sge *ib_sge;
         u32 offset, data_len, data_left, rdma_write_max, va_offset = 0;
         int ret = 0, i, ib_sge_cnt;
@@ -2484,11 +2454,11 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         }
         wr->ib_sge = ib_sge;
 
-        wr->send_wr_num = DIV_ROUND_UP(data->nents, isert_conn->max_sge);
-        wr->send_wr = kzalloc(sizeof(struct ib_send_wr) * wr->send_wr_num,
+        wr->rdma_wr_num = DIV_ROUND_UP(data->nents, isert_conn->max_sge);
+        wr->rdma_wr = kzalloc(sizeof(struct ib_rdma_wr) * wr->rdma_wr_num,
                                 GFP_KERNEL);
-        if (!wr->send_wr) {
-                isert_dbg("Unable to allocate wr->send_wr\n");
+        if (!wr->rdma_wr) {
+                isert_dbg("Unable to allocate wr->rdma_wr\n");
                 ret = -ENOMEM;
                 goto unmap_cmd;
         }
@@ -2496,31 +2466,31 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         wr->isert_cmd = isert_cmd;
         rdma_write_max = isert_conn->max_sge * PAGE_SIZE;
 
-        for (i = 0; i < wr->send_wr_num; i++) {
-                send_wr = &isert_cmd->rdma_wr.send_wr[i];
+        for (i = 0; i < wr->rdma_wr_num; i++) {
+                rdma_wr = &isert_cmd->rdma_wr.rdma_wr[i];
                 data_len = min(data_left, rdma_write_max);
 
-                send_wr->send_flags = 0;
+                rdma_wr->wr.send_flags = 0;
                 if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
-                        send_wr->opcode = IB_WR_RDMA_WRITE;
-                        send_wr->wr.rdma.remote_addr = isert_cmd->read_va + offset;
-                        send_wr->wr.rdma.rkey = isert_cmd->read_stag;
-                        if (i + 1 == wr->send_wr_num)
-                                send_wr->next = &isert_cmd->tx_desc.send_wr;
+                        rdma_wr->wr.opcode = IB_WR_RDMA_WRITE;
+                        rdma_wr->remote_addr = isert_cmd->read_va + offset;
+                        rdma_wr->rkey = isert_cmd->read_stag;
+                        if (i + 1 == wr->rdma_wr_num)
+                                rdma_wr->wr.next = &isert_cmd->tx_desc.send_wr;
                         else
-                                send_wr->next = &wr->send_wr[i + 1];
+                                rdma_wr->wr.next = &wr->rdma_wr[i + 1].wr;
                 } else {
-                        send_wr->opcode = IB_WR_RDMA_READ;
-                        send_wr->wr.rdma.remote_addr = isert_cmd->write_va + va_offset;
-                        send_wr->wr.rdma.rkey = isert_cmd->write_stag;
-                        if (i + 1 == wr->send_wr_num)
-                                send_wr->send_flags = IB_SEND_SIGNALED;
+                        rdma_wr->wr.opcode = IB_WR_RDMA_READ;
+                        rdma_wr->remote_addr = isert_cmd->write_va + va_offset;
+                        rdma_wr->rkey = isert_cmd->write_stag;
+                        if (i + 1 == wr->rdma_wr_num)
+                                rdma_wr->wr.send_flags = IB_SEND_SIGNALED;
                         else
-                                send_wr->next = &wr->send_wr[i + 1];
+                                rdma_wr->wr.next = &wr->rdma_wr[i + 1].wr;
                 }
 
                 ib_sge_cnt = isert_build_rdma_wr(isert_conn, isert_cmd, ib_sge,
-                                        send_wr, data_len, offset);
+                                        rdma_wr, data_len, offset);
                 ib_sge += ib_sge_cnt;
 
                 offset += data_len;
@@ -2535,45 +2505,6 @@ unmap_cmd:
         return ret;
 }
 
-static int
-isert_map_fr_pagelist(struct ib_device *ib_dev,
-                      struct scatterlist *sg_start, int sg_nents, u64 *fr_pl)
-{
-        u64 start_addr, end_addr, page, chunk_start = 0;
-        struct scatterlist *tmp_sg;
-        int i = 0, new_chunk, last_ent, n_pages;
-
-        n_pages = 0;
-        new_chunk = 1;
-        last_ent = sg_nents - 1;
-        for_each_sg(sg_start, tmp_sg, sg_nents, i) {
-                start_addr = ib_sg_dma_address(ib_dev, tmp_sg);
-                if (new_chunk)
-                        chunk_start = start_addr;
-                end_addr = start_addr + ib_sg_dma_len(ib_dev, tmp_sg);
-
-                isert_dbg("SGL[%d] dma_addr: 0x%llx len: %u\n",
-                          i, (unsigned long long)tmp_sg->dma_address,
-                          tmp_sg->length);
-
-                if ((end_addr & ~PAGE_MASK) && i < last_ent) {
-                        new_chunk = 0;
-                        continue;
-                }
-                new_chunk = 1;
-
-                page = chunk_start & PAGE_MASK;
-                do {
-                        fr_pl[n_pages++] = page;
-                        isert_dbg("Mapped page_list[%d] page_addr: 0x%llx\n",
-                                  n_pages - 1, page);
-                        page += PAGE_SIZE;
-                } while (page < end_addr);
-        }
-
-        return n_pages;
-}
-
 static inline void
 isert_inv_rkey(struct ib_send_wr *inv_wr, struct ib_mr *mr)
 {
@@ -2599,11 +2530,9 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
         struct isert_device *device = isert_conn->device;
         struct ib_device *ib_dev = device->ib_device;
         struct ib_mr *mr;
-        struct ib_fast_reg_page_list *frpl;
-        struct ib_send_wr fr_wr, inv_wr;
-        struct ib_send_wr *bad_wr, *wr = NULL;
-        int ret, pagelist_len;
-        u32 page_off;
+        struct ib_reg_wr reg_wr;
+        struct ib_send_wr inv_wr, *bad_wr, *wr = NULL;
+        int ret, n;
 
         if (mem->dma_nents == 1) {
                 sge->lkey = device->pd->local_dma_lkey;
@@ -2614,45 +2543,41 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
                 return 0;
         }
 
-        if (ind == ISERT_DATA_KEY_VALID) {
+        if (ind == ISERT_DATA_KEY_VALID)
                 /* Registering data buffer */
                 mr = fr_desc->data_mr;
-                frpl = fr_desc->data_frpl;
-        } else {
+        else
                 /* Registering protection buffer */
                 mr = fr_desc->pi_ctx->prot_mr;
-                frpl = fr_desc->pi_ctx->prot_frpl;
-        }
-
-        page_off = mem->offset % PAGE_SIZE;
-
-        isert_dbg("Use fr_desc %p sg_nents %d offset %u\n",
-                  fr_desc, mem->nents, mem->offset);
-
-        pagelist_len = isert_map_fr_pagelist(ib_dev, mem->sg, mem->nents,
-                                             &frpl->page_list[0]);
 
         if (!(fr_desc->ind & ind)) {
                 isert_inv_rkey(&inv_wr, mr);
                 wr = &inv_wr;
         }
 
-        /* Prepare FASTREG WR */
-        memset(&fr_wr, 0, sizeof(fr_wr));
-        fr_wr.wr_id = ISER_FASTREG_LI_WRID;
-        fr_wr.opcode = IB_WR_FAST_REG_MR;
-        fr_wr.wr.fast_reg.iova_start = frpl->page_list[0] + page_off;
-        fr_wr.wr.fast_reg.page_list = frpl;
-        fr_wr.wr.fast_reg.page_list_len = pagelist_len;
-        fr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
-        fr_wr.wr.fast_reg.length = mem->len;
-        fr_wr.wr.fast_reg.rkey = mr->rkey;
-        fr_wr.wr.fast_reg.access_flags = IB_ACCESS_LOCAL_WRITE;
+        n = ib_map_mr_sg(mr, mem->sg, mem->nents, PAGE_SIZE);
+        if (unlikely(n != mem->nents)) {
+                isert_err("failed to map mr sg (%d/%d)\n",
+                         n, mem->nents);
+                return n < 0 ? n : -EINVAL;
+        }
+
+        isert_dbg("Use fr_desc %p sg_nents %d offset %u\n",
+                  fr_desc, mem->nents, mem->offset);
+
+        reg_wr.wr.next = NULL;
+        reg_wr.wr.opcode = IB_WR_REG_MR;
+        reg_wr.wr.wr_id = ISER_FASTREG_LI_WRID;
+        reg_wr.wr.send_flags = 0;
+        reg_wr.wr.num_sge = 0;
+        reg_wr.mr = mr;
+        reg_wr.key = mr->lkey;
+        reg_wr.access = IB_ACCESS_LOCAL_WRITE;
 
         if (!wr)
-                wr = &fr_wr;
+                wr = &reg_wr.wr;
         else
-                wr->next = &fr_wr;
+                wr->next = &reg_wr.wr;
 
         ret = ib_post_send(isert_conn->qp, wr, &bad_wr);
         if (ret) {
@@ -2662,8 +2587,8 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
         fr_desc->ind &= ~ind;
 
         sge->lkey = mr->lkey;
-        sge->addr = frpl->page_list[0] + page_off;
-        sge->length = mem->len;
+        sge->addr = mr->iova;
+        sge->length = mr->length;
 
         isert_dbg("sge: addr: 0x%llx  length: %u lkey: %x\n",
                   sge->addr, sge->length, sge->lkey);
@@ -2733,8 +2658,8 @@ isert_reg_sig_mr(struct isert_conn *isert_conn,
                  struct isert_rdma_wr *rdma_wr,
                  struct fast_reg_descriptor *fr_desc)
 {
-        struct ib_send_wr sig_wr, inv_wr;
-        struct ib_send_wr *bad_wr, *wr = NULL;
+        struct ib_sig_handover_wr sig_wr;
+        struct ib_send_wr inv_wr, *bad_wr, *wr = NULL;
         struct pi_context *pi_ctx = fr_desc->pi_ctx;
         struct ib_sig_attrs sig_attrs;
         int ret;
@@ -2752,20 +2677,20 @@ isert_reg_sig_mr(struct isert_conn *isert_conn,
         }
 
         memset(&sig_wr, 0, sizeof(sig_wr));
-        sig_wr.opcode = IB_WR_REG_SIG_MR;
-        sig_wr.wr_id = ISER_FASTREG_LI_WRID;
-        sig_wr.sg_list = &rdma_wr->ib_sg[DATA];
-        sig_wr.num_sge = 1;
-        sig_wr.wr.sig_handover.access_flags = IB_ACCESS_LOCAL_WRITE;
-        sig_wr.wr.sig_handover.sig_attrs = &sig_attrs;
-        sig_wr.wr.sig_handover.sig_mr = pi_ctx->sig_mr;
+        sig_wr.wr.opcode = IB_WR_REG_SIG_MR;
+        sig_wr.wr.wr_id = ISER_FASTREG_LI_WRID;
+        sig_wr.wr.sg_list = &rdma_wr->ib_sg[DATA];
+        sig_wr.wr.num_sge = 1;
+        sig_wr.access_flags = IB_ACCESS_LOCAL_WRITE;
+        sig_wr.sig_attrs = &sig_attrs;
+        sig_wr.sig_mr = pi_ctx->sig_mr;
         if (se_cmd->t_prot_sg)
-                sig_wr.wr.sig_handover.prot = &rdma_wr->ib_sg[PROT];
+                sig_wr.prot = &rdma_wr->ib_sg[PROT];
 
         if (!wr)
-                wr = &sig_wr;
+                wr = &sig_wr.wr;
         else
-                wr->next = &sig_wr;
+                wr->next = &sig_wr.wr;
 
         ret = ib_post_send(isert_conn->qp, wr, &bad_wr);
         if (ret) {
@@ -2859,7 +2784,7 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
         struct isert_conn *isert_conn = conn->context;
         struct fast_reg_descriptor *fr_desc = NULL;
-        struct ib_send_wr *send_wr;
+        struct ib_rdma_wr *rdma_wr;
         struct ib_sge *ib_sg;
         u32 offset;
         int ret = 0;
@@ -2900,26 +2825,26 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
 
         memcpy(&wr->s_ib_sge, ib_sg, sizeof(*ib_sg));
         wr->ib_sge = &wr->s_ib_sge;
-        wr->send_wr_num = 1;
-        memset(&wr->s_send_wr, 0, sizeof(*send_wr));
-        wr->send_wr = &wr->s_send_wr;
+        wr->rdma_wr_num = 1;
+        memset(&wr->s_rdma_wr, 0, sizeof(wr->s_rdma_wr));
+        wr->rdma_wr = &wr->s_rdma_wr;
         wr->isert_cmd = isert_cmd;
 
-        send_wr = &isert_cmd->rdma_wr.s_send_wr;
-        send_wr->sg_list = &wr->s_ib_sge;
-        send_wr->num_sge = 1;
-        send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
+        rdma_wr = &isert_cmd->rdma_wr.s_rdma_wr;
+        rdma_wr->wr.sg_list = &wr->s_ib_sge;
+        rdma_wr->wr.num_sge = 1;
+        rdma_wr->wr.wr_id = (uintptr_t)&isert_cmd->tx_desc;
         if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
-                send_wr->opcode = IB_WR_RDMA_WRITE;
-                send_wr->wr.rdma.remote_addr = isert_cmd->read_va;
-                send_wr->wr.rdma.rkey = isert_cmd->read_stag;
-                send_wr->send_flags = !isert_prot_cmd(isert_conn, se_cmd) ?
+                rdma_wr->wr.opcode = IB_WR_RDMA_WRITE;
+                rdma_wr->remote_addr = isert_cmd->read_va;
+                rdma_wr->rkey = isert_cmd->read_stag;
+                rdma_wr->wr.send_flags = !isert_prot_cmd(isert_conn, se_cmd) ?
                                       0 : IB_SEND_SIGNALED;
         } else {
-                send_wr->opcode = IB_WR_RDMA_READ;
-                send_wr->wr.rdma.remote_addr = isert_cmd->write_va;
-                send_wr->wr.rdma.rkey = isert_cmd->write_stag;
-                send_wr->send_flags = IB_SEND_SIGNALED;
+                rdma_wr->wr.opcode = IB_WR_RDMA_READ;
+                rdma_wr->remote_addr = isert_cmd->write_va;
+                rdma_wr->rkey = isert_cmd->write_stag;
+                rdma_wr->wr.send_flags = IB_SEND_SIGNALED;
         }
 
         return 0;
@@ -2967,8 +2892,8 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
                 isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
                 isert_init_send_wr(isert_conn, isert_cmd,
                                    &isert_cmd->tx_desc.send_wr);
-                isert_cmd->rdma_wr.s_send_wr.next = &isert_cmd->tx_desc.send_wr;
-                wr->send_wr_num += 1;
+                isert_cmd->rdma_wr.s_rdma_wr.wr.next = &isert_cmd->tx_desc.send_wr;
+                wr->rdma_wr_num += 1;
 
                 rc = isert_post_recv(isert_conn, isert_cmd->rx_desc);
                 if (rc) {
@@ -2977,7 +2902,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
                 }
         }
 
-        rc = ib_post_send(isert_conn->qp, wr->send_wr, &wr_failed);
+        rc = ib_post_send(isert_conn->qp, &wr->rdma_wr->wr, &wr_failed);
         if (rc)
                 isert_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
 
@@ -3011,7 +2936,7 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery)
                 return rc;
         }
 
-        rc = ib_post_send(isert_conn->qp, wr->send_wr, &wr_failed);
+        rc = ib_post_send(isert_conn->qp, &wr->rdma_wr->wr, &wr_failed);
         if (rc)
                 isert_warn("ib_post_send() failed for IB_WR_RDMA_READ\n");
 
@@ -3097,7 +3022,7 @@ isert_setup_id(struct isert_np *isert_np)
         sa = (struct sockaddr *)&np->np_sockaddr;
         isert_dbg("ksockaddr: %p, sa: %p\n", &np->np_sockaddr, sa);
 
-        id = rdma_create_id(isert_cma_handler, isert_np,
+        id = rdma_create_id(&init_net, isert_cma_handler, isert_np,
                             RDMA_PS_TCP, IB_QPT_RC);
         if (IS_ERR(id)) {
                 isert_err("rdma_create_id() failed: %ld\n", PTR_ERR(id));