git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From eb3fe263a48b0d27b229c213929c4cb3b1b39a0f Mon Sep 17 00:00:00 2001
   2 From: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
   3 Date: Wed, 23 Aug 2017 04:47:04 -0700
   4 Subject: scsi: megaraid_sas: Return pended IOCTLs with cmd_status MFI_STAT_WRONG_STATE in case adapter is dead
   5
   6 From: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
   7
   8 commit eb3fe263a48b0d27b229c213929c4cb3b1b39a0f upstream.
   9
  10 After a kill adapter, since the cmd_status is not set, the IOCTLs will
  11 be hung in driver resulting in application hang.  Set cmd_status
  12 MFI_STAT_WRONG_STATE when completing pended IOCTLs.
  13
  14 Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
  15 Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
  16 Reviewed-by: Hannes Reinecke <hare@suse.com>
  17 Reviewed-by: Tomas Henzl <thenzl@redhat.com>
  18 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/scsi/megaraid/megaraid_sas_base.c |    5 ++++-
  23  1 file changed, 4 insertions(+), 1 deletion(-)
  24
  25 --- a/drivers/scsi/megaraid/megaraid_sas_base.c
  26 +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
  27 @@ -1824,9 +1824,12 @@ static void megasas_complete_outstanding
  28                         if (cmd_fusion->sync_cmd_idx != (u32)ULONG_MAX) {
  29                                 cmd_mfi = instance->cmd_list[cmd_fusion->sync_cmd_idx];
  30                                 if (cmd_mfi->sync_cmd &&
  31 -                                       cmd_mfi->frame->hdr.cmd != MFI_CMD_ABORT)
  32 +                                   (cmd_mfi->frame->hdr.cmd != MFI_CMD_ABORT)) {
  33 +                                       cmd_mfi->frame->hdr.cmd_status =
  34 +                                                       MFI_STAT_WRONG_STATE;
  35                                         megasas_complete_cmd(instance,
  36                                                              cmd_mfi, DID_OK);
  37 +                               }
  38                         }
  39                 }
  40         } else {