From patchwork Wed Jun 14 15:33:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 105560 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp386171obh; Wed, 14 Jun 2017 08:25:48 -0700 (PDT) X-Received: by 10.101.75.134 with SMTP id t6mr579616pgq.191.1497453948037; Wed, 14 Jun 2017 08:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497453948; cv=none; d=google.com; s=arc-20160816; b=D0mWN8q3tzaJ3c7tWEzxQ6YV+i7S/XRcBQd2p5Ux46KK47NrxTE5VOq1yFz8Zt+A4r XfIcUy5O+yrwRk3KdSDuncGncDbiqqqE0ZXJwl5KV2FTkdNISwqsjvIqbjMj1xXt5VtU URFmm6ARKV2HJ7SStiUHKxP4HimY2VstVxYEOLC+Un8TqOPtmOnubvaaIOZx7FFlMnue X9SH7BLHOKPqeG6NbMw+CxGHWafAt610Awjbf8LEc+iFE33dNs5KsspmNScYWPp1i8mJ qgATU0fG5qJtZcUHz+umoPfnxvc1yDWtU3i6w1Ni6qyf/ULW/RV8PUbdKMt5sbZxFSCb 6fmA== 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=oTTXQeriGrKKcTIH8U1boPZ2SZ+fOPvUYRHWEIy8QLABHtZAVRzObzvh5gA4Ej8mSS Wrc9aGbEinNpq7eQ+70YfebuMsklosD6W2xzQpSzfl6YMAGU0AKaUDGasvbPy6zEUIQ/ HEsQwitZ1BbXkOZz2j60oYCAJTUwW9/FkJ1fwQZoW/Fdce7q6Y6jeWpWLxsYeLsnJcxc YdfsKPiCTvRVnIUOxNVU+qjzOy9EfKFJadZoa62VeVWO+BP5g46PitaDQScWrGckD77e gW/ivbGztnwclrBhQ3hzWjmCycp9ZCUx3sRIiO25Z4FV/ZkIebORmxEA+hsivbmAoCkY bAoA== 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 27si192890pfr.232.2017.06.14.08.25.47; Wed, 14 Jun 2017 08:25:48 -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 S1752553AbdFNPZ1 (ORCPT + 25 others); Wed, 14 Jun 2017 11:25:27 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:7836 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752444AbdFNPEF (ORCPT ); Wed, 14 Jun 2017 11:04:05 -0400 Received: from 172.30.72.57 (EHLO dggeml406-hub.china.huawei.com) ([172.30.72.57]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id API60190; Wed, 14 Jun 2017 23:03:27 +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, 14 Jun 2017 23:03:12 +0800 From: John Garry To: , CC: , , , , , "Xiang Chen" , John Garry Subject: [PATCH v6 01/22] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() Date: Wed, 14 Jun 2017 23:33:11 +0800 Message-ID: <1497454412-91194-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497454412-91194-1-git-send-email-john.garry@huawei.com> References: <1497454412-91194-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.0A090201.5941503F.0179, 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: 381afd88a4d56caf0efc618bfba7443e 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",