[PATCH RFC v3 4/7] ata: libata: Add ata_internal_timeout()

John Garry
2022-10-25T10:11:31Z

Add a internal command timeout handler. Also hook into libsas timeout
handler.

Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/ata/libata-scsi.c | 10 ++++++++++
drivers/scsi/libsas/sas_scsi_host.c | 5 +++++
include/linux/libata.h | 2 ++
3 files changed, 17 insertions(+)

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 18c60addf943..cbf266c9d4c2 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1138,6 +1138,16 @@ int ata_internal_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
}
EXPORT_SYMBOL_GPL(ata_internal_queuecommand);

+enum blk_eh_timer_return ata_internal_timeout(struct scsi_cmnd *scmd)
+{
+ struct request *rq = blk_mq_rq_from_pdu(scmd);
+ struct completion *wait = rq->end_io_data;
+
+ complete(wait);
+ return BLK_EH_DONE;
+}
+EXPORT_SYMBOL_GPL(ata_internal_timeout);
+
/**
* ata_scsi_slave_config - Set SCSI device attributes
* @sdev: SCSI device to examine
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 4fdd84868ac2..9d2122e65fba 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -921,10 +921,15 @@ void sas_task_complete_internal(struct sas_task *task)

enum blk_eh_timer_return sas_internal_timeout(struct scsi_cmnd *scmd)
{
+ struct domain_device *dev = cmd_to_domain_dev(scmd);
struct sas_task *task = TO_SAS_TASK(scmd);
bool is_completed = true;
unsigned long flags;

+ /* Handle libata internal command */
+ if (dev_is_sata(dev) && !task->slow_task)
+ return ata_internal_timeout(scmd);
+
spin_lock_irqsave(&task->task_state_lock, flags);
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
task->task_state_flags |= SAS_TASK_STATE_ABORTED;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 1a03c7fbb4e6..d5a15d1a5c4d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1143,6 +1143,7 @@ extern void ata_scsi_unlock_native_capacity(struct scsi_device *sdev);
extern int ata_scsi_slave_config(struct scsi_device *sdev);
extern int ata_internal_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scmd);
+extern enum blk_eh_timer_return ata_internal_timeout(struct scsi_cmnd *scmd);
extern int ata_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd);
extern void ata_scsi_slave_destroy(struct scsi_device *sdev);
extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
@@ -1397,6 +1398,7 @@ extern const struct attribute_group *ata_common_sdev_groups[];
.max_sectors = ATA_MAX_SECTORS_LBA48,\
.reserved_queuecommand = ata_internal_queuecommand,\
.cmd_size = sizeof(struct ata_queued_cmd),\
+ .reserved_timedout = ata_internal_timeout,\
.init_cmd_priv = ata_init_cmd_priv

#define ATA_SUBBASE_SHT(drv_name) \
--
2.35.3