Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly update of the usual drivers: arcmsr, qla2xxx, lpfc,
  hisi_sas, target/iscsi and target/core.

  Additionally Christoph refactored gdth as part of the dma changes. The
  major mid-layer change this time is the removal of bidi commands and
  with them the whole of the osd/exofs driver and filesystem. This is a
  major simplification for block and mq in particular"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (240 commits)
  scsi: cxgb4i: validate tcp sequence number only if chip version <= T5
  scsi: cxgb4i: get pf number from lldi->pf
  scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
  scsi: mpt3sas: Add missing breaks in switch statements
  scsi: aacraid: Fix missing break in switch statement
  scsi: kill command serial number
  scsi: csiostor: drop serial_number usage
  scsi: mvumi: use request tag instead of serial_number
  scsi: dpt_i2o: remove serial number usage
  scsi: st: osst: Remove negative constant left-shifts
  scsi: ufs-bsg: Allow reading descriptors
  scsi: ufs: Allow reading descriptor via raw upiu
  scsi: ufs-bsg: Change the calling convention for write descriptor
  scsi: ufs: Remove unused device quirks
  Revert "scsi: ufs: disable vccq if it's not needed by UFS device"
  scsi: megaraid_sas: Remove a bunch of set but not used variables
  scsi: clean obsolete return values of eh_timed_out
  scsi: sd: Optimal I/O size should be a multiple of physical block size
  scsi: MAINTAINERS: SCSI initiator and target tweaks
  scsi: fcoe: make use of fip_mode enum complete
  ...

3 files changed, 36 insertions, 50 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index e3dd13798d79..989f1ac4245c 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1186,7 +1186,7 @@ sequence_cmd:
         rc = iscsit_sequence_cmd(conn, cmd, buf, hdr->cmdsn);
 
         if (!rc && dump_payload == false && unsol_data)
-                iscsit_set_unsoliticed_dataout(cmd);
+                iscsit_set_unsolicited_dataout(cmd);
         else if (dump_payload && imm_data)
                 target_put_sess_cmd(&cmd->se_cmd);
 
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index e9c336cff8f5..1a039f16d315 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1217,22 +1217,15 @@ static int srpt_ch_qp_err(struct srpt_rdma_ch *ch)
 static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch)
 {
         struct srpt_send_ioctx *ioctx;
-        unsigned long flags;
+        int tag, cpu;
 
         BUG_ON(!ch);
 
-        ioctx = NULL;
-        spin_lock_irqsave(&ch->spinlock, flags);
-        if (!list_empty(&ch->free_list)) {
-                ioctx = list_first_entry(&ch->free_list,
-                                         struct srpt_send_ioctx, free_list);
-                list_del(&ioctx->free_list);
-        }
-        spin_unlock_irqrestore(&ch->spinlock, flags);
-
-        if (!ioctx)
-                return ioctx;
+        tag = sbitmap_queue_get(&ch->sess->sess_tag_pool, &cpu);
+        if (tag < 0)
+                return NULL;
 
+        ioctx = ch->ioctx_ring[tag];
         BUG_ON(ioctx->ch != ch);
         ioctx->state = SRPT_STATE_NEW;
         WARN_ON_ONCE(ioctx->recv_ioctx);
@@ -1245,6 +1238,8 @@ static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch)
          */
         memset(&ioctx->cmd, 0, sizeof(ioctx->cmd));
         memset(&ioctx->sense_data, 0, sizeof(ioctx->sense_data));
+        ioctx->cmd.map_tag = tag;
+        ioctx->cmd.map_cpu = cpu;
 
         return ioctx;
 }
@@ -1505,7 +1500,7 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch,
                         pr_err("0x%llx: parsing SRP descriptor table failed.\n",
                                srp_cmd->tag);
                 }
