These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / target / target_core_device.c
index ce5f768..3436a83 100644 (file)
@@ -36,8 +36,8 @@
 #include <asm/unaligned.h>
 #include <net/sock.h>
 #include <net/tcp.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_device.h>
+#include <scsi/scsi_common.h>
+#include <scsi/scsi_proto.h>
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
@@ -56,48 +56,47 @@ static struct se_hba *lun0_hba;
 struct se_device *g_lun0_dev;
 
 sense_reason_t
-transport_lookup_cmd_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
+transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun)
 {
        struct se_lun *se_lun = NULL;
        struct se_session *se_sess = se_cmd->se_sess;
-       struct se_device *dev;
-       unsigned long flags;
-
-       if (unpacked_lun >= TRANSPORT_MAX_LUNS_PER_TPG)
-               return TCM_NON_EXISTENT_LUN;
-
-       spin_lock_irqsave(&se_sess->se_node_acl->device_list_lock, flags);
-       se_cmd->se_deve = se_sess->se_node_acl->device_list[unpacked_lun];
-       if (se_cmd->se_deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
-               struct se_dev_entry *deve = se_cmd->se_deve;
-
-               deve->total_cmds++;
+       struct se_node_acl *nacl = se_sess->se_node_acl;
+       struct se_dev_entry *deve;
+       sense_reason_t ret = TCM_NO_SENSE;
 
-               if ((se_cmd->data_direction == DMA_TO_DEVICE) &&
-                   (deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY)) {
-                       pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
-                               " Access for 0x%08x\n",
-                               se_cmd->se_tfo->get_fabric_name(),
-                               unpacked_lun);
-                       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
-                       return TCM_WRITE_PROTECTED;
-               }
+       rcu_read_lock();
+       deve = target_nacl_find_deve(nacl, unpacked_lun);
+       if (deve) {
+               atomic_long_inc(&deve->total_cmds);
 
                if (se_cmd->data_direction == DMA_TO_DEVICE)
-                       deve->write_bytes += se_cmd->data_length;
+                       atomic_long_add(se_cmd->data_length,
+                                       &deve->write_bytes);
                else if (se_cmd->data_direction == DMA_FROM_DEVICE)
-                       deve->read_bytes += se_cmd->data_length;
+                       atomic_long_add(se_cmd->data_length,
+                                       &deve->read_bytes);
 
-               se_lun = deve->se_lun;
-               se_cmd->se_lun = deve->se_lun;
+               se_lun = rcu_dereference(deve->se_lun);
+               se_cmd->se_lun = rcu_dereference(deve->se_lun);
                se_cmd->pr_res_key = deve->pr_res_key;
                se_cmd->orig_fe_lun = unpacked_lun;
                se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
 
                percpu_ref_get(&se_lun->lun_ref);
                se_cmd->lun_ref_active = true;
+
+               if ((se_cmd->data_direction == DMA_TO_DEVICE) &&
+                   (deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY)) {
+                       pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
+                               " Access for 0x%08llx\n",
+                               se_cmd->se_tfo->get_fabric_name(),
+                               unpacked_lun);
+                       rcu_read_unlock();
+                       ret = TCM_WRITE_PROTECTED;
+                       goto ref_dev;
+               }
        }
-       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
+       rcu_read_unlock();
 
        if (!se_lun) {
                /*
@@ -107,76 +106,82 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
                 */
                if (unpacked_lun != 0) {
                        pr_err("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
-                               " Access for 0x%08x\n",
+                               " Access for 0x%08llx\n",
                                se_cmd->se_tfo->get_fabric_name(),
                                unpacked_lun);
                        return TCM_NON_EXISTENT_LUN;
                }
-               /*
-                * Force WRITE PROTECT for virtual LUN 0
-                */
-               if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
-                   (se_cmd->data_direction != DMA_NONE))
-                       return TCM_WRITE_PROTECTED;
 
-               se_lun = &se_sess->se_tpg->tpg_virt_lun0;
-               se_cmd->se_lun = &se_sess->se_tpg->tpg_virt_lun0;
+               se_lun = se_sess->se_tpg->tpg_virt_lun0;
+               se_cmd->se_lun = se_sess->se_tpg->tpg_virt_lun0;
                se_cmd->orig_fe_lun = 0;
                se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
 
                percpu_ref_get(&se_lun->lun_ref);
                se_cmd->lun_ref_active = true;
-       }
 
-       /* Directly associate cmd with se_dev */
-       se_cmd->se_dev = se_lun->lun_se_dev;
+               /*
+                * Force WRITE PROTECT for virtual LUN 0
+                */
+               if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
+                   (se_cmd->data_direction != DMA_NONE)) {
+                       ret = TCM_WRITE_PROTECTED;
+                       goto ref_dev;
+               }
+       }
+       /*
+        * RCU reference protected by percpu se_lun->lun_ref taken above that
+        * must drop to zero (including initial reference) before this se_lun
+        * pointer can be kfree_rcu() by the final se_lun->lun_group put via
+        * target_core_fabric_configfs.c:target_fabric_port_release
+        */
+ref_dev:
+       se_cmd->se_dev = rcu_dereference_raw(se_lun->lun_se_dev);
+       atomic_long_inc(&se_cmd->se_dev->num_cmds);
 
-       dev = se_lun->lun_se_dev;
-       atomic_long_inc(&dev->num_cmds);
        if (se_cmd->data_direction == DMA_TO_DEVICE)
-               atomic_long_add(se_cmd->data_length, &dev->write_bytes);
+               atomic_long_add(se_cmd->data_length,
+                               &se_cmd->se_dev->write_bytes);
        else if (se_cmd->data_direction == DMA_FROM_DEVICE)
-               atomic_long_add(se_cmd->data_length, &dev->read_bytes);
+               atomic_long_add(se_cmd->data_length,
+                               &se_cmd->se_dev->read_bytes);
 
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(transport_lookup_cmd_lun);
 
-int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
+int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun)
 {
        struct se_dev_entry *deve;
        struct se_lun *se_lun = NULL;
        struct se_session *se_sess = se_cmd->se_sess;
+       struct se_node_acl *nacl = se_sess->se_node_acl;
        struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;
        unsigned long flags;
 
-       if (unpacked_lun >= TRANSPORT_MAX_LUNS_PER_TPG)
-               return -ENODEV;
-
-       spin_lock_irqsave(&se_sess->se_node_acl->device_list_lock, flags);
-       se_cmd->se_deve = se_sess->se_node_acl->device_list[unpacked_lun];
-       deve = se_cmd->se_deve;
-
-       if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
-               se_tmr->tmr_lun = deve->se_lun;
-               se_cmd->se_lun = deve->se_lun;
-               se_lun = deve->se_lun;
+       rcu_read_lock();
+       deve = target_nacl_find_deve(nacl, unpacked_lun);
+       if (deve) {
+               se_tmr->tmr_lun = rcu_dereference(deve->se_lun);
+               se_cmd->se_lun = rcu_dereference(deve->se_lun);
+               se_lun = rcu_dereference(deve->se_lun);
                se_cmd->pr_res_key = deve->pr_res_key;
                se_cmd->orig_fe_lun = unpacked_lun;
        }
-       spin_unlock_irqrestore(&se_sess->se_node_acl->device_list_lock, flags);
+       rcu_read_unlock();
 
        if (!se_lun) {
                pr_debug("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
-                       " Access for 0x%08x\n",
+                       " Access for 0x%08llx\n",
                        se_cmd->se_tfo->get_fabric_name(),
                        unpacked_lun);
                return -ENODEV;
        }
-
-       /* Directly associate cmd with se_dev */
-       se_cmd->se_dev = se_lun->lun_se_dev;
-       se_tmr->tmr_dev = se_lun->lun_se_dev;
+       /*
+        * XXX: Add percpu se_lun->lun_ref reference count for TMR
+        */
+       se_cmd->se_dev = rcu_dereference_raw(se_lun->lun_se_dev);
+       se_tmr->tmr_dev = rcu_dereference_raw(se_lun->lun_se_dev);
 
        spin_lock_irqsave(&se_tmr->tmr_dev->se_tmr_lock, flags);
        list_add_tail(&se_tmr->tmr_list, &se_tmr->tmr_dev->dev_tmr_list);
@@ -186,9 +191,24 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
 }
 EXPORT_SYMBOL(transport_lookup_tmr_lun);
 
