Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp3499057rdh; Thu, 28 Sep 2023 13:34:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEShHUc1YNNYzjlZVZMfFO4V6lqhjt3lARc6aOrCzHmgZoVApG5bv1/qwNK754RvFRUExDc X-Received: by 2002:a05:6358:63a3:b0:143:383e:5b22 with SMTP id k35-20020a05635863a300b00143383e5b22mr2081884rwh.28.1695933263646; Thu, 28 Sep 2023 13:34:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695933263; cv=none; d=google.com; s=arc-20160816; b=KpRlcTvcXcqCSEXhPr1zxM/6wIvAZ3o6TotjaMymHimMZGGbSQm+Xo2JCBB5zs8Fn3 ymMIprska5MA/cf6CgPk/uc7cO+btEqiTSui3JwudjCWmYT9/8Aljocjd+HXNjQ7Gxe3 e38hqEXXTxkYrri4ePa5p+kmbmLDRtyUv8Gj+TSR6r27nWhrNmgtEqvDHKQvK22IVnaY jYujCQTRv2GFdP3Uhwxy/d3/aEhG1d5eb0xcEtpBVMPUsQC6VQ45NupOvCji7qyo3PVC PkVWUeaBlbH88mBAcpCExRn7vsb/rD+8j9Iklp9N/DhhiI8aZmWyJQMWiU5VldiSwgg2 n+8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=31ywSb3qC8T2hXHBoIxLY0cqLMBrm52j3brfGK+5VDk=; fh=lsNLkLM0YX1lpZFLhI1poshLI9Fs76oXf9iRVcfoDxM=; b=XOO4l3F3/F4I10XgwyfKCFPQwTaN5ZikbdBFI/zvwnmdN5KDaMoojts+IMEA15qfn0 rZV7f5F2XqqgTsFEMfi+iFnFRA/QkZzuEYZsjSQG93+fBqYEr+ODs5i6jt0oZqAkHaqo 2G5kbT23p/t/JpSnHav7f/hfXk68qmVj5sHJ4yPzmzrUC//Wvamm0Hb5EfVKDFrc219A a4jqgUmYlg8dOwcr6N+TUYyd7yuPxxQwX8swgcG3LHwU3NO4lio3r1x+9RbhW/9egFxs PU7nxC8oecSvX1yXLKk6uJxwLLAKufOTrZz11ei14dQlxAcJNmwqPiydiZ6b2K1R5Uix ming== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=f+yE7NiM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id m16-20020a63fd50000000b0056c0e3c77f7si19412631pgj.805.2023.09.28.13.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 13:34:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=f+yE7NiM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 3DDFE83BD99E; Thu, 28 Sep 2023 07:48:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231578AbjI1Orp (ORCPT + 99 others); Thu, 28 Sep 2023 10:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231327AbjI1Orh (ORCPT ); Thu, 28 Sep 2023 10:47:37 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A495FCE2; Thu, 28 Sep 2023 07:47:31 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-68bed2c786eso10505286b3a.0; Thu, 28 Sep 2023 07:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695912451; x=1696517251; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=31ywSb3qC8T2hXHBoIxLY0cqLMBrm52j3brfGK+5VDk=; b=f+yE7NiM9dgv241a68kANEqGzp330SNL0LJGCrME+rsVzotVvYK3kjt8HqnoXEYmJb MQcT/Yc7aYBB/wA344xoX1yV1M8/1uDMoN0voIv9QWXezWZScAAD4LByeRlDfz7ShfvQ blfE08wvgsCa3I61hI5euVk747UIp544250K8z0fhd16DBtEM9W4dC0xZt6HkXu0Lizo uzys5fw+wq5k37/ONQfEVPUYy0niXMzsl5ewlQYXnEat/uibjnK6Ck//rxUUgMgSvrrH 0MVyZl2OUVGnWqxJWaWHV3YdU6Fztg78zmUEyRokXMfJ877eB3cC6c57cyFz5BbTwltd J5qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695912451; x=1696517251; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=31ywSb3qC8T2hXHBoIxLY0cqLMBrm52j3brfGK+5VDk=; b=tTTaGSqWyPnhx/rPG73ox6GWpL/5upLR2TIa6dYedu9BuM9XOVLRcqfaaXbxl8RQy7 GM8iPYBI2qI3f1Z7RIw4ygUgnhG8j+oF36Q8iomPBGBnWsx7lUopRqLzi8kMs5D1UI8m bE2vRxNasOb2qxxd8gL+oUS8e4+p3mS/cumdwrdxK+eoDJ+laTVAfsc0oM6IOYUi+5c/ 9JSaPT+mkwUoxSJnkX/RxUuBZ4qjKIqk8R8FOMqf1QoEclbqafFxYjdYZlNSnmQ+ZSwo P8RWq7RuILsRcN/G3VAdH1qD5H0AyckvEUYssAH4fn63KPAUR7CzLGlJ2WwZFh1WrAyB lGPA== X-Gm-Message-State: AOJu0Yy/XmulgPAZZkomxVfJHiBnTIA8e4f9XGs5OdFfd68ZE2RIvcUb dbqX/4o4n/GoN8oHSkkvnS8= X-Received: by 2002:a05:6a21:7784:b0:15d:facd:f214 with SMTP id bd4-20020a056a21778400b0015dfacdf214mr1315190pzc.32.1695912450711; Thu, 28 Sep 2023 07:47:30 -0700 (PDT) Received: from 377044c6c369.cse.ust.hk (191host097.mobilenet.cse.ust.hk. [143.89.191.97]) by smtp.gmail.com with ESMTPSA id l5-20020a170902eb0500b001c619fbd5fbsm8531199plb.298.2023.09.28.07.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 07:47:30 -0700 (PDT) From: Chengfeng Ye To: jejb@linux.ibm.com, martin.petersen@oracle.com, john.g.garry@oracle.com, dlemoal@kernel.org, yanaijie@huawei.com, jinpu.wang@ionos.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Chengfeng Ye Subject: [PATCH v2] scsi: mvsas: fix potential deadlock on &task->task_state_lock Date: Thu, 28 Sep 2023 14:47:21 +0000 Message-Id: <20230928144721.31794-1-dg573847474@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 28 Sep 2023 07:48:44 -0700 (PDT) &mvi->lock and &task->task_state_lock could be acquired under irq context from mvs_64xx_isr(). As mvs_port_deformed() also acquire the lock, called from workqueue sas_suspend_devices() under process context, and without irq protection. mvs_port_deformed() --> mvs_port_notify_deformed() --> mvs_do_release_task() --> mvs_int_rx() --> mvs_slot_complete() --> spin_lock(&mvi->lock) --> mvs_64xx_isr() --> spin_lock(&mvi->lock) mvs_port_deformed() --> mvs_port_notify_deformed() --> mvs_do_release_task() --> mvs_int_rx() --> mvs_slot_complete() --> spin_lock(&task->task_state_lock) --> mvs_64xx_isr() --> mvs_int_rx() --> mvs_slot_complete() --> spin_lock(&task->task_state_lock) Another strange thing is that while inspecting the code I find mvs_do_release_task() should be called with phy->mvi locked held, but the call chain from mvs_port_notify_deformed() seems do not hold the lock. The current patch just switch spin_lock(&task->task_state_lock) to spin_lock_irqsave(). If I didn't miss anything, seems the better way could be adding a spin_lock_irqsave() to protect mvi->lock at mvs_port_notify_deformed()? Signed-off-by: Chengfeng Ye --- Change in v2: Declare varible name as "irqflags", since "flags" is already used --- drivers/scsi/mvsas/mv_sas.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 1444b1f1c4c8..ea48c1e9f185 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -1534,6 +1534,7 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags) struct mvs_device *mvi_dev = NULL; struct task_status_struct *tstat; struct domain_device *dev; + unsigned long irqflags; u32 aborted; void *to; @@ -1546,12 +1547,12 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags) dev = task->dev; mvi_dev = dev->lldd_dev; - spin_lock(&task->task_state_lock); + spin_lock_irqsave(&task->task_state_lock, irqflags); task->task_state_flags &= ~SAS_TASK_STATE_PENDING; task->task_state_flags |= SAS_TASK_STATE_DONE; /* race condition*/ aborted = task->task_state_flags & SAS_TASK_STATE_ABORTED; - spin_unlock(&task->task_state_lock); + spin_unlock_irqrestore(&task->task_state_lock, irqflags); memset(tstat, 0, sizeof(*tstat)); tstat->resp = SAS_TASK_COMPLETE; -- 2.17.1