From patchwork Wed May 31 14:32:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 100779 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp343014qge; Wed, 31 May 2017 07:12:00 -0700 (PDT) X-Received: by 10.98.14.86 with SMTP id w83mr30220806pfi.83.1496239920742; Wed, 31 May 2017 07:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496239920; cv=none; d=google.com; s=arc-20160816; b=z2eOJ+I2OzIKySE+KVMhHeysEkpCsW1cFKDG/8AGEv82xKD1wmQr7liF06rEDFzYIH NuV50k+rBISgspEQGf5U3TA80d5RsM8IDgRBlk0YWt+/BdLK3F9OVbkrfMCQtQvgwKVW deHkwNvkR0v7+tZq7nmUtt+BpwcR4mA9m3e3PXAZQY6/sl8VsMYP8Rb4CunuV3aFEycn yF4qZfvi7Q9lcJCoYu4TX1/w0n69iVEcM9gN33BUr5gYEPCrNDjS7pOaEQ99Lj69LBYu ruuiHeHmQ6L9RxOg6GUn8mgIWqcfUyS9vQyqhqxHWAKruMWytEqyrhkO7MAKclmmx5Nd ZJSQ== 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=4Pep7ZyeMDlfuhXLRMkurEwtLRDkHm0fkdfkuIG7hMc=; b=xy7HQlN1ElUZuxsf35jEsTuWSU/bfyoOix7BrnYSLJjcgGHYO/wzMXWUi0tvgDOl+0 8TxdsnQcslqre0VHH0kpXT3nLAXr4h/mwxO4tkCO/u/SiBneEjVPQQ221mAYptHSqX82 Isypt4QkJ51MhtxfgSCXCqfBQu7oV+kO7lmU8HnYqdVnCrks5D7K9ZHdU9BW56QVuGMd 6xGKxUat0Wgr56K5eMwE4IJkq0cpYGiyjxRVzCXKqsj8oHJ9oRelDD2ofhq/qOIXMFXY 9nrdg3NRNayVaAdXeWrk2jl1ungZiJr5PFfsRCGZB+Rhm2y6PQIUakxoglfPoAvgmvVh ZGEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 w20si16767865pgj.290.2017.05.31.07.12.00; Wed, 31 May 2017 07:12:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbdEaOLg (ORCPT + 25 others); Wed, 31 May 2017 10:11:36 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:7295 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdEaOFL (ORCPT ); Wed, 31 May 2017 10:05:11 -0400 Received: from 172.30.72.55 (EHLO dggeml405-hub.china.huawei.com) ([172.30.72.55]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id APN16053; Wed, 31 May 2017 22:05:07 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by dggeml405-hub.china.huawei.com (10.3.17.49) with Microsoft SMTP Server id 14.3.301.0; Wed, 31 May 2017 22:04:57 +0800 From: John Garry To: , CC: , , , , , Xiang Chen , John Garry Subject: [PATCH v3 01/23] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() Date: Wed, 31 May 2017 22:32:53 +0800 Message-ID: <1496241195-217678-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1496241195-217678-1-git-send-email-john.garry@huawei.com> References: <1496241195-217678-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.592ECD95.004A, 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: 18f0db841d6a0b9b118692f44377b8c4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f720d3c..3605d28 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",