-                goto release_ioctx;
+                goto busy;
         }
 
         rc = target_submit_cmd_map_sgls(cmd, ch->sess, srp_cmd->cdb,
@@ -1516,13 +1511,12 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch,
         if (rc != 0) {
                 pr_debug("target_submit_cmd() returned %d for tag %#llx\n", rc,
                          srp_cmd->tag);
-                goto release_ioctx;
+                goto busy;
         }
         return;
 
-release_ioctx:
-        send_ioctx->state = SRPT_STATE_DONE;
-        srpt_release_cmd(cmd);
+busy:
+        target_send_busy(cmd);
 }
 
 static int srp_tmr_to_tcm(int fn)
@@ -1582,11 +1576,9 @@ static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch,
                                TARGET_SCF_ACK_KREF);
         if (rc != 0) {
                 send_ioctx->cmd.se_tmr_req->response = TMR_FUNCTION_REJECTED;
-                goto fail;
+                cmd->se_tfo->queue_tm_rsp(cmd);
         }
         return;
-fail:
-        transport_send_check_condition_and_sense(cmd, 0, 0); // XXX:
 }
 
 /**
@@ -2151,7 +2143,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
         struct srpt_rdma_ch *ch = NULL;
         char i_port_id[36];
         u32 it_iu_len;
-        int i, ret;
+        int i, tag_num, tag_size, ret;
 
         WARN_ON_ONCE(irqs_disabled());
 
@@ -2251,11 +2243,8 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
                 goto free_rsp_cache;
         }
 
-        INIT_LIST_HEAD(&ch->free_list);
-        for (i = 0; i < ch->rq_size; i++) {
+        for (i = 0; i < ch->rq_size; i++)
                 ch->ioctx_ring[i]->ch = ch;
-                list_add_tail(&ch->ioctx_ring[i]->free_list, &ch->free_list);
-        }
         if (!sdev->use_srq) {
                 u16 imm_data_offset = req->req_flags & SRP_IMMED_REQUESTED ?
                         be16_to_cpu(req->imm_data_offset) : 0;
@@ -2309,18 +2298,20 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
 
         pr_debug("registering session %s\n", ch->sess_name);
 
+        tag_num = ch->rq_size;
+        tag_size = 1; /* ib_srpt does not use se_sess->sess_cmd_map */
         if (sport->port_guid_tpg.se_tpg_wwn)
-                ch->sess = target_setup_session(&sport->port_guid_tpg, 0, 0,
-                                                TARGET_PROT_NORMAL,
+                ch->sess = target_setup_session(&sport->port_guid_tpg, tag_num,
+                                                tag_size, TARGET_PROT_NORMAL,
                                                 ch->sess_name, ch, NULL);
         if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))
-                ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,
-                                        TARGET_PROT_NORMAL, i_port_id, ch,
-                                        NULL);
+                ch->sess = target_setup_session(&sport->port_gid_tpg, tag_num,
+                                        tag_size, TARGET_PROT_NORMAL, i_port_id,
+                                        ch, NULL);
         /* Retry without leading "0x" */
         if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))
-                ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,
-                                                TARGET_PROT_NORMAL,
+                ch->sess = target_setup_session(&sport->port_gid_tpg, tag_num,
+                                                tag_size, TARGET_PROT_NORMAL,
                                                 i_port_id + 2, ch, NULL);
         if (IS_ERR_OR_NULL(ch->sess)) {
                 WARN_ON_ONCE(ch->sess == NULL);
@@ -2703,14 +2694,6 @@ static int srpt_rdma_cm_handler(struct rdma_cm_id *cm_id,
         return ret;
 }
 
-static int srpt_write_pending_status(struct se_cmd *se_cmd)
-{
-        struct srpt_send_ioctx *ioctx;
-
-        ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);
-        return ioctx->state == SRPT_STATE_NEED_DATA;
-}
-
 /*
  * srpt_write_pending - Start data transfer from initiator to target (write).
  */