+bool target_lun_is_rdonly(struct se_cmd *cmd)
+{
+       struct se_session *se_sess = cmd->se_sess;
+       struct se_dev_entry *deve;
+       bool ret;
+
+       rcu_read_lock();
+       deve = target_nacl_find_deve(se_sess->se_node_acl, cmd->orig_fe_lun);
+       ret = (deve && deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY);
+       rcu_read_unlock();
+
+       return ret;
+}
+EXPORT_SYMBOL(target_lun_is_rdonly);
+
 /*
  * This function is called from core_scsi3_emulate_pro_register_and_move()
- * and core_scsi3_decode_spec_i_port(), and will increment &deve->pr_ref_count
+ * and core_scsi3_decode_spec_i_port(), and will increment &deve->pr_kref
  * when a matching rtpi is found.
  */
 struct se_dev_entry *core_get_se_deve_from_rtpi(
@@ -197,231 +217,239 @@ struct se_dev_entry *core_get_se_deve_from_rtpi(
 {
        struct se_dev_entry *deve;
        struct se_lun *lun;
-       struct se_port *port;
        struct se_portal_group *tpg = nacl->se_tpg;
-       u32 i;
 
-       spin_lock_irq(&nacl->device_list_lock);
-       for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
-               deve = nacl->device_list[i];
-
-               if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
-                       continue;
-
-               lun = deve->se_lun;
+       rcu_read_lock();
+       hlist_for_each_entry_rcu(deve, &nacl->lun_entry_hlist, link) {
+               lun = rcu_dereference(deve->se_lun);
                if (!lun) {
                        pr_err("%s device entries device pointer is"
                                " NULL, but Initiator has access.\n",
                                tpg->se_tpg_tfo->get_fabric_name());
                        continue;
                }
-               port = lun->lun_sep;
-               if (!port) {
-                       pr_err("%s device entries device pointer is"
-                               " NULL, but Initiator has access.\n",
-                               tpg->se_tpg_tfo->get_fabric_name());
-                       continue;
-               }
-               if (port->sep_rtpi != rtpi)
+               if (lun->lun_rtpi != rtpi)
                        continue;
 
-               atomic_inc_mb(&deve->pr_ref_count);
-               spin_unlock_irq(&nacl->device_list_lock);
+               kref_get(&deve->pr_kref);
+               rcu_read_unlock();
 
                return deve;
        }
-       spin_unlock_irq(&nacl->device_list_lock);
+       rcu_read_unlock();
 
        return NULL;
 }
 
-int core_free_device_list_for_node(
+void core_free_device_list_for_node(
        struct se_node_acl *nacl,
        struct se_portal_group *tpg)
 {
        struct se_dev_entry *deve;
-       struct se_lun *lun;
-       u32 i;
-
-       if (!nacl->device_list)
-               return 0;
-
-       spin_lock_irq(&nacl->device_list_lock);
-       for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
-               deve = nacl->device_list[i];
-
-               if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
-                       continue;
-
-               if (!deve->se_lun) {
-                       pr_err("%s device entries device pointer is"
-                               " NULL, but Initiator has access.\n",
-                               tpg->se_tpg_tfo->get_fabric_name());
-                       continue;
-               }
-               lun = deve->se_lun;
 
-               spin_unlock_irq(&nacl->device_list_lock);
-               core_disable_device_list_for_node(lun, NULL, deve->mapped_lun,
-                       TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg);
-               spin_lock_irq(&nacl->device_list_lock);
+       mutex_lock(&nacl->lun_entry_mutex);
+       hlist_for_each_entry_rcu(deve, &nacl->lun_entry_hlist, link) {
+               struct se_lun *lun = rcu_dereference_check(deve->se_lun,
+                                       lockdep_is_held(&nacl->lun_entry_mutex));
+               core_disable_device_list_for_node(lun, deve, nacl, tpg);
        }
-       spin_unlock_irq(&nacl->device_list_lock);
-
-       array_free(nacl->device_list, TRANSPORT_MAX_LUNS_PER_TPG);
-       nacl->device_list = NULL;
-
-       return 0;
+       mutex_unlock(&nacl->lun_entry_mutex);
 }
 
 void core_update_device_list_access(
-       u32 mapped_lun,
+       u64 mapped_lun,
        u32 lun_access,
        struct se_node_acl *nacl)
 {
        struct se_dev_entry *deve;
 
-       spin_lock_irq(&nacl->device_list_lock);
-       deve = nacl->device_list[mapped_lun];
-       if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
-               deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
-               deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
-       } else {
-               deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
-               deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+       mutex_lock(&nacl->lun_entry_mutex);
+       deve = target_nacl_find_deve(nacl, mapped_lun);
+       if (deve) {
+               if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
+                       deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
+                       deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
+               } else {
+                       deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
+                       deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+               }
        }
-       spin_unlock_irq(&nacl->device_list_lock);
+       mutex_unlock(&nacl->lun_entry_mutex);
 }
 
-/*      core_enable_device_list_for_node():
- *
- *
+/*
+ * Called with rcu_read_lock or nacl->device_list_lock held.
  */
+struct se_dev_entry *target_nacl_find_deve(struct se_node_acl *nacl, u64 mapped_lun)
+{
+       struct se_dev_entry *deve;
+
+       hlist_for_each_entry_rcu(deve, &nacl->lun_entry_hlist, link)
+               if (deve->mapped_lun == mapped_lun)
+                       return deve;
+
+       return NULL;
+}
+EXPORT_SYMBOL(target_nacl_find_deve);
+
+void target_pr_kref_release(struct kref *kref)
+{
+       struct se_dev_entry *deve = container_of(kref, struct se_dev_entry,
+                                                pr_kref);
+       complete(&deve->pr_comp);
+}
+
+static void
+target_luns_data_has_changed(struct se_node_acl *nacl, struct se_dev_entry *new,
+                            bool skip_new)
+{
+       struct se_dev_entry *tmp;
+
+       rcu_read_lock();
+       hlist_for_each_entry_rcu(tmp, &nacl->lun_entry_hlist, link) {
+               if (skip_new && tmp == new)
+                       continue;
+               core_scsi3_ua_allocate(tmp, 0x3F,
+                                      ASCQ_3FH_REPORTED_LUNS_DATA_HAS_CHANGED);
+       }
+       rcu_read_unlock();
+}
+
 int core_enable_device_list_for_node(
        struct se_lun *lun,
        struct se_lun_acl *lun_acl,
-       u32 mapped_lun,
+       u64 mapped_lun,
        u32 lun_access,
        struct se_node_acl *nacl,
        struct se_portal_group *tpg)
 {
-       struct se_port *port = lun->lun_sep;
-       struct se_dev_entry *deve;
-
-       spin_lock_irq(&nacl->device_list_lock);
-
-       deve = nacl->device_list[mapped_lun];
-
-       /*
-        * Check if the call is handling demo mode -> explicit LUN ACL
-        * transition.  This transition must be for the same struct se_lun
-        * + mapped_lun that was setup in demo mode..
-        */
-       if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
-               if (deve->se_lun_acl != NULL) {
-                       pr_err("struct se_dev_entry->se_lun_acl"
-                              " already set for demo mode -> explicit"
-                              " LUN ACL transition\n");
-                       spin_unlock_irq(&nacl->device_list_lock);
-                       return -EINVAL;
-               }
-               if (deve->se_lun != lun) {
-                       pr_err("struct se_dev_entry->se_lun does"
-                              " match passed struct se_lun for demo mode"
-                              " -> explicit LUN ACL transition\n");
-                       spin_unlock_irq(&nacl->device_list_lock);
+       struct se_dev_entry *orig, *new;
+
+       new = kzalloc(sizeof(*new), GFP_KERNEL);
+       if (!new) {
+               pr_err("Unable to allocate se_dev_entry memory\n");
+               return -ENOMEM;
+       }
+
+       atomic_set(&new->ua_count, 0);
+       spin_lock_init(&new->ua_lock);
+       INIT_LIST_HEAD(&new->ua_list);
+       INIT_LIST_HEAD(&new->lun_link);
+
+       new->mapped_lun = mapped_lun;
+       kref_init(&new->pr_kref);
+       init_completion(&new->pr_comp);
+
+       if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE)
+               new->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
+       else
+               new->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+
+       new->creation_time = get_jiffies_64();
+       new->attach_count++;
+
+       mutex_lock(&nacl->lun_entry_mutex);
+       orig = target_nacl_find_deve(nacl, mapped_lun);
+       if (orig && orig->se_lun) {
+               struct se_lun *orig_lun = rcu_dereference_check(orig->se_lun,
+                                       lockdep_is_held(&nacl->lun_entry_mutex));
+
+               if (orig_lun != lun) {
+                       pr_err("Existing orig->se_lun doesn't match new lun"
+                              " for dynamic -> explicit NodeACL conversion:"
+                               " %s\n", nacl->initiatorname);
+                       mutex_unlock(&nacl->lun_entry_mutex);
+                       kfree(new);
                        return -EINVAL;
                }
-               deve->se_lun_acl = lun_acl;
+               BUG_ON(orig->se_lun_acl != NULL);
 
-               if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
-                       deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
-                       deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
-               } else {
-                       deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
-                       deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
-               }
+               rcu_assign_pointer(new->se_lun, lun);
+               rcu_assign_pointer(new->se_lun_acl, lun_acl);
+               hlist_del_rcu(&orig->link);
+               hlist_add_head_rcu(&new->link, &nacl->lun_entry_hlist);
+               mutex_unlock(&nacl->lun_entry_mutex);
 
-               spin_unlock_irq(&nacl->device_list_lock);
-               return 0;
-       }
+               spin_lock(&lun->lun_deve_lock);
+               list_del(&orig->lun_link);
+               list_add_tail(&new->lun_link, &lun->lun_deve_list);
+               spin_unlock(&lun->lun_deve_lock);
 
-       deve->se_lun = lun;
-       deve->se_lun_acl = lun_acl;
-       deve->mapped_lun = mapped_lun;
-       deve->lun_flags |= TRANSPORT_LUNFLAGS_INITIATOR_ACCESS;
-
-       if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
-               deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
-               deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
-       } else {
-               deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
-               deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+               kref_put(&orig->pr_kref, target_pr_kref_release);
+               wait_for_completion(&orig->pr_comp);
+
+               target_luns_data_has_changed(nacl, new, true);
+               kfree_rcu(orig, rcu_head);
+               return 0;
        }
 
-       deve->creation_time = get_jiffies_64();
-       deve->attach_count++;
-       spin_unlock_irq(&nacl->device_list_lock);
+       rcu_assign_pointer(new->se_lun, lun);
+       rcu_assign_pointer(new->se_lun_acl, lun_acl);
+       hlist_add_head_rcu(&new->link, &nacl->lun_entry_hlist);
+       mutex_unlock(&nacl->lun_entry_mutex);
 
-       spin_lock_bh(&port->sep_alua_lock);
-       list_add_tail(&deve->alua_port_list, &port->sep_alua_list);
-       spin_unlock_bh(&port->sep_alua_lock);
+       spin_lock(&lun->lun_deve_lock);
+       list_add_tail(&new->lun_link, &lun->lun_deve_list);
+       spin_unlock(&lun->lun_deve_lock);
 
+       target_luns_data_has_changed(nacl, new, true);
        return 0;
 }
 
-/*      core_disable_device_list_for_node():
- *
- *
+/*
+ *     Called with se_node_acl->lun_entry_mutex held.
  */
-int core_disable_device_list_for_node(
+void core_disable_device_list_for_node(
        struct se_lun *lun,
-       struct se_lun_acl *lun_acl,
-       u32 mapped_lun,
-       u32 lun_access,
+       struct se_dev_entry *orig,
        struct se_node_acl *nacl,
        struct se_portal_group *tpg)
 {
-       struct se_port *port = lun->lun_sep;
-       struct se_dev_entry *deve = nacl->device_list[mapped_lun];
-
+       /*
+        * rcu_dereference_raw protected by se_lun->lun_group symlink
+        * reference to se_device->dev_group.
+        */
+       struct se_device *dev = rcu_dereference_raw(lun->lun_se_dev);
        /*
         * If the MappedLUN entry is being disabled, the entry in
-        * port->sep_alua_list must be removed now before clearing the
+        * lun->lun_deve_list must be removed now before clearing the
         * struct se_dev_entry pointers below as logic in
         * core_alua_do_transition_tg_pt() depends on these being present.
         *
         * deve->se_lun_acl will be NULL for demo-mode created LUNs
         * that have not been explicitly converted to MappedLUNs ->
-        * struct se_lun_acl, but we remove deve->alua_port_list from
-        * port->sep_alua_list. This also means that active UAs and
+        * struct se_lun_acl, but we remove deve->lun_link from
+        * lun->lun_deve_list. This also means that active UAs and
         * NodeACL context specific PR metadata for demo-mode
         * MappedLUN *deve will be released below..
         */
-       spin_lock_bh(&port->sep_alua_lock);
-       list_del(&deve->alua_port_list);
-       spin_unlock_bh(&port->sep_alua_lock);
+       spin_lock(&lun->lun_deve_lock);
+       list_del(&orig->lun_link);
+       spin_unlock(&lun->lun_deve_lock);
        /*
-        * Wait for any in process SPEC_I_PT=1 or REGISTER_AND_MOVE
-        * PR operation to complete.
+        * Disable struct se_dev_entry LUN ACL mapping
         */
-       while (atomic_read(&deve->pr_ref_count) != 0)
-               cpu_relax();
+       core_scsi3_ua_release_all(orig);
 
-       spin_lock_irq(&nacl->device_list_lock);
+       hlist_del_rcu(&orig->link);
+       clear_bit(DEF_PR_REG_ACTIVE, &orig->deve_flags);
+       orig->lun_flags = 0;
+       orig->creation_time = 0;
+       orig->attach_count--;
        /*
-        * Disable struct se_dev_entry LUN ACL mapping
+        * Before firing off RCU callback, wait for any in process SPEC_I_PT=1
+        * or REGISTER_AND_MOVE PR operation to complete.
         */
-       core_scsi3_ua_release_all(deve);
-       deve->se_lun = NULL;
-       deve->se_lun_acl = NULL;
-       deve->lun_flags = 0;
-       deve->creation_time = 0;
-       deve->attach_count--;
-       spin_unlock_irq(&nacl->device_list_lock);
-
-       core_scsi3_free_pr_reg_from_nacl(lun->lun_se_dev, nacl);
-       return 0;
+       kref_put(&orig->pr_kref, target_pr_kref_release);
+       wait_for_completion(&orig->pr_comp);
+
+       rcu_assign_pointer(orig->se_lun, NULL);
+       rcu_assign_pointer(orig->se_lun_acl, NULL);
+
+       kfree_rcu(orig, rcu_head);
+
+       core_scsi3_free_pr_reg_from_nacl(dev, nacl);
+       target_luns_data_has_changed(nacl, NULL, false);
 }
 
 /*      core_clear_lun_from_tpg():
@@ -432,53 +460,35 @@ void core_clear_lun_from_tpg(struct se_lun *lun, struct se_portal_group *tpg)
 {
        struct se_node_acl *nacl;
        struct se_dev_entry *deve;
-       u32 i;
 
-       spin_lock_irq(&tpg->acl_node_lock);
+       mutex_lock(&tpg->acl_node_mutex);
        list_for_each_entry(nacl, &tpg->acl_node_list, acl_list) {
-               spin_unlock_irq(&tpg->acl_node_lock);
 
-               spin_lock_irq(&nacl->device_list_lock);
-               for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
-                       deve = nacl->device_list[i];
-                       if (lun != deve->se_lun)
-                               continue;
-                       spin_unlock_irq(&nacl->device_list_lock);
+               mutex_lock(&nacl->lun_entry_mutex);
+               hlist_for_each_entry_rcu(deve, &nacl->lun_entry_hlist, link) {
+                       struct se_lun *tmp_lun = rcu_dereference_check(deve->se_lun,
+                                       lockdep_is_held(&nacl->lun_entry_mutex));
 
-                       core_disable_device_list_for_node(lun, NULL,
-                               deve->mapped_lun, TRANSPORT_LUNFLAGS_NO_ACCESS,
-                               nacl, tpg);
+                       if (lun != tmp_lun)
+                               continue;
 
-                       spin_lock_irq(&nacl->device_list_lock);
+                       core_disable_device_list_for_node(lun, deve, nacl, tpg);
                }
-               spin_unlock_irq(&nacl->device_list_lock);
-
-               spin_lock_irq(&tpg->acl_node_lock);
+               mutex_unlock(&nacl->lun_entry_mutex);
        }
-       spin_unlock_irq(&tpg->acl_node_lock);
+       mutex_unlock(&tpg->acl_node_mutex);
 }
 
-static struct se_port *core_alloc_port(struct se_device *dev)
+int core_alloc_rtpi(struct se_lun *lun, struct se_device *dev)
 {
-       struct se_port *port, *port_tmp;
-
-       port = kzalloc(sizeof(struct se_port), GFP_KERNEL);
-       if (!port) {
-               pr_err("Unable to allocate struct se_port\n");
-               return ERR_PTR(-ENOMEM);
-       }
-       INIT_LIST_HEAD(&port->sep_alua_list);
-       INIT_LIST_HEAD(&port->sep_list);
-       atomic_set(&port->sep_tg_pt_secondary_offline, 0);
-       spin_lock_init(&port->sep_alua_lock);
-       mutex_init(&port->sep_tg_pt_md_mutex);
+       struct se_lun *tmp;
 
        spin_lock(&dev->se_port_lock);
-       if (dev->dev_port_count == 0x0000ffff) {
+       if (dev->export_count == 0x0000ffff) {
                pr_warn("Reached dev->dev_port_count =="
                                " 0x0000ffff\n");
                spin_unlock(&dev->se_port_lock);
-               return ERR_PTR(-ENOSPC);
+               return -ENOSPC;
        }
 again:
        /*
@@ -493,133 +503,23 @@ again:
         * 2h        Relative port 2, historically known as port B
         * 3h to FFFFh    Relative port 3 through 65 535
         */
-       port->sep_rtpi = dev->dev_rpti_counter++;
-       if (!port->sep_rtpi)
+       lun->lun_rtpi = dev->dev_rpti_counter++;
+       if (!lun->lun_rtpi)
                goto again;
 
-       list_for_each_entry(port_tmp, &dev->dev_sep_list, sep_list) {
+       list_for_each_entry(tmp, &dev->dev_sep_list, lun_dev_link) {
                /*
                 * Make sure RELATIVE TARGET PORT IDENTIFIER is unique
                 * for 16-bit wrap..
                 */
-               if (port->sep_rtpi == port_tmp->sep_rtpi)
+               if (lun->lun_rtpi == tmp->lun_rtpi)
                        goto again;
        }
        spin_unlock(&dev->se_port_lock);
 
-       return port;
-}
-
-static void core_export_port(
-       struct se_device *dev,
-       struct se_portal_group *tpg,
-       struct se_port *port,
-       struct se_lun *lun)
-{
-       struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem = NULL;
-
-       spin_lock(&dev->se_port_lock);
-       spin_lock(&lun->lun_sep_lock);
-       port->sep_tpg = tpg;
-       port->sep_lun = lun;
-       lun->lun_sep = port;
-       spin_unlock(&lun->lun_sep_lock);
-
-       list_add_tail(&port->sep_list, &dev->dev_sep_list);
-       spin_unlock(&dev->se_port_lock);
-
-       if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH) &&
-           !(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) {
-               tg_pt_gp_mem = core_alua_allocate_tg_pt_gp_mem(port);
-               if (IS_ERR(tg_pt_gp_mem) || !tg_pt_gp_mem) {
-                       pr_err("Unable to allocate t10_alua_tg_pt"
-                                       "_gp_member_t\n");
-                       return;
-               }
-               spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem,
-                       dev->t10_alua.default_tg_pt_gp);
-               spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
-               pr_debug("%s/%s: Adding to default ALUA Target Port"
-                       " Group: alua/default_tg_pt_gp\n",
-                       dev->transport->name, tpg->se_tpg_tfo->get_fabric_name());
-       }
-
-       dev->dev_port_count++;
-       port->sep_index = port->sep_rtpi; /* RELATIVE TARGET PORT IDENTIFIER */
-}
-
-/*
- *     Called with struct se_device->se_port_lock spinlock held.
- */
-static void core_release_port(struct se_device *dev, struct se_port *port)
-       __releases(&dev->se_port_lock) __acquires(&dev->se_port_lock)
-{
-       /*
-        * Wait for any port reference for PR ALL_TG_PT=1 operation
-        * to complete in __core_scsi3_alloc_registration()
-        */
-       spin_unlock(&dev->se_port_lock);
-       if (atomic_read(&port->sep_tg_pt_ref_cnt))
-               cpu_relax();
-       spin_lock(&dev->se_port_lock);
-
-       core_alua_free_tg_pt_gp_mem(port);
-
-       list_del(&port->sep_list);
-       dev->dev_port_count--;
-       kfree(port);
-}
-
-int core_dev_export(
-       struct se_device *dev,
-       struct se_portal_group *tpg,
-       struct se_lun *lun)
-{
-       struct se_hba *hba = dev->se_hba;
-       struct se_port *port;
-
-       port = core_alloc_port(dev);
-       if (IS_ERR(port))
-               return PTR_ERR(port);
-
-       lun->lun_se_dev = dev;
-
-       spin_lock(&hba->device_lock);
-       dev->export_count++;
-       spin_unlock(&hba->device_lock);
-
-       core_export_port(dev, tpg, port, lun);
        return 0;
 }
 
