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

Pull SCSI target updates from Nicholas Bellinger:
 "This contains the usual set of updates and bugfixes to target-core +
  existing fabric module code, along with a handful of the patches
  destined for v3.3 stable.

  It also contains the necessary target-core infrastructure pieces
  required to run using tcm_qla2xxx.ko WWPNs with the new Qlogic Fibre
  Channel fabric module currently queued in target-pending/for-next-merge,
  and coming for round 2.

  The highlights for this series include:

   - Add target_submit_tmr() helper function for fabric task management
     (andy)
   - Convert tcm_fc to use target_submit_tmr() (andy)
   - Replace target core various cmd flags with a transport state (hch)
   - Convert loopback to use workqueue submission (hch)
   - Convert target core to use array_zalloc for tpg_lun_list (joern)
   - Convert target core to use array_zalloc for device_list (joern)
   - Add target core support for TMR_ABORT_TASK (nab)
   - Add target core se_sess->sess_kref + get/put helpers (nab)
   - Add target core se_node_acl->acl_kref for ->acl_free_comp usage
     (nab)
   - Convert iscsi-target to use target_put_session + sess_kref (nab)
   - Fix tcm_fc fc_exch memory leak in ft_send_resp_status (nab)
   - Fix ib_srpt srpt_handle_cmd send_ioctx->ioctx_kref leak on
     exception (nab)
   - Fix target core up handling of short INQUIRY buffers (roland)
   - Untangle target-core front-end and back-end meanings of max_sectors
     attribute (roland)
   - Set loopback residual field for SCSI commands (roland)
   - Fix target-core 16-bit target ports for SET TARGET PORT GROUPS
     emulation (roland)

  Thanks again to Andy, Christoph, Joern, Roland, and everyone who has
  contributed this round!"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (64 commits)
  ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception
  loopback: Fix transport_generic_allocate_tasks error handling
  iscsi-target: remove improper externs
  iscsi-target: Remove unused variables in iscsi_target_parameters.c
  target: remove obvious warnings
  target: Use array_zalloc for device_list
  target: Use array_zalloc for tpg_lun_list
  target: Fix sense code for unsupported SERVICE ACTION IN
  target: Remove hack to make READ CAPACITY(10) lie if thin provisioning is enabled
  target: Bump core version to v4.1.0-rc2-ml + fabric versions
  tcm_fc: Fix fc_exch memory leak in ft_send_resp_status
  target: Drop unused legacy target_core_fabric_ops API callers
  iscsi-target: Convert to use target_put_session + sess_kref
  target: Convert se_node_acl->acl_group removal to use ->acl_kref
  target: Add se_node_acl->acl_kref for ->acl_free_comp usage
  target: Add se_node_acl->acl_free_comp for NodeACL release path
  target: Add se_sess->sess_kref + get/put helpers
  target: Convert session_lock to irqsave
  target: Fix typo in drivers/target
  iscsi-target: Fix dynamic -> explict NodeACL pointer reference
  ...

4 files changed, 46 insertions, 134 deletions

diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index e05c55100ec6..830657908db8 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -17,7 +17,7 @@
 #ifndef __TCM_FC_H__
 #define __TCM_FC_H__
 
-#define FT_VERSION "0.3"
+#define FT_VERSION "0.4"
 
 #define FT_NAMELEN 32           /* length of ASCII WWPNs including pad */
 #define FT_TPG_NAMELEN 32       /* max length of TPG name */
