target: Don't force session reset if queue_depth does not change

[karo-tx-linux.git] / drivers / target / target_core_sbc.c

diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index df7b6e95c019dd91ee56671d93e03a3356fb51b9..a0ad618f1b1ada886058322a0224b26b0f74ccb0 100644 (file)
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -507,8 +507,11 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
         * been failed with a non-zero SCSI status.
         */
        if (cmd->scsi_status) {
-               pr_err("compare_and_write_callback: non zero scsi_status:"
+               pr_debug("compare_and_write_callback: non zero scsi_status:"
                        " 0x%02x\n", cmd->scsi_status);
+               *post_ret = 1;
+               if (cmd->scsi_status == SAM_STAT_CHECK_CONDITION)
+                       ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                goto out;
        }
 
@@ -519,8 +522,8 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
                goto out;
        }
 
-       write_sg = kmalloc(sizeof(struct scatterlist) * cmd->t_data_nents,
-                          GFP_KERNEL);
+       write_sg = kmalloc_array(cmd->t_data_nents, sizeof(*write_sg),
+                                GFP_KERNEL);
        if (!write_sg) {
                pr_err("Unable to allocate compare_and_write sg\n");
                ret = TCM_OUT_OF_RESOURCES;
@@ -604,7 +607,7 @@ static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool succes
 
        spin_lock_irq(&cmd->t_state_lock);
        cmd->t_state = TRANSPORT_PROCESSING;
-       cmd->transport_state |= CMD_T_ACTIVE|CMD_T_BUSY|CMD_T_SENT;
+       cmd->transport_state |= CMD_T_ACTIVE | CMD_T_SENT;
        spin_unlock_irq(&cmd->t_state_lock);
 
        __target_execute_cmd(cmd, false);
@@ -828,6 +831,60 @@ sbc_check_dpofua(struct se_device *dev, struct se_cmd *cmd, unsigned char *cdb)
        return 0;
 }
 
+/**
+ * sbc_parse_verify - parse VERIFY, VERIFY_16 and WRITE VERIFY commands
+ * @cmd:     (in)  structure that describes the SCSI command to be parsed.
+ * @sectors: (out) Number of logical blocks on the storage medium that will be
+ *           affected by the SCSI command.
+ * @bufflen: (out) Expected length of the SCSI Data-Out buffer.
+ */
+static sense_reason_t sbc_parse_verify(struct se_cmd *cmd, int *sectors,
+                                      u32 *bufflen)
+{
+       struct se_device *dev = cmd->se_dev;
+       u8 *cdb = cmd->t_task_cdb;
+       u8 bytchk = (cdb[1] >> 1) & 3;
+       sense_reason_t ret;
+
+       switch (cdb[0]) {
+       case VERIFY:
+       case WRITE_VERIFY:
+               *sectors = transport_get_sectors_10(cdb);
+               cmd->t_task_lba = transport_lba_32(cdb);
+               break;
+       case VERIFY_16:
+       case WRITE_VERIFY_16:
+               *sectors = transport_get_sectors_16(cdb);
+               cmd->t_task_lba = transport_lba_64(cdb);
+               break;
+       default:
+               WARN_ON_ONCE(true);
+               return TCM_UNSUPPORTED_SCSI_OPCODE;
+       }
+
+       if (sbc_check_dpofua(dev, cmd, cdb))
+               return TCM_INVALID_CDB_FIELD;
+
+       ret = sbc_check_prot(dev, cmd, cdb, *sectors, true);
+       if (ret)
+               return ret;
+
+       switch (bytchk) {
+       case 0:
+               *bufflen = 0;
+               break;
+       case 1:
+               *bufflen = sbc_get_size(cmd, *sectors);
+               cmd->se_cmd_flags |= SCF_SCSI_DATA_CDB;
+               break;
+       default:
+               pr_err("Unsupported BYTCHK value %d for SCSI opcode %#x\n",
+                      bytchk, cdb[0]);
+               return TCM_INVALID_CDB_FIELD;
+       }
+       return TCM_NO_SENSE;
+}
+
 sense_reason_t
 sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
 {
@@ -895,7 +952,6 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                cmd->execute_cmd = sbc_execute_rw;
                break;
        case WRITE_10:
-       case WRITE_VERIFY:
                sectors = transport_get_sectors_10(cdb);
                cmd->t_task_lba = transport_lba_32(cdb);
 
@@ -909,6 +965,13 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                cmd->se_cmd_flags |= SCF_SCSI_DATA_CDB;
                cmd->execute_cmd = sbc_execute_rw;
                break;
+       case WRITE_VERIFY:
+       case WRITE_VERIFY_16:
+               ret = sbc_parse_verify(cmd, &sectors, &size);
+               if (ret)
+                       return ret;
+               cmd->execute_cmd = sbc_execute_rw;
+               goto check_lba;
        case WRITE_12:
                sectors = transport_get_sectors_12(cdb);
                cmd->t_task_lba = transport_lba_32(cdb);
@@ -1105,9 +1168,10 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
                        return ret;
                break;
        case VERIFY:
-               size = 0;
-               sectors = transport_get_sectors_10(cdb);
-               cmd->t_task_lba = transport_lba_32(cdb);
+       case VERIFY_16:
+               ret = sbc_parse_verify(cmd, &sectors, &size);
+               if (ret)
+                       return ret;
                cmd->execute_cmd = sbc_emulate_noop;
                goto check_lba;
        case REZERO_UNIT: