From patchwork Fri Jun 9 14:16:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 103525 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp2706334obh; Fri, 9 Jun 2017 06:54:27 -0700 (PDT) X-Received: by 10.98.60.139 with SMTP id b11mr31411885pfk.170.1497016467436; Fri, 09 Jun 2017 06:54:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497016467; cv=none; d=google.com; s=arc-20160816; b=jcvFOgD6fX9LImpZtiLRniE/IoZ0j+Dyv93G8NIhKzfqrLHQvCcRCgUnS3dw2/SurX cibxUILReufCJDfuUfbpFt1JFmSmpasPnwUbpUvVpmWmt06uYF5IY8JqZFw4E6jnRzfO 8txBTfVKGoP3rD/1bVmla6CIzMV/qQgiV4dPEilzmmJwqawaUl1UIq/2YBXgBAcjFFNt /cDcpNHnvohZ0snPNsmyxzi240qjUzMwwc/N8jj2My4YoGLLuT//YEax9cyHUWWAg8gB z5jT5sPudZ6M7ZJ9i4qdbKfLLRftlxZ/m57BQN1SNizzul+L5B+dDEI3vxuFpeYocajb lOSg== 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=BLqL/HMBY+ahe1cf8Eqpr1QervdkSTaOE6srx0FRwz52vOJvKWi39rYC5RHPa/7+Ft Q1ylVYXp5+4TRCPjg/BoEsRB9xrIyxcZrjG2CrO6lRtkFeLkZ5t+JZzlj41I6c3BsEWv IGf/BNX1SQZCkGIapvpXHS5LHhnjsvZ7cDM5IgBZjypljvT4ITlXztzaQNdE06qR2eO0 1DAcomcHxTna8pDgaKouWrufV6HXeoLthrK0lseTdFwxy+HjbK6DJ1G7xCi34u5SM6V9 IN5A01OICLhFSVSrw6BaHSvPZFHcnlhk7pEYHvmpK2t1Rds5pRdv9vuMamjup2FwVcUY izWQ== 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 e1si1039409plk.239.2017.06.09.06.54.27; Fri, 09 Jun 2017 06:54:27 -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 S1751869AbdFINyO (ORCPT + 25 others); Fri, 9 Jun 2017 09:54:14 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:7357 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbdFINto (ORCPT ); Fri, 9 Jun 2017 09:49:44 -0400 Received: from 172.30.72.56 (EHLO DGGEML403-HUB.china.huawei.com) ([172.30.72.56]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id APA64576; Fri, 09 Jun 2017 21:48:35 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEML403-HUB.china.huawei.com (10.3.17.33) with Microsoft SMTP Server id 14.3.301.0; Fri, 9 Jun 2017 21:48:26 +0800 From: John Garry To: , CC: , , , , , Xiang Chen , John Garry Subject: [PATCH v5 01/23] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() Date: Fri, 9 Jun 2017 22:16:14 +0800 Message-ID: <1497017796-105067-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497017796-105067-1-git-send-email-john.garry@huawei.com> References: <1497017796-105067-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.0A020202.593AA734.028A, 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: a6975ec0518a2fb055382939be15475b 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",