releases/4.4.154/scsi-vmw_pvscsi-return-did_reset-for-status-sam_stat_command_terminated.patch

   1 From foo@baz Tue Aug 28 16:10:37 CEST 2018
   2 From: Jim Gill <jgill@vmware.com>
   3 Date: Thu, 2 Aug 2018 14:13:30 -0700
   4 Subject: scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED
   5
   6 From: Jim Gill <jgill@vmware.com>
   7
   8 [ Upstream commit e95153b64d03c2b6e8d62e51bdcc33fcad6e0856 ]
   9
  10 Commands that are reset are returned with status
  11 SAM_STAT_COMMAND_TERMINATED. PVSCSI currently returns DID_OK |
  12 SAM_STAT_COMMAND_TERMINATED which fails the command. Instead, set hostbyte
  13 to DID_RESET to allow upper layers to retry.
  14
  15 Tested by copying a large file between two pvscsi disks on same adapter
  16 while performing a bus reset at 1-second intervals. Before fix, commands
  17 sometimes fail with DID_OK. After fix, commands observed to fail with
  18 DID_RESET.
  19
  20 Signed-off-by: Jim Gill <jgill@vmware.com>
  21 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  22 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24 ---
  25  drivers/scsi/vmw_pvscsi.c |   11 ++++++++---
  26  1 file changed, 8 insertions(+), 3 deletions(-)
  27
  28 --- a/drivers/scsi/vmw_pvscsi.c
  29 +++ b/drivers/scsi/vmw_pvscsi.c
  30 @@ -545,9 +545,14 @@ static void pvscsi_complete_request(stru
  31             (btstat == BTSTAT_SUCCESS ||
  32              btstat == BTSTAT_LINKED_COMMAND_COMPLETED ||
  33              btstat == BTSTAT_LINKED_COMMAND_COMPLETED_WITH_FLAG)) {
  34 -               cmd->result = (DID_OK << 16) | sdstat;
  35 -               if (sdstat == SAM_STAT_CHECK_CONDITION && cmd->sense_buffer)
  36 -                       cmd->result |= (DRIVER_SENSE << 24);
  37 +               if (sdstat == SAM_STAT_COMMAND_TERMINATED) {
  38 +                       cmd->result = (DID_RESET << 16);
  39 +               } else {
  40 +                       cmd->result = (DID_OK << 16) | sdstat;
  41 +                       if (sdstat == SAM_STAT_CHECK_CONDITION &&
  42 +                           cmd->sense_buffer)
  43 +                               cmd->result |= (DRIVER_SENSE << 24);
  44 +               }
  45         } else
  46                 switch (btstat) {
  47                 case BTSTAT_SUCCESS: