From patchwork Wed May 17 10:49:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 99947 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp159579qge; Wed, 17 May 2017 03:19:44 -0700 (PDT) X-Received: by 10.98.2.85 with SMTP id 82mr2870149pfc.52.1495016384735; Wed, 17 May 2017 03:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495016384; cv=none; d=google.com; s=arc-20160816; b=H2g2feBYVeQxGornBXNI9nBAHh9Gj5A9Z0e7Xi5/rE25eWl9nptiyKNFVyas98Drsw hb7KIjZPAed4kECjcgMX8nzPLVe6wKeKTmpDtdl3o8zNoSU94apL37O7rGLI3cZKcUL6 TisvoPWiwg/YKXIndH15jDxeWhxpOl0Ve59X4Nn37W0+T5Yj+XHFkww+CGa3OuLMGeyS ulC4lQlIweZZRlucz7jStqpuBOlyXMYHqAU33nGA8feTT0vVyuZYAHAfQIbnE4BMtD+2 //5mCy5XypZTElE69rcv2pu9W2CMTV2EobB4++Z2emz9qdt8/UPgR3h7mbocDnaU04rZ MN4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=Us+A426uMq7XGQ+3i3+LHy/7M813ZY4dQi9JtBUP2wo=; b=fuc7EjfQkZpuB2M+LvSdTxni1sjpYLEVhC3xnf6v9dfwtcQnQn0hphHQRvvtOOC8xb 1C/rTzwbB4O8XM/rx5Mhh8AOb8Z8fJ5Tf9bmOx5F0Kr7K1YqZoHSxixTZsViOa5Icmnx CeA98m9CS0VMuIDKgnZ0JlBzW9gDmGw0Xm24Ja9FVoUXS+7raakjoagBgi37dtmDh+6q mSIijBTBsd3QDikLprLU5tgfnVGMUTKF1KF195slX5wcFiYk00j0lxwulHY9TDEWIsA9 Prb2eLHfUPX6my9k8x3yOxhYDy6o0Lo4hhbrbWMqs5yaWJmVlRBs2i0Xb5WdELgyW391 N1bQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f79si1678041pfd.308.2017.05.17.03.19.44; Wed, 17 May 2017 03:19:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754170AbdEQKTn (ORCPT + 1 other); Wed, 17 May 2017 06:19:43 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:6309 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752913AbdEQKTl (ORCPT ); Wed, 17 May 2017 06:19:41 -0400 Received: from 172.30.72.57 (EHLO dggeml406-hub.china.huawei.com) ([172.30.72.57]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AOT12408; Wed, 17 May 2017 18:19:37 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by dggeml406-hub.china.huawei.com (10.3.17.50) with Microsoft SMTP Server id 14.3.301.0; Wed, 17 May 2017 18:19:31 +0800 From: John Garry To: , CC: , , , , , Xiang Chen , John Garry Subject: [PATCH 01/22] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() Date: Wed, 17 May 2017 18:49:36 +0800 Message-ID: <1495018197-120535-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495018197-120535-1-git-send-email-john.garry@huawei.com> References: <1495018197-120535-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.591C23BA.002F, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b27ed3aa20296f3e60cae0bed2744b43 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Xiang Chen We need to check for timeout before task status, or the task will be mistook as completed internal abort command. Also add protection for sas_task.task_state_flags in hisi_sas_tmf_timedout(). Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index d622db5..98535aa 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -691,8 +691,13 @@ static void hisi_sas_task_done(struct sas_task *task) static void hisi_sas_tmf_timedout(unsigned long data) { struct sas_task *task = (struct sas_task *)data; + 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; + spin_unlock_irqrestore(&task->task_state_lock, flags); - task->task_state_flags |= SAS_TASK_STATE_ABORTED; complete(&task->slow_task->completion); } @@ -1247,6 +1252,17 @@ static int hisi_sas_query_task(struct sas_task *task) wait_for_completion(&task->slow_task->completion); res = TMF_RESP_FUNC_FAILED; + /* Internal abort timed out */ + if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) { + if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) { + struct hisi_sas_slot *slot = task->lldd_task; + + if (slot) + slot->task = NULL; + dev_err(dev, "internal task abort: timeout.\n"); + } + } + if (task->task_status.resp == SAS_TASK_COMPLETE && task->task_status.stat == TMF_RESP_FUNC_COMPLETE) { res = TMF_RESP_FUNC_COMPLETE; @@ -1259,13 +1275,6 @@ static int hisi_sas_query_task(struct sas_task *task) goto exit; } - /* Internal abort timed out */ - if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) { - if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) { - dev_err(dev, "internal task abort: timeout.\n"); - } - } - exit: dev_dbg(dev, "internal task abort: task to dev %016llx task=%p " "resp: 0x%x sts 0x%x\n",