-void core_dev_unexport(
-       struct se_device *dev,
-       struct se_portal_group *tpg,
-       struct se_lun *lun)
-{
-       struct se_hba *hba = dev->se_hba;
-       struct se_port *port = lun->lun_sep;
-
-       spin_lock(&lun->lun_sep_lock);
-       if (lun->lun_se_dev == NULL) {
-               spin_unlock(&lun->lun_sep_lock);
-               return;
-       }
-       spin_unlock(&lun->lun_sep_lock);
-
-       spin_lock(&dev->se_port_lock);
-       core_release_port(dev, port);
-       spin_unlock(&dev->se_port_lock);
-
-       spin_lock(&hba->device_lock);
-       dev->export_count--;
-       spin_unlock(&hba->device_lock);
-
-       lun->lun_sep = NULL;
-       lun->lun_se_dev = NULL;
-}
-
 static void se_release_vpd_for_dev(struct se_device *dev)
 {
        struct t10_vpd *vpd, *vpd_tmp;
@@ -651,556 +551,19 @@ static u32 se_dev_align_max_sectors(u32 max_sectors, u32 block_size)
        return aligned_max_sectors;
 }
 
-bool se_dev_check_wce(struct se_device *dev)
-{
-       bool wce = false;
-
-       if (dev->transport->get_write_cache)
-               wce = dev->transport->get_write_cache(dev);
-       else if (dev->dev_attrib.emulate_write_cache > 0)
-               wce = true;
-
-       return wce;
-}
-
-int se_dev_set_max_unmap_lba_count(
-       struct se_device *dev,
-       u32 max_unmap_lba_count)
-{
-       dev->dev_attrib.max_unmap_lba_count = max_unmap_lba_count;
-       pr_debug("dev[%p]: Set max_unmap_lba_count: %u\n",
-                       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,
-       u32 max_unmap_block_desc_count)
-{
-       dev->dev_attrib.max_unmap_block_desc_count =
-               max_unmap_block_desc_count;
-       pr_debug("dev[%p]: Set max_unmap_block_desc_count: %u\n",
-                       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,
-       u32 unmap_granularity)
-{
-       dev->dev_attrib.unmap_granularity = unmap_granularity;
-       pr_debug("dev[%p]: Set unmap_granularity: %u\n",
-                       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,
-       u32 unmap_granularity_alignment)
-{
-       dev->dev_attrib.unmap_granularity_alignment = unmap_granularity_alignment;
-       pr_debug("dev[%p]: Set unmap_granularity_alignment: %u\n",
-                       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,
-       u32 max_write_same_len)
-{
-       dev->dev_attrib.max_write_same_len = max_write_same_len;
-       pr_debug("dev[%p]: Set max_write_same_len: %u\n",
-                       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)
-{
-       const char *configname;
-
-       configname = config_item_name(&dev->dev_group.cg_item);
-       if (strlen(configname) >= 16) {
-               pr_warn("dev[%p]: Backstore name '%s' is too long for "
-                       "INQUIRY_MODEL, truncating to 16 bytes\n", dev,
-                       configname);
-       }
-       snprintf(&dev->t10_wwn.model[0], 16, "%s", configname);
-}
-
-int se_dev_set_emulate_model_alias(struct se_device *dev, int flag)
-{
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change model alias"
-                       " while export_count is %d\n",
-                       dev, dev->export_count);
-                       return -EINVAL;
-       }
-
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-
-       if (flag) {
-               dev_set_t10_wwn_model_alias(dev);
-       } else {
-               strncpy(&dev->t10_wwn.model[0],
-                       dev->transport->inquiry_prod, 16);
-       }
-       dev->dev_attrib.emulate_model_alias = flag;
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_model_alias);
-
-int se_dev_set_emulate_dpo(struct se_device *dev, int flag)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-
-       if (flag) {
-               pr_err("dpo_emulated not supported\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_dpo);
-
-int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       if (flag &&
-           dev->transport->get_write_cache) {
-               pr_warn("emulate_fua_write not supported for this device, ignoring\n");
-               return 0;
-       }
-       if (dev->export_count) {
-               pr_err("emulate_fua_write cannot be changed with active"
-                      " exports: %d\n", dev->export_count);
-               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)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-
-       if (flag) {
-               pr_err("ua read emulated not supported\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_fua_read);
-
-int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       if (flag &&
-           dev->transport->get_write_cache) {
-               pr_err("emulate_write_cache not supported for this device\n");
-               return -EINVAL;
-       }
-       if (dev->export_count) {
-               pr_err("emulate_write_cache cannot be changed with active"
-                      " exports: %d\n", dev->export_count);
-               return -EINVAL;
-       }
-       dev->dev_attrib.emulate_write_cache = flag;
-       pr_debug("dev[%p]: SE Device WRITE_CACHE_EMULATION flag: %d\n",
-                       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)
-{
-       if ((flag != 0) && (flag != 1) && (flag != 2)) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device"
-                       " UA_INTRLCK_CTRL while export_count is %d\n",
-                       dev, dev->export_count);
-               return -EINVAL;
-       }
-       dev->dev_attrib.emulate_ua_intlck_ctrl = flag;
-       pr_debug("dev[%p]: SE Device UA_INTRLCK_CTRL flag: %d\n",
-               dev, dev->dev_attrib.emulate_ua_intlck_ctrl);
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_ua_intlck_ctrl);
-
-int se_dev_set_emulate_tas(struct se_device *dev, int flag)
-{
-       if ((flag != 0) && (flag != 1)) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device TAS while"
-                       " export_count is %d\n",
-                       dev, dev->export_count);
-               return -EINVAL;
-       }
-       dev->dev_attrib.emulate_tas = flag;
-       pr_debug("dev[%p]: SE Device TASK_ABORTED status bit: %s\n",
-               dev, (dev->dev_attrib.emulate_tas) ? "Enabled" : "Disabled");
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_tas);
-
-int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
-{
-       if ((flag != 0) && (flag != 1)) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       /*
-        * We expect this value to be non-zero when generic Block Layer
-        * Discard supported is detected iblock_create_virtdevice().
-        */
-       if (flag && !dev->dev_attrib.max_unmap_block_desc_count) {
-               pr_err("Generic Block Discard not supported\n");
-               return -ENOSYS;
-       }
-
-       dev->dev_attrib.emulate_tpu = flag;
-       pr_debug("dev[%p]: SE Device Thin Provisioning UNMAP bit: %d\n",
-                               dev, flag);
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_tpu);
-
-int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
-{
-       if ((flag != 0) && (flag != 1)) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       /*
-        * We expect this value to be non-zero when generic Block Layer
-        * Discard supported is detected iblock_create_virtdevice().
-        */
-       if (flag && !dev->dev_attrib.max_unmap_block_desc_count) {
-               pr_err("Generic Block Discard not supported\n");
-               return -ENOSYS;
-       }
-
-       dev->dev_attrib.emulate_tpws = flag;
-       pr_debug("dev[%p]: SE Device Thin Provisioning WRITE_SAME: %d\n",
-                               dev, flag);
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_tpws);
-
-int se_dev_set_emulate_caw(struct se_device *dev, int flag)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       dev->dev_attrib.emulate_caw = flag;
-       pr_debug("dev[%p]: SE Device CompareAndWrite (AtomicTestandSet): %d\n",
-                dev, flag);
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_caw);
-
-int se_dev_set_emulate_3pc(struct se_device *dev, int flag)
-{
-       if (flag != 0 && flag != 1) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       dev->dev_attrib.emulate_3pc = flag;
-       pr_debug("dev[%p]: SE Device 3rd Party Copy (EXTENDED_COPY): %d\n",
-               dev, flag);
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_emulate_3pc);
-
-int se_dev_set_pi_prot_type(struct se_device *dev, int flag)
-{
-       int rc, old_prot = dev->dev_attrib.pi_prot_type;
-
-       if (flag != 0 && flag != 1 && flag != 2 && flag != 3) {
-               pr_err("Illegal value %d for pi_prot_type\n", flag);
-               return -EINVAL;
-       }
-       if (flag == 2) {
-               pr_err("DIF TYPE2 protection currently not supported\n");
-               return -ENOSYS;
-       }
-       if (dev->dev_attrib.hw_pi_prot_type) {
-               pr_warn("DIF protection enabled on underlying hardware,"
-                       " ignoring\n");
-               return 0;
-       }
-       if (!dev->transport->init_prot || !dev->transport->free_prot) {
-               /* 0 is only allowed value for non-supporting backends */
-               if (flag == 0)
-                       return 0;
-
-               pr_err("DIF protection not supported by backend: %s\n",
-                      dev->transport->name);
-               return -ENOSYS;
-       }
-       if (!(dev->dev_flags & DF_CONFIGURED)) {
-               pr_err("DIF protection requires device to be configured\n");
-               return -ENODEV;
-       }
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device PROT type while"
-                      " export_count is %d\n", dev, dev->export_count);
-               return -EINVAL;
-       }
-
-       dev->dev_attrib.pi_prot_type = flag;
-
-       if (flag && !old_prot) {
-               rc = dev->transport->init_prot(dev);
-               if (rc) {
-                       dev->dev_attrib.pi_prot_type = old_prot;
-                       return rc;
-               }
-
-       } else if (!flag && old_prot) {
-               dev->transport->free_prot(dev);
-       }
-       pr_debug("dev[%p]: SE Device Protection Type: %d\n", dev, flag);
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_pi_prot_type);
-
-int se_dev_set_pi_prot_format(struct se_device *dev, int flag)
-{
-       int rc;
-
-       if (!flag)
-               return 0;
-
-       if (flag != 1) {
-               pr_err("Illegal value %d for pi_prot_format\n", flag);
-               return -EINVAL;
-       }
-       if (!dev->transport->format_prot) {
-               pr_err("DIF protection format not supported by backend %s\n",
-                      dev->transport->name);
-               return -ENOSYS;
-       }
-       if (!(dev->dev_flags & DF_CONFIGURED)) {
-               pr_err("DIF protection format requires device to be configured\n");
-               return -ENODEV;
-       }
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to format SE Device PROT type while"
-                      " export_count is %d\n", dev, dev->export_count);
-               return -EINVAL;
-       }
-
-       rc = dev->transport->format_prot(dev);
-       if (rc)
-               return rc;
-
-       pr_debug("dev[%p]: SE Device Protection Format complete\n", dev);
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_pi_prot_format);
-
-int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
-{
-       if ((flag != 0) && (flag != 1)) {
-               pr_err("Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       dev->dev_attrib.enforce_pr_isids = flag;
-       pr_debug("dev[%p]: SE Device enforce_pr_isids bit: %s\n", dev,
-               (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)
-{
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to set force_pr_aptpl while"
-                      " export_count is %d\n", dev, dev->export_count);
-               return -EINVAL;
-       }
-
-       dev->dev_attrib.force_pr_aptpl = 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)
-{
-       if ((flag != 0) && (flag != 1)) {
-               printk(KERN_ERR "Illegal value %d\n", flag);
-               return -EINVAL;
-       }
-       dev->dev_attrib.is_nonrot = flag;
-       pr_debug("dev[%p]: SE Device is_nonrot bit: %d\n",
-              dev, flag);
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_is_nonrot);
-
-int se_dev_set_emulate_rest_reord(struct se_device *dev, int flag)
-{
-       if (flag != 0) {
-               printk(KERN_ERR "dev[%p]: SE Device emulatation of restricted"
-                       " reordering not implemented\n", dev);
-               return -ENOSYS;
-       }
-       dev->dev_attrib.emulate_rest_reord = 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.
- */
-int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth)
-{
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device TCQ while"
-                       " export_count is %d\n",
-                       dev, dev->export_count);
-               return -EINVAL;
-       }
-       if (!queue_depth) {
-               pr_err("dev[%p]: Illegal ZERO value for queue"
-                       "_depth\n", dev);
-               return -EINVAL;
-       }
-
-       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_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
-{
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device"
-                       " optimal_sectors while export_count is %d\n",
-                       dev, dev->export_count);
-               return -EINVAL;
-       }
-       if (optimal_sectors > dev->dev_attrib.hw_max_sectors) {
-               pr_err("dev[%p]: Passed optimal_sectors %u cannot be"
-                       " greater than hw_max_sectors: %u\n", dev,
-                       optimal_sectors, dev->dev_attrib.hw_max_sectors);
-               return -EINVAL;
-       }
-
-       dev->dev_attrib.optimal_sectors = optimal_sectors;
-       pr_debug("dev[%p]: SE Device optimal_sectors changed to %u\n",
-                       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)
-{
-       if (dev->export_count) {
-               pr_err("dev[%p]: Unable to change SE Device block_size"
-                       " while export_count is %d\n",
-                       dev, dev->export_count);
-               return -EINVAL;
-       }
-
-       if ((block_size != 512) &&
-           (block_size != 1024) &&
-           (block_size != 2048) &&
-           (block_size != 4096)) {
-               pr_err("dev[%p]: Illegal value for block_device: %u"
-                       " for SE device, must be 512, 1024, 2048 or 4096\n",
-                       dev, block_size);
-               return -EINVAL;
-       }
-
-       dev->dev_attrib.block_size = block_size;
-       pr_debug("dev[%p]: SE Device block_size changed to %u\n",
-                       dev, block_size);
-
-       if (dev->dev_attrib.max_bytes_per_io)
-               dev->dev_attrib.hw_max_sectors =
-                       dev->dev_attrib.max_bytes_per_io / block_size;
-
-       return 0;
-}
-EXPORT_SYMBOL(se_dev_set_block_size);
-
-struct se_lun *core_dev_add_lun(
+int core_dev_add_lun(
        struct se_portal_group *tpg,
        struct se_device *dev,
-       u32 unpacked_lun)
+       struct se_lun *lun)
 {
-       struct se_lun *lun;
        int rc;
 
-       lun = core_tpg_alloc_lun(tpg, unpacked_lun);
-       if (IS_ERR(lun))
-               return lun;
-
        rc = core_tpg_add_lun(tpg, lun,
                                TRANSPORT_LUNFLAGS_READ_WRITE, dev);
        if (rc < 0)
-               return ERR_PTR(rc);
+               return rc;
 
-       pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
+       pr_debug("%s_TPG[%u]_LUN[%llu] - Activated %s Logical Unit from"
                " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                tpg->se_tpg_tfo->get_fabric_name(), dev->se_hba->hba_id);
@@ -1210,20 +573,19 @@ struct se_lun *core_dev_add_lun(
         */
        if (tpg->se_tpg_tfo->tpg_check_demo_mode(tpg)) {
                struct se_node_acl *acl;
-               spin_lock_irq(&tpg->acl_node_lock);
+
+               mutex_lock(&tpg->acl_node_mutex);
                list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
                        if (acl->dynamic_node_acl &&
                            (!tpg->se_tpg_tfo->tpg_check_demo_mode_login_only ||
                             !tpg->se_tpg_tfo->tpg_check_demo_mode_login_only(tpg))) {
-                               spin_unlock_irq(&tpg->acl_node_lock);
-                               core_tpg_add_node_to_devs(acl, tpg);
-                               spin_lock_irq(&tpg->acl_node_lock);
+                               core_tpg_add_node_to_devs(acl, tpg, lun);
                        }
                }
-               spin_unlock_irq(&tpg->acl_node_lock);
+               mutex_unlock(&tpg->acl_node_mutex);
        }
 
-       return lun;
+       return 0;
 }
 
 /*      core_dev_del_lun():
@@ -1234,7 +596,7 @@ void core_dev_del_lun(
        struct se_portal_group *tpg,
        struct se_lun *lun)
 {
-       pr_debug("%s_TPG[%u]_LUN[%u] - Deactivating %s Logical Unit from"
+       pr_debug("%s_TPG[%u]_LUN[%llu] - Deactivating %s Logical Unit from"
                " device object\n", tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
                tpg->se_tpg_tfo->get_fabric_name());
@@ -1242,72 +604,10 @@ void core_dev_del_lun(
        core_tpg_remove_lun(tpg, lun);
 }
 
-struct se_lun *core_get_lun_from_tpg(struct se_portal_group *tpg, u32 unpacked_lun)
-{
-       struct se_lun *lun;
-
-       spin_lock(&tpg->tpg_lun_lock);
-       if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS"
-                       "_PER_TPG-1: %u for Target Portal Group: %hu\n",
-                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
-                       TRANSPORT_MAX_LUNS_PER_TPG-1,
-                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
-               spin_unlock(&tpg->tpg_lun_lock);
-               return NULL;
-       }
-       lun = tpg->tpg_lun_list[unpacked_lun];
-
-       if (lun->lun_status != TRANSPORT_LUN_STATUS_FREE) {
-               pr_err("%s Logical Unit Number: %u is not free on"
-                       " Target Portal Group: %hu, ignoring request.\n",
-                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
-                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
-               spin_unlock(&tpg->tpg_lun_lock);
-               return NULL;
-       }
-       spin_unlock(&tpg->tpg_lun_lock);
-
-       return lun;
-}
-
-/*      core_dev_get_lun():
- *
- *
- */
-static struct se_lun *core_dev_get_lun(struct se_portal_group *tpg, u32 unpacked_lun)
-{
-       struct se_lun *lun;
-
-       spin_lock(&tpg->tpg_lun_lock);
-       if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
-               pr_err("%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER"
-                       "_TPG-1: %u for Target Portal Group: %hu\n",
-                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
-                       TRANSPORT_MAX_LUNS_PER_TPG-1,
-                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
-               spin_unlock(&tpg->tpg_lun_lock);
-               return NULL;
-       }
-       lun = tpg->tpg_lun_list[unpacked_lun];
-
-       if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
-               pr_err("%s Logical Unit Number: %u is not active on"
-                       " Target Portal Group: %hu, ignoring request.\n",
-                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
-                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
-               spin_unlock(&tpg->tpg_lun_lock);
-               return NULL;
-       }
-       spin_unlock(&tpg->tpg_lun_lock);
-
-       return lun;
-}
-
 struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
        struct se_portal_group *tpg,
        struct se_node_acl *nacl,
-       u32 mapped_lun,
+       u64 mapped_lun,
        int *ret)
 {
        struct se_lun_acl *lacl;
@@ -1325,11 +625,8 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
                return NULL;
        }
 
