From patchwork Mon Apr 24 03:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Chao X-Patchwork-Id: 86831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2485886vqo; Sun, 23 Apr 2023 20:40:44 -0700 (PDT) X-Google-Smtp-Source: AKy350bHUWBUW9wZkB2+d6Wmy8hcTHKWJRCaVz1FW2u6oLhxZmeT6/4N3Hm0tYICnijzQbOZ5FUu X-Received: by 2002:a17:902:ec90:b0:1a9:7873:8935 with SMTP id x16-20020a170902ec9000b001a978738935mr2789779plg.52.1682307643851; Sun, 23 Apr 2023 20:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682307643; cv=none; d=google.com; s=arc-20160816; b=cce/WrgYvGfwunxCruB4X7+5QZ9Lmgx795QjVThDhXb89w7RNasKjuYCF19own+bVK GuEDxw8yNEyQ2GZ/IO0e0o4AHozKAC6ZXX18BMeip1Uc3QV6B+MipsguFb7lS1XqsEv/ G01e0pJwR35VLs6bJrC7IHvrgPywh/7pNXmRYETfytx0EsgMVjw7/pd97cW04185lnEC denlI5SZnM5Go2VuNzbr9huaJaD2v6VzHsggfuaLXrfRKC/4VWRK6xQqzZrHUALb+q5I MR4X2jSA8pTujnuQ5AhvI++/1fQOWNm6sijcoM4fqBoJp8xmSBW0GUWnQbMOUvDQFx05 lY+Q== 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=cJjSUzYBS7tQHc7k1Nb/PjaSB03OxKluK5vLuchdEOM=; b=Y0Dh4xqOl79w8+xdgEd0q8V6Y6EqflCyzNVCWN/RRpm1aG8nQRIUQIXwS+jGxPBL3I Lk01ZnCEmrWRre+7kAIgoBlBjwh2qizVLqbSV9u7JIAc8buGMa3XzzcmsIMTUq4iaS9Y G1q7tYkW9R+hVNEyzFbHos9cp5f13McBwgouA+eedPfq5Rfu84osruO6KNZCqPC+v2QB WR5jFDSUUhpChGCbJnRBy844n4doUijzCPDbbxzZaf8gaLa+Ipk1pnk8ebMV7i13/xyf R8nvGe0ffsyEjQ9L0qpxIxrANlDpkrKhtPC1zLQgvOlH/LDUIAzir4nuNuOZli+f6bBz 7yaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=Gnbdezs3; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a17090a7b8a00b00247268002b5si9743663pjc.177.2023.04.23.20.40.31; Sun, 23 Apr 2023 20:40:43 -0700 (PDT) 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=Gnbdezs3; 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 S230381AbjDXDi6 (ORCPT + 99 others); Sun, 23 Apr 2023 23:38:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbjDXDiw (ORCPT ); Sun, 23 Apr 2023 23:38:52 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87CA2270B; Sun, 23 Apr 2023 20:38:50 -0700 (PDT) X-UUID: 8333b5d4e25111eda9a90f0bb45854f4-20230424 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=cJjSUzYBS7tQHc7k1Nb/PjaSB03OxKluK5vLuchdEOM=; b=Gnbdezs3Dbpc9uMkiPeGsDZgwSwjb84otZ9fR7T+jLjfos37cbQ7aP+83y97ycn+l9VsbznkfCHCNUt4RYCU6GbQm9Tc3Ie3VSmbeV/6ptkFbOsoBO++58lDMAX8pHFjiRgquH4M28Hbk7lsv5pPaYMhZ7FjhCGesjGYrRTz+2Q=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:a06d9000-2a07-4410-9143-83f8e8c1f3c3,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:120426c,CLOUDID:25bb0085-cd9c-45f5-8134-710979e3df0e,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 8333b5d4e25111eda9a90f0bb45854f4-20230424 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1268910123; Mon, 24 Apr 2023 11:38:43 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 24 Apr 2023 11:38:42 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Mon, 24 Apr 2023 11:38:42 +0800 From: Alice Chao To: Alim Akhtar , Avri Altman , Bart Van Assche , "James E.J. Bottomley" , "Martin K. Petersen" , Matthias Brugger , AngeloGioacchino Del Regno , Asutosh Das , Stanley Chu , Manivannan Sadhasivam , Can Guo CC: , , , , , , , , , , , , , , Subject: [PATCH 1/1] scsi: ufs: core: Fix &hwq->cq_lock deadlock issue Date: Mon, 24 Apr 2023 11:38:35 +0800 Message-ID: <20230424033839.20410-1-alice.chao@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 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, SPF_PASS,T_SCC_BODY_TEXT_LINE,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764027419967149880?= X-GMAIL-MSGID: =?utf-8?q?1764027419967149880?= [name:lockdep&]WARNING: inconsistent lock state [name:lockdep&]-------------------------------- [name:lockdep&]inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage. [name:lockdep&]kworker/u16:4/260 [HC0[0]:SC0[0]:HE1:SE1] takes: ffffff8028444600 (&hwq->cq_lock){?.-.}-{2:2}, at: ufshcd_mcq_poll_cqe_lock+0x30/0xe0 [name:lockdep&]{IN-HARDIRQ-W} state was registered at: lock_acquire+0x17c/0x33c _raw_spin_lock+0x5c/0x7c ufshcd_mcq_poll_cqe_lock+0x30/0xe0 ufs_mtk_mcq_intr+0x60/0x1bc [ufs_mediatek_mod] __handle_irq_event_percpu+0x140/0x3ec handle_irq_event+0x50/0xd8 handle_fasteoi_irq+0x148/0x2b0 generic_handle_domain_irq+0x4c/0x6c gic_handle_irq+0x58/0x134 call_on_irq_stack+0x40/0x74 do_interrupt_handler+0x84/0xe4 el1_interrupt+0x3c/0x78 Possible unsafe locking scenario: CPU0 ---- lock(&hwq->cq_lock); lock(&hwq->cq_lock); *** DEADLOCK *** 2 locks held by kworker/u16:4/260: [name:lockdep&] stack backtrace: CPU: 7 PID: 260 Comm: kworker/u16:4 Tainted: G S W OE 6.1.17-mainline-android14-2-g277223301adb #1 Workqueue: ufs_eh_wq_0 ufshcd_err_handler Call trace: dump_backtrace+0x10c/0x160 show_stack+0x20/0x30 dump_stack_lvl+0x98/0xd8 dump_stack+0x20/0x60 print_usage_bug+0x584/0x76c mark_lock_irq+0x488/0x510 mark_lock+0x1ec/0x25c __lock_acquire+0x4d8/0xffc lock_acquire+0x17c/0x33c _raw_spin_lock+0x5c/0x7c ufshcd_mcq_poll_cqe_lock+0x30/0xe0 ufshcd_poll+0x68/0x1b0 ufshcd_transfer_req_compl+0x9c/0xc8 ufshcd_err_handler+0x3bc/0xea0 process_one_work+0x2f4/0x7e8 worker_thread+0x234/0x450 kthread+0x110/0x134 ret_from_fork+0x10/0x20 ufs_mtk_mcq_intr() could refer to https://lore.kernel.org/all/20230328103423.10970-3-powen.kao@mediatek.com/ When ufshcd_err_handler() is executed, CQ event interrupt can enter waiting for the same lock. It could happened in upstream code path ufshcd_handle_mcq_cq_events() and also in ufs_mtk_mcq_intr(). This warning message will be generated when &hwq->cq_lock is used in IRQ context with IRQ enabled. Use ufshcd_mcq_poll_cqe_lock() with spin_lock_irqsave instead of spin_lock to resolve the deadlock issue. Fixes: ed975065c31c ("scsi: ufs: core: mcq: Add completion support in poll") Signed-off-by: Alice Chao --- Change since v1 -Change commit: Fix title -Add commit: Add Fixes: tag --- drivers/ufs/core/ufs-mcq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c index 31df052fbc41..202ff71e1b58 100644 --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -299,11 +299,11 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_poll_cqe_nolock); unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba, struct ufs_hw_queue *hwq) { - unsigned long completed_reqs; + unsigned long completed_reqs, flags; - spin_lock(&hwq->cq_lock); + spin_lock_irqsave(&hwq->cq_lock, flags); completed_reqs = ufshcd_mcq_poll_cqe_nolock(hba, hwq); - spin_unlock(&hwq->cq_lock); + spin_unlock_irqrestore(&hwq->cq_lock, flags); return completed_reqs; }