OSDN Git Service

scsi: libsas: Handle non-TMF codes in sas_scsi_find_task()
authorJohn Garry <john.garry@huawei.com>
Thu, 17 Feb 2022 15:42:29 +0000 (23:42 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 19 Feb 2022 20:59:34 +0000 (15:59 -0500)
LLDD TMF callbacks may return linux or other error codes instead of TMF
codes. This may cause problems in sas_scsi_find_task() ->
.lldd_query_task(), as only TMF codes are handled there. As such, we may
not return a task_disposition type from sas_scsi_find_task(). Function
sas_eh_handle_sas_errors() only handles that type, and will only progress
error handling for those recognised types.

Return TASK_ABORT_FAILED upon exit on the assumption that the command may
still be alive and error handling should be escalated.

Link: https://lore.kernel.org/r/1645112566-115804-2-git-send-email-john.garry@huawei.com
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/libsas/sas_scsi_host.c

index bcb391b..19cb954 100644 (file)
@@ -316,11 +316,13 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task)
                                pr_notice("%s: task 0x%p failed to abort\n",
                                          __func__, task);
                                return TASK_ABORT_FAILED;
+                       default:
+                               pr_notice("%s: task 0x%p result code %d not handled\n",
+                                         __func__, task, res);
                        }
-
                }
        }
-       return res;
+       return TASK_ABORT_FAILED;
 }
 
 static int sas_recover_lu(struct domain_device *dev, struct scsi_cmnd *cmd)