From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27A7EC433E1 for ; Mon, 24 Aug 2020 16:37:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB3812311A for ; Mon, 24 Aug 2020 16:37:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Bd+vBJWo"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="be+VOu23"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="bTTkUXVD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB3812311A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kSOYYBrJ92UN7Uwfg2EQ7tUjEYUzoovYs2NcIufmxNI=; b=Bd+vBJWo8+Y2hLD0LEJrD4hTI ltA6Pkv7dhmGiw2k1d9EGV32hLkFciU+lu8+8TH2Yo1yOFZ6Wt9BfoSzdg2QBGEvuS+PV73Av+VXZ edrM4htQOv39IUHbp+z5MwAPWvh/SvEwWUWQbf8nxUekRQ5RcjSu19JeUaAAA3OPZItut4qB2+UD/ Jh1n3UgHWdczEnF/RwdWw8SL9F8hurjI1DFmHG/+eLXctR2xbWh3KBR/pXGAQ4FrwLsaqgJLdnhAt GHlkAHpKv+bXtDk9H6qYWPm7oD5iRdhQYnytqZleCSQRsHJNm5xwSMqiUdKdfNNUE7E95xHe/uZ2X Rpf6xaHGg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFTS-0000Zi-PD; Mon, 24 Aug 2020 16:37:34 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFSm-0000JN-E6; Mon, 24 Aug 2020 16:36:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=XHAAxSFjvO5I0LKWLE5YzR8Ib6xl0UbKPo61qGUOg+4=; b=be+VOu23fEONJpxFZB1wXWlszY hZZoUCfQxdgXNAgh7v+LEJURjx/alrGInm8fhDlKAFu8YyQQKdp5kV/j6rjdUNn9zJJhSUrDnAfLJ VlLe5OybHbq+djWNg/3I/YkFJOKEp2rlvEjRhAdu94Cl3OhYmeqzcqGhKm20Phys5ujEarnSp1CH8 0IzDeFOdC7XQVSj8ijFjhfMvh2SYsoibLB4MFI9sCESTmS64ingZyFogcnpeUwdrBh4oA8wcpC8+B yAGAAUgWUZRGTVrbyyGFc7hiyyTiVkGWi+1FO7OeYwFKxFvvO14kvZsTcPdm/bcXmRFKNTUXMEI4w 2RrovOlg==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFS9-0000ZA-NI; Mon, 24 Aug 2020 16:36:16 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1DF622D08; Mon, 24 Aug 2020 16:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286960; bh=jowReR2z/GQ4K4l2WEKj6s2SfpcIYYFpwlZYy/NPzWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bTTkUXVDp+QjkcmjbLWurIK7RdfHAV1q6DfNUHV0UznXqfFkks0/A03ZGyI/wA5fS 0MHiPIOXhYiYLeLI/AHrFgLqj/EvlqEr9FmU6iTL/SS55tajvuTleOoQjN2hPb1x4N wZ10+AO2Sk9KR0Tj0o1lst5Ldt30pe5WksSN0j5Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 41/63] scsi: ufs: Clean up completed request without interrupt notification Date: Mon, 24 Aug 2020 12:34:41 -0400 Message-Id: <20200824163504.605538-41-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_173614_015578_592A1EB8 X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-scsi@vger.kernel.org, "Martin K . Petersen" , Avri Altman , Can Guo , linux-mediatek@lists.infradead.org, Stanley Chu , linux-arm-kernel@lists.infradead.org, Bean Huo Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Stanley Chu [ Upstream commit b10178ee7fa88b68a9e8adc06534d2605cb0ec23 ] If somehow no interrupt notification is raised for a completed request and its doorbell bit is cleared by host, UFS driver needs to cleanup its outstanding bit in ufshcd_abort(). Otherwise, system may behave abnormally in the following scenario: After ufshcd_abort() returns, this request will be requeued by SCSI layer with its outstanding bit set. Any future completed request will trigger ufshcd_transfer_req_compl() to handle all "completed outstanding bits". At this time the "abnormal outstanding bit" will be detected and the "requeued request" will be chosen to execute request post-processing flow. This is wrong because this request is still "alive". Link: https://lore.kernel.org/r/20200811141859.27399-2-huobean@gmail.com Reviewed-by: Can Guo Acked-by: Avri Altman Signed-off-by: Stanley Chu Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 2b449057deb83..796c05e1b0091 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6437,7 +6437,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) /* command completed already */ dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n", __func__, tag); - goto out; + goto cleanup; } else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n", @@ -6471,6 +6471,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup: scsi_dma_unmap(cmd); spin_lock_irqsave(host->host_lock, flags); -- 2.25.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2228AC433E1 for ; Mon, 24 Aug 2020 17:17:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F09B020738 for ; Mon, 24 Aug 2020 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598289478; bh=jowReR2z/GQ4K4l2WEKj6s2SfpcIYYFpwlZYy/NPzWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t/frJZZzy3Rzpvcpy7R3PK+OT10TPbmuBqL/yubD772eilg6tEqPNt2uW1mFE9LbK 9572yc1S2bOFHy5g0W2zlXl5nmTiDuSrvRhGjDTBkR2DiFCk3BfvzlOODZG7dO6Xsj vEyWrNsDxipXb7hEkBm6e+YZiIqmq/Tfml9mOKQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726661AbgHXRRu (ORCPT ); Mon, 24 Aug 2020 13:17:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:40112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728295AbgHXQgj (ORCPT ); Mon, 24 Aug 2020 12:36:39 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1DF622D08; Mon, 24 Aug 2020 16:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286960; bh=jowReR2z/GQ4K4l2WEKj6s2SfpcIYYFpwlZYy/NPzWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bTTkUXVDp+QjkcmjbLWurIK7RdfHAV1q6DfNUHV0UznXqfFkks0/A03ZGyI/wA5fS 0MHiPIOXhYiYLeLI/AHrFgLqj/EvlqEr9FmU6iTL/SS55tajvuTleOoQjN2hPb1x4N wZ10+AO2Sk9KR0Tj0o1lst5Ldt30pe5WksSN0j5Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stanley Chu , Can Guo , Avri Altman , Bean Huo , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.8 41/63] scsi: ufs: Clean up completed request without interrupt notification Date: Mon, 24 Aug 2020 12:34:41 -0400 Message-Id: <20200824163504.605538-41-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Stanley Chu [ Upstream commit b10178ee7fa88b68a9e8adc06534d2605cb0ec23 ] If somehow no interrupt notification is raised for a completed request and its doorbell bit is cleared by host, UFS driver needs to cleanup its outstanding bit in ufshcd_abort(). Otherwise, system may behave abnormally in the following scenario: After ufshcd_abort() returns, this request will be requeued by SCSI layer with its outstanding bit set. Any future completed request will trigger ufshcd_transfer_req_compl() to handle all "completed outstanding bits". At this time the "abnormal outstanding bit" will be detected and the "requeued request" will be chosen to execute request post-processing flow. This is wrong because this request is still "alive". Link: https://lore.kernel.org/r/20200811141859.27399-2-huobean@gmail.com Reviewed-by: Can Guo Acked-by: Avri Altman Signed-off-by: Stanley Chu Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 2b449057deb83..796c05e1b0091 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6437,7 +6437,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) /* command completed already */ dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n", __func__, tag); - goto out; + goto cleanup; } else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n", @@ -6471,6 +6471,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup: scsi_dma_unmap(cmd); spin_lock_irqsave(host->host_lock, flags); -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EB1CC433E1 for ; Mon, 24 Aug 2020 16:39:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C8ED22CBB for ; Mon, 24 Aug 2020 16:39:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="faGZtCnJ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="be+VOu23"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="bTTkUXVD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C8ED22CBB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S5ZvqdHDk8uyKeQsmd6melJtM8wiM9oIpfwU2uKoQYQ=; b=faGZtCnJAZFok/21py+AT2Swn v/xeD0OkHaLtoeP+2cS9nXFuvbYLiWZwj8RT56wn4UVtGAsfM9WM4fIvYY3NMOTOa81IAsspMv3K2 92i/lLIaMrnq60Pn2rV3ePbnBtKaUls42CbahFZq5o1QaB6QJvTDvEr4jh9FAQXa79EZeykNb5xVn FV8PERuUTnofbKHotdFs0ig7QyCjVmAwPXc1ahUO7/nt+4FlLEznddV8qF6Opi6N5xY45QQBOunEr Dv/xVMKhTZY3xzOBBZGTLd1bsG1AjADm6Wax3u0gzhIK4zf0xC63EeXUSjDpxl7qBpzaybyOrCMxn tVQdM8Aow==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFTO-0000Yg-Ho; Mon, 24 Aug 2020 16:37:30 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFSm-0000JN-E6; Mon, 24 Aug 2020 16:36:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=XHAAxSFjvO5I0LKWLE5YzR8Ib6xl0UbKPo61qGUOg+4=; b=be+VOu23fEONJpxFZB1wXWlszY hZZoUCfQxdgXNAgh7v+LEJURjx/alrGInm8fhDlKAFu8YyQQKdp5kV/j6rjdUNn9zJJhSUrDnAfLJ VlLe5OybHbq+djWNg/3I/YkFJOKEp2rlvEjRhAdu94Cl3OhYmeqzcqGhKm20Phys5ujEarnSp1CH8 0IzDeFOdC7XQVSj8ijFjhfMvh2SYsoibLB4MFI9sCESTmS64ingZyFogcnpeUwdrBh4oA8wcpC8+B yAGAAUgWUZRGTVrbyyGFc7hiyyTiVkGWi+1FO7OeYwFKxFvvO14kvZsTcPdm/bcXmRFKNTUXMEI4w 2RrovOlg==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFS9-0000ZA-NI; Mon, 24 Aug 2020 16:36:16 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1DF622D08; Mon, 24 Aug 2020 16:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286960; bh=jowReR2z/GQ4K4l2WEKj6s2SfpcIYYFpwlZYy/NPzWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bTTkUXVDp+QjkcmjbLWurIK7RdfHAV1q6DfNUHV0UznXqfFkks0/A03ZGyI/wA5fS 0MHiPIOXhYiYLeLI/AHrFgLqj/EvlqEr9FmU6iTL/SS55tajvuTleOoQjN2hPb1x4N wZ10+AO2Sk9KR0Tj0o1lst5Ldt30pe5WksSN0j5Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 41/63] scsi: ufs: Clean up completed request without interrupt notification Date: Mon, 24 Aug 2020 12:34:41 -0400 Message-Id: <20200824163504.605538-41-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_173614_015578_592A1EB8 X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-scsi@vger.kernel.org, "Martin K . Petersen" , Avri Altman , Can Guo , linux-mediatek@lists.infradead.org, Stanley Chu , linux-arm-kernel@lists.infradead.org, Bean Huo Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Stanley Chu [ Upstream commit b10178ee7fa88b68a9e8adc06534d2605cb0ec23 ] If somehow no interrupt notification is raised for a completed request and its doorbell bit is cleared by host, UFS driver needs to cleanup its outstanding bit in ufshcd_abort(). Otherwise, system may behave abnormally in the following scenario: After ufshcd_abort() returns, this request will be requeued by SCSI layer with its outstanding bit set. Any future completed request will trigger ufshcd_transfer_req_compl() to handle all "completed outstanding bits". At this time the "abnormal outstanding bit" will be detected and the "requeued request" will be chosen to execute request post-processing flow. This is wrong because this request is still "alive". Link: https://lore.kernel.org/r/20200811141859.27399-2-huobean@gmail.com Reviewed-by: Can Guo Acked-by: Avri Altman Signed-off-by: Stanley Chu Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 2b449057deb83..796c05e1b0091 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6437,7 +6437,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) /* command completed already */ dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n", __func__, tag); - goto out; + goto cleanup; } else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n", @@ -6471,6 +6471,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup: scsi_dma_unmap(cmd); spin_lock_irqsave(host->host_lock, flags); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel