Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp2140488rwb; Thu, 15 Dec 2022 20:32:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Z8mkvyfYGwvOQMcz+vFMwgqM/CK/ETVwv6vMIdzeQHO+VXeD3wsh4fq42udypq9R3qewG X-Received: by 2002:aa7:911a:0:b0:577:5afa:6321 with SMTP id 26-20020aa7911a000000b005775afa6321mr34710108pfh.26.1671165177318; Thu, 15 Dec 2022 20:32:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671165177; cv=none; d=google.com; s=arc-20160816; b=y2kNK0CEA/96XAJR0RU/j+wXJ/2SkE3nIM8tnRRTShQRLxPlpCd+PBwtt7HFZwiS6+ zb31QnK4yYVXQfqc1bxpNoLkRbyt0oHHkqU0AsAFjx9ntKzRih8ewmoySMBbdR2q4GQ5 j71eM4RU+tIR5c9bZY7t2QumYDfkU0BPJwybwZYg//PoBu5bizb0a/2nGCmooGiQn56s 8cG3m7Zi5PpNW8ZNF5jFf8VnwJYKv9h+RfAVNKCCcw17Q3iPKLd1Jx1wfeRuqidZl5Rc I9NEebwW9yj3kNVTuTjQTxTOGFUpmKjdmxKJCNLNb5IvJ7n4PBlbBKNwXg2GGqcIdVyR 9vkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=2mEp0WUODIj5kqMh7KIiuG3LhKqtAh/A0pYoODwnxvo=; b=O4baB33iuOQ1Q0oApCt7P+wN9dGnP50D2XInJ0fPDR//kublMhDOaxUp9Y+fROXKli P4wO/cakCqPnYWUj068ZujlIfXOtlSSILZNwmVf6wu/f1FFNjKhS95qTMK04UIuTEAbZ zSq+yi0JckKn3THduuhoY/FoRrpaaFGB60eHyRpgYiqSanuegiCEtqRNV125Ds7p5Knz mMAs1f+tKE0/6K3S/QdeO/H0MApNHrbtAbk9ILQRyJ6vjwhocMhD373rnJlLcR80GD7t iuv1skZ/mYRaB7K3jjK2F2RnPCx/oy9oUvSlWT4Wvq5m5Qtdg3aEZ4jTepzAi2VBS2LX EH0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=lf0awVcr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay18-20020a056a00301200b0057a74250665si1120373pfb.310.2022.12.15.20.32.48; Thu, 15 Dec 2022 20:32:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=lf0awVcr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229962AbiLPDj4 (ORCPT + 68 others); Thu, 15 Dec 2022 22:39:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbiLPDjy (ORCPT ); Thu, 15 Dec 2022 22:39:54 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C43DE1DA75; Thu, 15 Dec 2022 19:39:48 -0800 (PST) X-UUID: 8865c7dc9d054114adf3e15032581b2e-20221216 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=2mEp0WUODIj5kqMh7KIiuG3LhKqtAh/A0pYoODwnxvo=; b=lf0awVcrPxcEiPYwpvOUKpgNM6b4SYn93zh8CqcisLxmswYIQ3o6BWojRCEUkvScLWehpgpUg225tiYwmVmfqA3uuTpkjWKrMcHWe490vOfnlhVdijyAI6q4IlyQAJYq4b7AM5wytFE18Hdum4Iz9PO4NZ/5tPTRIiW08ZFxN14=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.14,REQID:ed6ab05b-1234-4959-972f-4e0a0a7cf244,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:dcaaed0,CLOUDID:82d1c0b4-d2e2-434d-b6d3-aeae88dfcc78,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 8865c7dc9d054114adf3e15032581b2e-20221216 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 517239489; Fri, 16 Dec 2022 11:39:42 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Fri, 16 Dec 2022 11:39:41 +0800 Received: from mbjsdccf07.mediatek.inc (10.15.20.246) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Fri, 16 Dec 2022 11:39:40 +0800 From: Mason Zhang To: Alim Akhtar , Avri Altman , Bart Van Assche , "James E . J . Bottomley" , "Martin K . Petersen" , Matthias Brugger , Bean Huo , Stanley Chu , Jinyoung Choi CC: , , , , Peter Wang , Peng Zhou , , Mason Zhang Subject: [PATCH v4 1/1] scsi: ufs: core: fix device management cmd timeout flow Date: Fri, 16 Dec 2022 11:25:33 +0800 Message-ID: <20221216032532.1280-1-mason.zhang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_SPF_TEMPERROR,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mason Zhang In ufs error handler flow, host will send device management cmd(NOP OUT) to device for recovery link. If cmd response timeout, and clear doorbell fail, ufshcd_wait_for_dev_cmd will do nothing and return, hba->dev_cmd.complete struct not set to null. In this time, if cmd has been responsed by device, then it will call complete() in __ufshcd_transfer_req_compl, because of complete struct is alloced in stack, then the KE will occur. Fix the following crash: ipanic_die+0x24/0x38 [mrdump] die+0x344/0x748 arm64_notify_die+0x44/0x104 do_debug_exception+0x104/0x1e0 el1_dbg+0x38/0x54 el1_sync_handler+0x40/0x88 el1_sync+0x8c/0x140 queued_spin_lock_slowpath+0x2e4/0x3c0 __ufshcd_transfer_req_compl+0x3b0/0x1164 ufshcd_trc_handler+0x15c/0x308 ufshcd_host_reset_and_restore+0x54/0x260 ufshcd_reset_and_restore+0x28c/0x57c ufshcd_err_handler+0xeb8/0x1b6c process_one_work+0x288/0x964 worker_thread+0x4bc/0xc7c kthread+0x15c/0x264 ret_from_fork+0x10/0x30 Signed-off-by: Mason Zhang --- Changes since v3: * Not clear outstanding_reqs if clear cmds fail. Updated the patch in v4. Changes since v2: * Modified comment after clear doorbell. Changes since v1: * Remove change id. --- drivers/ufs/core/ufshcd.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index b1f59a5fe632..fa86ce80f350 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -3008,6 +3008,22 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, } else { dev_err(hba->dev, "%s: failed to clear tag %d\n", __func__, lrbp->task_tag); + + spin_lock_irqsave(&hba->outstanding_lock, flags); + pending = test_bit(lrbp->task_tag, + &hba->outstanding_reqs); + if (pending) + hba->dev_cmd.complete = NULL; + spin_unlock_irqrestore(&hba->outstanding_lock, flags); + + if (!pending) { + /* + * The completion handler ran while we tried to + * clear the command. + */ + time_left = 1; + goto retry; + } } } -- 2.18.0