-       INIT_LIST_HEAD(&lacl->lacl_list);
        lacl->mapped_lun = mapped_lun;
        lacl->se_lun_nacl = nacl;
-       snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",
-                nacl->initiatorname);
 
        return lacl;
 }
@@ -1337,22 +634,16 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
 int core_dev_add_initiator_node_lun_acl(
        struct se_portal_group *tpg,
        struct se_lun_acl *lacl,
-       u32 unpacked_lun,
+       struct se_lun *lun,
        u32 lun_access)
 {
-       struct se_lun *lun;
-       struct se_node_acl *nacl;
-
-       lun = core_dev_get_lun(tpg, unpacked_lun);
-       if (!lun) {
-               pr_err("%s Logical Unit Number: %u is not active on"
-                       " Target Portal Group: %hu, ignoring request.\n",
-                       tpg->se_tpg_tfo->get_fabric_name(), unpacked_lun,
-                       tpg->se_tpg_tfo->tpg_get_tag(tpg));
-               return -EINVAL;
-       }
+       struct se_node_acl *nacl = lacl->se_lun_nacl;
+       /*
+        * rcu_dereference_raw protected by se_lun->lun_group symlink
+        * reference to se_device->dev_group.
+        */
+       struct se_device *dev = rcu_dereference_raw(lun->lun_se_dev);
 
-       nacl = lacl->se_lun_nacl;
        if (!nacl)
                return -EINVAL;
 
@@ -1366,55 +657,43 @@ int core_dev_add_initiator_node_lun_acl(
                        lun_access, nacl, tpg) < 0)
                return -EINVAL;
 