@@ -2887,8 +2870,19 @@ static void srpt_queue_tm_rsp(struct se_cmd *cmd)
         srpt_queue_response(cmd);
 }
 
+/*
+ * This function is called for aborted commands if no response is sent to the
+ * initiator. Make sure that the credits freed by aborting a command are
+ * returned to the initiator the next time a response is sent by incrementing
+ * ch->req_lim_delta.
+ */
 static void srpt_aborted_task(struct se_cmd *cmd)
 {
+        struct srpt_send_ioctx *ioctx = container_of(cmd,
+                                struct srpt_send_ioctx, cmd);
+        struct srpt_rdma_ch *ch = ioctx->ch;
+
+        atomic_inc(&ch->req_lim_delta);
 }
 
 static int srpt_queue_status(struct se_cmd *cmd)
@@ -3290,7 +3284,6 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
                                 struct srpt_send_ioctx, cmd);
         struct srpt_rdma_ch *ch = ioctx->ch;
         struct srpt_recv_ioctx *recv_ioctx = ioctx->recv_ioctx;
-        unsigned long flags;
 
         WARN_ON_ONCE(ioctx->state != SRPT_STATE_DONE &&
                      !(ioctx->cmd.transport_state & CMD_T_ABORTED));
@@ -3306,9 +3299,7 @@ static void srpt_release_cmd(struct se_cmd *se_cmd)
                 ioctx->n_rw_ctx = 0;
         }
 
-        spin_lock_irqsave(&ch->spinlock, flags);
-        list_add(&ioctx->free_list, &ch->free_list);
-        spin_unlock_irqrestore(&ch->spinlock, flags);
+        target_free_tag(se_cmd->se_sess, se_cmd);
 }
 
 /**
@@ -3806,7 +3797,6 @@ static const struct target_core_fabric_ops srpt_template = {
         .sess_get_index                 = srpt_sess_get_index,
         .sess_get_initiator_sid         = NULL,
         .write_pending                  = srpt_write_pending,
-        .write_pending_status           = srpt_write_pending_status,
         .set_default_node_attributes    = srpt_set_default_node_attrs,
         .get_cmd_state                  = srpt_get_tcm_cmd_state,
         .queue_data_in                  = srpt_queue_data_in,
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index 39b3e50baf3d..ee9f20e9177a 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -207,7 +207,6 @@ struct srpt_rw_ctx {
  * @rw_ctxs:     RDMA read/write contexts.
  * @imm_sg:      Scatterlist for immediate data.
  * @rdma_cqe:    RDMA completion queue element.
- * @free_list:   Node in srpt_rdma_ch.free_list.
  * @state:       I/O context state.
  * @cmd:         Target core command data structure.
  * @sense_data:  SCSI sense data.
@@ -227,7 +226,6 @@ struct srpt_send_ioctx {
         struct scatterlist      imm_sg;
 
         struct ib_cqe           rdma_cqe;
-        struct list_head        free_list;
         enum srpt_command_state state;
         struct se_cmd           cmd;
         u8                      n_rdma;
@@ -277,7 +275,6 @@ enum rdma_ch_state {
  * @req_lim_delta: Number of credits not yet sent back to the initiator.
  * @imm_data_offset: Offset from start of SRP_CMD for immediate data.
  * @spinlock:      Protects free_list and state.
- * @free_list:     Head of list with free send I/O contexts.
  * @state:         channel state. See also enum rdma_ch_state.
  * @using_rdma_cm: Whether the RDMA/CM or IB/CM is used for this channel.
  * @processing_wait_list: Whether or not cmd_wait_list is being processed.
@@ -318,7 +315,6 @@ struct srpt_rdma_ch {
         atomic_t                req_lim_delta;
         u16                     imm_data_offset;
         spinlock_t              spinlock;
-        struct list_head        free_list;
         enum rdma_ch_state      state;
         struct kmem_cache       *rsp_buf_cache;
         struct srpt_send_ioctx  **ioctx_ring;