@@ -113,12 +113,10 @@ struct ft_lport_acl {
  * Commands
  */
 struct ft_cmd {
-        u32 lun;                        /* LUN from request */
         struct ft_sess *sess;           /* session held for cmd */
         struct fc_seq *seq;             /* sequence in exchange mgr */
         struct se_cmd se_cmd;           /* Local TCM I/O descriptor */
         struct fc_frame *req_frame;
-        unsigned char *cdb;             /* pointer to CDB inside frame */
         u32 write_data_len;             /* data received on writes */
         struct work_struct work;
         /* Local sense buffer */
@@ -143,11 +141,8 @@ extern struct target_fabric_configfs *ft_configfs;
 void ft_sess_put(struct ft_sess *);
 int ft_sess_shutdown(struct se_session *);
 void ft_sess_close(struct se_session *);
-void ft_sess_stop(struct se_session *, int, int);
-int ft_sess_logged_in(struct se_session *);
 u32 ft_sess_get_index(struct se_session *);
 u32 ft_sess_get_port_name(struct se_session *, unsigned char *, u32);
-void ft_sess_set_erl0(struct se_session *);
 
 void ft_lport_add(struct fc_lport *, void *);
 void ft_lport_del(struct fc_lport *, void *);
@@ -165,7 +160,6 @@ int ft_write_pending_status(struct se_cmd *);
 u32 ft_get_task_tag(struct se_cmd *);
 int ft_get_cmd_state(struct se_cmd *);
 int ft_queue_tm_resp(struct se_cmd *);
-int ft_is_state_remove(struct se_cmd *);
 
 /*
  * other internal functions.
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 9e7e26c74c79..62dec9715ce5 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -59,9 +59,6 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller)
         se_cmd = &cmd->se_cmd;
         pr_debug("%s: cmd %p sess %p seq %p se_cmd %p\n",
                 caller, cmd, cmd->sess, cmd->seq, se_cmd);
-        pr_debug("%s: cmd %p cdb %p\n",
-                caller, cmd, cmd->cdb);
-        pr_debug("%s: cmd %p lun %d\n", caller, cmd, cmd->lun);
 
         pr_debug("%s: cmd %p data_nents %u len %u se_cmd_flags <0x%x>\n",
                 caller, cmd, se_cmd->t_data_nents,
@@ -81,8 +78,6 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller)
                         caller, cmd, ep->sid, ep->did, ep->oxid, ep->rxid,
                         sp->id, ep->esb_stat);
         }
-        print_hex_dump(KERN_INFO, "ft_dump_cmd ", DUMP_PREFIX_NONE,
-                16, 4, cmd->cdb, MAX_COMMAND_SIZE, 0);
 }
 
 static void ft_free_cmd(struct ft_cmd *cmd)
@@ -249,11 +244,6 @@ int ft_get_cmd_state(struct se_cmd *se_cmd)
         return 0;
 }
 
-int ft_is_state_remove(struct se_cmd *se_cmd)
-{
-        return 0;       /* XXX TBD */
-}
-
 /*
  * FC sequence response handler for follow-on sequences (data) and aborts.
  */
@@ -325,10 +315,12 @@ static void ft_send_resp_status(struct fc_lport *lport,
 
         fc_fill_reply_hdr(fp, rx_fp, FC_RCTL_DD_CMD_STATUS, 0);
         sp = fr_seq(fp);
-        if (sp)
+        if (sp) {
                 lport->tt.seq_send(lport, sp, fp);
-        else
+                lport->tt.exch_done(sp);
+        } else {
                 lport->tt.frame_send(lport, fp);
+        }
 }
 
 /*
@@ -358,16 +350,10 @@ static void ft_send_resp_code_and_free(struct ft_cmd *cmd,
  */
 static void ft_send_tm(struct ft_cmd *cmd)
 {
-        struct se_tmr_req *tmr;
         struct fcp_cmnd *fcp;
-        struct ft_sess *sess;
+        int rc;
         u8 tm_func;
 
-        transport_init_se_cmd(&cmd->se_cmd, &ft_configfs->tf_ops,
-                        cmd->sess->se_sess, 0, DMA_NONE, 0,
-                        &cmd->ft_sense_buffer[0]);
-        target_get_sess_cmd(cmd->sess->se_sess, &cmd->se_cmd, false);
-
         fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp));
 
         switch (fcp->fc_tm_flags) {
@@ -396,44 +382,12 @@ static void ft_send_tm(struct ft_cmd *cmd)
                 return;
         }
 
