Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "The highlights this merge window include:

   - Allow target fabric drivers to function as built-in.  (Roland)
   - Fix tcm_loop multi-TPG endpoint nexus bug.  (Hannes)
   - Move per device config_item_type into se_subsystem_api, allowing
     configfs attributes to be defined at module_init time.  (Jerome +
     nab)
   - Convert existing IBLOCK/FILEIO/RAMDISK/PSCSI/TCMU drivers to use
     external configfs attributes.  (nab)
   - A number of iser-target fixes related to active session + network
     portal shutdown stability during extended stress testing.  (Sagi +
     Slava)
   - Dynamic allocation of T10-PI contexts for iser-target, fixing a
     potentially bogus iscsi_np->tpg_np pointer reference in >= v3.14
     code.  (Sagi)
   - iser-target performance + scalability improvements.  (Sagi)
   - Fixes for SPC-4 Persistent Reservation AllRegistrants spec
     compliance.  (Ilias + James + nab)
   - Avoid potential short kern_sendmsg() in iscsi-target for now until
     Al's conversion to use msghdr iteration is merged post -rc1.
     (Viro)

  Also, Sagi has requested a number of iser-target patches (9) that
  address stability issues he's encountered during extended stress
  testing be considered for v3.10.y + v3.14.y code.  Given the amount of
  LOC involved, it will certainly require extra backporting effort.

  Apologies in advance to Greg-KH & Co on this.  Sagi and I will be
  working post-merge to ensure they each get applied correctly"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (53 commits)
  target: Allow AllRegistrants to re-RESERVE existing reservation
  uapi/linux/target_core_user.h: fix headers_install.sh badness
  iscsi-target: Fail connection on short sendmsg writes
  iscsi-target: nullify session in failed login sequence
  target: Avoid dropping AllRegistrants reservation during unregister
  target: Fix R_HOLDER bit usage for AllRegistrants
  iscsi-target: Drop left-over bogus iscsi_np->tpg_np
  iser-target: Fix wc->wr_id cast warning
  iser-target: Remove code duplication
  iser-target: Adjust log levels and prettify some prints
  iser-target: Use debug_level parameter to control logging level
  iser-target: Fix logout sequence
  iser-target: Don't wait for session commands from completion context
  iser-target: Reduce CQ lock contention by batch polling
  iser-target: Introduce isert_poll_budget
  iser-target: Remove an atomic operation from the IO path
  iser-target: Remove redundant call to isert_conn_terminate
  iser-target: Use single CQ for TX and RX
  iser-target: Centralize completion elements to a context
  iser-target: Cast wr_id with uintptr_t instead of unsinged long
  ...

23 files changed, 1511 insertions, 1238 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 10641b7816f4..dafb3c531f96 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -22,7 +22,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/in6.h>
-#include <linux/llist.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
 #include <target/target_core_base.h>
@@ -36,11 +35,17 @@
 #define ISERT_MAX_CONN          8
 #define ISER_MAX_RX_CQ_LEN      (ISERT_QP_MAX_RECV_DTOS * ISERT_MAX_CONN)
 #define ISER_MAX_TX_CQ_LEN      (ISERT_QP_MAX_REQ_DTOS  * ISERT_MAX_CONN)
+#define ISER_MAX_CQ_LEN         (ISER_MAX_RX_CQ_LEN + ISER_MAX_TX_CQ_LEN + \
+                                 ISERT_MAX_CONN)
+
+int isert_debug_level = 0;
+module_param_named(debug_level, isert_debug_level, int, 0644);
+MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0 (default:0)");
 
 static DEFINE_MUTEX(device_list_mutex);
 static LIST_HEAD(device_list);
-static struct workqueue_struct *isert_rx_wq;
 static struct workqueue_struct *isert_comp_wq;
+static struct workqueue_struct *isert_release_wq;
 
 static void
 isert_unmap_cmd(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn);
@@ -54,19 +59,32 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                struct isert_rdma_wr *wr);
 static int
 isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd);
+static int
+isert_rdma_post_recvl(struct isert_conn *isert_conn);
+static int
+isert_rdma_accept(struct isert_conn *isert_conn);
+struct rdma_cm_id *isert_setup_id(struct isert_np *isert_np);
+
+static inline bool
+isert_prot_cmd(struct isert_conn *conn, struct se_cmd *cmd)
+{
+        return (conn->pi_support &&
+                cmd->prot_op != TARGET_PROT_NORMAL);
+}
+
 
 static void
 isert_qp_event_callback(struct ib_event *e, void *context)
 {
         struct isert_conn *isert_conn = (struct isert_conn *)context;
 
-        pr_err("isert_qp_event_callback event: %d\n", e->event);
+        isert_err("conn %p event: %d\n", isert_conn, e->event);
         switch (e->event) {
         case IB_EVENT_COMM_EST:
                 rdma_notify(isert_conn->conn_cm_id, IB_EVENT_COMM_EST);
                 break;
         case IB_EVENT_QP_LAST_WQE_REACHED:
-                pr_warn("Reached TX IB_EVENT_QP_LAST_WQE_REACHED:\n");
+                isert_warn("Reached TX IB_EVENT_QP_LAST_WQE_REACHED\n");
                 break;
         default:
                 break;
@@ -80,39 +98,41 @@ isert_query_device(struct ib_device *ib_dev, struct ib_device_attr *devattr)
 
         ret = ib_query_device(ib_dev, devattr);
         if (ret) {
-                pr_err("ib_query_device() failed: %d\n", ret);
+                isert_err("ib_query_device() failed: %d\n", ret);
                 return ret;
         }
-        pr_debug("devattr->max_sge: %d\n", devattr->max_sge);
-        pr_debug("devattr->max_sge_rd: %d\n", devattr->max_sge_rd);
+        isert_dbg("devattr->max_sge: %d\n", devattr->max_sge);
+        isert_dbg("devattr->max_sge_rd: %d\n", devattr->max_sge_rd);
 
         return 0;
 }
 
 static int
-isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id,
-                    u8 protection)
+isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id)
 {
         struct isert_device *device = isert_conn->conn_device;
         struct ib_qp_init_attr attr;
-        int ret, index, min_index = 0;
+        struct isert_comp *comp;
+        int ret, i, min = 0;
 
         mutex_lock(&device_list_mutex);
-        for (index = 0; index < device->cqs_used; index++)
-                if (device->cq_active_qps[index] <
-                    device->cq_active_qps[min_index])
-                        min_index = index;
-        device->cq_active_qps[min_index]++;
-        pr_debug("isert_conn_setup_qp: Using min_index: %d\n", min_index);
+        for (i = 0; i < device->comps_used; i++)
+                if (device->comps[i].active_qps <
+                    device->comps[min].active_qps)
+                        min = i;
+        comp = &device->comps[min];
+        comp->active_qps++;
+        isert_info("conn %p, using comp %p min_index: %d\n",
+                   isert_conn, comp, min);
         mutex_unlock(&device_list_mutex);
 
         memset(&attr, 0, sizeof(struct ib_qp_init_attr));
         attr.event_handler = isert_qp_event_callback;
         attr.qp_context = isert_conn;
-        attr.send_cq = device->dev_tx_cq[min_index];
-        attr.recv_cq = device->dev_rx_cq[min_index];
+        attr.send_cq = comp->cq;
+        attr.recv_cq = comp->cq;
         attr.cap.max_send_wr = ISERT_QP_MAX_REQ_DTOS;
-        attr.cap.max_recv_wr = ISERT_QP_MAX_RECV_DTOS;
+        attr.cap.max_recv_wr = ISERT_QP_MAX_RECV_DTOS + 1;
         /*
          * FIXME: Use devattr.max_sge - 2 for max_send_sge as
          * work-around for RDMA_READs with ConnectX-2.
@@ -126,29 +146,29 @@ isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id,
         attr.cap.max_recv_sge = 1;
         attr.sq_sig_type = IB_SIGNAL_REQ_WR;
         attr.qp_type = IB_QPT_RC;
-        if (protection)
+        if (device->pi_capable)
                 attr.create_flags |= IB_QP_CREATE_SIGNATURE_EN;
 
-        pr_debug("isert_conn_setup_qp cma_id->device: %p\n",
-                 cma_id->device);
-        pr_debug("isert_conn_setup_qp conn_pd->device: %p\n",
-                 isert_conn->conn_pd->device);
-
         ret = rdma_create_qp(cma_id, isert_conn->conn_pd, &attr);
         if (ret) {
-                pr_err("rdma_create_qp failed for cma_id %d\n", ret);
-                return ret;
+                isert_err("rdma_create_qp failed for cma_id %d\n", ret);
+                goto err;
         }
         isert_conn->conn_qp = cma_id->qp;
-        pr_debug("rdma_create_qp() returned success >>>>>>>>>>>>>>>>>>>>>>>>>.\n");
 
         return 0;
+err:
+        mutex_lock(&device_list_mutex);
+        comp->active_qps--;
+        mutex_unlock(&device_list_mutex);
+
+        return ret;
 }
 
 static void
 isert_cq_event_callback(struct ib_event *e, void *context)
 {
-        pr_debug("isert_cq_event_callback event: %d\n", e->event);
+        isert_dbg("event: %d\n", e->event);
 }
 
 static int
@@ -182,6 +202,7 @@ isert_alloc_rx_descriptors(struct isert_conn *isert_conn)
         }
 
         isert_conn->conn_rx_desc_head = 0;
+
         return 0;
 
 dma_map_fail:
@@ -193,6 +214,8 @@ dma_map_fail:
         kfree(isert_conn->conn_rx_descs);
         isert_conn->conn_rx_descs = NULL;
 fail:
+        isert_err("conn %p failed to allocate rx descriptors\n", isert_conn);
+
         return -ENOMEM;
 }
 
@@ -216,27 +239,23 @@ isert_free_rx_descriptors(struct isert_conn *isert_conn)
         isert_conn->conn_rx_descs = NULL;
 }
 
-static void isert_cq_tx_work(struct work_struct *);
-static void isert_cq_tx_callback(struct ib_cq *, void *);
-static void isert_cq_rx_work(struct work_struct *);
-static void isert_cq_rx_callback(struct ib_cq *, void *);
+static void isert_cq_work(struct work_struct *);
+static void isert_cq_callback(struct ib_cq *, void *);
 
 static int
 isert_create_device_ib_res(struct isert_device *device)
 {
         struct ib_device *ib_dev = device->ib_device;
-        struct isert_cq_desc *cq_desc;
         struct ib_device_attr *dev_attr;
-        int ret = 0, i, j;
-        int max_rx_cqe, max_tx_cqe;
+        int ret = 0, i;
+        int max_cqe;
 
         dev_attr = &device->dev_attr;
         ret = isert_query_device(ib_dev, dev_attr);
         if (ret)
                 return ret;
 
-        max_rx_cqe = min(ISER_MAX_RX_CQ_LEN, dev_attr->max_cqe);
-        max_tx_cqe = min(ISER_MAX_TX_CQ_LEN, dev_attr->max_cqe);
+        max_cqe = min(ISER_MAX_CQ_LEN, dev_attr->max_cqe);
 
         /* asign function handlers */
         if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS &&
@@ -254,55 +273,38 @@ isert_create_device_ib_res(struct isert_device *device)
         device->pi_capable = dev_attr->device_cap_flags &
                              IB_DEVICE_SIGNATURE_HANDOVER ? true : false;
 
-        device->cqs_used = min_t(int, num_online_cpus(),
-                                 device->ib_device->num_comp_vectors);
-        device->cqs_used = min(ISERT_MAX_CQ, device->cqs_used);
-        pr_debug("Using %d CQs, device %s supports %d vectors support "
-                 "Fast registration %d pi_capable %d\n",
-                 device->cqs_used, device->ib_device->name,
-                 device->ib_device->num_comp_vectors, device->use_fastreg,
-                 device->pi_capable);
-        device->cq_desc = kzalloc(sizeof(struct isert_cq_desc) *
-                                device->cqs_used, GFP_KERNEL);
-        if (!device->cq_desc) {
-                pr_err("Unable to allocate device->cq_desc\n");
+        device->comps_used = min(ISERT_MAX_CQ, min_t(int, num_online_cpus(),
+                                        device->ib_device->num_comp_vectors));
+        isert_info("Using %d CQs, %s supports %d vectors support "
+                   "Fast registration %d pi_capable %d\n",
+                   device->comps_used, device->ib_device->name,
+                   device->ib_device->num_comp_vectors, device->use_fastreg,
+                   device->pi_capable);
+
+        device->comps = kcalloc(device->comps_used, sizeof(struct isert_comp),
+                                GFP_KERNEL);
+        if (!device->comps) {
+                isert_err("Unable to allocate completion contexts\n");
                 return -ENOMEM;
         }
-        cq_desc = device->cq_desc;
-
-        for (i = 0; i < device->cqs_used; i++) {
-                cq_desc[i].device = device;
-                cq_desc[i].cq_index = i;
-
-                INIT_WORK(&cq_desc[i].cq_rx_work, isert_cq_rx_work);
-                device->dev_rx_cq[i] = ib_create_cq(device->ib_device,
-                                                isert_cq_rx_callback,
-                                                isert_cq_event_callback,
-                                                (void *)&cq_desc[i],
-                                                max_rx_cqe, i);
-                if (IS_ERR(device->dev_rx_cq[i])) {
-                        ret = PTR_ERR(device->dev_rx_cq[i]);
-                        device->dev_rx_cq[i] = NULL;
-                        goto out_cq;
-                }
 
-                INIT_WORK(&cq_desc[i].cq_tx_work, isert_cq_tx_work);
-                device->dev_tx_cq[i] = ib_create_cq(device->ib_device,
-                                                isert_cq_tx_callback,
-                                                isert_cq_event_callback,
-                                                (void *)&cq_desc[i],
-                                                max_tx_cqe, i);
-                if (IS_ERR(device->dev_tx_cq[i])) {
-                        ret = PTR_ERR(device->dev_tx_cq[i]);
-                        device->dev_tx_cq[i] = NULL;
-                        goto out_cq;
-                }
+        for (i = 0; i < device->comps_used; i++) {
+                struct isert_comp *comp = &device->comps[i];
 
-                ret = ib_req_notify_cq(device->dev_rx_cq[i], IB_CQ_NEXT_COMP);
-                if (ret)
+                comp->device = device;
+                INIT_WORK(&comp->work, isert_cq_work);
+                comp->cq = ib_create_cq(device->ib_device,
+                                        isert_cq_callback,
+                                        isert_cq_event_callback,
+                                        (void *)comp,
+                                        max_cqe, i);
+                if (IS_ERR(comp->cq)) {
+                        ret = PTR_ERR(comp->cq);
+                        comp->cq = NULL;
                         goto out_cq;
+                }
 
-                ret = ib_req_notify_cq(device->dev_tx_cq[i], IB_CQ_NEXT_COMP);
+                ret = ib_req_notify_cq(comp->cq, IB_CQ_NEXT_COMP);
                 if (ret)
                         goto out_cq;
         }
@@ -310,19 +312,15 @@ isert_create_device_ib_res(struct isert_device *device)
         return 0;
 
 out_cq:
-        for (j = 0; j < i; j++) {
-                cq_desc = &device->cq_desc[j];
+        for (i = 0; i < device->comps_used; i++) {
+                struct isert_comp *comp = &device->comps[i];
 
-                if (device->dev_rx_cq[j]) {
-                        cancel_work_sync(&cq_desc->cq_rx_work);
-                        ib_destroy_cq(device->dev_rx_cq[j]);
-                }
-                if (device->dev_tx_cq[j]) {
-                        cancel_work_sync(&cq_desc->cq_tx_work);
-                        ib_destroy_cq(device->dev_tx_cq[j]);
+                if (comp->cq) {
+                        cancel_work_sync(&comp->work);
+                        ib_destroy_cq(comp->cq);
                 }
         }
-        kfree(device->cq_desc);
+        kfree(device->comps);
 
         return ret;
 }
@@ -330,21 +328,18 @@ out_cq:
 static void
 isert_free_device_ib_res(struct isert_device *device)
 {
-        struct isert_cq_desc *cq_desc;
         int i;
 
-        for (i = 0; i < device->cqs_used; i++) {
-                cq_desc = &device->cq_desc[i];
+        isert_info("device %p\n", device);
 
-                cancel_work_sync(&cq_desc->cq_rx_work);
-                cancel_work_sync(&cq_desc->cq_tx_work);
-                ib_destroy_cq(device->dev_rx_cq[i]);
-                ib_destroy_cq(device->dev_tx_cq[i]);
-                device->dev_rx_cq[i] = NULL;
-                device->dev_tx_cq[i] = NULL;
-        }
+        for (i = 0; i < device->comps_used; i++) {
+                struct isert_comp *comp = &device->comps[i];
 
-        kfree(device->cq_desc);
+                cancel_work_sync(&comp->work);
+                ib_destroy_cq(comp->cq);
+                comp->cq = NULL;
+        }
+        kfree(device->comps);
 }
 
 static void
@@ -352,6 +347,7 @@ isert_device_try_release(struct isert_device *device)
 {
         mutex_lock(&device_list_mutex);
         device->refcount--;
+        isert_info("device %p refcount %d\n", device, device->refcount);
         if (!device->refcount) {
                 isert_free_device_ib_res(device);
                 list_del(&device->dev_node);
@@ -370,6 +366,8 @@ isert_device_find_by_ib_dev(struct rdma_cm_id *cma_id)
         list_for_each_entry(device, &device_list, dev_node) {
                 if (device->ib_device->node_guid == cma_id->device->node_guid) {
                         device->refcount++;
+                        isert_info("Found iser device %p refcount %d\n",
+                                   device, device->refcount);
                         mutex_unlock(&device_list_mutex);
                         return device;
                 }
@@ -393,6 +391,8 @@ isert_device_find_by_ib_dev(struct rdma_cm_id *cma_id)
 
         device->refcount++;
         list_add_tail(&device->dev_node, &device_list);
+        isert_info("Created a new iser device %p refcount %d\n",
+                   device, device->refcount);
         mutex_unlock(&device_list_mutex);
 
         return device;
@@ -407,7 +407,7 @@ isert_conn_free_fastreg_pool(struct isert_conn *isert_conn)
         if (list_empty(&isert_conn->conn_fr_pool))
                 return;
 
-        pr_debug("Freeing conn %p fastreg pool", isert_conn);
+        isert_info("Freeing conn %p fastreg pool", isert_conn);
 
         list_for_each_entry_safe(fr_desc, tmp,
                                  &isert_conn->conn_fr_pool, list) {
@@ -425,87 +425,97 @@ isert_conn_free_fastreg_pool(struct isert_conn *isert_conn)
         }
 
         if (i < isert_conn->conn_fr_pool_size)
-                pr_warn("Pool still has %d regions registered\n",
+                isert_warn("Pool still has %d regions registered\n",
                         isert_conn->conn_fr_pool_size - i);
 }
 
 static int
+isert_create_pi_ctx(struct fast_reg_descriptor *desc,
+                    struct ib_device *device,
+                    struct ib_pd *pd)
+{
+        struct ib_mr_init_attr mr_init_attr;
+        struct pi_context *pi_ctx;
+        int ret;
+
+        pi_ctx = kzalloc(sizeof(*desc->pi_ctx), GFP_KERNEL);
+        if (!pi_ctx) {
+                isert_err("Failed to allocate pi context\n");
+                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_fast_reg_mr(pd, 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;
+        }
+        desc->ind |= ISERT_PROT_KEY_VALID;
+
+        memset(&mr_init_attr, 0, sizeof(mr_init_attr));
+        mr_init_attr.max_reg_descriptors = 2;
+        mr_init_attr.flags |= IB_MR_SIGNATURE_EN;
+        pi_ctx->sig_mr = ib_create_mr(pd, &mr_init_attr);
+        if (IS_ERR(pi_ctx->sig_mr)) {
+                isert_err("Failed to allocate signature enabled mr err=%ld\n",
+                          PTR_ERR(pi_ctx->sig_mr));
+                ret = PTR_ERR(pi_ctx->sig_mr);
+                goto err_prot_mr;
+        }
+
+        desc->pi_ctx = pi_ctx;
+        desc->ind |= ISERT_SIG_KEY_VALID;
+        desc->ind &= ~ISERT_PROTECTED;
+
+        return 0;
+
+err_prot_mr:
+        ib_dereg_mr(desc->pi_ctx->prot_mr);
+err_prot_frpl:
+        ib_free_fast_reg_page_list(desc->pi_ctx->prot_frpl);
+err_pi_ctx:
+        kfree(desc->pi_ctx);
+
+        return ret;
+}
+
+static int
 isert_create_fr_desc(struct ib_device *ib_device, struct ib_pd *pd,
-                     struct fast_reg_descriptor *fr_desc, u8 protection)
+                     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)) {
-                pr_err("Failed to allocate data frpl err=%ld\n",
-                       PTR_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_fast_reg_mr(pd, ISCSI_ISER_SG_TABLESIZE);
         if (IS_ERR(fr_desc->data_mr)) {
-                pr_err("Failed to allocate data frmr err=%ld\n",
-                       PTR_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;
         }
-        pr_debug("Create fr_desc %p page_list %p\n",
-                 fr_desc, fr_desc->data_frpl->page_list);
         fr_desc->ind |= ISERT_DATA_KEY_VALID;
 
-        if (protection) {
-                struct ib_mr_init_attr mr_init_attr = {0};
-                struct pi_context *pi_ctx;
-
-                fr_desc->pi_ctx = kzalloc(sizeof(*fr_desc->pi_ctx), GFP_KERNEL);
-                if (!fr_desc->pi_ctx) {
-                        pr_err("Failed to allocate pi context\n");
-                        ret = -ENOMEM;
-                        goto err_data_mr;
-                }
-                pi_ctx = fr_desc->pi_ctx;
-
-                pi_ctx->prot_frpl = ib_alloc_fast_reg_page_list(ib_device,
-                                                    ISCSI_ISER_SG_TABLESIZE);
-                if (IS_ERR(pi_ctx->prot_frpl)) {
-                        pr_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_fast_reg_mr(pd, ISCSI_ISER_SG_TABLESIZE);
-                if (IS_ERR(pi_ctx->prot_mr)) {
-                        pr_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;
-                }
-                fr_desc->ind |= ISERT_PROT_KEY_VALID;
-
-                mr_init_attr.max_reg_descriptors = 2;
-                mr_init_attr.flags |= IB_MR_SIGNATURE_EN;
-                pi_ctx->sig_mr = ib_create_mr(pd, &mr_init_attr);
-                if (IS_ERR(pi_ctx->sig_mr)) {
-                        pr_err("Failed to allocate signature enabled mr err=%ld\n",
-                               PTR_ERR(pi_ctx->sig_mr));
-                        ret = PTR_ERR(pi_ctx->sig_mr);
-                        goto err_prot_mr;
-                }
-                fr_desc->ind |= ISERT_SIG_KEY_VALID;
-        }
-        fr_desc->ind &= ~ISERT_PROTECTED;
+        isert_dbg("Created fr_desc %p\n", fr_desc);
 
         return 0;
-err_prot_mr:
-        ib_dereg_mr(fr_desc->pi_ctx->prot_mr);
-err_prot_frpl:
-        ib_free_fast_reg_page_list(fr_desc->pi_ctx->prot_frpl);
-err_pi_ctx:
-        kfree(fr_desc->pi_ctx);
-err_data_mr:
-        ib_dereg_mr(fr_desc->data_mr);
+
 err_data_frpl:
         ib_free_fast_reg_page_list(fr_desc->data_frpl);
 
@@ -513,7 +523,7 @@ err_data_frpl:
 }
 
 static int
-isert_conn_create_fastreg_pool(struct isert_conn *isert_conn, u8 pi_support)
+isert_conn_create_fastreg_pool(struct isert_conn *isert_conn)
 {
         struct fast_reg_descriptor *fr_desc;
         struct isert_device *device = isert_conn->conn_device;
@@ -531,16 +541,15 @@ isert_conn_create_fastreg_pool(struct isert_conn *isert_conn, u8 pi_support)
         for (i = 0; i < tag_num; i++) {
                 fr_desc = kzalloc(sizeof(*fr_desc), GFP_KERNEL);
                 if (!fr_desc) {
-                        pr_err("Failed to allocate fast_reg descriptor\n");
+                        isert_err("Failed to allocate fast_reg descriptor\n");
                         ret = -ENOMEM;
                         goto err;
                 }
 
                 ret = isert_create_fr_desc(device->ib_device,
-                                           isert_conn->conn_pd, fr_desc,
-                                           pi_support);
+                                           isert_conn->conn_pd, fr_desc);
                 if (ret) {
-                        pr_err("Failed to create fastreg descriptor err=%d\n",
+                        isert_err("Failed to create fastreg descriptor err=%d\n",
                                ret);
                         kfree(fr_desc);
                         goto err;
@@ -550,7 +559,7 @@ isert_conn_create_fastreg_pool(struct isert_conn *isert_conn, u8 pi_support)
                 isert_conn->conn_fr_pool_size++;
         }
 
-        pr_debug("Creating conn %p fastreg pool size=%d",
+        isert_dbg("Creating conn %p fastreg pool size=%d",
                  isert_conn, isert_conn->conn_fr_pool_size);
 
         return 0;
@@ -563,47 +572,45 @@ err:
 static int
 isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
 {
-        struct iscsi_np *np = cma_id->context;
-        struct isert_np *isert_np = np->np_context;
+        struct isert_np *isert_np = cma_id->context;
+        struct iscsi_np *np = isert_np->np;
         struct isert_conn *isert_conn;
         struct isert_device *device;
         struct ib_device *ib_dev = cma_id->device;
         int ret = 0;
-        u8 pi_support;
 
         spin_lock_bh(&np->np_thread_lock);
         if (!np->enabled) {
                 spin_unlock_bh(&np->np_thread_lock);
-                pr_debug("iscsi_np is not enabled, reject connect request\n");
+                isert_dbg("iscsi_np is not enabled, reject connect request\n");
                 return rdma_reject(cma_id, NULL, 0);
         }
         spin_unlock_bh(&np->np_thread_lock);
 
-        pr_debug("Entering isert_connect_request cma_id: %p, context: %p\n",
+        isert_dbg("cma_id: %p, portal: %p\n",
                  cma_id, cma_id->context);
 
         isert_conn = kzalloc(sizeof(struct isert_conn), GFP_KERNEL);
         if (!isert_conn) {
-                pr_err("Unable to allocate isert_conn\n");
+                isert_err("Unable to allocate isert_conn\n");
                 return -ENOMEM;
         }
         isert_conn->state = ISER_CONN_INIT;
         INIT_LIST_HEAD(&isert_conn->conn_accept_node);
         init_completion(&isert_conn->conn_login_comp);
+        init_completion(&isert_conn->login_req_comp);
         init_completion(&isert_conn->conn_wait);
-        init_completion(&isert_conn->conn_wait_comp_err);
         kref_init(&isert_conn->conn_kref);
         mutex_init(&isert_conn->conn_mutex);
         spin_lock_init(&isert_conn->conn_lock);
         INIT_LIST_HEAD(&isert_conn->conn_fr_pool);
 
-        cma_id->context = isert_conn;
         isert_conn->conn_cm_id = cma_id;
 
         isert_conn->login_buf = kzalloc(ISCSI_DEF_MAX_RECV_SEG_LEN +
                                         ISER_RX_LOGIN_SIZE, GFP_KERNEL);
         if (!isert_conn->login_buf) {
-                pr_err("Unable to allocate isert_conn->login_buf\n");
+                isert_err("Unable to allocate isert_conn->login_buf\n");
                 ret = -ENOMEM;
                 goto out;
         }
@@ -611,7 +618,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         isert_conn->login_req_buf = isert_conn->login_buf;
         isert_conn->login_rsp_buf = isert_conn->login_buf +
                                     ISCSI_DEF_MAX_RECV_SEG_LEN;
-        pr_debug("Set login_buf: %p login_req_buf: %p login_rsp_buf: %p\n",
+        isert_dbg("Set login_buf: %p login_req_buf: %p login_rsp_buf: %p\n",
                  isert_conn->login_buf, isert_conn->login_req_buf,
                  isert_conn->login_rsp_buf);
 
@@ -621,7 +628,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
 
         ret = ib_dma_mapping_error(ib_dev, isert_conn->login_req_dma);
         if (ret) {
-                pr_err("ib_dma_mapping_error failed for login_req_dma: %d\n",
+                isert_err("ib_dma_mapping_error failed for login_req_dma: %d\n",
                        ret);
                 isert_conn->login_req_dma = 0;
                 goto out_login_buf;
@@ -633,7 +640,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
 
         ret = ib_dma_mapping_error(ib_dev, isert_conn->login_rsp_dma);
         if (ret) {
-                pr_err("ib_dma_mapping_error failed for login_rsp_dma: %d\n",
+                isert_err("ib_dma_mapping_error failed for login_rsp_dma: %d\n",
                        ret);
                 isert_conn->login_rsp_dma = 0;
                 goto out_req_dma_map;
@@ -649,13 +656,13 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         isert_conn->initiator_depth = min_t(u8,
                                 event->param.conn.initiator_depth,
                                 device->dev_attr.max_qp_init_rd_atom);
-        pr_debug("Using initiator_depth: %u\n", isert_conn->initiator_depth);
+        isert_dbg("Using initiator_depth: %u\n", isert_conn->initiator_depth);
 
         isert_conn->conn_device = device;
         isert_conn->conn_pd = ib_alloc_pd(isert_conn->conn_device->ib_device);
         if (IS_ERR(isert_conn->conn_pd)) {
                 ret = PTR_ERR(isert_conn->conn_pd);
-                pr_err("ib_alloc_pd failed for conn %p: ret=%d\n",
+                isert_err("ib_alloc_pd failed for conn %p: ret=%d\n",
                        isert_conn, ret);
                 goto out_pd;
         }
@@ -664,20 +671,20 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
                                            IB_ACCESS_LOCAL_WRITE);
         if (IS_ERR(isert_conn->conn_mr)) {
                 ret = PTR_ERR(isert_conn->conn_mr);
-                pr_err("ib_get_dma_mr failed for conn %p: ret=%d\n",
+                isert_err("ib_get_dma_mr failed for conn %p: ret=%d\n",
                        isert_conn, ret);
                 goto out_mr;
         }
 
-        pi_support = np->tpg_np->tpg->tpg_attrib.t10_pi;
-        if (pi_support && !device->pi_capable) {
-                pr_err("Protection information requested but not supported, "
-                       "rejecting connect request\n");
-                ret = rdma_reject(cma_id, NULL, 0);
-                goto out_mr;
-        }
+        ret = isert_conn_setup_qp(isert_conn, cma_id);
+        if (ret)
+                goto out_conn_dev;
 
-        ret = isert_conn_setup_qp(isert_conn, cma_id, pi_support);
+        ret = isert_rdma_post_recvl(isert_conn);
+        if (ret)
+                goto out_conn_dev;
+
+        ret = isert_rdma_accept(isert_conn);
         if (ret)
                 goto out_conn_dev;
 
@@ -685,7 +692,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         list_add_tail(&isert_conn->conn_accept_node, &isert_np->np_accept_list);
         mutex_unlock(&isert_np->np_accept_mutex);
 
-        pr_debug("isert_connect_request() up np_sem np: %p\n", np);
+        isert_info("np %p: Allow accept_np to continue\n", np);
         up(&isert_np->np_sem);
         return 0;
 
@@ -705,6 +712,7 @@ out_login_buf:
         kfree(isert_conn->login_buf);
 out:
         kfree(isert_conn);
+        rdma_reject(cma_id, NULL, 0);
         return ret;
 }
 
@@ -713,24 +721,25 @@ isert_connect_release(struct isert_conn *isert_conn)
 {
         struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
         struct isert_device *device = isert_conn->conn_device;
-        int cq_index;
 
-        pr_debug("Entering isert_connect_release(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p\n", isert_conn);
 
         if (device && device->use_fastreg)
                 isert_conn_free_fastreg_pool(isert_conn);
 
+        isert_free_rx_descriptors(isert_conn);
+        rdma_destroy_id(isert_conn->conn_cm_id);
+
         if (isert_conn->conn_qp) {
-                cq_index = ((struct isert_cq_desc *)
-                        isert_conn->conn_qp->recv_cq->cq_context)->cq_index;
-                pr_debug("isert_connect_release: cq_index: %d\n", cq_index);
-                isert_conn->conn_device->cq_active_qps[cq_index]--;
+                struct isert_comp *comp = isert_conn->conn_qp->recv_cq->cq_context;
 
-                rdma_destroy_qp(isert_conn->conn_cm_id);
-        }
+                isert_dbg("dec completion context %p active_qps\n", comp);
+                mutex_lock(&device_list_mutex);
+                comp->active_qps--;
+                mutex_unlock(&device_list_mutex);
 
-        isert_free_rx_descriptors(isert_conn);
-        rdma_destroy_id(isert_conn->conn_cm_id);
+                ib_destroy_qp(isert_conn->conn_qp);
+        }
 
         ib_dereg_mr(isert_conn->conn_mr);
         ib_dealloc_pd(isert_conn->conn_pd);
@@ -747,16 +756,24 @@ isert_connect_release(struct isert_conn *isert_conn)
 
         if (device)
                 isert_device_try_release(device);
-
-        pr_debug("Leaving isert_connect_release >>>>>>>>>>>>\n");
 }
 
 static void
 isert_connected_handler(struct rdma_cm_id *cma_id)
 {
-        struct isert_conn *isert_conn = cma_id->context;
+        struct isert_conn *isert_conn = cma_id->qp->qp_context;
 
-        kref_get(&isert_conn->conn_kref);
+        isert_info("conn %p\n", isert_conn);
+
+        if (!kref_get_unless_zero(&isert_conn->conn_kref)) {
+                isert_warn("conn %p connect_release is running\n", isert_conn);
+                return;
+        }
+
+        mutex_lock(&isert_conn->conn_mutex);
+        if (isert_conn->state != ISER_CONN_FULL_FEATURE)
+                isert_conn->state = ISER_CONN_UP;
+        mutex_unlock(&isert_conn->conn_mutex);
 }
 
 static void
@@ -765,8 +782,8 @@ isert_release_conn_kref(struct kref *kref)
         struct isert_conn *isert_conn = container_of(kref,
                                 struct isert_conn, conn_kref);
 
-        pr_debug("Calling isert_connect_release for final kref %s/%d\n",
-                 current->comm, current->pid);
+        isert_info("conn %p final kref %s/%d\n", isert_conn, current->comm,
+                   current->pid);
 
         isert_connect_release(isert_conn);
 }
@@ -777,75 +794,111 @@ isert_put_conn(struct isert_conn *isert_conn)
         kref_put(&isert_conn->conn_kref, isert_release_conn_kref);
 }
 
+/**
+ * isert_conn_terminate() - Initiate connection termination
+ * @isert_conn: isert connection struct
+ *
+ * Notes:
+ * In case the connection state is FULL_FEATURE, move state
+ * to TEMINATING and start teardown sequence (rdma_disconnect).
+ * In case the connection state is UP, complete flush as well.
+ *
+ * This routine must be called with conn_mutex held. Thus it is
+ * safe to call multiple times.
+ */
 static void
-isert_disconnect_work(struct work_struct *work)
+isert_conn_terminate(struct isert_conn *isert_conn)
 {
-        struct isert_conn *isert_conn = container_of(work,
-                                struct isert_conn, conn_logout_work);
+        int err;
 
-        pr_debug("isert_disconnect_work(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
-        mutex_lock(&isert_conn->conn_mutex);
-        if (isert_conn->state == ISER_CONN_UP)
+        switch (isert_conn->state) {
+        case ISER_CONN_TERMINATING:
+                break;
+        case ISER_CONN_UP:
+        case ISER_CONN_FULL_FEATURE: /* FALLTHRU */
+                isert_info("Terminating conn %p state %d\n",
+                           isert_conn, isert_conn->state);
                 isert_conn->state = ISER_CONN_TERMINATING;
-
-        if (isert_conn->post_recv_buf_count == 0 &&
-            atomic_read(&isert_conn->post_send_buf_count) == 0) {
-                mutex_unlock(&isert_conn->conn_mutex);
-                goto wake_up;
-        }
-        if (!isert_conn->conn_cm_id) {
-                mutex_unlock(&isert_conn->conn_mutex);
-                isert_put_conn(isert_conn);
-                return;
+                err = rdma_disconnect(isert_conn->conn_cm_id);
+                if (err)
+                        isert_warn("Failed rdma_disconnect isert_conn %p\n",
+                                   isert_conn);
+                break;
+        default:
+                isert_warn("conn %p teminating in state %d\n",
+                           isert_conn, isert_conn->state);
         }
+}
 
-        if (isert_conn->disconnect) {
-                /* Send DREQ/DREP towards our initiator */
-                rdma_disconnect(isert_conn->conn_cm_id);
-        }
+static int
+isert_np_cma_handler(struct isert_np *isert_np,
+                     enum rdma_cm_event_type event)
+{
+        isert_dbg("isert np %p, handling event %d\n", isert_np, event);
 
-        mutex_unlock(&isert_conn->conn_mutex);
+        switch (event) {
+        case RDMA_CM_EVENT_DEVICE_REMOVAL:
+                isert_np->np_cm_id = NULL;
+                break;
+        case RDMA_CM_EVENT_ADDR_CHANGE:
+                isert_np->np_cm_id = isert_setup_id(isert_np);
+                if (IS_ERR(isert_np->np_cm_id)) {
+                        isert_err("isert np %p setup id failed: %ld\n",
+                                  isert_np, PTR_ERR(isert_np->np_cm_id));
+                        isert_np->np_cm_id = NULL;
+                }
+                break;
+        default:
+                isert_err("isert np %p Unexpected event %d\n",
+                          isert_np, event);
+        }
 
-wake_up:
-        complete(&isert_conn->conn_wait);
+        return -1;
 }
 
 static int
-isert_disconnected_handler(struct rdma_cm_id *cma_id, bool disconnect)
+isert_disconnected_handler(struct rdma_cm_id *cma_id,
+                           enum rdma_cm_event_type event)
 {
+        struct isert_np *isert_np = cma_id->context;
         struct isert_conn *isert_conn;
 
-        if (!cma_id->qp) {
-                struct isert_np *isert_np = cma_id->context;
+        if (isert_np->np_cm_id == cma_id)
+                return isert_np_cma_handler(cma_id->context, event);
 
-                isert_np->np_cm_id = NULL;
-                return -1;
-        }
+        isert_conn = cma_id->qp->qp_context;
 
-        isert_conn = (struct isert_conn *)cma_id->context;
+        mutex_lock(&isert_conn->conn_mutex);
+        isert_conn_terminate(isert_conn);
+        mutex_unlock(&isert_conn->conn_mutex);
 
-        isert_conn->disconnect = disconnect;
-        INIT_WORK(&isert_conn->conn_logout_work, isert_disconnect_work);
-        schedule_work(&isert_conn->conn_logout_work);
+        isert_info("conn %p completing conn_wait\n", isert_conn);
+        complete(&isert_conn->conn_wait);
 
         return 0;
 }
 
+static void
+isert_connect_error(struct rdma_cm_id *cma_id)
+{
+        struct isert_conn *isert_conn = cma_id->qp->qp_context;
+
+        isert_put_conn(isert_conn);
+}
+
 static int
 isert_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
 {
         int ret = 0;
-        bool disconnect = false;
 
-        pr_debug("isert_cma_handler: event %d status %d conn %p id %p\n",
-                 event->event, event->status, cma_id->context, cma_id);
+        isert_info("event %d status %d id %p np %p\n", event->event,
+                   event->status, cma_id, cma_id->context);
 
         switch (event->event) {
         case RDMA_CM_EVENT_CONNECT_REQUEST:
                 ret = isert_connect_request(cma_id, event);
                 if (ret)
-                        pr_err("isert_cma_handler failed RDMA_CM_EVENT: 0x%08x %d\n",
-                                event->event, ret);
+                        isert_err("failed handle connect request %d\n", ret);
                 break;
         case RDMA_CM_EVENT_ESTABLISHED:
                 isert_connected_handler(cma_id);
@@ -853,13 +906,16 @@ isert_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
         case RDMA_CM_EVENT_ADDR_CHANGE:    /* FALLTHRU */
         case RDMA_CM_EVENT_DISCONNECTED:   /* FALLTHRU */
         case RDMA_CM_EVENT_DEVICE_REMOVAL: /* FALLTHRU */
-                disconnect = true;
         case RDMA_CM_EVENT_TIMEWAIT_EXIT:  /* FALLTHRU */
-                ret = isert_disconnected_handler(cma_id, disconnect);
+                ret = isert_disconnected_handler(cma_id, event->event);
                 break;
+        case RDMA_CM_EVENT_REJECTED:       /* FALLTHRU */
+        case RDMA_CM_EVENT_UNREACHABLE:    /* FALLTHRU */
         case RDMA_CM_EVENT_CONNECT_ERROR:
+                isert_connect_error(cma_id);
+                break;
         default:
-                pr_err("Unhandled RDMA CMA event: %d\n", event->event);
+                isert_err("Unhandled RDMA CMA event: %d\n", event->event);
                 break;
         }
 
@@ -876,7 +932,7 @@ isert_post_recv(struct isert_conn *isert_conn, u32 count)
 
         for (rx_wr = isert_conn->conn_rx_wr, i = 0; i < count; i++, rx_wr++) {
                 rx_desc         = &isert_conn->conn_rx_descs[rx_head];
-                rx_wr->wr_id    = (unsigned long)rx_desc;
+                rx_wr->wr_id    = (uintptr_t)rx_desc;
                 rx_wr->sg_list  = &rx_desc->rx_sg;
                 rx_wr->num_sge  = 1;
                 rx_wr->next     = rx_wr + 1;
@@ -890,10 +946,10 @@ isert_post_recv(struct isert_conn *isert_conn, u32 count)
         ret = ib_post_recv(isert_conn->conn_qp, isert_conn->conn_rx_wr,
                                 &rx_wr_failed);
         if (ret) {
-                pr_err("ib_post_recv() failed with ret: %d\n", ret);
+                isert_err("ib_post_recv() failed with ret: %d\n", ret);
                 isert_conn->post_recv_buf_count -= count;
         } else {
-                pr_debug("isert_post_recv(): Posted %d RX buffers\n", count);
+                isert_dbg("isert_post_recv(): Posted %d RX buffers\n", count);
                 isert_conn->conn_rx_desc_head = rx_head;
         }
         return ret;
@@ -910,19 +966,15 @@ isert_post_send(struct isert_conn *isert_conn, struct iser_tx_desc *tx_desc)
                                       ISER_HEADERS_LEN, DMA_TO_DEVICE);
 
         send_wr.next    = NULL;
-        send_wr.wr_id   = (unsigned long)tx_desc;
+        send_wr.wr_id   = (uintptr_t)tx_desc;
         send_wr.sg_list = tx_desc->tx_sg;
         send_wr.num_sge = tx_desc->num_sge;
         send_wr.opcode  = IB_WR_SEND;
         send_wr.send_flags = IB_SEND_SIGNALED;
 
-        atomic_inc(&isert_conn->post_send_buf_count);
-
         ret = ib_post_send(isert_conn->conn_qp, &send_wr, &send_wr_failed);
-        if (ret) {
-                pr_err("ib_post_send() failed, ret: %d\n", ret);
-                atomic_dec(&isert_conn->post_send_buf_count);
-        }
+        if (ret)
+                isert_err("ib_post_send() failed, ret: %d\n", ret);
 
         return ret;
 }
@@ -945,7 +997,7 @@ isert_create_send_desc(struct isert_conn *isert_conn,
 
         if (tx_desc->tx_sg[0].lkey != isert_conn->conn_mr->lkey) {
                 tx_desc->tx_sg[0].lkey = isert_conn->conn_mr->lkey;
-                pr_debug("tx_desc %p lkey mismatch, fixing\n", tx_desc);
+                isert_dbg("tx_desc %p lkey mismatch, fixing\n", tx_desc);
         }
 }
 
@@ -959,7 +1011,7 @@ isert_init_tx_hdrs(struct isert_conn *isert_conn,
         dma_addr = ib_dma_map_single(ib_dev, (void *)tx_desc,
                         ISER_HEADERS_LEN, DMA_TO_DEVICE);
         if (ib_dma_mapping_error(ib_dev, dma_addr)) {
-                pr_err("ib_dma_mapping_error() failed\n");
+                isert_err("ib_dma_mapping_error() failed\n");
                 return -ENOMEM;
         }
 
@@ -968,40 +1020,24 @@ isert_init_tx_hdrs(struct isert_conn *isert_conn,
         tx_desc->tx_sg[0].length = ISER_HEADERS_LEN;
         tx_desc->tx_sg[0].lkey = isert_conn->conn_mr->lkey;
 
-        pr_debug("isert_init_tx_hdrs: Setup tx_sg[0].addr: 0x%llx length: %u"
-                 " lkey: 0x%08x\n", tx_desc->tx_sg[0].addr,
-                 tx_desc->tx_sg[0].length, tx_desc->tx_sg[0].lkey);
+        isert_dbg("Setup tx_sg[0].addr: 0x%llx length: %u lkey: 0x%x\n",
+                  tx_desc->tx_sg[0].addr, tx_desc->tx_sg[0].length,
+                  tx_desc->tx_sg[0].lkey);
 
         return 0;
 }
 
 static void
 isert_init_send_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
-                   struct ib_send_wr *send_wr, bool coalesce)
+                   struct ib_send_wr *send_wr)
 {
         struct iser_tx_desc *tx_desc = &isert_cmd->tx_desc;
 
         isert_cmd->rdma_wr.iser_ib_op = ISER_IB_SEND;
-        send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc;
+        send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
         send_wr->opcode = IB_WR_SEND;
         send_wr->sg_list = &tx_desc->tx_sg[0];
         send_wr->num_sge = isert_cmd->tx_desc.num_sge;
-        /*
-         * Coalesce send completion interrupts by only setting IB_SEND_SIGNALED
-         * bit for every ISERT_COMP_BATCH_COUNT number of ib_post_send() calls.
-         */
-        mutex_lock(&isert_conn->conn_mutex);
-        if (coalesce && isert_conn->state == ISER_CONN_UP &&
-            ++isert_conn->conn_comp_batch < ISERT_COMP_BATCH_COUNT) {
-                tx_desc->llnode_active = true;
-                llist_add(&tx_desc->comp_llnode, &isert_conn->conn_comp_llist);
-                mutex_unlock(&isert_conn->conn_mutex);
-                return;
-        }
-        isert_conn->conn_comp_batch = 0;
-        tx_desc->comp_llnode_batch = llist_del_all(&isert_conn->conn_comp_llist);
-        mutex_unlock(&isert_conn->conn_mutex);
-
         send_wr->send_flags = IB_SEND_SIGNALED;
 }
 
@@ -1017,22 +1053,21 @@ isert_rdma_post_recvl(struct isert_conn *isert_conn)
         sge.length = ISER_RX_LOGIN_SIZE;
         sge.lkey = isert_conn->conn_mr->lkey;
 
-        pr_debug("Setup sge: addr: %llx length: %d 0x%08x\n",
+        isert_dbg("Setup sge: addr: %llx length: %d 0x%08x\n",
                 sge.addr, sge.length, sge.lkey);
 
         memset(&rx_wr, 0, sizeof(struct ib_recv_wr));
-        rx_wr.wr_id = (unsigned long)isert_conn->login_req_buf;
+        rx_wr.wr_id = (uintptr_t)isert_conn->login_req_buf;
         rx_wr.sg_list = &sge;
         rx_wr.num_sge = 1;
 
         isert_conn->post_recv_buf_count++;
         ret = ib_post_recv(isert_conn->conn_qp, &rx_wr, &rx_wr_fail);
         if (ret) {
-                pr_err("ib_post_recv() failed: %d\n", ret);
+                isert_err("ib_post_recv() failed: %d\n", ret);
                 isert_conn->post_recv_buf_count--;
         }
 
-        pr_debug("ib_post_recv(): returned success >>>>>>>>>>>>>>>>>>>>>>>>\n");
         return ret;
 }
 
@@ -1072,13 +1107,9 @@ isert_put_login_tx(struct iscsi_conn *conn, struct iscsi_login *login,
                 if (login->login_complete) {
                         if (!conn->sess->sess_ops->SessionType &&
                             isert_conn->conn_device->use_fastreg) {
-                                /* Normal Session and fastreg is used */
-                                u8 pi_support = login->np->tpg_np->tpg->tpg_attrib.t10_pi;
-
-                                ret = isert_conn_create_fastreg_pool(isert_conn,
-                                                                     pi_support);
+                                ret = isert_conn_create_fastreg_pool(isert_conn);
                                 if (ret) {
-                                        pr_err("Conn: %p failed to create"
+                                        isert_err("Conn: %p failed to create"
                                                " fastreg pool\n", isert_conn);
                                         return ret;
                                 }
@@ -1092,7 +1123,10 @@ isert_put_login_tx(struct iscsi_conn *conn, struct iscsi_login *login,
                         if (ret)
                                 return ret;
 
-                        isert_conn->state = ISER_CONN_UP;
+                        /* Now we are in FULL_FEATURE phase */
+                        mutex_lock(&isert_conn->conn_mutex);
+                        isert_conn->state = ISER_CONN_FULL_FEATURE;
+                        mutex_unlock(&isert_conn->conn_mutex);
                         goto post_send;
                 }
 
@@ -1109,18 +1143,17 @@ post_send:
 }
 
 static void
-isert_rx_login_req(struct iser_rx_desc *rx_desc, int rx_buflen,
-                   struct isert_conn *isert_conn)
+isert_rx_login_req(struct isert_conn *isert_conn)
 {
+        struct iser_rx_desc *rx_desc = (void *)isert_conn->login_req_buf;
+        int rx_buflen = isert_conn->login_req_len;
         struct iscsi_conn *conn = isert_conn->conn;
         struct iscsi_login *login = conn->conn_login;
         int size;
 
-        if (!login) {
-                pr_err("conn->conn_login is NULL\n");
-                dump_stack();
-                return;
-        }
+        isert_info("conn %p\n", isert_conn);
+
+        WARN_ON_ONCE(!login);
 
         if (login->first_request) {
                 struct iscsi_login_req *login_req =
@@ -1146,8 +1179,9 @@ isert_rx_login_req(struct iser_rx_desc *rx_desc, int rx_buflen,
         memcpy(&login->req[0], (void *)&rx_desc->iscsi_header, ISCSI_HDR_LEN);
 
         size = min(rx_buflen, MAX_KEY_VALUE_PAIRS);
-        pr_debug("Using login payload size: %d, rx_buflen: %d MAX_KEY_VALUE_PAIRS: %d\n",
-                 size, rx_buflen, MAX_KEY_VALUE_PAIRS);
+        isert_dbg("Using login payload size: %d, rx_buflen: %d "
+                  "MAX_KEY_VALUE_PAIRS: %d\n", size, rx_buflen,
+                  MAX_KEY_VALUE_PAIRS);
         memcpy(login->req_buf, &rx_desc->data[0], size);
 
         if (login->first_request) {
@@ -1166,7 +1200,7 @@ static struct iscsi_cmd
 
         cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);
         if (!cmd) {
-                pr_err("Unable to allocate iscsi_cmd + isert_cmd\n");
+                isert_err("Unable to allocate iscsi_cmd + isert_cmd\n");
                 return NULL;
         }
         isert_cmd = iscsit_priv_cmd(cmd);
@@ -1209,8 +1243,8 @@ isert_handle_scsi_cmd(struct isert_conn *isert_conn,
         sg = &cmd->se_cmd.t_data_sg[0];
         sg_nents = max(1UL, DIV_ROUND_UP(imm_data_len, PAGE_SIZE));
 
-        pr_debug("Copying Immediate SG: %p sg_nents: %u from %p imm_data_len: %d\n",
-                 sg, sg_nents, &rx_desc->data[0], imm_data_len);
+        isert_dbg("Copying Immediate SG: %p sg_nents: %u from %p imm_data_len: %d\n",
+                  sg, sg_nents, &rx_desc->data[0], imm_data_len);
 
         sg_copy_from_buffer(sg, sg_nents, &rx_desc->data[0], imm_data_len);
 
@@ -1254,13 +1288,15 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
          * FIXME: Unexpected unsolicited_data out
          */
         if (!cmd->unsolicited_data) {
-                pr_err("Received unexpected solicited data payload\n");
+                isert_err("Received unexpected solicited data payload\n");
                 dump_stack();
                 return -1;
         }
 
-        pr_debug("Unsolicited DataOut unsol_data_len: %u, write_data_done: %u, data_length: %u\n",
-                 unsol_data_len, cmd->write_data_done, cmd->se_cmd.data_length);
+        isert_dbg("Unsolicited DataOut unsol_data_len: %u, "
+                  "write_data_done: %u, data_length: %u\n",
+                  unsol_data_len,  cmd->write_data_done,
+                  cmd->se_cmd.data_length);
 
         sg_off = cmd->write_data_done / PAGE_SIZE;
         sg_start = &cmd->se_cmd.t_data_sg[sg_off];
@@ -1270,12 +1306,13 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
          * FIXME: Non page-aligned unsolicited_data out
          */
         if (page_off) {
-                pr_err("Received unexpected non-page aligned data payload\n");
+                isert_err("unexpected non-page aligned data payload\n");
                 dump_stack();
                 return -1;
         }
-        pr_debug("Copying DataOut: sg_start: %p, sg_off: %u sg_nents: %u from %p %u\n",
-                 sg_start, sg_off, sg_nents, &rx_desc->data[0], unsol_data_len);
+        isert_dbg("Copying DataOut: sg_start: %p, sg_off: %u "
+                  "sg_nents: %u from %p %u\n", sg_start, sg_off,
+                  sg_nents, &rx_desc->data[0], unsol_data_len);
 
         sg_copy_from_buffer(sg_start, sg_nents, &rx_desc->data[0],
                             unsol_data_len);
@@ -1322,8 +1359,8 @@ isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd
 
         text_in = kzalloc(payload_length, GFP_KERNEL);
         if (!text_in) {
-                pr_err("Unable to allocate text_in of payload_length: %u\n",
-                       payload_length);
+                isert_err("Unable to allocate text_in of payload_length: %u\n",
+                          payload_length);
                 return -ENOMEM;
         }
         cmd->text_in_ptr = text_in;
@@ -1348,8 +1385,8 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
 
         if (sess->sess_ops->SessionType &&
            (!(opcode & ISCSI_OP_TEXT) || !(opcode & ISCSI_OP_LOGOUT))) {
-                pr_err("Got illegal opcode: 0x%02x in SessionType=Discovery,"
-                       " ignoring\n", opcode);
+                isert_err("Got illegal opcode: 0x%02x in SessionType=Discovery,"
+                          " ignoring\n", opcode);
                 return 0;
         }
 
@@ -1395,10 +1432,6 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                         break;
 
                 ret = iscsit_handle_logout_cmd(conn, cmd, (unsigned char *)hdr);
-                if (ret > 0)
-                        wait_for_completion_timeout(&conn->conn_logout_comp,
-                                                    SECONDS_FOR_LOGOUT_COMP *
-                                                    HZ);
                 break;
         case ISCSI_OP_TEXT:
                 cmd = isert_allocate_cmd(conn);
@@ -1410,7 +1443,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                                             rx_desc, (struct iscsi_text *)hdr);
                 break;
         default:
-                pr_err("Got unknown iSCSI OpCode: 0x%02x\n", opcode);
+                isert_err("Got unknown iSCSI OpCode: 0x%02x\n", opcode);
                 dump_stack();
                 break;
         }
@@ -1431,23 +1464,23 @@ isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn)
                 if (iser_hdr->flags & ISER_RSV) {
                         read_stag = be32_to_cpu(iser_hdr->read_stag);
                         read_va = be64_to_cpu(iser_hdr->read_va);
-                        pr_debug("ISER_RSV: read_stag: 0x%08x read_va: 0x%16llx\n",
-                                 read_stag, (unsigned long long)read_va);
+                        isert_dbg("ISER_RSV: read_stag: 0x%x read_va: 0x%llx\n",
+                                  read_stag, (unsigned long long)read_va);
                 }
                 if (iser_hdr->flags & ISER_WSV) {
                         write_stag = be32_to_cpu(iser_hdr->write_stag);
                         write_va = be64_to_cpu(iser_hdr->write_va);
-                        pr_debug("ISER_WSV: write__stag: 0x%08x write_va: 0x%16llx\n",
-                                 write_stag, (unsigned long long)write_va);
+                        isert_dbg("ISER_WSV: write_stag: 0x%x write_va: 0x%llx\n",
+                                  write_stag, (unsigned long long)write_va);
                 }
 
-                pr_debug("ISER ISCSI_CTRL PDU\n");
+                isert_dbg("ISER ISCSI_CTRL PDU\n");
                 break;
         case ISER_HELLO:
-                pr_err("iSER Hello message\n");
+                isert_err("iSER Hello message\n");
                 break;
         default:
-                pr_warn("Unknown iSER hdr flags: 0x%02x\n", iser_hdr->flags);
+                isert_warn("Unknown iSER hdr flags: 0x%02x\n", iser_hdr->flags);
                 break;
         }
 
@@ -1457,7 +1490,7 @@ isert_rx_do_work(struct iser_rx_desc *rx_desc, struct isert_conn *isert_conn)
 
 static void
 isert_rx_completion(struct iser_rx_desc *desc, struct isert_conn *isert_conn,
-                    unsigned long xfer_len)
+                    u32 xfer_len)
 {
         struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
         struct iscsi_hdr *hdr;
@@ -1467,34 +1500,43 @@ isert_rx_completion(struct iser_rx_desc *desc, struct isert_conn *isert_conn,
         if ((char *)desc == isert_conn->login_req_buf) {
                 rx_dma = isert_conn->login_req_dma;
                 rx_buflen = ISER_RX_LOGIN_SIZE;
-                pr_debug("ISER login_buf: Using rx_dma: 0x%llx, rx_buflen: %d\n",
+                isert_dbg("login_buf: Using rx_dma: 0x%llx, rx_buflen: %d\n",
                          rx_dma, rx_buflen);
         } else {
                 rx_dma = desc->dma_addr;
                 rx_buflen = ISER_RX_PAYLOAD_SIZE;
-                pr_debug("ISER req_buf: Using rx_dma: 0x%llx, rx_buflen: %d\n",
+                isert_dbg("req_buf: Using rx_dma: 0x%llx, rx_buflen: %d\n",
                          rx_dma, rx_buflen);
         }
 
         ib_dma_sync_single_for_cpu(ib_dev, rx_dma, rx_buflen, DMA_FROM_DEVICE);
 
         hdr = &desc->iscsi_header;
-        pr_debug("iSCSI opcode: 0x%02x, ITT: 0x%08x, flags: 0x%02x dlen: %d\n",
+        isert_dbg("iSCSI opcode: 0x%02x, ITT: 0x%08x, flags: 0x%02x dlen: %d\n",
                  hdr->opcode, hdr->itt, hdr->flags,
                  (int)(xfer_len - ISER_HEADERS_LEN));
 
-        if ((char *)desc == isert_conn->login_req_buf)
-                isert_rx_login_req(desc, xfer_len - ISER_HEADERS_LEN,
-                                   isert_conn);
-        else
+        if ((char *)desc == isert_conn->login_req_buf) {
+                isert_conn->login_req_len = xfer_len - ISER_HEADERS_LEN;
+                if (isert_conn->conn) {
+                        struct iscsi_login *login = isert_conn->conn->conn_login;
+
+                        if (login && !login->first_request)
+                                isert_rx_login_req(isert_conn);
+                }
+                mutex_lock(&isert_conn->conn_mutex);
+                complete(&isert_conn->login_req_comp);
+                mutex_unlock(&isert_conn->conn_mutex);
+        } else {
                 isert_rx_do_work(desc, isert_conn);
+        }
 
         ib_dma_sync_single_for_device(ib_dev, rx_dma, rx_buflen,
                                       DMA_FROM_DEVICE);
 
         isert_conn->post_recv_buf_count--;
-        pr_debug("iSERT: Decremented post_recv_buf_count: %d\n",
-                 isert_conn->post_recv_buf_count);
+        isert_dbg("Decremented post_recv_buf_count: %d\n",
+                  isert_conn->post_recv_buf_count);
 
         if ((char *)desc == isert_conn->login_req_buf)
                 return;
@@ -1505,7 +1547,7 @@ isert_rx_completion(struct iser_rx_desc *desc, struct isert_conn *isert_conn,
                                 ISERT_MIN_POSTED_RX);
                 err = isert_post_recv(isert_conn, count);
                 if (err) {
-                        pr_err("isert_post_recv() count: %d failed, %d\n",
+                        isert_err("isert_post_recv() count: %d failed, %d\n",
                                count, err);
                 }
         }
@@ -1534,12 +1576,12 @@ isert_map_data_buf(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
         data->dma_nents = ib_dma_map_sg(ib_dev, data->sg, data->nents,
                                         data->dma_dir);
         if (unlikely(!data->dma_nents)) {
-                pr_err("Cmd: unable to dma map SGs %p\n", sg);
+                isert_err("Cmd: unable to dma map SGs %p\n", sg);
                 return -EINVAL;
         }
 
-        pr_debug("Mapped cmd: %p count: %u sg: %p sg_nents: %u rdma_len %d\n",
-                 isert_cmd, data->dma_nents, data->sg, data->nents, data->len);
+        isert_dbg("Mapped cmd: %p count: %u sg: %p sg_nents: %u rdma_len %d\n",
+                  isert_cmd, data->dma_nents, data->sg, data->nents, data->len);
 
         return 0;
 }
@@ -1560,21 +1602,21 @@ isert_unmap_cmd(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
 {
         struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
 
-        pr_debug("isert_unmap_cmd: %p\n", isert_cmd);
+        isert_dbg("Cmd %p\n", isert_cmd);
 
         if (wr->data.sg) {
-                pr_debug("isert_unmap_cmd: %p unmap_sg op\n", isert_cmd);
+                isert_dbg("Cmd %p unmap_sg op\n", isert_cmd);
                 isert_unmap_data_buf(isert_conn, &wr->data);
         }
 
         if (wr->send_wr) {
-                pr_debug("isert_unmap_cmd: %p free send_wr\n", isert_cmd);
+                isert_dbg("Cmd %p free send_wr\n", isert_cmd);
                 kfree(wr->send_wr);
                 wr->send_wr = NULL;
         }
 
         if (wr->ib_sge) {
-                pr_debug("isert_unmap_cmd: %p free ib_sge\n", isert_cmd);
+                isert_dbg("Cmd %p free ib_sge\n", isert_cmd);
                 kfree(wr->ib_sge);
                 wr->ib_sge = NULL;
         }
@@ -1586,11 +1628,10 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
         struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
         LIST_HEAD(unmap_list);
 
-        pr_debug("unreg_fastreg_cmd: %p\n", isert_cmd);
+        isert_dbg("Cmd %p\n", isert_cmd);
 
         if (wr->fr_desc) {
-                pr_debug("unreg_fastreg_cmd: %p free fr_desc %p\n",
-                         isert_cmd, wr->fr_desc);
+                isert_dbg("Cmd %p free fr_desc %p\n", isert_cmd, wr->fr_desc);
                 if (wr->fr_desc->ind & ISERT_PROTECTED) {
                         isert_unmap_data_buf(isert_conn, &wr->prot);
                         wr->fr_desc->ind &= ~ISERT_PROTECTED;
@@ -1602,7 +1643,7 @@ isert_unreg_rdma(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn)
         }
 
         if (wr->data.sg) {
-                pr_debug("unreg_fastreg_cmd: %p unmap_sg op\n", isert_cmd);
+                isert_dbg("Cmd %p unmap_sg op\n", isert_cmd);
                 isert_unmap_data_buf(isert_conn, &wr->data);
         }
 
@@ -1618,7 +1659,7 @@ isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)
         struct iscsi_conn *conn = isert_conn->conn;
         struct isert_device *device = isert_conn->conn_device;
 
-        pr_debug("Entering isert_put_cmd: %p\n", isert_cmd);
+        isert_dbg("Cmd %p\n", isert_cmd);
 
         switch (cmd->iscsi_opcode) {
         case ISCSI_OP_SCSI_CMD:
@@ -1668,7 +1709,7 @@ isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)
                  * associated cmd->se_cmd needs to be released.
                  */
                 if (cmd->se_cmd.se_tfo != NULL) {
-                        pr_debug("Calling transport_generic_free_cmd from"
+                        isert_dbg("Calling transport_generic_free_cmd from"
                                  " isert_put_cmd for 0x%02x\n",
                                  cmd->iscsi_opcode);
                         transport_generic_free_cmd(&cmd->se_cmd, 0);
@@ -1687,7 +1728,7 @@ static void
 isert_unmap_tx_desc(struct iser_tx_desc *tx_desc, struct ib_device *ib_dev)
 {
         if (tx_desc->dma_addr != 0) {
-                pr_debug("Calling ib_dma_unmap_single for tx_desc->dma_addr\n");
+                isert_dbg("unmap single for tx_desc->dma_addr\n");
                 ib_dma_unmap_single(ib_dev, tx_desc->dma_addr,
                                     ISER_HEADERS_LEN, DMA_TO_DEVICE);
                 tx_desc->dma_addr = 0;
@@ -1699,7 +1740,7 @@ isert_completion_put(struct iser_tx_desc *tx_desc, struct isert_cmd *isert_cmd,
                      struct ib_device *ib_dev, bool comp_err)
 {
         if (isert_cmd->pdu_buf_dma != 0) {
-                pr_debug("Calling ib_dma_unmap_single for isert_cmd->pdu_buf_dma\n");
+                isert_dbg("unmap single for isert_cmd->pdu_buf_dma\n");
                 ib_dma_unmap_single(ib_dev, isert_cmd->pdu_buf_dma,
                                     isert_cmd->pdu_buf_len, DMA_TO_DEVICE);
                 isert_cmd->pdu_buf_dma = 0;
@@ -1717,7 +1758,7 @@ isert_check_pi_status(struct se_cmd *se_cmd, struct ib_mr *sig_mr)
 
         ret = ib_check_mr_status(sig_mr, IB_MR_CHECK_SIG_STATUS, &mr_status);
         if (ret) {
-                pr_err("ib_check_mr_status failed, ret %d\n", ret);
+                isert_err("ib_check_mr_status failed, ret %d\n", ret);
                 goto fail_mr_status;
         }
 
@@ -1740,12 +1781,12 @@ isert_check_pi_status(struct se_cmd *se_cmd, struct ib_mr *sig_mr)
                 do_div(sec_offset_err, block_size);
                 se_cmd->bad_sector = sec_offset_err + se_cmd->t_task_lba;
 
-                pr_err("isert: PI error found type %d at sector 0x%llx "
-                       "expected 0x%x vs actual 0x%x\n",
-                       mr_status.sig_err.err_type,
-                       (unsigned long long)se_cmd->bad_sector,
-                       mr_status.sig_err.expected,
-                       mr_status.sig_err.actual);
+                isert_err("PI error found type %d at sector 0x%llx "
+                          "expected 0x%x vs actual 0x%x\n",
+                          mr_status.sig_err.err_type,
+                          (unsigned long long)se_cmd->bad_sector,
+                          mr_status.sig_err.expected,
+                          mr_status.sig_err.actual);
                 ret = 1;
         }
 
@@ -1801,7 +1842,7 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
         cmd->write_data_done = wr->data.len;
         wr->send_wr_num = 0;
 
-        pr_debug("Cmd: %p RDMA_READ comp calling execute_cmd\n", isert_cmd);
+        isert_dbg("Cmd: %p RDMA_READ comp calling execute_cmd\n", isert_cmd);
         spin_lock_bh(&cmd->istate_lock);
         cmd->cmd_flags |= ICF_GOT_LAST_DATAOUT;
         cmd->i_state = ISTATE_RECEIVED_LAST_DATAOUT;
@@ -1823,36 +1864,22 @@ isert_do_control_comp(struct work_struct *work)
         struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
         struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
 
+        isert_dbg("Cmd %p i_state %d\n", isert_cmd, cmd->i_state);
+
         switch (cmd->i_state) {
         case ISTATE_SEND_TASKMGTRSP:
-                pr_debug("Calling iscsit_tmr_post_handler >>>>>>>>>>>>>>>>>\n");
-
-                atomic_dec(&isert_conn->post_send_buf_count);
                 iscsit_tmr_post_handler(cmd, cmd->conn);
-
-                cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
-                break;
-        case ISTATE_SEND_REJECT:
-                pr_debug("Got isert_do_control_comp ISTATE_SEND_REJECT: >>>\n");
-                atomic_dec(&isert_conn->post_send_buf_count);
-
+        case ISTATE_SEND_REJECT:   /* FALLTHRU */
+        case ISTATE_SEND_TEXTRSP:  /* FALLTHRU */
                 cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
+                isert_completion_put(&isert_cmd->tx_desc, isert_cmd,
+                                     ib_dev, false);
                 break;
         case ISTATE_SEND_LOGOUTRSP:
-                pr_debug("Calling iscsit_logout_post_handler >>>>>>>>>>>>>>\n");
-
-                atomic_dec(&isert_conn->post_send_buf_count);
                 iscsit_logout_post_handler(cmd, cmd->conn);
                 break;
-        case ISTATE_SEND_TEXTRSP:
-                atomic_dec(&isert_conn->post_send_buf_count);
-                cmd->i_state = ISTATE_SENT_STATUS;
-                isert_completion_put(&isert_cmd->tx_desc, isert_cmd, ib_dev, false);
-                break;
         default:
-                pr_err("Unknown do_control_comp i_state %d\n", cmd->i_state);
+                isert_err("Unknown i_state %d\n", cmd->i_state);
                 dump_stack();
                 break;
         }
@@ -1865,7 +1892,6 @@ isert_response_completion(struct iser_tx_desc *tx_desc,
                           struct ib_device *ib_dev)
 {
         struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
-        struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
 
         if (cmd->i_state == ISTATE_SEND_TASKMGTRSP ||
             cmd->i_state == ISTATE_SEND_LOGOUTRSP ||
@@ -1878,267 +1904,151 @@ isert_response_completion(struct iser_tx_desc *tx_desc,
                 return;
         }
 
-        /**
-         * If send_wr_num is 0 this means that we got
-         * RDMA completion and we cleared it and we should
-         * simply decrement the response post. else the
-         * response is incorporated in send_wr_num, just
-         * sub it.
-         **/
-        if (wr->send_wr_num)
-                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
-        else
-                atomic_dec(&isert_conn->post_send_buf_count);
-
         cmd->i_state = ISTATE_SENT_STATUS;
         isert_completion_put(tx_desc, isert_cmd, ib_dev, false);
 }
 
 static void
-__isert_send_completion(struct iser_tx_desc *tx_desc,
-                        struct isert_conn *isert_conn)
+isert_send_completion(struct iser_tx_desc *tx_desc,
+                      struct isert_conn *isert_conn)
 {
         struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
         struct isert_cmd *isert_cmd = tx_desc->isert_cmd;
         struct isert_rdma_wr *wr;
 
         if (!isert_cmd) {
-                atomic_dec(&isert_conn->post_send_buf_count);
                 isert_unmap_tx_desc(tx_desc, ib_dev);
                 return;
         }
         wr = &isert_cmd->rdma_wr;
 
+        isert_dbg("Cmd %p iser_ib_op %d\n", isert_cmd, wr->iser_ib_op);
+
         switch (wr->iser_ib_op) {
         case ISER_IB_RECV:
-                pr_err("isert_send_completion: Got ISER_IB_RECV\n");
+                isert_err("Got ISER_IB_RECV\n");
                 dump_stack();
                 break;
         case ISER_IB_SEND:
-                pr_debug("isert_send_completion: Got ISER_IB_SEND\n");
                 isert_response_completion(tx_desc, isert_cmd,
                                           isert_conn, ib_dev);
                 break;
         case ISER_IB_RDMA_WRITE:
-                pr_debug("isert_send_completion: Got ISER_IB_RDMA_WRITE\n");
-                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
                 isert_completion_rdma_write(tx_desc, isert_cmd);
                 break;
         case ISER_IB_RDMA_READ:
-                pr_debug("isert_send_completion: Got ISER_IB_RDMA_READ:\n");
-
-                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
                 isert_completion_rdma_read(tx_desc, isert_cmd);
                 break;
         default:
-                pr_err("Unknown wr->iser_ib_op: 0x%02x\n", wr->iser_ib_op);
+                isert_err("Unknown wr->iser_ib_op: 0x%x\n", wr->iser_ib_op);
                 dump_stack();
                 break;
         }
 }
 
-static void
-isert_send_completion(struct iser_tx_desc *tx_desc,
-                      struct isert_conn *isert_conn)
-{
-        struct llist_node *llnode = tx_desc->comp_llnode_batch;
-        struct iser_tx_desc *t;
-        /*
-         * Drain coalesced completion llist starting from comp_llnode_batch
-         * setup in isert_init_send_wr(), and then complete trailing tx_desc.
-         */
-        while (llnode) {
-                t = llist_entry(llnode, struct iser_tx_desc, comp_llnode);
-                llnode = llist_next(llnode);
-                __isert_send_completion(t, isert_conn);
-        }
-        __isert_send_completion(tx_desc, isert_conn);
-}
-
-static void
-isert_cq_drain_comp_llist(struct isert_conn *isert_conn, struct ib_device *ib_dev)
+/**
+ * is_isert_tx_desc() - Indicate if the completion wr_id
+ *     is a TX descriptor or not.
+ * @isert_conn: iser connection
+ * @wr_id: completion WR identifier
+ *
+ * Since we cannot rely on wc opcode in FLUSH errors
+ * we must work around it by checking if the wr_id address
+ * falls in the iser connection rx_descs buffer. If so
+ * it is an RX descriptor, otherwize it is a TX.
+ */
+static inline bool
+is_isert_tx_desc(struct isert_conn *isert_conn, void *wr_id)
 {
-        struct llist_node *llnode;
-        struct isert_rdma_wr *wr;
-        struct iser_tx_desc *t;
+        void *start = isert_conn->conn_rx_descs;
+        int len = ISERT_QP_MAX_RECV_DTOS * sizeof(*isert_conn->conn_rx_descs);
 
-        mutex_lock(&isert_conn->conn_mutex);
-        llnode = llist_del_all(&isert_conn->conn_comp_llist);
-        isert_conn->conn_comp_batch = 0;
-        mutex_unlock(&isert_conn->conn_mutex);
-
-        while (llnode) {
-                t = llist_entry(llnode, struct iser_tx_desc, comp_llnode);
-                llnode = llist_next(llnode);
-                wr = &t->isert_cmd->rdma_wr;
-
-                /**
-                 * If send_wr_num is 0 this means that we got
-                 * RDMA completion and we cleared it and we should
-                 * simply decrement the response post. else the
-                 * response is incorporated in send_wr_num, just
-                 * sub it.
-                 **/
-                if (wr->send_wr_num)
-                        atomic_sub(wr->send_wr_num,
-                                   &isert_conn->post_send_buf_count);
-                else
-                        atomic_dec(&isert_conn->post_send_buf_count);
+        if (wr_id >= start && wr_id < start + len)
+                return false;
 
-                isert_completion_put(t, t->isert_cmd, ib_dev, true);
-        }
+        return true;
 }
 
 static void
-isert_cq_tx_comp_err(struct iser_tx_desc *tx_desc, struct isert_conn *isert_conn)
+isert_cq_comp_err(struct isert_conn *isert_conn, struct ib_wc *wc)
 {
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
-        struct isert_cmd *isert_cmd = tx_desc->isert_cmd;
-        struct llist_node *llnode = tx_desc->comp_llnode_batch;
-        struct isert_rdma_wr *wr;
-        struct iser_tx_desc *t;
-
-        while (llnode) {
-                t = llist_entry(llnode, struct iser_tx_desc, comp_llnode);
-                llnode = llist_next(llnode);
-                wr = &t->isert_cmd->rdma_wr;
+        if (wc->wr_id == ISER_BEACON_WRID) {
+                isert_info("conn %p completing conn_wait_comp_err\n",
+                           isert_conn);
+                complete(&isert_conn->conn_wait_comp_err);
+        } else if (is_isert_tx_desc(isert_conn, (void *)(uintptr_t)wc->wr_id)) {
+                struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
+                struct isert_cmd *isert_cmd;
+                struct iser_tx_desc *desc;
 
-                /**
-                 * If send_wr_num is 0 this means that we got
-                 * RDMA completion and we cleared it and we should
-                 * simply decrement the response post. else the
-                 * response is incorporated in send_wr_num, just
-                 * sub it.
-                 **/
-                if (wr->send_wr_num)
-                        atomic_sub(wr->send_wr_num,
-                                   &isert_conn->post_send_buf_count);
+                desc = (struct iser_tx_desc *)(uintptr_t)wc->wr_id;
+                isert_cmd = desc->isert_cmd;
+                if (!isert_cmd)
+                        isert_unmap_tx_desc(desc, ib_dev);
                 else
-                        atomic_dec(&isert_conn->post_send_buf_count);
-
-                isert_completion_put(t, t->isert_cmd, ib_dev, true);
-        }
-        tx_desc->comp_llnode_batch = NULL;
-
-        if (!isert_cmd)
-                isert_unmap_tx_desc(tx_desc, ib_dev);
-        else
-                isert_completion_put(tx_desc, isert_cmd, ib_dev, true);
-}
-
-static void
-isert_cq_rx_comp_err(struct isert_conn *isert_conn)
-{
-        struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
-        struct iscsi_conn *conn = isert_conn->conn;
-
-        if (isert_conn->post_recv_buf_count)
-                return;
-
-        isert_cq_drain_comp_llist(isert_conn, ib_dev);
-
-        if (conn->sess) {
-                target_sess_cmd_list_set_waiting(conn->sess->se_sess);
-                target_wait_for_sess_cmds(conn->sess->se_sess);
+                        isert_completion_put(desc, isert_cmd, ib_dev, true);
+        } else {
+                isert_conn->post_recv_buf_count--;
+                if (!isert_conn->post_recv_buf_count)
+                        iscsit_cause_connection_reinstatement(isert_conn->conn, 0);
         }
-
-        while (atomic_read(&isert_conn->post_send_buf_count))
-                msleep(3000);
-
-        mutex_lock(&isert_conn->conn_mutex);
-        isert_conn->state = ISER_CONN_DOWN;
-        mutex_unlock(&isert_conn->conn_mutex);
-
-        iscsit_cause_connection_reinstatement(isert_conn->conn, 0);
-
-        complete(&isert_conn->conn_wait_comp_err);
 }
 
 static void
-isert_cq_tx_work(struct work_struct *work)
+isert_handle_wc(struct ib_wc *wc)
 {
-        struct isert_cq_desc *cq_desc = container_of(work,
-                                struct isert_cq_desc, cq_tx_work);
-        struct isert_device *device = cq_desc->device;
-        int cq_index = cq_desc->cq_index;
-        struct ib_cq *tx_cq = device->dev_tx_cq[cq_index];
         struct isert_conn *isert_conn;
         struct iser_tx_desc *tx_desc;
-        struct ib_wc wc;
-
-        while (ib_poll_cq(tx_cq, 1, &wc) == 1) {
-                tx_desc = (struct iser_tx_desc *)(unsigned long)wc.wr_id;
-                isert_conn = wc.qp->qp_context;
+        struct iser_rx_desc *rx_desc;
 
-                if (wc.status == IB_WC_SUCCESS) {
-                        isert_send_completion(tx_desc, isert_conn);
+        isert_conn = wc->qp->qp_context;
+        if (likely(wc->status == IB_WC_SUCCESS)) {
+                if (wc->opcode == IB_WC_RECV) {
+                        rx_desc = (struct iser_rx_desc *)(uintptr_t)wc->wr_id;
+                        isert_rx_completion(rx_desc, isert_conn, wc->byte_len);
                 } else {
-                        pr_debug("TX wc.status != IB_WC_SUCCESS >>>>>>>>>>>>>>\n");
-                        pr_debug("TX wc.status: 0x%08x\n", wc.status);
-                        pr_debug("TX wc.vendor_err: 0x%08x\n", wc.vendor_err);
-
-                        if (wc.wr_id != ISER_FASTREG_LI_WRID) {
-                                if (tx_desc->llnode_active)
-                                        continue;
-
-                                atomic_dec(&isert_conn->post_send_buf_count);
-                                isert_cq_tx_comp_err(tx_desc, isert_conn);
-                        }
+                        tx_desc = (struct iser_tx_desc *)(uintptr_t)wc->wr_id;
+                        isert_send_completion(tx_desc, isert_conn);
                 }
-        }
-
-        ib_req_notify_cq(tx_cq, IB_CQ_NEXT_COMP);
-}
-
-static void
-isert_cq_tx_callback(struct ib_cq *cq, void *context)
-{
-        struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;
+        } else {
+                if (wc->status != IB_WC_WR_FLUSH_ERR)
+                        isert_err("wr id %llx status %d vend_err %x\n",
+                                  wc->wr_id, wc->status, wc->vendor_err);
+                else
+                        isert_dbg("flush error: wr id %llx\n", wc->wr_id);
 
-        queue_work(isert_comp_wq, &cq_desc->cq_tx_work);
+                if (wc->wr_id != ISER_FASTREG_LI_WRID)
+                        isert_cq_comp_err(isert_conn, wc);
+        }
 }
 
 static void
-isert_cq_rx_work(struct work_struct *work)
+isert_cq_work(struct work_struct *work)
 {
-        struct isert_cq_desc *cq_desc = container_of(work,
-                        struct isert_cq_desc, cq_rx_work);
-        struct isert_device *device = cq_desc->device;
-        int cq_index = cq_desc->cq_index;
-        struct ib_cq *rx_cq = device->dev_rx_cq[cq_index];
-        struct isert_conn *isert_conn;
-        struct iser_rx_desc *rx_desc;
-        struct ib_wc wc;
-        unsigned long xfer_len;
+        enum { isert_poll_budget = 65536 };
+        struct isert_comp *comp = container_of(work, struct isert_comp,
+                                               work);
+        struct ib_wc *const wcs = comp->wcs;
+        int i, n, completed = 0;
 
-        while (ib_poll_cq(rx_cq, 1, &wc) == 1) {
-                rx_desc = (struct iser_rx_desc *)(unsigned long)wc.wr_id;
-                isert_conn = wc.qp->qp_context;
+        while ((n = ib_poll_cq(comp->cq, ARRAY_SIZE(comp->wcs), wcs)) > 0) {
+                for (i = 0; i < n; i++)
+                        isert_handle_wc(&wcs[i]);
 
-                if (wc.status == IB_WC_SUCCESS) {
-                        xfer_len = (unsigned long)wc.byte_len;
-                        isert_rx_completion(rx_desc, isert_conn, xfer_len);
-                } else {
-                        pr_debug("RX wc.status != IB_WC_SUCCESS >>>>>>>>>>>>>>\n");
-                        if (wc.status != IB_WC_WR_FLUSH_ERR) {
-                                pr_debug("RX wc.status: 0x%08x\n", wc.status);
-                                pr_debug("RX wc.vendor_err: 0x%08x\n",
-                                         wc.vendor_err);
-                        }
-                        isert_conn->post_recv_buf_count--;
-                        isert_cq_rx_comp_err(isert_conn);
-                }
+                completed += n;
+                if (completed >= isert_poll_budget)
+                        break;
         }
 
-        ib_req_notify_cq(rx_cq, IB_CQ_NEXT_COMP);
+        ib_req_notify_cq(comp->cq, IB_CQ_NEXT_COMP);
 }
 
 static void
-isert_cq_rx_callback(struct ib_cq *cq, void *context)
+isert_cq_callback(struct ib_cq *cq, void *context)
 {
-        struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;
+        struct isert_comp *comp = context;
 
-        queue_work(isert_rx_wq, &cq_desc->cq_rx_work);
+        queue_work(isert_comp_wq, &comp->work);
 }
 
 static int
@@ -2147,13 +2057,10 @@ isert_post_response(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd)
         struct ib_send_wr *wr_failed;
         int ret;
 
-        atomic_inc(&isert_conn->post_send_buf_count);
-
         ret = ib_post_send(isert_conn->conn_qp, &isert_cmd->tx_desc.send_wr,
                            &wr_failed);
         if (ret) {
-                pr_err("ib_post_send failed with %d\n", ret);
-                atomic_dec(&isert_conn->post_send_buf_count);
+                isert_err("ib_post_send failed with %d\n", ret);
                 return ret;
         }
         return ret;
@@ -2200,9 +2107,9 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
                 isert_cmd->tx_desc.num_sge = 2;
         }
 
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting SCSI Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("Posting SCSI Response\n");
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2231,8 +2138,16 @@ isert_get_sup_prot_ops(struct iscsi_conn *conn)
         struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
         struct isert_device *device = isert_conn->conn_device;
 
-        if (device->pi_capable)
-                return TARGET_PROT_ALL;
+        if (conn->tpg->tpg_attrib.t10_pi) {
+                if (device->pi_capable) {
+                        isert_info("conn %p PI offload enabled\n", isert_conn);
+                        isert_conn->pi_support = true;
+                        return TARGET_PROT_ALL;
+                }
+        }
+
+        isert_info("conn %p PI offload disabled\n", isert_conn);
+        isert_conn->pi_support = false;
 
         return TARGET_PROT_NORMAL;
 }
@@ -2250,9 +2165,9 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn,
                                &isert_cmd->tx_desc.iscsi_header,
                                nopout_response);
         isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting NOPIN Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p Posting NOPIN Response\n", isert_conn);
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2268,9 +2183,9 @@ isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
         iscsit_build_logout_rsp(cmd, conn, (struct iscsi_logout_rsp *)
                                 &isert_cmd->tx_desc.iscsi_header);
         isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting Logout Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p Posting Logout Response\n", isert_conn);
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2286,9 +2201,9 @@ isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
         iscsit_build_task_mgt_rsp(cmd, conn, (struct iscsi_tm_rsp *)
                                   &isert_cmd->tx_desc.iscsi_header);
         isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting Task Management Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p Posting Task Management Response\n", isert_conn);
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2318,9 +2233,9 @@ isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
         tx_dsg->lkey    = isert_conn->conn_mr->lkey;
         isert_cmd->tx_desc.num_sge = 2;
 
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting Reject IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p Posting Reject\n", isert_conn);
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2358,9 +2273,9 @@ isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
                 tx_dsg->lkey    = isert_conn->conn_mr->lkey;
                 isert_cmd->tx_desc.num_sge = 2;
         }
-        isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);
+        isert_init_send_wr(isert_conn, isert_cmd, send_wr);
 
-        pr_debug("Posting Text Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
+        isert_dbg("conn %p Text Reject\n", isert_conn);
 
         return isert_post_response(isert_conn, isert_cmd);
 }
@@ -2383,30 +2298,31 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
 
         send_wr->sg_list = ib_sge;
         send_wr->num_sge = sg_nents;
-        send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc;
+        send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
         /*
          * Perform mapping of TCM scatterlist memory ib_sge dma_addr.
          */
         for_each_sg(sg_start, tmp_sg, sg_nents, i) {
-                pr_debug("ISER RDMA from SGL dma_addr: 0x%16llx dma_len: %u, page_off: %u\n",
-                         (unsigned long long)tmp_sg->dma_address,
-                         tmp_sg->length, page_off);
+                isert_dbg("RDMA from SGL dma_addr: 0x%llx dma_len: %u, "
+                          "page_off: %u\n",
+                          (unsigned long long)tmp_sg->dma_address,
+                          tmp_sg->length, page_off);
 
                 ib_sge->addr = ib_sg_dma_address(ib_dev, tmp_sg) + page_off;
                 ib_sge->length = min_t(u32, data_left,
                                 ib_sg_dma_len(ib_dev, tmp_sg) - page_off);
                 ib_sge->lkey = isert_conn->conn_mr->lkey;
 
-                pr_debug("RDMA ib_sge: addr: 0x%16llx  length: %u lkey: %08x\n",
-                         ib_sge->addr, ib_sge->length, ib_sge->lkey);
+                isert_dbg("RDMA ib_sge: addr: 0x%llx  length: %u lkey: %x\n",
+                          ib_sge->addr, ib_sge->length, ib_sge->lkey);
                 page_off = 0;
                 data_left -= ib_sge->length;
                 ib_sge++;
-                pr_debug("Incrementing ib_sge pointer to %p\n", ib_sge);
+                isert_dbg("Incrementing ib_sge pointer to %p\n", ib_sge);
         }
 
-        pr_debug("Set outgoing sg_list: %p num_sg: %u from TCM SGLs\n",
-                 send_wr->sg_list, send_wr->num_sge);
+        isert_dbg("Set outgoing sg_list: %p num_sg: %u from TCM SGLs\n",
+                  send_wr->sg_list, send_wr->num_sge);
 
         return sg_nents;
 }
@@ -2438,7 +2354,7 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
 
         ib_sge = kzalloc(sizeof(struct ib_sge) * data->nents, GFP_KERNEL);
         if (!ib_sge) {
-                pr_warn("Unable to allocate ib_sge\n");
+                isert_warn("Unable to allocate ib_sge\n");
                 ret = -ENOMEM;
                 goto unmap_cmd;
         }
@@ -2448,7 +2364,7 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         wr->send_wr = kzalloc(sizeof(struct ib_send_wr) * wr->send_wr_num,
                                 GFP_KERNEL);
         if (!wr->send_wr) {
-                pr_debug("Unable to allocate wr->send_wr\n");
+                isert_dbg("Unable to allocate wr->send_wr\n");
                 ret = -ENOMEM;
                 goto unmap_cmd;
         }
@@ -2512,9 +2428,9 @@ isert_map_fr_pagelist(struct ib_device *ib_dev,
                         chunk_start = start_addr;
                 end_addr = start_addr + ib_sg_dma_len(ib_dev, tmp_sg);
 
-                pr_debug("SGL[%d] dma_addr: 0x%16llx len: %u\n",
-                         i, (unsigned long long)tmp_sg->dma_address,
-                         tmp_sg->length);
+                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;
@@ -2525,8 +2441,8 @@ isert_map_fr_pagelist(struct ib_device *ib_dev,
                 page = chunk_start & PAGE_MASK;
                 do {
                         fr_pl[n_pages++] = page;
-                        pr_debug("Mapped page_list[%d] page_addr: 0x%16llx\n",
-                                 n_pages - 1, page);
+                        isert_dbg("Mapped page_list[%d] page_addr: 0x%llx\n",
+                                  n_pages - 1, page);
                         page += PAGE_SIZE;
                 } while (page < end_addr);
         }
@@ -2534,6 +2450,21 @@ isert_map_fr_pagelist(struct ib_device *ib_dev,
         return n_pages;
 }
 
+static inline void
+isert_inv_rkey(struct ib_send_wr *inv_wr, struct ib_mr *mr)
+{
+        u32 rkey;
+
+        memset(inv_wr, 0, sizeof(*inv_wr));
+        inv_wr->wr_id = ISER_FASTREG_LI_WRID;
+        inv_wr->opcode = IB_WR_LOCAL_INV;
+        inv_wr->ex.invalidate_rkey = mr->rkey;
+
+        /* Bump the key */
+        rkey = ib_inc_rkey(mr->rkey);
+        ib_update_fast_reg_key(mr, rkey);
+}
+
 static int
 isert_fast_reg_mr(struct isert_conn *isert_conn,
                   struct fast_reg_descriptor *fr_desc,
@@ -2548,15 +2479,13 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
         struct ib_send_wr *bad_wr, *wr = NULL;
         int ret, pagelist_len;
         u32 page_off;
-        u8 key;
 
         if (mem->dma_nents == 1) {
                 sge->lkey = isert_conn->conn_mr->lkey;
                 sge->addr = ib_sg_dma_address(ib_dev, &mem->sg[0]);
                 sge->length = ib_sg_dma_len(ib_dev, &mem->sg[0]);
-                pr_debug("%s:%d sge: addr: 0x%llx  length: %u lkey: %x\n",
-                         __func__, __LINE__, sge->addr, sge->length,
-                         sge->lkey);
+                isert_dbg("sge: addr: 0x%llx  length: %u lkey: %x\n",
+                         sge->addr, sge->length, sge->lkey);
                 return 0;
         }
 
@@ -2572,21 +2501,15 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
 
         page_off = mem->offset % PAGE_SIZE;
 
-        pr_debug("Use fr_desc %p sg_nents %d offset %u\n",
-                 fr_desc, mem->nents, mem->offset);
+        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 & ISERT_DATA_KEY_VALID)) {
-                memset(&inv_wr, 0, sizeof(inv_wr));
-                inv_wr.wr_id = ISER_FASTREG_LI_WRID;
-                inv_wr.opcode = IB_WR_LOCAL_INV;
-                inv_wr.ex.invalidate_rkey = mr->rkey;
+        if (!(fr_desc->ind & ind)) {
+                isert_inv_rkey(&inv_wr, mr);
                 wr = &inv_wr;
-                /* Bump the key */
-                key = (u8)(mr->rkey & 0x000000FF);
-                ib_update_fast_reg_key(mr, ++key);
         }
 
         /* Prepare FASTREG WR */
@@ -2608,7 +2531,7 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
 
         ret = ib_post_send(isert_conn->conn_qp, wr, &bad_wr);
         if (ret) {
-                pr_err("fast registration failed, ret:%d\n", ret);
+                isert_err("fast registration failed, ret:%d\n", ret);
                 return ret;
         }
         fr_desc->ind &= ~ind;
@@ -2617,9 +2540,8 @@ isert_fast_reg_mr(struct isert_conn *isert_conn,
         sge->addr = frpl->page_list[0] + page_off;
         sge->length = mem->len;
 
-        pr_debug("%s:%d sge: addr: 0x%llx  length: %u lkey: %x\n",
-                 __func__, __LINE__, sge->addr, sge->length,
-                 sge->lkey);
+        isert_dbg("sge: addr: 0x%llx  length: %u lkey: %x\n",
+                  sge->addr, sge->length, sge->lkey);
 
         return ret;
 }
@@ -2665,7 +2587,7 @@ isert_set_sig_attrs(struct se_cmd *se_cmd, struct ib_sig_attrs *sig_attrs)
                 isert_set_dif_domain(se_cmd, sig_attrs, &sig_attrs->mem);
                 break;
         default:
-                pr_err("Unsupported PI operation %d\n", se_cmd->prot_op);
+                isert_err("Unsupported PI operation %d\n", se_cmd->prot_op);
                 return -EINVAL;
         }
 
@@ -2681,17 +2603,16 @@ isert_set_prot_checks(u8 prot_checks)
 }
 
 static int
-isert_reg_sig_mr(struct isert_conn *isert_conn, struct se_cmd *se_cmd,
-                 struct fast_reg_descriptor *fr_desc,
-                 struct ib_sge *data_sge, struct ib_sge *prot_sge,
-                 struct ib_sge *sig_sge)
+isert_reg_sig_mr(struct isert_conn *isert_conn,
+                 struct se_cmd *se_cmd,
+                 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 pi_context *pi_ctx = fr_desc->pi_ctx;
         struct ib_sig_attrs sig_attrs;
         int ret;
-        u32 key;
 
         memset(&sig_attrs, 0, sizeof(sig_attrs));
         ret = isert_set_sig_attrs(se_cmd, &sig_attrs);
@@ -2701,26 +2622,20 @@ isert_reg_sig_mr(struct isert_conn *isert_conn, struct se_cmd *se_cmd,
         sig_attrs.check_mask = isert_set_prot_checks(se_cmd->prot_checks);
 
         if (!(fr_desc->ind & ISERT_SIG_KEY_VALID)) {
-                memset(&inv_wr, 0, sizeof(inv_wr));
-                inv_wr.opcode = IB_WR_LOCAL_INV;
-                inv_wr.wr_id = ISER_FASTREG_LI_WRID;
-                inv_wr.ex.invalidate_rkey = pi_ctx->sig_mr->rkey;
+                isert_inv_rkey(&inv_wr, pi_ctx->sig_mr);
                 wr = &inv_wr;
-                /* Bump the key */
-                key = (u8)(pi_ctx->sig_mr->rkey & 0x000000FF);
-                ib_update_fast_reg_key(pi_ctx->sig_mr, ++key);
         }
 
         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 = data_sge;
+        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;
         if (se_cmd->t_prot_sg)
-                sig_wr.wr.sig_handover.prot = prot_sge;
+                sig_wr.wr.sig_handover.prot = &rdma_wr->ib_sg[PROT];
 
         if (!wr)
                 wr = &sig_wr;
@@ -2729,39 +2644,98 @@ isert_reg_sig_mr(struct isert_conn *isert_conn, struct se_cmd *se_cmd,
 
         ret = ib_post_send(isert_conn->conn_qp, wr, &bad_wr);
         if (ret) {
-                pr_err("fast registration failed, ret:%d\n", ret);
+                isert_err("fast registration failed, ret:%d\n", ret);
                 goto err;
         }
         fr_desc->ind &= ~ISERT_SIG_KEY_VALID;
 
-        sig_sge->lkey = pi_ctx->sig_mr->lkey;
-        sig_sge->addr = 0;
-        sig_sge->length = se_cmd->data_length;
+        rdma_wr->ib_sg[SIG].lkey = pi_ctx->sig_mr->lkey;
+        rdma_wr->ib_sg[SIG].addr = 0;
+        rdma_wr->ib_sg[SIG].length = se_cmd->data_length;
         if (se_cmd->prot_op != TARGET_PROT_DIN_STRIP &&
             se_cmd->prot_op != TARGET_PROT_DOUT_INSERT)
                 /*
                  * We have protection guards on the wire
                  * so we need to set a larget transfer
                  */
-                sig_sge->length += se_cmd->prot_length;
+                rdma_wr->ib_sg[SIG].length += se_cmd->prot_length;
 
-        pr_debug("sig_sge: addr: 0x%llx  length: %u lkey: %x\n",
-                 sig_sge->addr, sig_sge->length,
-                 sig_sge->lkey);
+        isert_dbg("sig_sge: addr: 0x%llx  length: %u lkey: %x\n",
+                  rdma_wr->ib_sg[SIG].addr, rdma_wr->ib_sg[SIG].length,
+                  rdma_wr->ib_sg[SIG].lkey);
 err:
         return ret;
 }
 
 static int
+isert_handle_prot_cmd(struct isert_conn *isert_conn,
+                      struct isert_cmd *isert_cmd,
+                      struct isert_rdma_wr *wr)
+{
+        struct isert_device *device = isert_conn->conn_device;
+        struct se_cmd *se_cmd = &isert_cmd->iscsi_cmd->se_cmd;
+        int ret;
+
+        if (!wr->fr_desc->pi_ctx) {
+                ret = isert_create_pi_ctx(wr->fr_desc,
+                                          device->ib_device,
+                                          isert_conn->conn_pd);
+                if (ret) {
+                        isert_err("conn %p failed to allocate pi_ctx\n",
+                                  isert_conn);
+                        return ret;
+                }
+        }
+
+        if (se_cmd->t_prot_sg) {
+                ret = isert_map_data_buf(isert_conn, isert_cmd,
+                                         se_cmd->t_prot_sg,
+                                         se_cmd->t_prot_nents,
+                                         se_cmd->prot_length,
+                                         0, wr->iser_ib_op, &wr->prot);
+                if (ret) {
+                        isert_err("conn %p failed to map protection buffer\n",
+                                  isert_conn);
+                        return ret;
+                }
+
+                memset(&wr->ib_sg[PROT], 0, sizeof(wr->ib_sg[PROT]));
+                ret = isert_fast_reg_mr(isert_conn, wr->fr_desc, &wr->prot,
+                                        ISERT_PROT_KEY_VALID, &wr->ib_sg[PROT]);
+                if (ret) {
+                        isert_err("conn %p failed to fast reg mr\n",
+                                  isert_conn);
+                        goto unmap_prot_cmd;
+                }
+        }
+
+        ret = isert_reg_sig_mr(isert_conn, se_cmd, wr, wr->fr_desc);
+        if (ret) {
+                isert_err("conn %p failed to fast reg mr\n",
+                          isert_conn);
+                goto unmap_prot_cmd;
+        }
+        wr->fr_desc->ind |= ISERT_PROTECTED;
+
+        return 0;
+
+unmap_prot_cmd:
+        if (se_cmd->t_prot_sg)
+                isert_unmap_data_buf(isert_conn, &wr->prot);
+
+        return ret;
+}
+
+static int
 isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                struct isert_rdma_wr *wr)
 {
         struct se_cmd *se_cmd = &cmd->se_cmd;
         struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
         struct isert_conn *isert_conn = conn->context;
-        struct ib_sge data_sge;
-        struct ib_send_wr *send_wr;
         struct fast_reg_descriptor *fr_desc = NULL;
+        struct ib_send_wr *send_wr;
+        struct ib_sge *ib_sg;
         u32 offset;
         int ret = 0;
         unsigned long flags;
@@ -2775,8 +2749,7 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         if (ret)
                 return ret;
 
-        if (wr->data.dma_nents != 1 ||
-            se_cmd->prot_op != TARGET_PROT_NORMAL) {
+        if (wr->data.dma_nents != 1 || isert_prot_cmd(isert_conn, se_cmd)) {
                 spin_lock_irqsave(&isert_conn->conn_lock, flags);
                 fr_desc = list_first_entry(&isert_conn->conn_fr_pool,
                                            struct fast_reg_descriptor, list);
@@ -2786,38 +2759,21 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         }
 
         ret = isert_fast_reg_mr(isert_conn, fr_desc, &wr->data,
-                                ISERT_DATA_KEY_VALID, &data_sge);
+                                ISERT_DATA_KEY_VALID, &wr->ib_sg[DATA]);
         if (ret)
                 goto unmap_cmd;
 
-        if (se_cmd->prot_op != TARGET_PROT_NORMAL) {
-                struct ib_sge prot_sge, sig_sge;
-
-                if (se_cmd->t_prot_sg) {
-                        ret = isert_map_data_buf(isert_conn, isert_cmd,
-                                                 se_cmd->t_prot_sg,
-                                                 se_cmd->t_prot_nents,
-                                                 se_cmd->prot_length,
-                                                 0, wr->iser_ib_op, &wr->prot);
-                        if (ret)
-                                goto unmap_cmd;
-
-                        ret = isert_fast_reg_mr(isert_conn, fr_desc, &wr->prot,
-                                                ISERT_PROT_KEY_VALID, &prot_sge);
-                        if (ret)
-                                goto unmap_prot_cmd;
-                }
-
-                ret = isert_reg_sig_mr(isert_conn, se_cmd, fr_desc,
-                                       &data_sge, &prot_sge, &sig_sge);
+        if (isert_prot_cmd(isert_conn, se_cmd)) {
+                ret = isert_handle_prot_cmd(isert_conn, isert_cmd, wr);
                 if (ret)
-                        goto unmap_prot_cmd;
+                        goto unmap_cmd;
 
-                fr_desc->ind |= ISERT_PROTECTED;
-                memcpy(&wr->s_ib_sge, &sig_sge, sizeof(sig_sge));
-        } else
-                memcpy(&wr->s_ib_sge, &data_sge, sizeof(data_sge));
+                ib_sg = &wr->ib_sg[SIG];
+        } else {
+                ib_sg = &wr->ib_sg[DATA];
+        }
 
+        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));
@@ -2827,12 +2783,12 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *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 = (unsigned long)&isert_cmd->tx_desc;
+        send_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 = se_cmd->prot_op == TARGET_PROT_NORMAL ?
+                send_wr->send_flags = !isert_prot_cmd(isert_conn, se_cmd) ?
                                       0 : IB_SEND_SIGNALED;
         } else {
                 send_wr->opcode = IB_WR_RDMA_READ;
@@ -2842,9 +2798,7 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         }
 
         return 0;
-unmap_prot_cmd:
-        if (se_cmd->t_prot_sg)
-                isert_unmap_data_buf(isert_conn, &wr->prot);
+
 unmap_cmd:
         if (fr_desc) {
                 spin_lock_irqsave(&isert_conn->conn_lock, flags);
@@ -2867,16 +2821,17 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
         struct ib_send_wr *wr_failed;
         int rc;
 
-        pr_debug("Cmd: %p RDMA_WRITE data_length: %u\n",
+        isert_dbg("Cmd: %p RDMA_WRITE data_length: %u\n",
                  isert_cmd, se_cmd->data_length);
+
         wr->iser_ib_op = ISER_IB_RDMA_WRITE;
         rc = device->reg_rdma_mem(conn, cmd, wr);
         if (rc) {
-                pr_err("Cmd: %p failed to prepare RDMA res\n", isert_cmd);
+                isert_err("Cmd: %p failed to prepare RDMA res\n", isert_cmd);
                 return rc;
         }
 
-        if (se_cmd->prot_op == TARGET_PROT_NORMAL) {
+        if (!isert_prot_cmd(isert_conn, se_cmd)) {
                 /*
                  * Build isert_conn->tx_desc for iSCSI response PDU and attach
                  */
@@ -2886,24 +2841,20 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
                                      &isert_cmd->tx_desc.iscsi_header);
                 isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
                 isert_init_send_wr(isert_conn, isert_cmd,
-                                   &isert_cmd->tx_desc.send_wr, false);
+                                   &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;
         }
 
-        atomic_add(wr->send_wr_num, &isert_conn->post_send_buf_count);
-
         rc = ib_post_send(isert_conn->conn_qp, wr->send_wr, &wr_failed);
-        if (rc) {
-                pr_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
-                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
-        }
+        if (rc)
+                isert_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
 
-        if (se_cmd->prot_op == TARGET_PROT_NORMAL)
-                pr_debug("Cmd: %p posted RDMA_WRITE + Response for iSER Data "
+        if (!isert_prot_cmd(isert_conn, se_cmd))
+                isert_dbg("Cmd: %p posted RDMA_WRITE + Response for iSER Data "
                          "READ\n", isert_cmd);
         else
-                pr_debug("Cmd: %p posted RDMA_WRITE for iSER Data READ\n",
+                isert_dbg("Cmd: %p posted RDMA_WRITE for iSER Data READ\n",
                          isert_cmd);
 
         return 1;
@@ -2920,23 +2871,20 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery)
         struct ib_send_wr *wr_failed;
         int rc;
 
-        pr_debug("Cmd: %p RDMA_READ data_length: %u write_data_done: %u\n",
+        isert_dbg("Cmd: %p RDMA_READ data_length: %u write_data_done: %u\n",
                  isert_cmd, se_cmd->data_length, cmd->write_data_done);
         wr->iser_ib_op = ISER_IB_RDMA_READ;
         rc = device->reg_rdma_mem(conn, cmd, wr);
         if (rc) {
-                pr_err("Cmd: %p failed to prepare RDMA res\n", isert_cmd);
+                isert_err("Cmd: %p failed to prepare RDMA res\n", isert_cmd);
                 return rc;
         }
 
-        atomic_add(wr->send_wr_num, &isert_conn->post_send_buf_count);
-
         rc = ib_post_send(isert_conn->conn_qp, wr->send_wr, &wr_failed);
-        if (rc) {
-                pr_warn("ib_post_send() failed for IB_WR_RDMA_READ\n");
-                atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
-        }
-        pr_debug("Cmd: %p posted RDMA_READ memory for ISER Data WRITE\n",
+        if (rc)
+                isert_warn("ib_post_send() failed for IB_WR_RDMA_READ\n");
+
+        isert_dbg("Cmd: %p posted RDMA_READ memory for ISER Data WRITE\n",
                  isert_cmd);
 
         return 0;
@@ -2952,7 +2900,7 @@ isert_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
                 ret = isert_put_nopin(cmd, conn, false);
                 break;
         default:
-                pr_err("Unknown immediate state: 0x%02x\n", state);
+                isert_err("Unknown immediate state: 0x%02x\n", state);
                 ret = -EINVAL;
                 break;
         }
@@ -2963,15 +2911,14 @@ isert_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
 static int
 isert_response_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
 {
+        struct isert_conn *isert_conn = conn->context;
         int ret;
 
         switch (state) {
         case ISTATE_SEND_LOGOUTRSP:
                 ret = isert_put_logout_rsp(cmd, conn);
-                if (!ret) {
-                        pr_debug("Returning iSER Logout -EAGAIN\n");
-                        ret = -EAGAIN;
-                }
+                if (!ret)
+                        isert_conn->logout_posted = true;
                 break;
         case ISTATE_SEND_NOPIN:
                 ret = isert_put_nopin(cmd, conn, true);
@@ -2993,7 +2940,7 @@ isert_response_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
                 ret = isert_put_response(conn, cmd);
                 break;
         default:
-                pr_err("Unknown response state: 0x%02x\n", state);
+                isert_err("Unknown response state: 0x%02x\n", state);
                 ret = -EINVAL;
                 break;
         }
@@ -3001,27 +2948,64 @@ isert_response_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
         return ret;
 }
 
+struct rdma_cm_id *
+isert_setup_id(struct isert_np *isert_np)
+{
+        struct iscsi_np *np = isert_np->np;
+        struct rdma_cm_id *id;
+        struct sockaddr *sa;
+        int ret;
+
+        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,
+                            RDMA_PS_TCP, IB_QPT_RC);
+        if (IS_ERR(id)) {
+                isert_err("rdma_create_id() failed: %ld\n", PTR_ERR(id));
+                ret = PTR_ERR(id);
+                goto out;
+        }
+        isert_dbg("id %p context %p\n", id, id->context);
+
+        ret = rdma_bind_addr(id, sa);
+        if (ret) {
+                isert_err("rdma_bind_addr() failed: %d\n", ret);
+                goto out_id;
+        }
+
+        ret = rdma_listen(id, ISERT_RDMA_LISTEN_BACKLOG);
+        if (ret) {
+                isert_err("rdma_listen() failed: %d\n", ret);
+                goto out_id;
+        }
+
+        return id;
+out_id:
+        rdma_destroy_id(id);
+out:
+        return ERR_PTR(ret);
+}
+
 static int
 isert_setup_np(struct iscsi_np *np,
                struct __kernel_sockaddr_storage *ksockaddr)
 {
         struct isert_np *isert_np;
         struct rdma_cm_id *isert_lid;
-        struct sockaddr *sa;
         int ret;
 
         isert_np = kzalloc(sizeof(struct isert_np), GFP_KERNEL);
         if (!isert_np) {
-                pr_err("Unable to allocate struct isert_np\n");
+                isert_err("Unable to allocate struct isert_np\n");
                 return -ENOMEM;
         }
         sema_init(&isert_np->np_sem, 0);
         mutex_init(&isert_np->np_accept_mutex);
         INIT_LIST_HEAD(&isert_np->np_accept_list);
         init_completion(&isert_np->np_login_comp);
+        isert_np->np = np;
 
-        sa = (struct sockaddr *)ksockaddr;
-        pr_debug("ksockaddr: %p, sa: %p\n", ksockaddr, sa);
         /*
          * Setup the np->np_sockaddr from the passed sockaddr setup
          * in iscsi_target_configfs.c code..
@@ -3029,37 +3013,20 @@ isert_setup_np(struct iscsi_np *np,
         memcpy(&np->np_sockaddr, ksockaddr,
                sizeof(struct __kernel_sockaddr_storage));
 
-        isert_lid = rdma_create_id(isert_cma_handler, np, RDMA_PS_TCP,
-                                IB_QPT_RC);
+        isert_lid = isert_setup_id(isert_np);
         if (IS_ERR(isert_lid)) {
-                pr_err("rdma_create_id() for isert_listen_handler failed: %ld\n",
-                       PTR_ERR(isert_lid));
                 ret = PTR_ERR(isert_lid);
                 goto out;
         }
 
-        ret = rdma_bind_addr(isert_lid, sa);
-        if (ret) {
-                pr_err("rdma_bind_addr() for isert_lid failed: %d\n", ret);
-                goto out_lid;
-        }
-
-        ret = rdma_listen(isert_lid, ISERT_RDMA_LISTEN_BACKLOG);
-        if (ret) {
-                pr_err("rdma_listen() for isert_lid failed: %d\n", ret);
-                goto out_lid;
-        }
-
         isert_np->np_cm_id = isert_lid;
         np->np_context = isert_np;
-        pr_debug("Setup isert_lid->context: %p\n", isert_lid->context);
 
         return 0;
 
-out_lid:
-        rdma_destroy_id(isert_lid);
 out:
         kfree(isert_np);
+
         return ret;
 }
 
@@ -3075,16 +3042,12 @@ isert_rdma_accept(struct isert_conn *isert_conn)
         cp.retry_count = 7;
         cp.rnr_retry_count = 7;
 
-        pr_debug("Before rdma_accept >>>>>>>>>>>>>>>>>>>>.\n");
-
         ret = rdma_accept(cm_id, &cp);
         if (ret) {
-                pr_err("rdma_accept() failed with: %d\n", ret);
+                isert_err("rdma_accept() failed with: %d\n", ret);
                 return ret;
         }
 
-        pr_debug("After rdma_accept >>>>>>>>>>>>>>>>>>>>>.\n");
-
         return 0;
 }
 
@@ -3094,7 +3057,15 @@ isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login)
         struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
         int ret;
 
-        pr_debug("isert_get_login_rx before conn_login_comp conn: %p\n", conn);
+        isert_info("before login_req comp conn: %p\n", isert_conn);
+        ret = wait_for_completion_interruptible(&isert_conn->login_req_comp);
+        if (ret) {
+                isert_err("isert_conn %p interrupted before got login req\n",
+                          isert_conn);
+                return ret;
+        }
+        reinit_completion(&isert_conn->login_req_comp);
+
         /*
          * For login requests after the first PDU, isert_rx_login_req() will
          * kick schedule_delayed_work(&conn->login_work) as the packet is
@@ -3104,11 +3075,15 @@ isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login)
         if (!login->first_request)
                 return 0;
 
+        isert_rx_login_req(isert_conn);
+
+        isert_info("before conn_login_comp conn: %p\n", conn);
         ret = wait_for_completion_interruptible(&isert_conn->conn_login_comp);
         if (ret)
                 return ret;
 
-        pr_debug("isert_get_login_rx processing login->req: %p\n", login->req);
+        isert_info("processing login->req: %p\n", login->req);
+
         return 0;
 }
 
@@ -3161,7 +3136,7 @@ accept_wait:
         spin_lock_bh(&np->np_thread_lock);
         if (np->np_thread_state >= ISCSI_NP_THREAD_RESET) {
                 spin_unlock_bh(&np->np_thread_lock);
-                pr_debug("np_thread_state %d for isert_accept_np\n",
+                isert_dbg("np_thread_state %d for isert_accept_np\n",
                          np->np_thread_state);
                 /**
                  * No point in stalling here when np_thread
@@ -3186,17 +3161,10 @@ accept_wait:
         isert_conn->conn = conn;
         max_accept = 0;
 
-        ret = isert_rdma_post_recvl(isert_conn);
-        if (ret)
-                return ret;
-
-        ret = isert_rdma_accept(isert_conn);
-        if (ret)
-                return ret;
-
         isert_set_conn_info(np, conn, isert_conn);
 
-        pr_debug("Processing isert_accept_np: isert_conn: %p\n", isert_conn);
+        isert_dbg("Processing isert_conn: %p\n", isert_conn);
+
         return 0;
 }
 
@@ -3204,25 +3172,103 @@ static void
 isert_free_np(struct iscsi_np *np)
 {
         struct isert_np *isert_np = (struct isert_np *)np->np_context;
+        struct isert_conn *isert_conn, *n;
 
         if (isert_np->np_cm_id)
                 rdma_destroy_id(isert_np->np_cm_id);
 
+        /*
+         * FIXME: At this point we don't have a good way to insure
+         * that at this point we don't have hanging connections that
+         * completed RDMA establishment but didn't start iscsi login
+         * process. So work-around this by cleaning up what ever piled
+         * up in np_accept_list.
+         */
+        mutex_lock(&isert_np->np_accept_mutex);
+        if (!list_empty(&isert_np->np_accept_list)) {
+                isert_info("Still have isert connections, cleaning up...\n");
+                list_for_each_entry_safe(isert_conn, n,
+                                         &isert_np->np_accept_list,
+                                         conn_accept_node) {
+                        isert_info("cleaning isert_conn %p state (%d)\n",
+                                   isert_conn, isert_conn->state);
+                        isert_connect_release(isert_conn);
+                }
+        }
+        mutex_unlock(&isert_np->np_accept_mutex);
+
         np->np_context = NULL;
         kfree(isert_np);
 }
 
+static void isert_release_work(struct work_struct *work)
+{
+        struct isert_conn *isert_conn = container_of(work,
+                                                     struct isert_conn,
+                                                     release_work);
+
+        isert_info("Starting release conn %p\n", isert_conn);
+
+        wait_for_completion(&isert_conn->conn_wait);
+
+        mutex_lock(&isert_conn->conn_mutex);
+        isert_conn->state = ISER_CONN_DOWN;
+        mutex_unlock(&isert_conn->conn_mutex);
+
+        isert_info("Destroying conn %p\n", isert_conn);
+        isert_put_conn(isert_conn);
+}
+
+static void
+isert_wait4logout(struct isert_conn *isert_conn)
+{
+        struct iscsi_conn *conn = isert_conn->conn;
+
+        isert_info("conn %p\n", isert_conn);
+
+        if (isert_conn->logout_posted) {
+                isert_info("conn %p wait for conn_logout_comp\n", isert_conn);
+                wait_for_completion_timeout(&conn->conn_logout_comp,
+                                            SECONDS_FOR_LOGOUT_COMP * HZ);
+        }
+}
+
+static void
+isert_wait4cmds(struct iscsi_conn *conn)
+{
+        isert_info("iscsi_conn %p\n", conn);
+
+        if (conn->sess) {
+                target_sess_cmd_list_set_waiting(conn->sess->se_sess);
+                target_wait_for_sess_cmds(conn->sess->se_sess);
+        }
+}
+
+static void
+isert_wait4flush(struct isert_conn *isert_conn)
+{
+        struct ib_recv_wr *bad_wr;
+
+        isert_info("conn %p\n", isert_conn);
+
+        init_completion(&isert_conn->conn_wait_comp_err);
+        isert_conn->beacon.wr_id = ISER_BEACON_WRID;
+        /* post an indication that all flush errors were consumed */
+        if (ib_post_recv(isert_conn->conn_qp, &isert_conn->beacon, &bad_wr)) {
+                isert_err("conn %p failed to post beacon", isert_conn);
+                return;
+        }
+
+        wait_for_completion(&isert_conn->conn_wait_comp_err);
+}
+
 static void isert_wait_conn(struct iscsi_conn *conn)
 {
         struct isert_conn *isert_conn = conn->context;
 
-        pr_debug("isert_wait_conn: Starting \n");
+        isert_info("Starting conn %p\n", isert_conn);
 
         mutex_lock(&isert_conn->conn_mutex);
-        if (isert_conn->conn_cm_id && !isert_conn->disconnect) {
-                pr_debug("Calling rdma_disconnect from isert_wait_conn\n");
-                rdma_disconnect(isert_conn->conn_cm_id);
-        }
         /*
          * Only wait for conn_wait_comp_err if the isert_conn made it
          * into full feature phase..
@@ -3231,14 +3277,15 @@ static void isert_wait_conn(struct iscsi_conn *conn)
                 mutex_unlock(&isert_conn->conn_mutex);
                 return;
         }
-        if (isert_conn->state == ISER_CONN_UP)
-                isert_conn->state = ISER_CONN_TERMINATING;
+        isert_conn_terminate(isert_conn);
         mutex_unlock(&isert_conn->conn_mutex);
 
-        wait_for_completion(&isert_conn->conn_wait_comp_err);
+        isert_wait4cmds(conn);
+        isert_wait4flush(isert_conn);
+        isert_wait4logout(isert_conn);
 
-        wait_for_completion(&isert_conn->conn_wait);
-        isert_put_conn(isert_conn);
+        INIT_WORK(&isert_conn->release_work, isert_release_work);
+        queue_work(isert_release_wq, &isert_conn->release_work);
 }
 
 static void isert_free_conn(struct iscsi_conn *conn)
@@ -3273,35 +3320,39 @@ static int __init isert_init(void)
 {
         int ret;
 
-        isert_rx_wq = alloc_workqueue("isert_rx_wq", 0, 0);
-        if (!isert_rx_wq) {
-                pr_err("Unable to allocate isert_rx_wq\n");
+        isert_comp_wq = alloc_workqueue("isert_comp_wq", 0, 0);
+        if (!isert_comp_wq) {
+                isert_err("Unable to allocate isert_comp_wq\n");
+                ret = -ENOMEM;
                 return -ENOMEM;
         }
 
-        isert_comp_wq = alloc_workqueue("isert_comp_wq", 0, 0);
-        if (!isert_comp_wq) {
-                pr_err("Unable to allocate isert_comp_wq\n");
+        isert_release_wq = alloc_workqueue("isert_release_wq", WQ_UNBOUND,
+                                        WQ_UNBOUND_MAX_ACTIVE);
+        if (!isert_release_wq) {
+                isert_err("Unable to allocate isert_release_wq\n");
                 ret = -ENOMEM;
-                goto destroy_rx_wq;
+                goto destroy_comp_wq;
         }
 
         iscsit_register_transport(&iser_target_transport);
-        pr_debug("iSER_TARGET[0] - Loaded iser_target_transport\n");
+        isert_info("iSER_TARGET[0] - Loaded iser_target_transport\n");
+
         return 0;
 
-destroy_rx_wq:
-        destroy_workqueue(isert_rx_wq);
+destroy_comp_wq:
+        destroy_workqueue(isert_comp_wq);
+
         return ret;
 }
 
 static void __exit isert_exit(void)
 {
         flush_scheduled_work();
+        destroy_workqueue(isert_release_wq);
         destroy_workqueue(isert_comp_wq);
-        destroy_workqueue(isert_rx_wq);
         iscsit_unregister_transport(&iser_target_transport);
-        pr_debug("iSER_TARGET[0] - Released iser_target_transport\n");
+        isert_info("iSER_TARGET[0] - Released iser_target_transport\n");
 }
 
 MODULE_DESCRIPTION("iSER-Target for mainline target infrastructure");
diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index 04f51f7bf614..8dc8415d152d 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -4,9 +4,37 @@
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
 
+#define DRV_NAME        "isert"
+#define PFX             DRV_NAME ": "
+
+#define isert_dbg(fmt, arg...)                           \
+        do {                                             \
+                if (unlikely(isert_debug_level > 2))     \
+                        printk(KERN_DEBUG PFX "%s: " fmt,\
+                                __func__ , ## arg);      \
+        } while (0)
+
+#define isert_warn(fmt, arg...)                         \
+        do {                                            \
+                if (unlikely(isert_debug_level > 0))    \
+                        pr_warn(PFX "%s: " fmt,         \
+                                __func__ , ## arg);     \
+        } while (0)
+
+#define isert_info(fmt, arg...)                         \
+        do {                                            \
+                if (unlikely(isert_debug_level > 1))    \
+                        pr_info(PFX "%s: " fmt,         \
+                                __func__ , ## arg);     \
+        } while (0)
+
+#define isert_err(fmt, arg...) \
+        pr_err(PFX "%s: " fmt, __func__ , ## arg)
+
 #define ISERT_RDMA_LISTEN_BACKLOG       10
 #define ISCSI_ISER_SG_TABLESIZE         256
 #define ISER_FASTREG_LI_WRID            0xffffffffffffffffULL
+#define ISER_BEACON_WRID               0xfffffffffffffffeULL
 
 enum isert_desc_type {
         ISCSI_TX_CONTROL,
@@ -23,6 +51,7 @@ enum iser_ib_op_code {
 enum iser_conn_state {
         ISER_CONN_INIT,
         ISER_CONN_UP,
+        ISER_CONN_FULL_FEATURE,
         ISER_CONN_TERMINATING,
         ISER_CONN_DOWN,
 };
@@ -44,9 +73,6 @@ struct iser_tx_desc {
         struct ib_sge   tx_sg[2];
         int             num_sge;
         struct isert_cmd *isert_cmd;
-        struct llist_node *comp_llnode_batch;
-        struct llist_node comp_llnode;
-        bool            llnode_active;
         struct ib_send_wr send_wr;
 } __packed;
 
@@ -81,6 +107,12 @@ struct isert_data_buf {
         enum dma_data_direction dma_dir;
 };
 
+enum {
+        DATA = 0,
+        PROT = 1,
+        SIG = 2,
+};
+
 struct isert_rdma_wr {
         struct list_head        wr_list;
         struct isert_cmd        *isert_cmd;
@@ -90,6 +122,7 @@ struct isert_rdma_wr {
         int                     send_wr_num;
         struct ib_send_wr       *send_wr;
         struct ib_send_wr       s_send_wr;
+        struct ib_sge           ib_sg[3];
         struct isert_data_buf   data;
         struct isert_data_buf   prot;
         struct fast_reg_descriptor *fr_desc;
@@ -117,14 +150,15 @@ struct isert_device;
 struct isert_conn {
         enum iser_conn_state    state;
         int                     post_recv_buf_count;
-        atomic_t                post_send_buf_count;
         u32                     responder_resources;
         u32                     initiator_depth;
+        bool                    pi_support;
         u32                     max_sge;
         char                    *login_buf;
         char                    *login_req_buf;
         char                    *login_rsp_buf;
         u64                     login_req_dma;
+        int                     login_req_len;
         u64                     login_rsp_dma;
         unsigned int            conn_rx_desc_head;
         struct iser_rx_desc     *conn_rx_descs;
@@ -132,13 +166,13 @@ struct isert_conn {
         struct iscsi_conn       *conn;
         struct list_head        conn_accept_node;
         struct completion       conn_login_comp;
+        struct completion       login_req_comp;
         struct iser_tx_desc     conn_login_tx_desc;
         struct rdma_cm_id       *conn_cm_id;
         struct ib_pd            *conn_pd;
         struct ib_mr            *conn_mr;
         struct ib_qp            *conn_qp;
         struct isert_device     *conn_device;
-        struct work_struct      conn_logout_work;
         struct mutex            conn_mutex;
         struct completion       conn_wait;
         struct completion       conn_wait_comp_err;
@@ -147,31 +181,38 @@ struct isert_conn {
         int                     conn_fr_pool_size;
         /* lock to protect fastreg pool */
         spinlock_t              conn_lock;
-#define ISERT_COMP_BATCH_COUNT  8
-        int                     conn_comp_batch;
-        struct llist_head       conn_comp_llist;
-        bool                    disconnect;
+        struct work_struct      release_work;
+        struct ib_recv_wr       beacon;
+        bool                    logout_posted;
 };
 
 #define ISERT_MAX_CQ 64
 
-struct isert_cq_desc {
-        struct isert_device     *device;
-        int                     cq_index;
-        struct work_struct      cq_rx_work;
-        struct work_struct      cq_tx_work;
+/**
+ * struct isert_comp - iSER completion context
+ *
+ * @device:     pointer to device handle
+ * @cq:         completion queue
+ * @wcs:        work completion array
+ * @active_qps: Number of active QPs attached
+ *              to completion context
+ * @work:       completion work handle
+ */
+struct isert_comp {
+        struct isert_device     *device;
+        struct ib_cq            *cq;
+        struct ib_wc             wcs[16];
+        int                      active_qps;
+        struct work_struct       work;
 };
 
 struct isert_device {
         int                     use_fastreg;
         bool                    pi_capable;
-        int                     cqs_used;
         int                     refcount;
-        int                     cq_active_qps[ISERT_MAX_CQ];
         struct ib_device        *ib_device;
-        struct ib_cq            *dev_rx_cq[ISERT_MAX_CQ];
-        struct ib_cq            *dev_tx_cq[ISERT_MAX_CQ];
-        struct isert_cq_desc    *cq_desc;
+        struct isert_comp       *comps;
+        int                     comps_used;
         struct list_head        dev_node;
         struct ib_device_attr   dev_attr;
         int                     (*reg_rdma_mem)(struct iscsi_conn *conn,
@@ -182,6 +223,7 @@ struct isert_device {
 };
 
 struct isert_np {
+        struct iscsi_np         *np;
         struct semaphore        np_sem;
         struct rdma_cm_id       *np_cm_id;
         struct mutex            np_accept_mutex;
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 73e58d22e325..f8ec32298906 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -609,6 +609,7 @@ static int __init iscsi_target_init_module(void)
 
         return ret;
 r2t_out:
+        iscsit_unregister_transport(&iscsi_target_transport);
         kmem_cache_destroy(lio_r2t_cache);
 ooo_out:
         kmem_cache_destroy(lio_ooo_cache);
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index 302eb3b78715..09a522bae222 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -790,7 +790,6 @@ struct iscsi_np {
         void                    *np_context;
         struct iscsit_transport *np_transport;
         struct list_head        np_list;
-        struct iscsi_tpg_np     *tpg_np;
 } ____cacheline_aligned;
 
 struct iscsi_tpg_np {
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 480f2e0ecc11..713c0c1877ab 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -281,7 +281,6 @@ static int iscsi_login_zero_tsih_s1(
 {
         struct iscsi_session *sess = NULL;
         struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;
-        enum target_prot_op sup_pro_ops;
         int ret;
 
         sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);
@@ -343,9 +342,8 @@ static int iscsi_login_zero_tsih_s1(
                 kfree(sess);
                 return -ENOMEM;
         }
-        sup_pro_ops = conn->conn_transport->iscsit_get_sup_prot_ops(conn);
 
-        sess->se_sess = transport_init_session(sup_pro_ops);
+        sess->se_sess = transport_init_session(TARGET_PROT_NORMAL);
         if (IS_ERR(sess->se_sess)) {
                 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
                                 ISCSI_LOGIN_STATUS_NO_RESOURCES);
@@ -1161,6 +1159,7 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn,
         }
         kfree(conn->sess->sess_ops);
         kfree(conn->sess);
+        conn->sess = NULL;
 
 old_sess_out:
         iscsi_stop_login_thread_timer(np);
@@ -1204,6 +1203,9 @@ old_sess_out:
                 conn->sock = NULL;
         }
 
+        if (conn->conn_transport->iscsit_wait_conn)
+                conn->conn_transport->iscsit_wait_conn(conn);
+
         if (conn->conn_transport->iscsit_free_conn)
                 conn->conn_transport->iscsit_free_conn(conn);
 
@@ -1364,6 +1366,9 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         }
         login->zero_tsih = zero_tsih;
 
+        conn->sess->se_sess->sup_prot_ops =
+                conn->conn_transport->iscsit_get_sup_prot_ops(conn);
+
         tpg = conn->tpg;
         if (!tpg) {
                 pr_err("Unable to locate struct iscsi_conn->tpg\n");
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index c3cb5c15efda..9053a3c0c6e5 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -501,7 +501,6 @@ struct iscsi_tpg_np *iscsit_tpg_add_network_portal(
         init_completion(&tpg_np->tpg_np_comp);
         kref_init(&tpg_np->tpg_np_kref);
         tpg_np->tpg_np          = np;
-        np->tpg_np              = tpg_np;
         tpg_np->tpg             = tpg;
 
         spin_lock(&tpg->tpg_np_lock);
diff --git a/drivers/target/iscsi/iscsi_target_transport.c b/drivers/target/iscsi/iscsi_target_transport.c
index 882728fac30c..08217d62fb0d 100644
--- a/drivers/target/iscsi/iscsi_target_transport.c
+++ b/drivers/target/iscsi/iscsi_target_transport.c
@@ -26,8 +26,7 @@ struct iscsit_transport *iscsit_get_transport(int type)
 
 void iscsit_put_transport(struct iscsit_transport *t)
 {
-        if (t->owner)
-                module_put(t->owner);
+        module_put(t->owner);
 }
 
 int iscsit_register_transport(struct iscsit_transport *t)
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 7c6a95bcb35e..bcd88ec99793 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -1356,15 +1356,15 @@ static int iscsit_do_tx_data(
         struct iscsi_conn *conn,
         struct iscsi_data_count *count)
 {
-        int data = count->data_length, total_tx = 0, tx_loop = 0, iov_len;
+        int ret, iov_len;
         struct kvec *iov_p;
         struct msghdr msg;
 
         if (!conn || !conn->sock || !conn->conn_ops)
                 return -1;
 
-        if (data <= 0) {
-                pr_err("Data length is: %d\n", data);
+        if (count->data_length <= 0) {
+                pr_err("Data length is: %d\n", count->data_length);
                 return -1;
         }
 
@@ -1373,20 +1373,16 @@ static int iscsit_do_tx_data(
         iov_p = count->iov;
         iov_len = count->iov_count;
 
-        while (total_tx < data) {
-                tx_loop = kernel_sendmsg(conn->sock, &msg, iov_p, iov_len,
-                                        (data - total_tx));
-                if (tx_loop <= 0) {
-                        pr_debug("tx_loop: %d total_tx %d\n",
-                                tx_loop, total_tx);
-                        return tx_loop;
-                }
-                total_tx += tx_loop;
-                pr_debug("tx_loop: %d, total_tx: %d, data: %d\n",
-                                        tx_loop, total_tx, data);
+        ret = kernel_sendmsg(conn->sock, &msg, iov_p, iov_len,
+                             count->data_length);
+        if (ret != count->data_length) {
+                pr_err("Unexpected ret: %d send data %d\n",
+                       ret, count->data_length);
+                return -EPIPE;
         }
+        pr_debug("ret: %d, sent data: %d\n", ret, count->data_length);
 
-        return total_tx;
+        return ret;
 }
 
 int rx_data(
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 4d1b7224a7f2..7172a71f9f0b 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -138,7 +138,7 @@ static void tcm_loop_submission_work(struct work_struct *work)
                 set_host_byte(sc, DID_TRANSPORT_DISRUPTED);
                 goto out_done;
         }
-        tl_nexus = tl_hba->tl_nexus;
+        tl_nexus = tl_tpg->tl_nexus;
         if (!tl_nexus) {
                 scmd_printk(KERN_ERR, sc, "TCM_Loop I_T Nexus"
                                 " does not exist\n");
@@ -218,16 +218,26 @@ static int tcm_loop_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *sc)
  * to struct scsi_device
  */
 static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
-                              struct tcm_loop_nexus *tl_nexus,
                               int lun, int task, enum tcm_tmreq_table tmr)
 {
         struct se_cmd *se_cmd = NULL;
         struct se_session *se_sess;
         struct se_portal_group *se_tpg;
+        struct tcm_loop_nexus *tl_nexus;
         struct tcm_loop_cmd *tl_cmd = NULL;
         struct tcm_loop_tmr *tl_tmr = NULL;
         int ret = TMR_FUNCTION_FAILED, rc;
 
+        /*
+         * Locate the tl_nexus and se_sess pointers
+         */
+        tl_nexus = tl_tpg->tl_nexus;
+        if (!tl_nexus) {
+                pr_err("Unable to perform device reset without"
+                                " active I_T Nexus\n");
+                return ret;
+        }
+
         tl_cmd = kmem_cache_zalloc(tcm_loop_cmd_cache, GFP_KERNEL);
         if (!tl_cmd) {
                 pr_err("Unable to allocate memory for tl_cmd\n");
@@ -243,7 +253,7 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,
 
         se_cmd = &tl_cmd->tl_se_cmd;
         se_tpg = &tl_tpg->tl_se_tpg;
-        se_sess = tl_nexus->se_sess;
+        se_sess = tl_tpg->tl_nexus->se_sess;
         /*
          * Initialize struct se_cmd descriptor from target_core_mod infrastructure
          */
@@ -288,7 +298,6 @@ release:
 static int tcm_loop_abort_task(struct scsi_cmnd *sc)
 {
         struct tcm_loop_hba *tl_hba;
-        struct tcm_loop_nexus *tl_nexus;
         struct tcm_loop_tpg *tl_tpg;
         int ret = FAILED;
 
@@ -296,21 +305,8 @@ static int tcm_loop_abort_task(struct scsi_cmnd *sc)
          * Locate the tcm_loop_hba_t pointer
          */
         tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);
-        /*
-         * Locate the tl_nexus and se_sess pointers
-         */
-        tl_nexus = tl_hba->tl_nexus;
-        if (!tl_nexus) {
-                pr_err("Unable to perform device reset without"
-                                " active I_T Nexus\n");
-                return FAILED;
-        }
-
-        /*
-         * Locate the tl_tpg pointer from TargetID in sc->device->id
-         */
         tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];
-        ret = tcm_loop_issue_tmr(tl_tpg, tl_nexus, sc->device->lun,
+        ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun,
                                  sc->request->tag, TMR_ABORT_TASK);
         return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;
 }
@@ -322,7 +318,6 @@ static int tcm_loop_abort_task(struct scsi_cmnd *sc)
 static int tcm_loop_device_reset(struct scsi_cmnd *sc)
 {
         struct tcm_loop_hba *tl_hba;
-        struct tcm_loop_nexus *tl_nexus;
         struct tcm_loop_tpg *tl_tpg;
         int ret = FAILED;
 
@@ -330,20 +325,9 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)
          * Locate the tcm_loop_hba_t pointer
          */
         tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);
-        /*
-         * Locate the tl_nexus and se_sess pointers
-         */
-        tl_nexus = tl_hba->tl_nexus;
-        if (!tl_nexus) {
-                pr_err("Unable to perform device reset without"
-                                " active I_T Nexus\n");
-                return FAILED;
-        }
-        /*
-         * Locate the tl_tpg pointer from TargetID in sc->device->id
-         */
         tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];
-        ret = tcm_loop_issue_tmr(tl_tpg, tl_nexus, sc->device->lun,
+
+        ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun,
                                  0, TMR_LUN_RESET);
         return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;
 }
@@ -940,8 +924,8 @@ static int tcm_loop_make_nexus(
         struct tcm_loop_nexus *tl_nexus;
         int ret = -ENOMEM;
 
-        if (tl_tpg->tl_hba->tl_nexus) {
-                pr_debug("tl_tpg->tl_hba->tl_nexus already exists\n");
+        if (tl_tpg->tl_nexus) {
+                pr_debug("tl_tpg->tl_nexus already exists\n");
                 return -EEXIST;
         }
         se_tpg = &tl_tpg->tl_se_tpg;
@@ -976,7 +960,7 @@ static int tcm_loop_make_nexus(
          */
         __transport_register_session(se_tpg, tl_nexus->se_sess->se_node_acl,
                         tl_nexus->se_sess, tl_nexus);
-        tl_tpg->tl_hba->tl_nexus = tl_nexus;
+        tl_tpg->tl_nexus = tl_nexus;
         pr_debug("TCM_Loop_ConfigFS: Established I_T Nexus to emulated"
                 " %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tl_hba),
                 name);
@@ -992,12 +976,8 @@ static int tcm_loop_drop_nexus(
 {
         struct se_session *se_sess;
         struct tcm_loop_nexus *tl_nexus;
-        struct tcm_loop_hba *tl_hba = tpg->tl_hba;
 
-        if (!tl_hba)
-                return -ENODEV;
-
-        tl_nexus = tl_hba->tl_nexus;
+        tl_nexus = tpg->tl_nexus;
         if (!tl_nexus)
                 return -ENODEV;
 
@@ -1013,13 +993,13 @@ static int tcm_loop_drop_nexus(
         }
 
         pr_debug("TCM_Loop_ConfigFS: Removing I_T Nexus to emulated"
-                " %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tl_hba),
+                " %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tpg->tl_hba),
                 tl_nexus->se_sess->se_node_acl->initiatorname);
         /*
          * Release the SCSI I_T Nexus to the emulated SAS Target Port
          */
         transport_deregister_session(tl_nexus->se_sess);
-        tpg->tl_hba->tl_nexus = NULL;
+        tpg->tl_nexus = NULL;
         kfree(tl_nexus);
         return 0;
 }
@@ -1035,7 +1015,7 @@ static ssize_t tcm_loop_tpg_show_nexus(
         struct tcm_loop_nexus *tl_nexus;
         ssize_t ret;
 
-        tl_nexus = tl_tpg->tl_hba->tl_nexus;
+        tl_nexus = tl_tpg->tl_nexus;
         if (!tl_nexus)
                 return -ENODEV;
 
diff --git a/drivers/target/loopback/tcm_loop.h b/drivers/target/loopback/tcm_loop.h
index 54c59d0b6608..6ae49f272ba6 100644
--- a/drivers/target/loopback/tcm_loop.h
+++ b/drivers/target/loopback/tcm_loop.h
@@ -27,11 +27,6 @@ struct tcm_loop_tmr {
 };
 
 struct tcm_loop_nexus {
-        int it_nexus_active;
-        /*
-         * Pointer to Linux/SCSI HBA from linux/include/scsi_host.h
-         */
-        struct scsi_host *sh;
         /*
          * Pointer to TCM session for I_T Nexus
          */
@@ -51,6 +46,7 @@ struct tcm_loop_tpg {
         atomic_t tl_tpg_port_count;
         struct se_portal_group tl_se_tpg;
         struct tcm_loop_hba *tl_hba;
+        struct tcm_loop_nexus *tl_nexus;
 };
 
 struct tcm_loop_hba {
@@ -59,7 +55,6 @@ struct tcm_loop_hba {
         struct se_hba_s *se_hba;
         struct se_lun *tl_hba_lun;
         struct se_port *tl_hba_lun_sep;
-        struct tcm_loop_nexus *tl_nexus;
         struct device dev;
         struct Scsi_Host *sh;
         struct tcm_loop_tpg tl_hba_tpgs[TL_TPGS_PER_HBA];
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 79f9296a08ae..75d89adfccc0 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -50,6 +50,19 @@
 #include "target_core_rd.h"
 #include "target_core_xcopy.h"
 
+#define TB_CIT_SETUP(_name, _item_ops, _group_ops, _attrs)              \
+static void target_core_setup_##_name##_cit(struct se_subsystem_api *sa) \
+{                                                                       \
+        struct target_backend_cits *tbc = &sa->tb_cits;                 \
+        struct config_item_type *cit = &tbc->tb_##_name##_cit;          \
+                                                                        \
+        cit->ct_item_ops = _item_ops;                                   \
+        cit->ct_group_ops = _group_ops;                                 \
+        cit->ct_attrs = _attrs;                                         \
+        cit->ct_owner = sa->owner;                                      \
+        pr_debug("Setup generic %s\n", __stringify(_name));             \
+}
+
 extern struct t10_alua_lu_gp *default_lu_gp;
 
 static LIST_HEAD(g_tf_list);
@@ -126,48 +139,57 @@ static struct config_group *target_core_register_fabric(
 
         pr_debug("Target_Core_ConfigFS: REGISTER -> group: %p name:"
                         " %s\n", group, name);
-        /*
-         * Below are some hardcoded request_module() calls to automatically
-         * local fabric modules when the following is called:
-         *
-         * mkdir -p /sys/kernel/config/target/$MODULE_NAME
-         *
-         * Note that this does not limit which TCM fabric module can be
-         * registered, but simply provids auto loading logic for modules with
-         * mkdir(2) system calls with known TCM fabric modules.
-         */
-        if (!strncmp(name, "iscsi", 5)) {
+
+        tf = target_core_get_fabric(name);
+        if (!tf) {
+                pr_err("target_core_register_fabric() trying autoload for %s\n",
+                        name);
+
                 /*
-                 * Automatically load the LIO Target fabric module when the
-                 * following is called:
+                 * Below are some hardcoded request_module() calls to automatically
+                 * local fabric modules when the following is called:
                  *
-                 * mkdir -p $CONFIGFS/target/iscsi
-                 */
-                ret = request_module("iscsi_target_mod");
-                if (ret < 0) {
-                        pr_err("request_module() failed for"
-                                " iscsi_target_mod.ko: %d\n", ret);
-                        return ERR_PTR(-EINVAL);
-                }
-        } else if (!strncmp(name, "loopback", 8)) {
-                /*
-                 * Automatically load the tcm_loop fabric module when the
-                 * following is called:
+                 * mkdir -p /sys/kernel/config/target/$MODULE_NAME
                  *
-                 * mkdir -p $CONFIGFS/target/loopback
+                 * Note that this does not limit which TCM fabric module can be
+                 * registered, but simply provids auto loading logic for modules with
+                 * mkdir(2) system calls with known TCM fabric modules.
                  */
-                ret = request_module("tcm_loop");
-                if (ret < 0) {
-                        pr_err("request_module() failed for"
-                                " tcm_loop.ko: %d\n", ret);
-                        return ERR_PTR(-EINVAL);
+
+                if (!strncmp(name, "iscsi", 5)) {
+                        /*
+                         * Automatically load the LIO Target fabric module when the
+                         * following is called:
+                         *
+                         * mkdir -p $CONFIGFS/target/iscsi
+                         */
+                        ret = request_module("iscsi_target_mod");
+                        if (ret < 0) {
+                                pr_err("request_module() failed for"
+                                       " iscsi_target_mod.ko: %d\n", ret);
+                                return ERR_PTR(-EINVAL);
+                        }
+                } else if (!strncmp(name, "loopback", 8)) {
+                        /*
+                         * Automatically load the tcm_loop fabric module when the
+                         * following is called:
+                         *
+                         * mkdir -p $CONFIGFS/target/loopback
+                         */
+                        ret = request_module("tcm_loop");
+                        if (ret < 0) {
+                                pr_err("request_module() failed for"
+                                       " tcm_loop.ko: %d\n", ret);
+                                return ERR_PTR(-EINVAL);
+                        }
                 }
+
+                tf = target_core_get_fabric(name);
         }
 
-        tf = target_core_get_fabric(name);
         if (!tf) {
                 pr_err("target_core_get_fabric() failed for %s\n",
-                        name);
+                       name);
                 return ERR_PTR(-EINVAL);
         }
         pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:"
@@ -562,198 +584,21 @@ EXPORT_SYMBOL(target_fabric_configfs_deregister);
 // Stop functions called by external Target Fabrics Modules
 //############################################################################*/
 
-/* Start functions for struct config_item_type target_core_dev_attrib_cit */
-
-#define DEF_DEV_ATTRIB_SHOW(_name)                                      \
-static ssize_t target_core_dev_show_attr_##_name(                       \
-        struct se_dev_attrib *da,                                       \
-        char *page)                                                     \
-{                                                                       \
-        return snprintf(page, PAGE_SIZE, "%u\n",                        \
-                (u32)da->da_dev->dev_attrib._name);                     \
-}
-
-#define DEF_DEV_ATTRIB_STORE(_name)                                     \
-static ssize_t target_core_dev_store_attr_##_name(                      \
-        struct se_dev_attrib *da,                                       \
-        const char *page,                                               \
-        size_t count)                                                   \
-{                                                                       \
-        unsigned long val;                                              \
-        int ret;                                                        \
-                                                                        \
-        ret = kstrtoul(page, 0, &val);                          \
-        if (ret < 0) {                                                  \
-                pr_err("kstrtoul() failed with"         \
-                        " ret: %d\n", ret);                             \
-                return -EINVAL;                                         \
-        }                                                               \
-        ret = se_dev_set_##_name(da->da_dev, (u32)val);                 \
-                                                                        \
-        return (!ret) ? count : -EINVAL;                                \
-}
-
-#define DEF_DEV_ATTRIB(_name)                                           \
-DEF_DEV_ATTRIB_SHOW(_name);                                             \
-DEF_DEV_ATTRIB_STORE(_name);
-
-#define DEF_DEV_ATTRIB_RO(_name)                                        \
-DEF_DEV_ATTRIB_SHOW(_name);
+/* Start functions for struct config_item_type tb_dev_attrib_cit */
 
 CONFIGFS_EATTR_STRUCT(target_core_dev_attrib, se_dev_attrib);
-#define SE_DEV_ATTR(_name, _mode)                                       \
-static struct target_core_dev_attrib_attribute                          \
-                        target_core_dev_attrib_##_name =                \
-                __CONFIGFS_EATTR(_name, _mode,                          \
-                target_core_dev_show_attr_##_name,                      \
-                target_core_dev_store_attr_##_name);
-
-#define SE_DEV_ATTR_RO(_name);                                          \
-static struct target_core_dev_attrib_attribute                          \
-                        target_core_dev_attrib_##_name =                \
-        __CONFIGFS_EATTR_RO(_name,                                      \
-        target_core_dev_show_attr_##_name);
-
-DEF_DEV_ATTRIB(emulate_model_alias);
-SE_DEV_ATTR(emulate_model_alias, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_dpo);
-SE_DEV_ATTR(emulate_dpo, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_fua_write);
-SE_DEV_ATTR(emulate_fua_write, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_fua_read);
-SE_DEV_ATTR(emulate_fua_read, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_write_cache);
-SE_DEV_ATTR(emulate_write_cache, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_ua_intlck_ctrl);
-SE_DEV_ATTR(emulate_ua_intlck_ctrl, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_tas);
-SE_DEV_ATTR(emulate_tas, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_tpu);
-SE_DEV_ATTR(emulate_tpu, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_tpws);
-SE_DEV_ATTR(emulate_tpws, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_caw);
-SE_DEV_ATTR(emulate_caw, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_3pc);
-SE_DEV_ATTR(emulate_3pc, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(pi_prot_type);
-SE_DEV_ATTR(pi_prot_type, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB_RO(hw_pi_prot_type);
-SE_DEV_ATTR_RO(hw_pi_prot_type);
-
-DEF_DEV_ATTRIB(pi_prot_format);
-SE_DEV_ATTR(pi_prot_format, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(enforce_pr_isids);
-SE_DEV_ATTR(enforce_pr_isids, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(is_nonrot);
-SE_DEV_ATTR(is_nonrot, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(emulate_rest_reord);
-SE_DEV_ATTR(emulate_rest_reord, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(force_pr_aptpl);
-SE_DEV_ATTR(force_pr_aptpl, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB_RO(hw_block_size);
-SE_DEV_ATTR_RO(hw_block_size);
-
-DEF_DEV_ATTRIB(block_size);
-SE_DEV_ATTR(block_size, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB_RO(hw_max_sectors);
-SE_DEV_ATTR_RO(hw_max_sectors);
-
-DEF_DEV_ATTRIB(fabric_max_sectors);
-SE_DEV_ATTR(fabric_max_sectors, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(optimal_sectors);
-SE_DEV_ATTR(optimal_sectors, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB_RO(hw_queue_depth);
-SE_DEV_ATTR_RO(hw_queue_depth);
-
-DEF_DEV_ATTRIB(queue_depth);
-SE_DEV_ATTR(queue_depth, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(max_unmap_lba_count);
-SE_DEV_ATTR(max_unmap_lba_count, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(max_unmap_block_desc_count);
-SE_DEV_ATTR(max_unmap_block_desc_count, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(unmap_granularity);
-SE_DEV_ATTR(unmap_granularity, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(unmap_granularity_alignment);
-SE_DEV_ATTR(unmap_granularity_alignment, S_IRUGO | S_IWUSR);
-
-DEF_DEV_ATTRIB(max_write_same_len);
-SE_DEV_ATTR(max_write_same_len, S_IRUGO | S_IWUSR);
-
 CONFIGFS_EATTR_OPS(target_core_dev_attrib, se_dev_attrib, da_group);
 
-static struct configfs_attribute *target_core_dev_attrib_attrs[] = {
-        &target_core_dev_attrib_emulate_model_alias.attr,
-        &target_core_dev_attrib_emulate_dpo.attr,
-        &target_core_dev_attrib_emulate_fua_write.attr,
-        &target_core_dev_attrib_emulate_fua_read.attr,
-        &target_core_dev_attrib_emulate_write_cache.attr,
-        &target_core_dev_attrib_emulate_ua_intlck_ctrl.attr,
-        &target_core_dev_attrib_emulate_tas.attr,
-        &target_core_dev_attrib_emulate_tpu.attr,
-        &target_core_dev_attrib_emulate_tpws.attr,
-        &target_core_dev_attrib_emulate_caw.attr,
-        &target_core_dev_attrib_emulate_3pc.attr,
-        &target_core_dev_attrib_pi_prot_type.attr,
-        &target_core_dev_attrib_hw_pi_prot_type.attr,
-        &target_core_dev_attrib_pi_prot_format.attr,
-        &target_core_dev_attrib_enforce_pr_isids.attr,
-        &target_core_dev_attrib_force_pr_aptpl.attr,
-        &target_core_dev_attrib_is_nonrot.attr,
-        &target_core_dev_attrib_emulate_rest_reord.attr,
-        &target_core_dev_attrib_hw_block_size.attr,
-        &target_core_dev_attrib_block_size.attr,
-        &target_core_dev_attrib_hw_max_sectors.attr,
-        &target_core_dev_attrib_fabric_max_sectors.attr,
-        &target_core_dev_attrib_optimal_sectors.attr,
-        &target_core_dev_attrib_hw_queue_depth.attr,
-        &target_core_dev_attrib_queue_depth.attr,
-        &target_core_dev_attrib_max_unmap_lba_count.attr,
-        &target_core_dev_attrib_max_unmap_block_desc_count.attr,
-        &target_core_dev_attrib_unmap_granularity.attr,
-        &target_core_dev_attrib_unmap_granularity_alignment.attr,
-        &target_core_dev_attrib_max_write_same_len.attr,
-        NULL,
-};
-
 static struct configfs_item_operations target_core_dev_attrib_ops = {
         .show_attribute         = target_core_dev_attrib_attr_show,
         .store_attribute        = target_core_dev_attrib_attr_store,
 };
 
-static struct config_item_type target_core_dev_attrib_cit = {
-        .ct_item_ops            = &target_core_dev_attrib_ops,
-        .ct_attrs               = target_core_dev_attrib_attrs,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev_attrib, &target_core_dev_attrib_ops, NULL, NULL);
 
-/* End functions for struct config_item_type target_core_dev_attrib_cit */
+/* End functions for struct config_item_type tb_dev_attrib_cit */
 
-/*  Start functions for struct config_item_type target_core_dev_wwn_cit */
+/*  Start functions for struct config_item_type tb_dev_wwn_cit */
 
 CONFIGFS_EATTR_STRUCT(target_core_dev_wwn, t10_wwn);
 #define SE_DEV_WWN_ATTR(_name, _mode)                                   \
@@ -984,15 +829,11 @@ static struct configfs_item_operations target_core_dev_wwn_ops = {
         .store_attribute        = target_core_dev_wwn_attr_store,
 };
 
-static struct config_item_type target_core_dev_wwn_cit = {
-        .ct_item_ops            = &target_core_dev_wwn_ops,
-        .ct_attrs               = target_core_dev_wwn_attrs,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev_wwn, &target_core_dev_wwn_ops, NULL, target_core_dev_wwn_attrs);
 
-/*  End functions for struct config_item_type target_core_dev_wwn_cit */
+/*  End functions for struct config_item_type tb_dev_wwn_cit */
 
-/*  Start functions for struct config_item_type target_core_dev_pr_cit */
+/*  Start functions for struct config_item_type tb_dev_pr_cit */
 
 CONFIGFS_EATTR_STRUCT(target_core_dev_pr, se_device);
 #define SE_DEV_PR_ATTR(_name, _mode)                                    \
@@ -1453,15 +1294,11 @@ static struct configfs_item_operations target_core_dev_pr_ops = {
         .store_attribute        = target_core_dev_pr_attr_store,
 };
 
-static struct config_item_type target_core_dev_pr_cit = {
-        .ct_item_ops            = &target_core_dev_pr_ops,
-        .ct_attrs               = target_core_dev_pr_attrs,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev_pr, &target_core_dev_pr_ops, NULL, target_core_dev_pr_attrs);
 
-/*  End functions for struct config_item_type target_core_dev_pr_cit */
+/*  End functions for struct config_item_type tb_dev_pr_cit */
 
-/*  Start functions for struct config_item_type target_core_dev_cit */
+/*  Start functions for struct config_item_type tb_dev_cit */
 
 static ssize_t target_core_show_dev_info(void *p, char *page)
 {
@@ -1925,7 +1762,7 @@ static struct target_core_configfs_attribute target_core_attr_dev_lba_map = {
         .store  = target_core_store_dev_lba_map,
 };
 
-static struct configfs_attribute *lio_core_dev_attrs[] = {
+static struct configfs_attribute *target_core_dev_attrs[] = {
         &target_core_attr_dev_info.attr,
         &target_core_attr_dev_control.attr,
         &target_core_attr_dev_alias.attr,
@@ -1984,13 +1821,9 @@ static struct configfs_item_operations target_core_dev_item_ops = {
         .store_attribute        = target_core_dev_store,
 };
 
-static struct config_item_type target_core_dev_cit = {
-        .ct_item_ops            = &target_core_dev_item_ops,
-        .ct_attrs               = lio_core_dev_attrs,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev, &target_core_dev_item_ops, NULL, target_core_dev_attrs);
 
-/* End functions for struct config_item_type target_core_dev_cit */
+/* End functions for struct config_item_type tb_dev_cit */
 
 /* Start functions for struct config_item_type target_core_alua_lu_gp_cit */
 
@@ -2670,7 +2503,7 @@ static struct config_item_type target_core_alua_tg_pt_gp_cit = {
 
 /* End functions for struct config_item_type target_core_alua_tg_pt_gp_cit */
 
-/* Start functions for struct config_item_type target_core_alua_tg_pt_gps_cit */
+/* Start functions for struct config_item_type tb_alua_tg_pt_gps_cit */
 
 static struct config_group *target_core_alua_create_tg_pt_gp(
         struct config_group *group,
@@ -2721,12 +2554,9 @@ static struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = {
         .drop_item              = &target_core_alua_drop_tg_pt_gp,
 };
 
-static struct config_item_type target_core_alua_tg_pt_gps_cit = {
-        .ct_group_ops           = &target_core_alua_tg_pt_gps_group_ops,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev_alua_tg_pt_gps, NULL, &target_core_alua_tg_pt_gps_group_ops, NULL);
 
-/* End functions for struct config_item_type target_core_alua_tg_pt_gps_cit */
+/* End functions for struct config_item_type tb_alua_tg_pt_gps_cit */
 
 /* Start functions for struct config_item_type target_core_alua_cit */
 
@@ -2744,7 +2574,7 @@ static struct config_item_type target_core_alua_cit = {
 
 /* End functions for struct config_item_type target_core_alua_cit */
 
-/* Start functions for struct config_item_type target_core_stat_cit */
+/* Start functions for struct config_item_type tb_dev_stat_cit */
 
 static struct config_group *target_core_stat_mkdir(
         struct config_group *group,
@@ -2765,12 +2595,9 @@ static struct configfs_group_operations target_core_stat_group_ops = {
         .drop_item              = &target_core_stat_rmdir,
 };
 
-static struct config_item_type target_core_stat_cit = {
-        .ct_group_ops           = &target_core_stat_group_ops,
-        .ct_owner               = THIS_MODULE,
-};
+TB_CIT_SETUP(dev_stat, NULL, &target_core_stat_group_ops, NULL);
 
-/* End functions for struct config_item_type target_core_stat_cit */
+/* End functions for struct config_item_type tb_dev_stat_cit */
 
 /* Start functions for struct config_item_type target_core_hba_cit */
 
@@ -2806,17 +2633,17 @@ static struct config_group *target_core_make_subdev(
         if (!dev_cg->default_groups)
                 goto out_free_device;
 
-        config_group_init_type_name(dev_cg, name, &target_core_dev_cit);
+        config_group_init_type_name(dev_cg, name, &t->tb_cits.tb_dev_cit);
         config_group_init_type_name(&dev->dev_attrib.da_group, "attrib",
-                        &target_core_dev_attrib_cit);
+                        &t->tb_cits.tb_dev_attrib_cit);
         config_group_init_type_name(&dev->dev_pr_group, "pr",
-                        &target_core_dev_pr_cit);
+                        &t->tb_cits.tb_dev_pr_cit);
         config_group_init_type_name(&dev->t10_wwn.t10_wwn_group, "wwn",
-                        &target_core_dev_wwn_cit);
+                        &t->tb_cits.tb_dev_wwn_cit);
         config_group_init_type_name(&dev->t10_alua.alua_tg_pt_gps_group,
-                        "alua", &target_core_alua_tg_pt_gps_cit);
+                        "alua", &t->tb_cits.tb_dev_alua_tg_pt_gps_cit);
         config_group_init_type_name(&dev->dev_stat_grps.stat_group,
-                        "statistics", &target_core_stat_cit);
+                        "statistics", &t->tb_cits.tb_dev_stat_cit);
 
         dev_cg->default_groups[0] = &dev->dev_attrib.da_group;
         dev_cg->default_groups[1] = &dev->dev_pr_group;
@@ -3110,6 +2937,17 @@ static struct config_item_type target_core_cit = {
 
 /* Stop functions for struct config_item_type target_core_hba_cit */
 
+void target_core_setup_sub_cits(struct se_subsystem_api *sa)
+{
+        target_core_setup_dev_cit(sa);
+        target_core_setup_dev_attrib_cit(sa);
+        target_core_setup_dev_pr_cit(sa);
+        target_core_setup_dev_wwn_cit(sa);
+        target_core_setup_dev_alua_tg_pt_gps_cit(sa);
+        target_core_setup_dev_stat_cit(sa);
+}
+EXPORT_SYMBOL(target_core_setup_sub_cits);
+
 static int __init target_core_init_configfs(void)
 {
         struct config_group *target_cg, *hba_cg = NULL, *alua_cg = NULL;
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index c45f9e907e44..7653cfb027a2 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -659,6 +659,7 @@ int se_dev_set_max_unmap_lba_count(
                         dev, dev->dev_attrib.max_unmap_lba_count);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_max_unmap_lba_count);
 
 int se_dev_set_max_unmap_block_desc_count(
         struct se_device *dev,
@@ -670,6 +671,7 @@ int se_dev_set_max_unmap_block_desc_count(
                         dev, dev->dev_attrib.max_unmap_block_desc_count);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_max_unmap_block_desc_count);
 
 int se_dev_set_unmap_granularity(
         struct se_device *dev,
@@ -680,6 +682,7 @@ int se_dev_set_unmap_granularity(
                         dev, dev->dev_attrib.unmap_granularity);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_unmap_granularity);
 
 int se_dev_set_unmap_granularity_alignment(
         struct se_device *dev,
@@ -690,6 +693,7 @@ int se_dev_set_unmap_granularity_alignment(
                         dev, dev->dev_attrib.unmap_granularity_alignment);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_unmap_granularity_alignment);
 
 int se_dev_set_max_write_same_len(
         struct se_device *dev,
@@ -700,6 +704,7 @@ int se_dev_set_max_write_same_len(
                         dev, dev->dev_attrib.max_write_same_len);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_max_write_same_len);
 
 static void dev_set_t10_wwn_model_alias(struct se_device *dev)
 {
@@ -738,6 +743,7 @@ int se_dev_set_emulate_model_alias(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_model_alias);
 
 int se_dev_set_emulate_dpo(struct se_device *dev, int flag)
 {
@@ -753,6 +759,7 @@ int se_dev_set_emulate_dpo(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_dpo);
 
 int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
 {
@@ -760,17 +767,12 @@ int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
                 pr_err("Illegal value %d\n", flag);
                 return -EINVAL;
         }
-
-        if (flag &&
-            dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-                pr_err("emulate_fua_write not supported for pSCSI\n");
-                return -EINVAL;
-        }
         dev->dev_attrib.emulate_fua_write = flag;
         pr_debug("dev[%p]: SE Device Forced Unit Access WRITEs: %d\n",
                         dev, dev->dev_attrib.emulate_fua_write);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_fua_write);
 
 int se_dev_set_emulate_fua_read(struct se_device *dev, int flag)
 {
@@ -786,6 +788,7 @@ int se_dev_set_emulate_fua_read(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_fua_read);
 
 int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
 {
@@ -794,11 +797,6 @@ int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
                 return -EINVAL;
         }
         if (flag &&
-            dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-                pr_err("emulate_write_cache not supported for pSCSI\n");
-                return -EINVAL;
-        }
-        if (flag &&
             dev->transport->get_write_cache) {
                 pr_err("emulate_write_cache not supported for this device\n");
                 return -EINVAL;
@@ -809,6 +807,7 @@ int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
                         dev, dev->dev_attrib.emulate_write_cache);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_write_cache);
 
 int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *dev, int flag)
 {
@@ -829,6 +828,7 @@ int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_ua_intlck_ctrl);
 
 int se_dev_set_emulate_tas(struct se_device *dev, int flag)
 {
@@ -849,6 +849,7 @@ int se_dev_set_emulate_tas(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_tas);
 
 int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
 {
@@ -870,6 +871,7 @@ int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
                                 dev, flag);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_tpu);
 
 int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
 {
@@ -891,6 +893,7 @@ int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
                                 dev, flag);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_tpws);
 
 int se_dev_set_emulate_caw(struct se_device *dev, int flag)
 {
@@ -904,6 +907,7 @@ int se_dev_set_emulate_caw(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_caw);
 
 int se_dev_set_emulate_3pc(struct se_device *dev, int flag)
 {
@@ -917,6 +921,7 @@ int se_dev_set_emulate_3pc(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_3pc);
 
 int se_dev_set_pi_prot_type(struct se_device *dev, int flag)
 {
@@ -970,6 +975,7 @@ int se_dev_set_pi_prot_type(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_pi_prot_type);
 
 int se_dev_set_pi_prot_format(struct se_device *dev, int flag)
 {
@@ -1005,6 +1011,7 @@ int se_dev_set_pi_prot_format(struct se_device *dev, int flag)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_pi_prot_format);
 
 int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
 {
@@ -1017,6 +1024,7 @@ int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
                 (dev->dev_attrib.enforce_pr_isids) ? "Enabled" : "Disabled");
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_enforce_pr_isids);
 
 int se_dev_set_force_pr_aptpl(struct se_device *dev, int flag)
 {
@@ -1034,6 +1042,7 @@ int se_dev_set_force_pr_aptpl(struct se_device *dev, int flag)
         pr_debug("dev[%p]: SE Device force_pr_aptpl: %d\n", dev, flag);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_force_pr_aptpl);
 
 int se_dev_set_is_nonrot(struct se_device *dev, int flag)
 {
@@ -1046,6 +1055,7 @@ int se_dev_set_is_nonrot(struct se_device *dev, int flag)
                dev, flag);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_is_nonrot);
 
 int se_dev_set_emulate_rest_reord(struct se_device *dev, int flag)
 {
@@ -1058,6 +1068,7 @@ int se_dev_set_emulate_rest_reord(struct se_device *dev, int flag)
         pr_debug("dev[%p]: SE Device emulate_rest_reord: %d\n", dev, flag);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_emulate_rest_reord);
 
 /*
  * Note, this can only be called on unexported SE Device Object.
@@ -1076,31 +1087,21 @@ int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth)
                 return -EINVAL;
         }
 
-        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+        if (queue_depth > dev->dev_attrib.queue_depth) {
                 if (queue_depth > dev->dev_attrib.hw_queue_depth) {
-                        pr_err("dev[%p]: Passed queue_depth: %u"
-                                " exceeds TCM/SE_Device TCQ: %u\n",
-                                dev, queue_depth,
+                        pr_err("dev[%p]: Passed queue_depth:"
+                                " %u exceeds TCM/SE_Device MAX"
+                                " TCQ: %u\n", dev, queue_depth,
                                 dev->dev_attrib.hw_queue_depth);
                         return -EINVAL;
                 }
-        } else {
-                if (queue_depth > dev->dev_attrib.queue_depth) {
-                        if (queue_depth > dev->dev_attrib.hw_queue_depth) {
-                                pr_err("dev[%p]: Passed queue_depth:"
-                                        " %u exceeds TCM/SE_Device MAX"
-                                        " TCQ: %u\n", dev, queue_depth,
-                                        dev->dev_attrib.hw_queue_depth);
-                                return -EINVAL;
-                        }
-                }
         }
-
         dev->dev_attrib.queue_depth = dev->queue_depth = queue_depth;
         pr_debug("dev[%p]: SE Device TCQ Depth changed to: %u\n",
                         dev, queue_depth);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_queue_depth);
 
 int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
 {
@@ -1123,22 +1124,12 @@ int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
                                 DA_STATUS_MAX_SECTORS_MIN);
                 return -EINVAL;
         }
-        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-                if (fabric_max_sectors > dev->dev_attrib.hw_max_sectors) {
-                        pr_err("dev[%p]: Passed fabric_max_sectors: %u"
-                                " greater than TCM/SE_Device max_sectors:"
-                                " %u\n", dev, fabric_max_sectors,
-                                dev->dev_attrib.hw_max_sectors);
-                         return -EINVAL;
-                }
-        } else {
-                if (fabric_max_sectors > DA_STATUS_MAX_SECTORS_MAX) {
-                        pr_err("dev[%p]: Passed fabric_max_sectors: %u"
-                                " greater than DA_STATUS_MAX_SECTORS_MAX:"
-                                " %u\n", dev, fabric_max_sectors,
-                                DA_STATUS_MAX_SECTORS_MAX);
-                        return -EINVAL;
-                }
+        if (fabric_max_sectors > DA_STATUS_MAX_SECTORS_MAX) {
+                pr_err("dev[%p]: Passed fabric_max_sectors: %u"
+                        " greater than DA_STATUS_MAX_SECTORS_MAX:"
+                        " %u\n", dev, fabric_max_sectors,
+                        DA_STATUS_MAX_SECTORS_MAX);
+                return -EINVAL;
         }
         /*
          * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()
@@ -1155,6 +1146,7 @@ int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
                         dev, fabric_max_sectors);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_fabric_max_sectors);
 
 int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
 {
@@ -1164,11 +1156,6 @@ int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
                         dev, dev->export_count);
                 return -EINVAL;
         }
-        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-                pr_err("dev[%p]: Passed optimal_sectors cannot be"
-                                " changed for TCM/pSCSI\n", dev);
-                return -EINVAL;
-        }
         if (optimal_sectors > dev->dev_attrib.fabric_max_sectors) {
                 pr_err("dev[%p]: Passed optimal_sectors %u cannot be"
                         " greater than fabric_max_sectors: %u\n", dev,
@@ -1181,6 +1168,7 @@ int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
                         dev, optimal_sectors);
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_optimal_sectors);
 
 int se_dev_set_block_size(struct se_device *dev, u32 block_size)
 {
@@ -1201,13 +1189,6 @@ int se_dev_set_block_size(struct se_device *dev, u32 block_size)
                 return -EINVAL;
         }
 
-        if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
-                pr_err("dev[%p]: Not allowed to change block_size for"
-                        " Physical Device, use for Linux/SCSI to change"
-                        " block_size for underlying hardware\n", dev);
-                return -EINVAL;
-        }
-
         dev->dev_attrib.block_size = block_size;
         pr_debug("dev[%p]: SE Device block_size changed to %u\n",
                         dev, block_size);
@@ -1218,6 +1199,7 @@ int se_dev_set_block_size(struct se_device *dev, u32 block_size)
 
         return 0;
 }
+EXPORT_SYMBOL(se_dev_set_block_size);
 
 struct se_lun *core_dev_add_lun(
         struct se_portal_group *tpg,
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 72c83d98662b..c2aea099ea4a 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -37,6 +37,7 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
+#include <target/target_core_backend_configfs.h>
 
 #include "target_core_file.h"
 
@@ -934,6 +935,42 @@ fd_parse_cdb(struct se_cmd *cmd)
         return sbc_parse_cdb(cmd, &fd_sbc_ops);
 }
 
+DEF_TB_DEFAULT_ATTRIBS(fileio);
+
+static struct configfs_attribute *fileio_backend_dev_attrs[] = {
+        &fileio_dev_attrib_emulate_model_alias.attr,
+        &fileio_dev_attrib_emulate_dpo.attr,
+        &fileio_dev_attrib_emulate_fua_write.attr,
+        &fileio_dev_attrib_emulate_fua_read.attr,
+        &fileio_dev_attrib_emulate_write_cache.attr,
+        &fileio_dev_attrib_emulate_ua_intlck_ctrl.attr,
+        &fileio_dev_attrib_emulate_tas.attr,
+        &fileio_dev_attrib_emulate_tpu.attr,
+        &fileio_dev_attrib_emulate_tpws.attr,
+        &fileio_dev_attrib_emulate_caw.attr,
+        &fileio_dev_attrib_emulate_3pc.attr,
+        &fileio_dev_attrib_pi_prot_type.attr,
+        &fileio_dev_attrib_hw_pi_prot_type.attr,
+        &fileio_dev_attrib_pi_prot_format.attr,
+        &fileio_dev_attrib_enforce_pr_isids.attr,
+        &fileio_dev_attrib_is_nonrot.attr,
+        &fileio_dev_attrib_emulate_rest_reord.attr,
+        &fileio_dev_attrib_force_pr_aptpl.attr,
+        &fileio_dev_attrib_hw_block_size.attr,
+        &fileio_dev_attrib_block_size.attr,
+        &fileio_dev_attrib_hw_max_sectors.attr,
+        &fileio_dev_attrib_fabric_max_sectors.attr,
+        &fileio_dev_attrib_optimal_sectors.attr,
+        &fileio_dev_attrib_hw_queue_depth.attr,
+        &fileio_dev_attrib_queue_depth.attr,
+        &fileio_dev_attrib_max_unmap_lba_count.attr,
+        &fileio_dev_attrib_max_unmap_block_desc_count.attr,
+        &fileio_dev_attrib_unmap_granularity.attr,
+        &fileio_dev_attrib_unmap_granularity_alignment.attr,
+        &fileio_dev_attrib_max_write_same_len.attr,
+        NULL,
+};
+
 static struct se_subsystem_api fileio_template = {
         .name                   = "fileio",
         .inquiry_prod           = "FILEIO",
@@ -957,6 +994,11 @@ static struct se_subsystem_api fileio_template = {
 
 static int __init fileio_module_init(void)
 {
+        struct target_backend_cits *tbc = &fileio_template.tb_cits;
+
+        target_core_setup_sub_cits(&fileio_template);
+        tbc->tb_dev_attrib_cit.ct_attrs = fileio_backend_dev_attrs;
+
         return transport_subsystem_register(&fileio_template);
 }
 
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
index a25051a37dd7..ff95f95dcd13 100644
--- a/drivers/target/target_core_hba.c
+++ b/drivers/target/target_core_hba.c
@@ -36,6 +36,7 @@
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
 #include <target/target_core_fabric.h>
+#include <target/target_core_configfs.h>
 
 #include "target_core_internal.h"
 
@@ -137,8 +138,7 @@ core_alloc_hba(const char *plugin_name, u32 plugin_dep_id, u32 hba_flags)
         return hba;
 
 out_module_put:
-        if (hba->transport->owner)
-                module_put(hba->transport->owner);
+        module_put(hba->transport->owner);
         hba->transport = NULL;
 out_free_hba:
         kfree(hba);
@@ -159,8 +159,7 @@ core_delete_hba(struct se_hba *hba)
         pr_debug("CORE_HBA[%d] - Detached HBA from Generic Target"
                         " Core\n", hba->hba_id);
 
-        if (hba->transport->owner)
-                module_put(hba->transport->owner);
+        module_put(hba->transport->owner);
 
         hba->transport = NULL;
         kfree(hba);
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 7e6b857c6b3f..3efff94fbd97 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -41,6 +41,7 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
+#include <target/target_core_backend_configfs.h>
 
 #include "target_core_iblock.h"
 
@@ -858,6 +859,42 @@ static bool iblock_get_write_cache(struct se_device *dev)
         return q->flush_flags & REQ_FLUSH;
 }
 
+DEF_TB_DEFAULT_ATTRIBS(iblock);
+
+static struct configfs_attribute *iblock_backend_dev_attrs[] = {
+        &iblock_dev_attrib_emulate_model_alias.attr,
+        &iblock_dev_attrib_emulate_dpo.attr,
+        &iblock_dev_attrib_emulate_fua_write.attr,
+        &iblock_dev_attrib_emulate_fua_read.attr,
+        &iblock_dev_attrib_emulate_write_cache.attr,
+        &iblock_dev_attrib_emulate_ua_intlck_ctrl.attr,
+        &iblock_dev_attrib_emulate_tas.attr,
+        &iblock_dev_attrib_emulate_tpu.attr,
+        &iblock_dev_attrib_emulate_tpws.attr,
+        &iblock_dev_attrib_emulate_caw.attr,
+        &iblock_dev_attrib_emulate_3pc.attr,
+        &iblock_dev_attrib_pi_prot_type.attr,
+        &iblock_dev_attrib_hw_pi_prot_type.attr,
+        &iblock_dev_attrib_pi_prot_format.attr,
+        &iblock_dev_attrib_enforce_pr_isids.attr,
+        &iblock_dev_attrib_is_nonrot.attr,
+        &iblock_dev_attrib_emulate_rest_reord.attr,
+        &iblock_dev_attrib_force_pr_aptpl.attr,
+        &iblock_dev_attrib_hw_block_size.attr,
+        &iblock_dev_attrib_block_size.attr,
+        &iblock_dev_attrib_hw_max_sectors.attr,
+        &iblock_dev_attrib_fabric_max_sectors.attr,
+        &iblock_dev_attrib_optimal_sectors.attr,
+        &iblock_dev_attrib_hw_queue_depth.attr,
+        &iblock_dev_attrib_queue_depth.attr,
+        &iblock_dev_attrib_max_unmap_lba_count.attr,
+        &iblock_dev_attrib_max_unmap_block_desc_count.attr,
+        &iblock_dev_attrib_unmap_granularity.attr,
+        &iblock_dev_attrib_unmap_granularity_alignment.attr,
+        &iblock_dev_attrib_max_write_same_len.attr,
+        NULL,
+};
+
 static struct se_subsystem_api iblock_template = {
         .name                   = "iblock",
         .inquiry_prod           = "IBLOCK",
@@ -883,6 +920,11 @@ static struct se_subsystem_api iblock_template = {
 
 static int __init iblock_module_init(void)
 {
+        struct target_backend_cits *tbc = &iblock_template.tb_cits;
+
+        target_core_setup_sub_cits(&iblock_template);
+        tbc->tb_dev_attrib_cit.ct_attrs = iblock_backend_dev_attrs;
+
         return transport_subsystem_register(&iblock_template);
 }
 
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index e31f42f369ff..60381db90026 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -18,34 +18,6 @@ int	core_dev_export(struct se_device *, struct se_portal_group *,
                 struct se_lun *);
 void    core_dev_unexport(struct se_device *, struct se_portal_group *,
                 struct se_lun *);
-int     se_dev_set_task_timeout(struct se_device *, u32);
-int     se_dev_set_max_unmap_lba_count(struct se_device *, u32);
-int     se_dev_set_max_unmap_block_desc_count(struct se_device *, u32);
-int     se_dev_set_unmap_granularity(struct se_device *, u32);
-int     se_dev_set_unmap_granularity_alignment(struct se_device *, u32);
-int     se_dev_set_max_write_same_len(struct se_device *, u32);
-int     se_dev_set_emulate_model_alias(struct se_device *, int);
-int     se_dev_set_emulate_dpo(struct se_device *, int);
-int     se_dev_set_emulate_fua_write(struct se_device *, int);
-int     se_dev_set_emulate_fua_read(struct se_device *, int);
-int     se_dev_set_emulate_write_cache(struct se_device *, int);
-int     se_dev_set_emulate_ua_intlck_ctrl(struct se_device *, int);
-int     se_dev_set_emulate_tas(struct se_device *, int);
-int     se_dev_set_emulate_tpu(struct se_device *, int);
-int     se_dev_set_emulate_tpws(struct se_device *, int);
-int     se_dev_set_emulate_caw(struct se_device *, int);
-int     se_dev_set_emulate_3pc(struct se_device *, int);
-int     se_dev_set_pi_prot_type(struct se_device *, int);
-int     se_dev_set_pi_prot_format(struct se_device *, int);
-int     se_dev_set_enforce_pr_isids(struct se_device *, int);
-int     se_dev_set_force_pr_aptpl(struct se_device *, int);
-int     se_dev_set_is_nonrot(struct se_device *, int);
-int     se_dev_set_emulate_rest_reord(struct se_device *dev, int);
-int     se_dev_set_queue_depth(struct se_device *, u32);
-int     se_dev_set_max_sectors(struct se_device *, u32);
-int     se_dev_set_fabric_max_sectors(struct se_device *, u32);
-int     se_dev_set_optimal_sectors(struct se_device *, u32);
-int     se_dev_set_block_size(struct se_device *, u32);
 struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_device *, u32);
 void    core_dev_del_lun(struct se_portal_group *, struct se_lun *);
 struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32);
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 4c261c33cf55..d56f2aaba9af 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -76,7 +76,7 @@ enum preempt_type {
 };
 
 static void __core_scsi3_complete_pro_release(struct se_device *, struct se_node_acl *,
-                        struct t10_pr_registration *, int);
+                                              struct t10_pr_registration *, int, int);
 
 static sense_reason_t
 target_scsi2_reservation_check(struct se_cmd *cmd)
@@ -1177,7 +1177,7 @@ static int core_scsi3_check_implicit_release(
                  *    service action with the SERVICE ACTION RESERVATION KEY
                  *    field set to zero (see 5.7.11.3).
                  */
-                __core_scsi3_complete_pro_release(dev, nacl, pr_reg, 0);
+                __core_scsi3_complete_pro_release(dev, nacl, pr_reg, 0, 1);
                 ret = 1;
                 /*
                  * For 'All Registrants' reservation types, all existing
@@ -1219,7 +1219,8 @@ static void __core_scsi3_free_registration(
 
         pr_reg->pr_reg_deve->def_pr_registered = 0;
         pr_reg->pr_reg_deve->pr_res_key = 0;
-        list_del(&pr_reg->pr_reg_list);
+        if (!list_empty(&pr_reg->pr_reg_list))
+                list_del(&pr_reg->pr_reg_list);
         /*
          * Caller accessing *pr_reg using core_scsi3_locate_pr_reg(),
          * so call core_scsi3_put_pr_reg() to decrement our reference.
@@ -1271,6 +1272,7 @@ void core_scsi3_free_pr_reg_from_nacl(
 {
         struct t10_reservation *pr_tmpl = &dev->t10_pr;
         struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_res_holder;
+        bool free_reg = false;
         /*
          * If the passed se_node_acl matches the reservation holder,
          * release the reservation.
@@ -1278,13 +1280,18 @@ void core_scsi3_free_pr_reg_from_nacl(
         spin_lock(&dev->dev_reservation_lock);
         pr_res_holder = dev->dev_pr_res_holder;
         if ((pr_res_holder != NULL) &&
-            (pr_res_holder->pr_reg_nacl == nacl))
-                __core_scsi3_complete_pro_release(dev, nacl, pr_res_holder, 0);
+            (pr_res_holder->pr_reg_nacl == nacl)) {
+                __core_scsi3_complete_pro_release(dev, nacl, pr_res_holder, 0, 1);
+                free_reg = true;
+        }
         spin_unlock(&dev->dev_reservation_lock);
         /*
          * Release any registration associated with the struct se_node_acl.
          */
         spin_lock(&pr_tmpl->registration_lock);
+        if (pr_res_holder && free_reg)
+                __core_scsi3_free_registration(dev, pr_res_holder, NULL, 0);
+
         list_for_each_entry_safe(pr_reg, pr_reg_tmp,
                         &pr_tmpl->registration_list, pr_reg_list) {
 
@@ -1307,7 +1314,7 @@ void core_scsi3_free_all_registrations(
         if (pr_res_holder != NULL) {
                 struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
                 __core_scsi3_complete_pro_release(dev, pr_res_nacl,
-                                pr_res_holder, 0);
+                                                  pr_res_holder, 0, 0);
         }
         spin_unlock(&dev->dev_reservation_lock);
 
@@ -1429,14 +1436,12 @@ core_scsi3_decode_spec_i_port(
         struct target_core_fabric_ops *tmp_tf_ops;
         unsigned char *buf;
         unsigned char *ptr, *i_str = NULL, proto_ident, tmp_proto_ident;
-        char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
+        char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN];
         sense_reason_t ret;
         u32 tpdl, tid_len = 0;
         int dest_local_nexus;
         u32 dest_rtpi = 0;
 
-        memset(dest_iport, 0, 64);
-
         local_se_deve = se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
         /*
          * Allocate a struct pr_transport_id_holder and setup the
@@ -2105,13 +2110,13 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key,
                 /*
                  * sa_res_key=0 Unregister Reservation Key for registered I_T Nexus.
                  */
-                pr_holder = core_scsi3_check_implicit_release(
-                                cmd->se_dev, pr_reg);
+                type = pr_reg->pr_res_type;
+                pr_holder = core_scsi3_check_implicit_release(cmd->se_dev,
+                                                              pr_reg);
                 if (pr_holder < 0) {
                         ret = TCM_RESERVATION_CONFLICT;
                         goto out;
                 }
-                type = pr_reg->pr_res_type;
 
                 spin_lock(&pr_tmpl->registration_lock);
                 /*
@@ -2269,6 +2274,7 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
         spin_lock(&dev->dev_reservation_lock);
         pr_res_holder = dev->dev_pr_res_holder;
         if (pr_res_holder) {
+                int pr_res_type = pr_res_holder->pr_res_type;
                 /*
                  * From spc4r17 Section 5.7.9: Reserving:
                  *
@@ -2279,7 +2285,9 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
                  * the logical unit, then the command shall be completed with
                  * RESERVATION CONFLICT status.
                  */
-                if (pr_res_holder != pr_reg) {
+                if ((pr_res_holder != pr_reg) &&
+                    (pr_res_type != PR_TYPE_WRITE_EXCLUSIVE_ALLREG) &&
+                    (pr_res_type != PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
                         struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
                         pr_err("SPC-3 PR: Attempted RESERVE from"
                                 " [%s]: %s while reservation already held by"
@@ -2385,23 +2393,59 @@ static void __core_scsi3_complete_pro_release(
         struct se_device *dev,
         struct se_node_acl *se_nacl,
         struct t10_pr_registration *pr_reg,
-        int explicit)
+        int explicit,
+        int unreg)
 {
         struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo;
         char i_buf[PR_REG_ISID_ID_LEN];
+        int pr_res_type = 0, pr_res_scope = 0;
 
         memset(i_buf, 0, PR_REG_ISID_ID_LEN);
         core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN);
         /*
          * Go ahead and release the current PR reservation holder.
+         * If an All Registrants reservation is currently active and
+         * a unregister operation is requested, replace the current
+         * dev_pr_res_holder with another active registration.
          */
-        dev->dev_pr_res_holder = NULL;
+        if (dev->dev_pr_res_holder) {
+                pr_res_type = dev->dev_pr_res_holder->pr_res_type;
+                pr_res_scope = dev->dev_pr_res_holder->pr_res_scope;
+                dev->dev_pr_res_holder->pr_res_type = 0;
+                dev->dev_pr_res_holder->pr_res_scope = 0;
+                dev->dev_pr_res_holder->pr_res_holder = 0;
+                dev->dev_pr_res_holder = NULL;
+        }
+        if (!unreg)
+                goto out;
 
-        pr_debug("SPC-3 PR [%s] Service Action: %s RELEASE cleared"
-                " reservation holder TYPE: %s ALL_TG_PT: %d\n",
-                tfo->get_fabric_name(), (explicit) ? "explicit" : "implicit",
-                core_scsi3_pr_dump_type(pr_reg->pr_res_type),
-                (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        spin_lock(&dev->t10_pr.registration_lock);
+        list_del_init(&pr_reg->pr_reg_list);
+        /*
+         * If the I_T nexus is a reservation holder, the persistent reservation
+         * is of an all registrants type, and the I_T nexus is the last remaining
+         * registered I_T nexus, then the device server shall also release the
+         * persistent reservation.
+         */
+        if (!list_empty(&dev->t10_pr.registration_list) &&
+            ((pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+             (pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG))) {
+                dev->dev_pr_res_holder =
+                        list_entry(dev->t10_pr.registration_list.next,
+                                   struct t10_pr_registration, pr_reg_list);
+                dev->dev_pr_res_holder->pr_res_type = pr_res_type;
+                dev->dev_pr_res_holder->pr_res_scope = pr_res_scope;
+                dev->dev_pr_res_holder->pr_res_holder = 1;
+        }
+        spin_unlock(&dev->t10_pr.registration_lock);
+out:
+        if (!dev->dev_pr_res_holder) {
+                pr_debug("SPC-3 PR [%s] Service Action: %s RELEASE cleared"
+                        " reservation holder TYPE: %s ALL_TG_PT: %d\n",
+                        tfo->get_fabric_name(), (explicit) ? "explicit" :
+                        "implicit", core_scsi3_pr_dump_type(pr_res_type),
+                        (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        }
         pr_debug("SPC-3 PR [%s] RELEASE Node: %s%s\n",
                 tfo->get_fabric_name(), se_nacl->initiatorname,
                 i_buf);
@@ -2532,7 +2576,7 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope,
          *    server shall not establish a unit attention condition.
          */
         __core_scsi3_complete_pro_release(dev, se_sess->se_node_acl,
-                        pr_reg, 1);
+                                          pr_reg, 1, 0);
 
         spin_unlock(&dev->dev_reservation_lock);
 
@@ -2620,7 +2664,7 @@ core_scsi3_emulate_pro_clear(struct se_cmd *cmd, u64 res_key)
         if (pr_res_holder) {
                 struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
                 __core_scsi3_complete_pro_release(dev, pr_res_nacl,
-                        pr_res_holder, 0);
+                                                  pr_res_holder, 0, 0);
         }
         spin_unlock(&dev->dev_reservation_lock);
         /*
@@ -2679,7 +2723,7 @@ static void __core_scsi3_complete_pro_preempt(
          */
         if (dev->dev_pr_res_holder)
                 __core_scsi3_complete_pro_release(dev, nacl,
-                                dev->dev_pr_res_holder, 0);
+                                                  dev->dev_pr_res_holder, 0, 0);
 
         dev->dev_pr_res_holder = pr_reg;
         pr_reg->pr_res_holder = 1;
@@ -2924,8 +2968,8 @@ core_scsi3_pro_preempt(struct se_cmd *cmd, int type, int scope, u64 res_key,
          */
         if (pr_reg_n != pr_res_holder)
                 __core_scsi3_complete_pro_release(dev,
-                                pr_res_holder->pr_reg_nacl,
-                                dev->dev_pr_res_holder, 0);
+                                                  pr_res_holder->pr_reg_nacl,
+                                                  dev->dev_pr_res_holder, 0, 0);
         /*
          * b) Remove the registrations for all I_T nexuses identified
          *    by the SERVICE ACTION RESERVATION KEY field, except the
@@ -3059,7 +3103,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
         struct t10_reservation *pr_tmpl = &dev->t10_pr;
         unsigned char *buf;
         unsigned char *initiator_str;
-        char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
+        char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN];
         u32 tid_len, tmp_tid_len;
         int new_reg = 0, type, scope, matching_iname;
         sense_reason_t ret;
@@ -3071,7 +3115,6 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
                 return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
         }
 
-        memset(dest_iport, 0, 64);
         memset(i_buf, 0, PR_REG_ISID_ID_LEN);
         se_tpg = se_sess->se_tpg;
         tf_ops = se_tpg->se_tpg_tfo;
@@ -3389,7 +3432,7 @@ after_iport_check:
          *    holder (i.e., the I_T nexus on which the
          */
         __core_scsi3_complete_pro_release(dev, pr_res_nacl,
-                        dev->dev_pr_res_holder, 0);
+                                          dev->dev_pr_res_holder, 0, 0);
         /*
          * g) Move the persistent reservation to the specified I_T nexus using
          *    the same scope and type as the persistent reservation released in
@@ -3837,7 +3880,8 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd)
         unsigned char *buf;
         u32 add_desc_len = 0, add_len = 0, desc_len, exp_desc_len;
         u32 off = 8; /* off into first Full Status descriptor */
-        int format_code = 0;
+        int format_code = 0, pr_res_type = 0, pr_res_scope = 0;
+        bool all_reg = false;
 
         if (cmd->data_length < 8) {
                 pr_err("PRIN SA READ_FULL_STATUS SCSI Data Length: %u"
@@ -3854,6 +3898,19 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd)
         buf[2] = ((dev->t10_pr.pr_generation >> 8) & 0xff);
         buf[3] = (dev->t10_pr.pr_generation & 0xff);
 
+        spin_lock(&dev->dev_reservation_lock);
+        if (dev->dev_pr_res_holder) {
+                struct t10_pr_registration *pr_holder = dev->dev_pr_res_holder;
+
+                if (pr_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG ||
+                    pr_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG) {
+                        all_reg = true;
+                        pr_res_type = pr_holder->pr_res_type;
+                        pr_res_scope = pr_holder->pr_res_scope;
+                }
+        }
+        spin_unlock(&dev->dev_reservation_lock);
+
         spin_lock(&pr_tmpl->registration_lock);
         list_for_each_entry_safe(pr_reg, pr_reg_tmp,
                         &pr_tmpl->registration_list, pr_reg_list) {
@@ -3901,14 +3958,20 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd)
                  * reservation holder for PR_HOLDER bit.
                  *
                  * Also, if this registration is the reservation
-                 * holder, fill in SCOPE and TYPE in the next byte.
+                 * holder or there is an All Registrants reservation
+                 * active, fill in SCOPE and TYPE in the next byte.
                  */
                 if (pr_reg->pr_res_holder) {
                         buf[off++] |= 0x01;
                         buf[off++] = (pr_reg->pr_res_scope & 0xf0) |
                                      (pr_reg->pr_res_type & 0x0f);
-                } else
+                } else if (all_reg) {
+                        buf[off++] |= 0x01;
+                        buf[off++] = (pr_res_scope & 0xf0) |
+                                     (pr_res_type & 0x0f);
+                } else {
                         off += 2;
+                }
 
                 off += 4; /* Skip over reserved area */
                 /*
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 7c8291f0bbbc..74873e42cf7e 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -44,6 +44,7 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
+#include <target/target_core_backend_configfs.h>
 
 #include "target_core_alua.h"
 #include "target_core_pscsi.h"
@@ -1165,6 +1166,26 @@ static void pscsi_req_done(struct request *req, int uptodate)
         kfree(pt);
 }
 
+DEF_TB_DEV_ATTRIB_RO(pscsi, hw_pi_prot_type);
+TB_DEV_ATTR_RO(pscsi, hw_pi_prot_type);
+
+DEF_TB_DEV_ATTRIB_RO(pscsi, hw_block_size);
+TB_DEV_ATTR_RO(pscsi, hw_block_size);
+
+DEF_TB_DEV_ATTRIB_RO(pscsi, hw_max_sectors);
+TB_DEV_ATTR_RO(pscsi, hw_max_sectors);
+
+DEF_TB_DEV_ATTRIB_RO(pscsi, hw_queue_depth);
+TB_DEV_ATTR_RO(pscsi, hw_queue_depth);
+
+static struct configfs_attribute *pscsi_backend_dev_attrs[] = {
+        &pscsi_dev_attrib_hw_pi_prot_type.attr,
+        &pscsi_dev_attrib_hw_block_size.attr,
+        &pscsi_dev_attrib_hw_max_sectors.attr,
+        &pscsi_dev_attrib_hw_queue_depth.attr,
+        NULL,
+};
+
 static struct se_subsystem_api pscsi_template = {
         .name                   = "pscsi",
         .owner                  = THIS_MODULE,
@@ -1185,6 +1206,11 @@ static struct se_subsystem_api pscsi_template = {
 
 static int __init pscsi_module_init(void)
 {
+        struct target_backend_cits *tbc = &pscsi_template.tb_cits;
+
+        target_core_setup_sub_cits(&pscsi_template);
+        tbc->tb_dev_attrib_cit.ct_attrs = pscsi_backend_dev_attrs;
+
         return transport_subsystem_register(&pscsi_template);
 }
 
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index b920db3388cd..60ebd170a561 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -34,6 +34,7 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
+#include <target/target_core_backend_configfs.h>
 
 #include "target_core_rd.h"
 
@@ -632,6 +633,42 @@ rd_parse_cdb(struct se_cmd *cmd)
         return sbc_parse_cdb(cmd, &rd_sbc_ops);
 }
 
+DEF_TB_DEFAULT_ATTRIBS(rd_mcp);
+
+static struct configfs_attribute *rd_mcp_backend_dev_attrs[] = {
+        &rd_mcp_dev_attrib_emulate_model_alias.attr,
+        &rd_mcp_dev_attrib_emulate_dpo.attr,
+        &rd_mcp_dev_attrib_emulate_fua_write.attr,
+        &rd_mcp_dev_attrib_emulate_fua_read.attr,
+        &rd_mcp_dev_attrib_emulate_write_cache.attr,
+        &rd_mcp_dev_attrib_emulate_ua_intlck_ctrl.attr,
+        &rd_mcp_dev_attrib_emulate_tas.attr,
+        &rd_mcp_dev_attrib_emulate_tpu.attr,
+        &rd_mcp_dev_attrib_emulate_tpws.attr,
+        &rd_mcp_dev_attrib_emulate_caw.attr,
+        &rd_mcp_dev_attrib_emulate_3pc.attr,
+        &rd_mcp_dev_attrib_pi_prot_type.attr,
+        &rd_mcp_dev_attrib_hw_pi_prot_type.attr,
+        &rd_mcp_dev_attrib_pi_prot_format.attr,
+        &rd_mcp_dev_attrib_enforce_pr_isids.attr,
+        &rd_mcp_dev_attrib_is_nonrot.attr,
+        &rd_mcp_dev_attrib_emulate_rest_reord.attr,
+        &rd_mcp_dev_attrib_force_pr_aptpl.attr,
+        &rd_mcp_dev_attrib_hw_block_size.attr,
+        &rd_mcp_dev_attrib_block_size.attr,
+        &rd_mcp_dev_attrib_hw_max_sectors.attr,
+        &rd_mcp_dev_attrib_fabric_max_sectors.attr,
+        &rd_mcp_dev_attrib_optimal_sectors.attr,
+        &rd_mcp_dev_attrib_hw_queue_depth.attr,
+        &rd_mcp_dev_attrib_queue_depth.attr,
+        &rd_mcp_dev_attrib_max_unmap_lba_count.attr,
+        &rd_mcp_dev_attrib_max_unmap_block_desc_count.attr,
+        &rd_mcp_dev_attrib_unmap_granularity.attr,
+        &rd_mcp_dev_attrib_unmap_granularity_alignment.attr,
+        &rd_mcp_dev_attrib_max_write_same_len.attr,
+        NULL,
+};
+
 static struct se_subsystem_api rd_mcp_template = {
         .name                   = "rd_mcp",
         .inquiry_prod           = "RAMDISK-MCP",
@@ -653,8 +690,12 @@ static struct se_subsystem_api rd_mcp_template = {
 
 int __init rd_module_init(void)
 {
+        struct target_backend_cits *tbc = &rd_mcp_template.tb_cits;
         int ret;
 
+        target_core_setup_sub_cits(&rd_mcp_template);
+        tbc->tb_dev_attrib_cit.ct_attrs = rd_mcp_backend_dev_attrs;
+
         ret = transport_subsystem_register(&rd_mcp_template);
         if (ret < 0) {
                 return ret;
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 9a1b314f6482..8bfa61c9693d 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -28,6 +28,8 @@
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_backend.h>
+#include <target/target_core_backend_configfs.h>
+
 #include <linux/target_core_user.h>
 
 /*
@@ -1092,6 +1094,42 @@ tcmu_parse_cdb(struct se_cmd *cmd)
         return ret;
 }
 
+DEF_TB_DEFAULT_ATTRIBS(tcmu);
+
+static struct configfs_attribute *tcmu_backend_dev_attrs[] = {
+        &tcmu_dev_attrib_emulate_model_alias.attr,
+        &tcmu_dev_attrib_emulate_dpo.attr,
+        &tcmu_dev_attrib_emulate_fua_write.attr,
+        &tcmu_dev_attrib_emulate_fua_read.attr,
+        &tcmu_dev_attrib_emulate_write_cache.attr,
+        &tcmu_dev_attrib_emulate_ua_intlck_ctrl.attr,
+        &tcmu_dev_attrib_emulate_tas.attr,
+        &tcmu_dev_attrib_emulate_tpu.attr,
+        &tcmu_dev_attrib_emulate_tpws.attr,
+        &tcmu_dev_attrib_emulate_caw.attr,
+        &tcmu_dev_attrib_emulate_3pc.attr,
+        &tcmu_dev_attrib_pi_prot_type.attr,
+        &tcmu_dev_attrib_hw_pi_prot_type.attr,
+        &tcmu_dev_attrib_pi_prot_format.attr,
+        &tcmu_dev_attrib_enforce_pr_isids.attr,
+        &tcmu_dev_attrib_is_nonrot.attr,
+        &tcmu_dev_attrib_emulate_rest_reord.attr,
+        &tcmu_dev_attrib_force_pr_aptpl.attr,
+        &tcmu_dev_attrib_hw_block_size.attr,
+        &tcmu_dev_attrib_block_size.attr,
+        &tcmu_dev_attrib_hw_max_sectors.attr,
+        &tcmu_dev_attrib_fabric_max_sectors.attr,
+        &tcmu_dev_attrib_optimal_sectors.attr,
+        &tcmu_dev_attrib_hw_queue_depth.attr,
+        &tcmu_dev_attrib_queue_depth.attr,
+        &tcmu_dev_attrib_max_unmap_lba_count.attr,
+        &tcmu_dev_attrib_max_unmap_block_desc_count.attr,
+        &tcmu_dev_attrib_unmap_granularity.attr,
+        &tcmu_dev_attrib_unmap_granularity_alignment.attr,
+        &tcmu_dev_attrib_max_write_same_len.attr,
+        NULL,
+};
+
 static struct se_subsystem_api tcmu_template = {
         .name                   = "user",
         .inquiry_prod           = "USER",
@@ -1112,6 +1150,7 @@ static struct se_subsystem_api tcmu_template = {
 
 static int __init tcmu_module_init(void)
 {
+        struct target_backend_cits *tbc = &tcmu_template.tb_cits;
         int ret;
 
         BUILD_BUG_ON((sizeof(struct tcmu_cmd_entry) % TCMU_OP_ALIGN_SIZE) != 0);
@@ -1134,6 +1173,9 @@ static int __init tcmu_module_init(void)
                 goto out_unreg_device;
         }
 
+        target_core_setup_sub_cits(&tcmu_template);
+        tbc->tb_dev_attrib_cit.ct_attrs = tcmu_backend_dev_attrs;
+
         ret = transport_subsystem_register(&tcmu_template);
         if (ret)
                 goto out_unreg_genl;
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 9adc1bca1178..430cfaf92285 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -5,6 +5,15 @@
 #define TRANSPORT_PLUGIN_VHBA_PDEV              2
 #define TRANSPORT_PLUGIN_VHBA_VDEV              3
 
+struct target_backend_cits {
+        struct config_item_type tb_dev_cit;
+        struct config_item_type tb_dev_attrib_cit;
+        struct config_item_type tb_dev_pr_cit;
+        struct config_item_type tb_dev_wwn_cit;
+        struct config_item_type tb_dev_alua_tg_pt_gps_cit;
+        struct config_item_type tb_dev_stat_cit;
+};
+
 struct se_subsystem_api {
         struct list_head sub_api_list;
 
@@ -44,6 +53,8 @@ struct se_subsystem_api {
         int (*init_prot)(struct se_device *);
         int (*format_prot)(struct se_device *);
         void (*free_prot)(struct se_device *);
+
+        struct target_backend_cits tb_cits;
 };
 
 struct sbc_ops {
@@ -96,4 +107,36 @@ sense_reason_t	transport_generic_map_mem_to_cmd(struct se_cmd *,
 
 void    array_free(void *array, int n);
 
+/* From target_core_configfs.c to setup default backend config_item_types */
+void    target_core_setup_sub_cits(struct se_subsystem_api *);
+
+/* attribute helpers from target_core_device.c for backend drivers */
+int     se_dev_set_max_unmap_lba_count(struct se_device *, u32);
+int     se_dev_set_max_unmap_block_desc_count(struct se_device *, u32);
+int     se_dev_set_unmap_granularity(struct se_device *, u32);
+int     se_dev_set_unmap_granularity_alignment(struct se_device *, u32);
+int     se_dev_set_max_write_same_len(struct se_device *, u32);
+int     se_dev_set_emulate_model_alias(struct se_device *, int);
+int     se_dev_set_emulate_dpo(struct se_device *, int);
+int     se_dev_set_emulate_fua_write(struct se_device *, int);
+int     se_dev_set_emulate_fua_read(struct se_device *, int);
+int     se_dev_set_emulate_write_cache(struct se_device *, int);
+int     se_dev_set_emulate_ua_intlck_ctrl(struct se_device *, int);
+int     se_dev_set_emulate_tas(struct se_device *, int);
+int     se_dev_set_emulate_tpu(struct se_device *, int);
+int     se_dev_set_emulate_tpws(struct se_device *, int);
+int     se_dev_set_emulate_caw(struct se_device *, int);
+int     se_dev_set_emulate_3pc(struct se_device *, int);
+int     se_dev_set_pi_prot_type(struct se_device *, int);
+int     se_dev_set_pi_prot_format(struct se_device *, int);
+int     se_dev_set_enforce_pr_isids(struct se_device *, int);
+int     se_dev_set_force_pr_aptpl(struct se_device *, int);
+int     se_dev_set_is_nonrot(struct se_device *, int);
+int     se_dev_set_emulate_rest_reord(struct se_device *dev, int);
+int     se_dev_set_queue_depth(struct se_device *, u32);
+int     se_dev_set_max_sectors(struct se_device *, u32);
+int     se_dev_set_fabric_max_sectors(struct se_device *, u32);
+int     se_dev_set_optimal_sectors(struct se_device *, u32);
+int     se_dev_set_block_size(struct se_device *, u32);
+
 #endif /* TARGET_CORE_BACKEND_H */
diff --git a/include/target/target_core_backend_configfs.h b/include/target/target_core_backend_configfs.h
new file mode 100644
index 000000000000..3247d7530107
--- /dev/null
+++ b/include/target/target_core_backend_configfs.h
@@ -0,0 +1,120 @@
+#ifndef TARGET_CORE_BACKEND_CONFIGFS_H
+#define TARGET_CORE_BACKEND_CONFIGFS_H
+
+#include <target/configfs_macros.h>
+
+#define DEF_TB_DEV_ATTRIB_SHOW(_backend, _name)                         \
+static ssize_t _backend##_dev_show_attr_##_name(                        \
+        struct se_dev_attrib *da,                                       \
+        char *page)                                                     \
+{                                                                       \
+        return snprintf(page, PAGE_SIZE, "%u\n",                        \
+                        (u32)da->da_dev->dev_attrib._name);             \
+}
+
+#define DEF_TB_DEV_ATTRIB_STORE(_backend, _name)                        \
+static ssize_t _backend##_dev_store_attr_##_name(                       \
+        struct se_dev_attrib *da,                                       \
+        const char *page,                                               \
+        size_t count)                                                   \
+{                                                                       \
+        unsigned long val;                                              \
+        int ret;                                                        \
+                                                                        \
+        ret = kstrtoul(page, 0, &val);                                  \
+        if (ret < 0) {                                                  \
+                pr_err("kstrtoul() failed with ret: %d\n", ret);        \
+                return -EINVAL;                                         \
+        }                                                               \
+        ret = se_dev_set_##_name(da->da_dev, (u32)val);                 \
+                                                                        \
+        return (!ret) ? count : -EINVAL;                                \
+}
+
+#define DEF_TB_DEV_ATTRIB(_backend, _name)                              \
+DEF_TB_DEV_ATTRIB_SHOW(_backend, _name);                                \
+DEF_TB_DEV_ATTRIB_STORE(_backend, _name);
+
+#define DEF_TB_DEV_ATTRIB_RO(_backend, name)                            \
+DEF_TB_DEV_ATTRIB_SHOW(_backend, name);
+
+CONFIGFS_EATTR_STRUCT(target_backend_dev_attrib, se_dev_attrib);
+#define TB_DEV_ATTR(_backend, _name, _mode)                             \
+static struct target_backend_dev_attrib_attribute _backend##_dev_attrib_##_name = \
+                __CONFIGFS_EATTR(_name, _mode,                          \
+                _backend##_dev_show_attr_##_name,                       \
+                _backend##_dev_store_attr_##_name);
+
+#define TB_DEV_ATTR_RO(_backend, _name)                                         \
+static struct target_backend_dev_attrib_attribute _backend##_dev_attrib_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _backend##_dev_show_attr_##_name);
+
+/*
+ * Default list of target backend device attributes as defined by
+ * struct se_dev_attrib
+ */
+
+#define DEF_TB_DEFAULT_ATTRIBS(_backend)                                \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_model_alias);               \
+        TB_DEV_ATTR(_backend, emulate_model_alias, S_IRUGO | S_IWUSR);  \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_dpo);                       \
+        TB_DEV_ATTR(_backend, emulate_dpo, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_fua_write);                 \
+        TB_DEV_ATTR(_backend, emulate_fua_write, S_IRUGO | S_IWUSR);    \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_fua_read);                  \
+        TB_DEV_ATTR(_backend, emulate_fua_read, S_IRUGO | S_IWUSR);     \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_write_cache);               \
+        TB_DEV_ATTR(_backend, emulate_write_cache, S_IRUGO | S_IWUSR);  \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_ua_intlck_ctrl);            \
+        TB_DEV_ATTR(_backend, emulate_ua_intlck_ctrl, S_IRUGO | S_IWUSR); \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_tas);                       \
+        TB_DEV_ATTR(_backend, emulate_tas, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_tpu);                       \
+        TB_DEV_ATTR(_backend, emulate_tpu, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_tpws);                      \
+        TB_DEV_ATTR(_backend, emulate_tpws, S_IRUGO | S_IWUSR);         \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_caw);                       \
+        TB_DEV_ATTR(_backend, emulate_caw, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_3pc);                       \
+        TB_DEV_ATTR(_backend, emulate_3pc, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, pi_prot_type);                      \
+        TB_DEV_ATTR(_backend, pi_prot_type, S_IRUGO | S_IWUSR);         \
+        DEF_TB_DEV_ATTRIB_RO(_backend, hw_pi_prot_type);                \
+        TB_DEV_ATTR_RO(_backend, hw_pi_prot_type);                      \
+        DEF_TB_DEV_ATTRIB(_backend, pi_prot_format);                    \
+        TB_DEV_ATTR(_backend, pi_prot_format, S_IRUGO | S_IWUSR);       \
+        DEF_TB_DEV_ATTRIB(_backend, enforce_pr_isids);                  \
+        TB_DEV_ATTR(_backend, enforce_pr_isids, S_IRUGO | S_IWUSR);     \
+        DEF_TB_DEV_ATTRIB(_backend, is_nonrot);                         \
+        TB_DEV_ATTR(_backend, is_nonrot, S_IRUGO | S_IWUSR);            \
+        DEF_TB_DEV_ATTRIB(_backend, emulate_rest_reord);                \
+        TB_DEV_ATTR(_backend, emulate_rest_reord, S_IRUGO | S_IWUSR);   \
+        DEF_TB_DEV_ATTRIB(_backend, force_pr_aptpl);                    \
+        TB_DEV_ATTR(_backend, force_pr_aptpl, S_IRUGO | S_IWUSR);       \
+        DEF_TB_DEV_ATTRIB_RO(_backend, hw_block_size);                  \
+        TB_DEV_ATTR_RO(_backend, hw_block_size);                        \
+        DEF_TB_DEV_ATTRIB(_backend, block_size);                        \
+        TB_DEV_ATTR(_backend, block_size, S_IRUGO | S_IWUSR);           \
+        DEF_TB_DEV_ATTRIB_RO(_backend, hw_max_sectors);                 \
+        TB_DEV_ATTR_RO(_backend, hw_max_sectors);                       \
+        DEF_TB_DEV_ATTRIB(_backend, fabric_max_sectors);                \
+        TB_DEV_ATTR(_backend, fabric_max_sectors, S_IRUGO | S_IWUSR);   \
+        DEF_TB_DEV_ATTRIB(_backend, optimal_sectors);                   \
+        TB_DEV_ATTR(_backend, optimal_sectors, S_IRUGO | S_IWUSR);      \
+        DEF_TB_DEV_ATTRIB_RO(_backend, hw_queue_depth);                 \
+        TB_DEV_ATTR_RO(_backend, hw_queue_depth);                       \
+        DEF_TB_DEV_ATTRIB(_backend, queue_depth);                       \
+        TB_DEV_ATTR(_backend, queue_depth, S_IRUGO | S_IWUSR);          \
+        DEF_TB_DEV_ATTRIB(_backend, max_unmap_lba_count);               \
+        TB_DEV_ATTR(_backend, max_unmap_lba_count, S_IRUGO | S_IWUSR);  \
+        DEF_TB_DEV_ATTRIB(_backend, max_unmap_block_desc_count);        \
+        TB_DEV_ATTR(_backend, max_unmap_block_desc_count, S_IRUGO | S_IWUSR); \
+        DEF_TB_DEV_ATTRIB(_backend, unmap_granularity);                 \
+        TB_DEV_ATTR(_backend, unmap_granularity, S_IRUGO | S_IWUSR);    \
+        DEF_TB_DEV_ATTRIB(_backend, unmap_granularity_alignment);       \
+        TB_DEV_ATTR(_backend, unmap_granularity_alignment, S_IRUGO | S_IWUSR); \
+        DEF_TB_DEV_ATTRIB(_backend, max_write_same_len);                \
+        TB_DEV_ATTR(_backend, max_write_same_len, S_IRUGO | S_IWUSR);
+
+#endif /* TARGET_CORE_BACKEND_CONFIGFS_H */
diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index 7dcfbe6771b1..b483d1909d3e 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -6,10 +6,6 @@
 #include <linux/types.h>
 #include <linux/uio.h>
 
-#ifndef __packed
-#define __packed                        __attribute__((packed))
-#endif
-
 #define TCMU_VERSION "1.0"
 
 /*