@@ -899,24 +899,6 @@ void sas_task_internal_done(struct sas_task *task)
complete(&task->slow_task->completion);
}
-void sas_task_internal_timedout(struct timer_list *t)
-{
- struct sas_task_slow *slow = from_timer(slow, t, timer);
- struct sas_task *task = slow->task;
- bool is_completed = true;
- unsigned long flags;
-
- 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;
- is_completed = false;
- }
- spin_unlock_irqrestore(&task->task_state_lock, flags);
-
- if (!is_completed)
- complete(&task->slow_task->completion);
-}
-
#define TASK_TIMEOUT (20 * HZ)
#define TASK_RETRY 3
@@ -979,35 +961,52 @@ static int sas_execute_internal_abort(struct domain_device *device,
{
struct sas_ha_struct *ha = device->port->ha;
struct sas_internal *i = to_sas_internal(ha->core.shost->transportt);
+ struct Scsi_Host *shost = ha->core.shost;
struct sas_task *task = NULL;
int res, retry;
+ struct request_queue *request_queue;
+ struct request *rq;
+
+ request_queue = sas_alloc_request_queue(shost);
+ if (IS_ERR(request_queue))
+ return PTR_ERR(request_queue);
for (retry = 0; retry < TASK_RETRY; retry++) {
+ struct scsi_cmnd *scmd;
+
task = sas_alloc_slow_task(GFP_KERNEL);
- if (!task)
- return -ENOMEM;
+ if (!task) {
+ res = -ENOMEM;
+ break;
+ }
task->dev = device;
task->task_proto = SAS_PROTOCOL_INTERNAL_ABORT;
task->task_done = sas_task_internal_done;
- task->slow_task->timer.function = sas_task_internal_timedout;
- task->slow_task->timer.expires = jiffies + TASK_TIMEOUT;
- add_timer(&task->slow_task->timer);
task->abort_task.tag = tag;
task->abort_task.type = type;
task->abort_task.qid = qid;
- res = i->dft->lldd_execute_task(task, GFP_KERNEL);
- if (res) {
- del_timer_sync(&task->slow_task->timer);
- pr_err("Executing internal abort failed %016llx (%d)\n",
- SAS_ADDR(device->sas_addr), res);
+ rq = scsi_alloc_request_hwq(request_queue, REQ_OP_DRV_IN, BLK_MQ_REQ_NOWAIT, qid);
+ if (!rq) {
+ res = PTR_ERR(rq);
break;
}
+ scmd = blk_mq_rq_to_pdu(rq);
+ scmd->submitter = SUBMITTED_BY_SCSI_CUSTOM_OPS;
+ ASSIGN_SAS_TASK(scmd, task);
+
+ task->uldd_task = scmd;
+
+ rq->timeout = TASK_TIMEOUT;
+
+ blk_execute_rq_nowait(rq, true, NULL);
+
wait_for_completion(&task->slow_task->completion);
res = TMF_RESP_FUNC_FAILED;
+ __blk_mq_end_request(rq, BLK_STS_OK);
/* Even if the internal abort timed out, return direct. */
if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
@@ -1042,7 +1041,11 @@ static int sas_execute_internal_abort(struct domain_device *device,
task = NULL;
}
BUG_ON(retry == TASK_RETRY && task != NULL);
+
sas_free_task(task);
+
+ blk_cleanup_queue(request_queue);
+
return res;
}
Like what we did for SMP commands, send internal abort commands through the block layer. At this point no code in libsas relies on the sas_slow_task.timer; unfortunately we can't delete it as some LLDDs (pm8001) still rely on it - let's try to remove them in future. But we can delete the legacy timeout handler, sas_task_internal_timedout(). Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/scsi/libsas/sas_scsi_host.c | 59 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 28 deletions(-)