-       spin_lock(&lun->lun_acl_lock);
-       list_add_tail(&lacl->lacl_list, &lun->lun_acl_list);
-       atomic_inc_mb(&lun->lun_acl_count);
-       spin_unlock(&lun->lun_acl_lock);
-
-       pr_debug("%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
+       pr_debug("%s_TPG[%hu]_LUN[%llu->%llu] - Added %s ACL for "
                " InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),
-               tpg->se_tpg_tfo->tpg_get_tag(tpg), unpacked_lun, lacl->mapped_lun,
+               tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun,
                (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) ? "RW" : "RO",
-               lacl->initiatorname);
+               nacl->initiatorname);
        /*
         * Check to see if there are any existing persistent reservation APTPL
         * pre-registrations that need to be enabled for this LUN ACL..
         */
-       core_scsi3_check_aptpl_registration(lun->lun_se_dev, tpg, lun, nacl,
+       core_scsi3_check_aptpl_registration(dev, tpg, lun, nacl,
                                            lacl->mapped_lun);
        return 0;
 }
 
-/*      core_dev_del_initiator_node_lun_acl():
- *
- *
- */
 int core_dev_del_initiator_node_lun_acl(
-       struct se_portal_group *tpg,
        struct se_lun *lun,
        struct se_lun_acl *lacl)
 {
+       struct se_portal_group *tpg = lun->lun_tpg;
        struct se_node_acl *nacl;
+       struct se_dev_entry *deve;
 
        nacl = lacl->se_lun_nacl;
        if (!nacl)
                return -EINVAL;
 
-       spin_lock(&lun->lun_acl_lock);
-       list_del(&lacl->lacl_list);
-       atomic_dec_mb(&lun->lun_acl_count);
-       spin_unlock(&lun->lun_acl_lock);
-
-       core_disable_device_list_for_node(lun, NULL, lacl->mapped_lun,
-               TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg);
-
-       lacl->se_lun = NULL;
+       mutex_lock(&nacl->lun_entry_mutex);
+       deve = target_nacl_find_deve(nacl, lacl->mapped_lun);
+       if (deve)
+               core_disable_device_list_for_node(lun, deve, nacl, tpg);
+       mutex_unlock(&nacl->lun_entry_mutex);
 
-       pr_debug("%s_TPG[%hu]_LUN[%u] - Removed ACL for"
-               " InitiatorNode: %s Mapped LUN: %u\n",
+       pr_debug("%s_TPG[%hu]_LUN[%llu] - Removed ACL for"
+               " InitiatorNode: %s Mapped LUN: %llu\n",
                tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,
-               lacl->initiatorname, lacl->mapped_lun);
+               nacl->initiatorname, lacl->mapped_lun);
 
        return 0;
 }
@@ -1424,10 +703,10 @@ void core_dev_free_initiator_node_lun_acl(
        struct se_lun_acl *lacl)
 {
        pr_debug("%s_TPG[%hu] - Freeing ACL for %s InitiatorNode: %s"
-               " Mapped LUN: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
+               " Mapped LUN: %llu\n", tpg->se_tpg_tfo->get_fabric_name(),
                tpg->se_tpg_tfo->tpg_get_tag(tpg),
                tpg->se_tpg_tfo->get_fabric_name(),
-               lacl->initiatorname, lacl->mapped_lun);
+               lacl->se_lun_nacl->initiatorname, lacl->mapped_lun);
 
        kfree(lacl);
 }
@@ -1473,14 +752,15 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
        struct se_device *dev;
        struct se_lun *xcopy_lun;
 
-       dev = hba->transport->alloc_device(hba, name);
+       dev = hba->backend->ops->alloc_device(hba, name);
        if (!dev)
                return NULL;
 
        dev->dev_link_magic = SE_DEV_LINK_MAGIC;
        dev->se_hba = hba;
-       dev->transport = hba->transport;
-       dev->prot_length = sizeof(struct se_dif_v1_tuple);
+       dev->transport = hba->backend->ops;
+       dev->prot_length = sizeof(struct t10_pi_tuple);
+       dev->hba_index = hba->hba_index;
 
        INIT_LIST_HEAD(&dev->dev_list);
        INIT_LIST_HEAD(&dev->dev_sep_list);
@@ -1496,7 +776,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
        spin_lock_init(&dev->se_tmr_lock);
        spin_lock_init(&dev->qf_cmd_lock);
        sema_init(&dev->caw_sem, 1);
-       atomic_set(&dev->dev_ordered_id, 0);
        INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
        spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
        INIT_LIST_HEAD(&dev->t10_pr.registration_list);
@@ -1513,9 +792,9 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
 
        dev->dev_attrib.da_dev = dev;
        dev->dev_attrib.emulate_model_alias = DA_EMULATE_MODEL_ALIAS;
-       dev->dev_attrib.emulate_dpo = DA_EMULATE_DPO;
-       dev->dev_attrib.emulate_fua_write = DA_EMULATE_FUA_WRITE;
-       dev->dev_attrib.emulate_fua_read = DA_EMULATE_FUA_READ;
+       dev->dev_attrib.emulate_dpo = 1;
+       dev->dev_attrib.emulate_fua_write = 1;
+       dev->dev_attrib.emulate_fua_read = 1;
        dev->dev_attrib.emulate_write_cache = DA_EMULATE_WRITE_CACHE;
        dev->dev_attrib.emulate_ua_intlck_ctrl = DA_EMULATE_UA_INTLLCK_CTRL;
        dev->dev_attrib.emulate_tas = DA_EMULATE_TAS;
@@ -1537,16 +816,59 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
        dev->dev_attrib.max_write_same_len = DA_MAX_WRITE_SAME_LEN;
 
        xcopy_lun = &dev->xcopy_lun;
-       xcopy_lun->lun_se_dev = dev;
-       init_completion(&xcopy_lun->lun_shutdown_comp);
-       INIT_LIST_HEAD(&xcopy_lun->lun_acl_list);
-       spin_lock_init(&xcopy_lun->lun_acl_lock);
-       spin_lock_init(&xcopy_lun->lun_sep_lock);
+       rcu_assign_pointer(xcopy_lun->lun_se_dev, dev);
        init_completion(&xcopy_lun->lun_ref_comp);
+       INIT_LIST_HEAD(&xcopy_lun->lun_deve_list);
+       INIT_LIST_HEAD(&xcopy_lun->lun_dev_link);
+       mutex_init(&xcopy_lun->lun_tg_pt_md_mutex);
+       xcopy_lun->lun_tpg = &xcopy_pt_tpg;
 
        return dev;
 }
 
+/*
+ * Check if the underlying struct block_device request_queue supports
+ * the QUEUE_FLAG_DISCARD bit for UNMAP/WRITE_SAME in SCSI + TRIM
+ * in ATA and we need to set TPE=1
+ */
+bool target_configure_unmap_from_queue(struct se_dev_attrib *attrib,
+                                      struct request_queue *q, int block_size)
+{
+       if (!blk_queue_discard(q))
+               return false;
+
+       attrib->max_unmap_lba_count = (q->limits.max_discard_sectors << 9) /
+                                                               block_size;
+       /*
+        * Currently hardcoded to 1 in Linux/SCSI code..
+        */
+       attrib->max_unmap_block_desc_count = 1;
+       attrib->unmap_granularity = q->limits.discard_granularity / block_size;
+       attrib->unmap_granularity_alignment = q->limits.discard_alignment /
+                                                               block_size;
+       return true;
+}
+EXPORT_SYMBOL(target_configure_unmap_from_queue);
+
+/*
+ * Convert from blocksize advertised to the initiator to the 512 byte
+ * units unconditionally used by the Linux block layer.
+ */
+sector_t target_to_linux_sector(struct se_device *dev, sector_t lb)
+{
+       switch (dev->dev_attrib.block_size) {
+       case 4096:
+               return lb << 3;
+       case 2048:
+               return lb << 2;
+       case 1024:
+               return lb << 1;
+       default:
+               return lb;
+       }
+}
+EXPORT_SYMBOL(target_to_linux_sector);
+
 int target_configure_device(struct se_device *dev)
 {
        struct se_hba *hba = dev->se_hba;
@@ -1679,7 +1001,7 @@ int core_dev_setup_virtual_lun0(void)
                goto out_free_hba;
        }
 
-       hba->transport->set_configfs_dev_params(dev, buf, sizeof(buf));
+       hba->backend->ops->set_configfs_dev_params(dev, buf, sizeof(buf));
 
        ret = target_configure_device(dev);
        if (ret)