releases/4.8.5/target-don-t-override-extended_copy-xcopy_pt_cmd-scsi-status-code.patch

   1 From 926317de33998c112c5510301868ea9aa34097e2 Mon Sep 17 00:00:00 2001
   2 From: Dinesh Israni <ddi@datera.io>
   3 Date: Mon, 10 Oct 2016 20:22:03 -0700
   4 Subject: target: Don't override EXTENDED_COPY xcopy_pt_cmd SCSI status code
   5
   6 From: Dinesh Israni <ddi@datera.io>
   7
   8 commit 926317de33998c112c5510301868ea9aa34097e2 upstream.
   9
  10 This patch addresses a bug where a local EXTENDED_COPY WRITE or READ
  11 backend I/O request would always return SAM_STAT_CHECK_CONDITION,
  12 even if underlying xcopy_pt_cmd->se_cmd generated a different
  13 SCSI status code.
  14
  15 ESX host environments expect to hit SAM_STAT_RESERVATION_CONFLICT
  16 for certain scenarios, and SAM_STAT_CHECK_CONDITION results in
  17 non-retriable status for these cases.
  18
  19 Tested on v4.1.y with ESX v5.5u2+ with local IBLOCK backend copy.
  20
  21 Reported-by: Nixon Vincent <nixon.vincent@calsoftinc.com>
  22 Tested-by: Nixon Vincent <nixon.vincent@calsoftinc.com>
  23 Cc: Nixon Vincent <nixon.vincent@calsoftinc.com>
  24 Tested-by: Dinesh Israni <ddi@datera.io>
  25 Signed-off-by: Dinesh Israni <ddi@datera.io>
  26 Cc: Dinesh Israni <ddi@datera.io>
  27 Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  28 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  29
  30 ---
  31  drivers/target/target_core_xcopy.c |   16 ++++++++++++----
  32  1 file changed, 12 insertions(+), 4 deletions(-)
  33
  34 --- a/drivers/target/target_core_xcopy.c
  35 +++ b/drivers/target/target_core_xcopy.c
  36 @@ -662,6 +662,7 @@ static int target_xcopy_read_source(
  37         rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, src_dev, &cdb[0],
  38                                 remote_port, true);
  39         if (rc < 0) {
  40 +               ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;
  41                 transport_generic_free_cmd(se_cmd, 0);
  42                 return rc;
  43         }
  44 @@ -673,6 +674,7 @@ static int target_xcopy_read_source(
  45
  46         rc = target_xcopy_issue_pt_cmd(xpt_cmd);
  47         if (rc < 0) {
  48 +               ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;
  49                 transport_generic_free_cmd(se_cmd, 0);
  50                 return rc;
  51         }
  52 @@ -723,6 +725,7 @@ static int target_xcopy_write_destinatio
  53                                 remote_port, false);
  54         if (rc < 0) {
  55                 struct se_cmd *src_cmd = &xop->src_pt_cmd->se_cmd;
  56 +               ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;
  57                 /*
  58                  * If the failure happened before the t_mem_list hand-off in
  59                  * target_xcopy_setup_pt_cmd(), Reset memory + clear flag so that
  60 @@ -738,6 +741,7 @@ static int target_xcopy_write_destinatio
  61
  62         rc = target_xcopy_issue_pt_cmd(xpt_cmd);
  63         if (rc < 0) {
  64 +               ec_cmd->scsi_status = xpt_cmd->se_cmd.scsi_status;
  65                 se_cmd->se_cmd_flags &= ~SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC;
  66                 transport_generic_free_cmd(se_cmd, 0);
  67                 return rc;
  68 @@ -824,10 +828,14 @@ static void target_xcopy_do_work(struct
  69  out:
  70         xcopy_pt_undepend_remotedev(xop);
  71         kfree(xop);
  72 -
  73 -       pr_warn_ratelimited("target_xcopy_do_work: rc: %d, Setting X-COPY CHECK_CONDITION"
  74 -                           " -> sending response\n", rc);
  75 -       ec_cmd->scsi_status = SAM_STAT_CHECK_CONDITION;
  76 +       /*
  77 +        * Don't override an error scsi status if it has already been set
  78 +        */
  79 +       if (ec_cmd->scsi_status == SAM_STAT_GOOD) {
  80 +               pr_warn_ratelimited("target_xcopy_do_work: rc: %d, Setting X-COPY"
  81 +                       " CHECK_CONDITION -> sending response\n", rc);
  82 +               ec_cmd->scsi_status = SAM_STAT_CHECK_CONDITION;
  83 +       }
  84         target_complete_cmd(ec_cmd, SAM_STAT_CHECK_CONDITION);
  85  }
  86