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
  ...

1 files changed, 14 insertions, 27 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 1c6f700f5faa..8b1d5e62ed40 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -781,7 +781,7 @@ static int iscsit_alloc_buffs(struct iscsi_cmd *cmd)
         struct scatterlist *sgl;
         u32 length = cmd->se_cmd.data_length;
         int nents = DIV_ROUND_UP(length, PAGE_SIZE);
-        int i = 0, ret;
+        int i = 0, j = 0, ret;
         /*
          * If no SCSI payload is present, allocate the default iovecs used for
          * iSCSI PDU Header
@@ -822,17 +822,15 @@ static int iscsit_alloc_buffs(struct iscsi_cmd *cmd)
          */
         ret = iscsit_allocate_iovecs(cmd);
         if (ret < 0)
-                goto page_alloc_failed;
+                return -ENOMEM;
 
         return 0;
 
 page_alloc_failed:
-        while (i >= 0) {
-                __free_page(sg_page(&sgl[i]));
-                i--;
-        }
-        kfree(cmd->t_mem_sg);
-        cmd->t_mem_sg = NULL;
+        while (j < i)
+                __free_page(sg_page(&sgl[j++]));
+
+        kfree(sgl);
         return -ENOMEM;
 }
 
@@ -1007,8 +1005,8 @@ done:
         /*
          * The CDB is going to an se_device_t.
          */
-        ret = iscsit_get_lun_for_cmd(cmd, hdr->cdb,
-                                get_unaligned_le64(&hdr->lun));
+        ret = transport_lookup_cmd_lun(&cmd->se_cmd,
+                                       scsilun_to_int(&hdr->lun));
         if (ret < 0) {
                 if (cmd->se_cmd.scsi_sense_reason == TCM_NON_EXISTENT_LUN) {
                         pr_debug("Responding to non-acl'ed,"
@@ -1364,7 +1362,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
                  * outstanding_r2ts reaches zero, go ahead and send the delayed
                  * TASK_ABORTED status.
                  */
-                if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
+                if (se_cmd->transport_state & CMD_T_ABORTED) {
                         if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
                                 if (--cmd->outstanding_r2ts < 1) {
                                         iscsit_stop_dataout_timer(cmd);
@@ -1472,14 +1470,12 @@ static int iscsit_handle_nop_out(
         unsigned char *ping_data = NULL;
         int cmdsn_ret, niov = 0, ret = 0, rx_got, rx_size;
         u32 checksum, data_crc, padding = 0, payload_length;
-        u64 lun;
         struct iscsi_cmd *cmd = NULL;
         struct kvec *iov = NULL;
         struct iscsi_nopout *hdr;
 
         hdr                     = (struct iscsi_nopout *) buf;
         payload_length          = ntoh24(hdr->dlength);
-        lun                     = get_unaligned_le64(&hdr->lun);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->ttt                = be32_to_cpu(hdr->ttt);
         hdr->cmdsn              = be32_to_cpu(hdr->cmdsn);
@@ -1689,13 +1685,11 @@ static int iscsit_handle_task_mgt_cmd(
         struct se_tmr_req *se_tmr;
         struct iscsi_tmr_req *tmr_req;
         struct iscsi_tm *hdr;
-        u32 payload_length;
         int out_of_order_cmdsn = 0;
         int ret;
         u8 function;
 
         hdr                     = (struct iscsi_tm *) buf;
-        payload_length          = ntoh24(hdr->dlength);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->rtt                = be32_to_cpu(hdr->rtt);
         hdr->cmdsn              = be32_to_cpu(hdr->cmdsn);
@@ -1747,8 +1741,8 @@ static int iscsit_handle_task_mgt_cmd(
          * Locate the struct se_lun for all TMRs not related to ERL=2 TASK_REASSIGN
          */
         if (function != ISCSI_TM_FUNC_TASK_REASSIGN) {
-                ret = iscsit_get_lun_for_tmr(cmd,
-                                get_unaligned_le64(&hdr->lun));
+                ret = transport_lookup_tmr_lun(&cmd->se_cmd,
+                                               scsilun_to_int(&hdr->lun));
                 if (ret < 0) {
                         cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                         se_tmr->response = ISCSI_TMF_RSP_NO_LUN;
@@ -2207,14 +2201,10 @@ static int iscsit_handle_snack(
         struct iscsi_conn *conn,
         unsigned char *buf)
 {
-        u32 unpacked_lun;
-        u64 lun;
         struct iscsi_snack *hdr;
 
         hdr                     = (struct iscsi_snack *) buf;
         hdr->flags              &= ~ISCSI_FLAG_CMD_FINAL;
-        lun                     = get_unaligned_le64(&hdr->lun);
-        unpacked_lun            = scsilun_to_int((struct scsi_lun *)&lun);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->ttt                = be32_to_cpu(hdr->ttt);
         hdr->exp_statsn         = be32_to_cpu(hdr->exp_statsn);
@@ -3514,7 +3504,6 @@ int iscsi_target_tx_thread(void *arg)
         struct iscsi_cmd *cmd = NULL;
         struct iscsi_conn *conn;
         struct iscsi_queue_req *qr = NULL;
-        struct se_cmd *se_cmd;
         struct iscsi_thread_set *ts = arg;
         /*
          * Allow ourselves to be interrupted by SIGINT so that a
@@ -3697,8 +3686,6 @@ check_rsp_state:
                                 goto transport_err;
                         }
 
-                        se_cmd = &cmd->se_cmd;
-
                         if (map_sg && !conn->conn_ops->IFMarker) {
                                 if (iscsit_fe_sendpage_sg(cmd, conn) < 0) {
                                         conn->tx_response_queue = 0;
@@ -4171,7 +4158,7 @@ int iscsit_close_connection(
         if (!atomic_read(&sess->session_reinstatement) &&
              atomic_read(&sess->session_fall_back_to_erl0)) {
                 spin_unlock_bh(&sess->conn_lock);
-                iscsit_close_session(sess);
+                target_put_session(sess->se_sess);
 
                 return 0;
         } else if (atomic_read(&sess->session_logout)) {
@@ -4292,7 +4279,7 @@ static void iscsit_logout_post_handler_closesession(
         iscsit_dec_conn_usage_count(conn);
         iscsit_stop_session(sess, 1, 1);
         iscsit_dec_session_usage_count(sess);
-        iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
 }
 
 static void iscsit_logout_post_handler_samecid(
@@ -4458,7 +4445,7 @@ int iscsit_free_session(struct iscsi_session *sess)
         } else
                 spin_unlock_bh(&sess->conn_lock);
 
-        iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
         return 0;
 }