-        pr_debug("alloc tm cmd fn %d\n", tm_func);
-        tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func, GFP_KERNEL);
-        if (!tmr) {
-                pr_debug("alloc failed\n");
+        /* FIXME: Add referenced task tag for ABORT_TASK */
+        rc = target_submit_tmr(&cmd->se_cmd, cmd->sess->se_sess,
+                &cmd->ft_sense_buffer[0], scsilun_to_int(&fcp->fc_lun),
+                cmd, tm_func, GFP_KERNEL, 0, 0);
+        if (rc < 0)
                 ft_send_resp_code_and_free(cmd, FCP_TMF_FAILED);
-                return;
-        }
-        cmd->se_cmd.se_tmr_req = tmr;
-
-        switch (fcp->fc_tm_flags) {
-        case FCP_TMF_LUN_RESET:
-                cmd->lun = scsilun_to_int((struct scsi_lun *)fcp->fc_lun);
-                if (transport_lookup_tmr_lun(&cmd->se_cmd, cmd->lun) < 0) {
-                        /*
-                         * Make sure to clean up newly allocated TMR request
-                         * since "unable to  handle TMR request because failed
-                         * to get to LUN"
-                         */
-                        pr_debug("Failed to get LUN for TMR func %d, "
-                                  "se_cmd %p, unpacked_lun %d\n",
-                                  tm_func, &cmd->se_cmd, cmd->lun);
-                        ft_dump_cmd(cmd, __func__);
-                        sess = cmd->sess;
-                        transport_send_check_condition_and_sense(&cmd->se_cmd,
-                                cmd->se_cmd.scsi_sense_reason, 0);
-                        ft_sess_put(sess);
-                        return;
-                }
-                break;
-        case FCP_TMF_TGT_RESET:
-        case FCP_TMF_CLR_TASK_SET:
-        case FCP_TMF_ABT_TASK_SET:
-        case FCP_TMF_CLR_ACA:
-                break;
-        default:
-                return;
-        }
-        transport_generic_handle_tmr(&cmd->se_cmd);
 }
 
 /*
@@ -538,7 +492,6 @@ static void ft_send_work(struct work_struct *work)
         struct fc_frame_header *fh = fc_frame_header_get(cmd->req_frame);
         struct fcp_cmnd *fcp;
         int data_dir = 0;
-        u32 data_len;
         int task_attr;
 
         fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp));
@@ -548,47 +501,6 @@ static void ft_send_work(struct work_struct *work)
         if (fcp->fc_flags & FCP_CFL_LEN_MASK)
                 goto err;               /* not handling longer CDBs yet */
 
-        if (fcp->fc_tm_flags) {
-                task_attr = FCP_PTA_SIMPLE;
-                data_dir = DMA_NONE;
-                data_len = 0;
-        } else {
-                switch (fcp->fc_flags & (FCP_CFL_RDDATA | FCP_CFL_WRDATA)) {
-                case 0:
-                        data_dir = DMA_NONE;
-                        break;
-                case FCP_CFL_RDDATA:
-                        data_dir = DMA_FROM_DEVICE;
-                        break;
-                case FCP_CFL_WRDATA:
-                        data_dir = DMA_TO_DEVICE;
-                        break;
-                case FCP_CFL_WRDATA | FCP_CFL_RDDATA:
-                        goto err;       /* TBD not supported by tcm_fc yet */
-                }
-                /*
-                 * Locate the SAM Task Attr from fc_pri_ta
-                 */
-                switch (fcp->fc_pri_ta & FCP_PTA_MASK) {
-                case FCP_PTA_HEADQ:
-                        task_attr = MSG_HEAD_TAG;
-                        break;
-                case FCP_PTA_ORDERED:
-                        task_attr = MSG_ORDERED_TAG;
-                        break;
-                case FCP_PTA_ACA:
-                        task_attr = MSG_ACA_TAG;
-                        break;
-                case FCP_PTA_SIMPLE: /* Fallthrough */
-                default:
-                        task_attr = MSG_SIMPLE_TAG;
-                }
-
-
-                task_attr = fcp->fc_pri_ta & FCP_PTA_MASK;
-                data_len = ntohl(fcp->fc_dl);
-                cmd->cdb = fcp->fc_cdb;
-        }
         /*
          * Check for FCP task management flags
          */
@@ -596,15 +508,46 @@ static void ft_send_work(struct work_struct *work)
                 ft_send_tm(cmd);
                 return;
         }
+
+        switch (fcp->fc_flags & (FCP_CFL_RDDATA | FCP_CFL_WRDATA)) {
+        case 0:
+                data_dir = DMA_NONE;
+                break;
+        case FCP_CFL_RDDATA:
+                data_dir = DMA_FROM_DEVICE;
+                break;
+        case FCP_CFL_WRDATA:
+                data_dir = DMA_TO_DEVICE;
+                break;
+        case FCP_CFL_WRDATA | FCP_CFL_RDDATA:
+                goto err;       /* TBD not supported by tcm_fc yet */
+        }
+        /*
+         * Locate the SAM Task Attr from fc_pri_ta
+         */
+        switch (fcp->fc_pri_ta & FCP_PTA_MASK) {
+        case FCP_PTA_HEADQ:
+                task_attr = MSG_HEAD_TAG;
+                break;
+        case FCP_PTA_ORDERED:
+                task_attr = MSG_ORDERED_TAG;
+                break;
+        case FCP_PTA_ACA:
+                task_attr = MSG_ACA_TAG;
+                break;
+        case FCP_PTA_SIMPLE: /* Fallthrough */
+        default:
+                task_attr = MSG_SIMPLE_TAG;
+        }
+
         fc_seq_exch(cmd->seq)->lp->tt.seq_set_resp(cmd->seq, ft_recv_seq, cmd);
-        cmd->lun = scsilun_to_int((struct scsi_lun *)fcp->fc_lun);
         /*
          * Use a single se_cmd->cmd_kref as we expect to release se_cmd
          * directly from ft_check_stop_free callback in response path.
          */
-        target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb,
-                                &cmd->ft_sense_buffer[0], cmd->lun, data_len,
-                                task_attr, data_dir, 0);
+        target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, fcp->fc_cdb,
+                        &cmd->ft_sense_buffer[0], scsilun_to_int(&fcp->fc_lun),
+                        ntohl(fcp->fc_dl), task_attr, data_dir, 0);
         pr_debug("r_ctl %x alloc target_submit_cmd\n", fh->fh_r_ctl);
         return;
 
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 73852fbc857b..f357039349ba 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -529,9 +529,6 @@ static struct target_core_fabric_ops ft_fabric_ops = {
         .release_cmd =                  ft_release_cmd,
         .shutdown_session =             ft_sess_shutdown,
         .close_session =                ft_sess_close,
-        .stop_session =                 ft_sess_stop,
-        .fall_back_to_erl0 =            ft_sess_set_erl0,
-        .sess_logged_in =               ft_sess_logged_in,
         .sess_get_index =               ft_sess_get_index,
         .sess_get_initiator_sid =       NULL,
         .write_pending =                ft_write_pending,
@@ -544,7 +541,6 @@ static struct target_core_fabric_ops ft_fabric_ops = {
         .queue_tm_rsp =                 ft_queue_tm_resp,
         .get_fabric_sense_len =         ft_get_fabric_sense_len,
         .set_fabric_sense_len =         ft_set_fabric_sense_len,
-        .is_state_remove =              ft_is_state_remove,
         /*
          * Setup function pointers for generic logic in
          * target_core_fabric_configfs.c
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index eff512b5a2a0..cb99da920068 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -309,11 +309,9 @@ int ft_sess_shutdown(struct se_session *se_sess)
 void ft_sess_close(struct se_session *se_sess)
 {
         struct ft_sess *sess = se_sess->fabric_sess_ptr;
-        struct fc_lport *lport;
         u32 port_id;
 
         mutex_lock(&ft_lport_lock);
-        lport = sess->tport->lport;
         port_id = sess->port_id;
         if (port_id == -1) {
                 mutex_unlock(&ft_lport_lock);
@@ -328,20 +326,6 @@ void ft_sess_close(struct se_session *se_sess)
         synchronize_rcu();              /* let transport deregister happen */
 }
 
-void ft_sess_stop(struct se_session *se_sess, int sess_sleep, int conn_sleep)
-{
-        struct ft_sess *sess = se_sess->fabric_sess_ptr;
-
-        pr_debug("port_id %x\n", sess->port_id);
-}
-
-int ft_sess_logged_in(struct se_session *se_sess)
-{
-        struct ft_sess *sess = se_sess->fabric_sess_ptr;
-
-        return sess->port_id != -1;
-}
-
 u32 ft_sess_get_index(struct se_session *se_sess)
 {
         struct ft_sess *sess = se_sess->fabric_sess_ptr;
@@ -357,11 +341,6 @@ u32 ft_sess_get_port_name(struct se_session *se_sess,
         return ft_format_wwn(buf, len, sess->port_name);
 }
 
-void ft_sess_set_erl0(struct se_session *se_sess)
-{
-        /* XXX TBD called when out of memory */
-}
-
 /*
  * libfc ops involving sessions.
  */