From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAA4835E1D5; Sat, 30 May 2026 20:44:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780173892; cv=none; b=Z6tFMEGVmmQdfnNwnJ7XPoHPkyMxSGjSIqj85i7oP2hiuylRl5iH9uMKRCKJP/pkj8VYOiIbPPsGvXZDQ9HcBh0CVvVE81am86jgnvaZKIzT0teSyTEfW0m2WaBF3yY/AH7uRprDSN5jld2N703TG8TTr7kPcZJPFH6h54mH0k0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780173892; c=relaxed/simple; bh=RQQTMSUlYVmsWV0GNSDmJ5Wt1VDx0vayUCwEBpR/iFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=keZ9PgrZWEvgcUZwAG03pgzoFJqX1lrKw8V45aUFI6/AXqMvfxC6Spvd2ydYUbDQ1LiBHVOHf5rxudtA6/MKUjUc/BMkkU+RhPo5nMGms2qfnuoPm9rjOaSpEKsQjXccwKRHYzJz3Y7AsRpAt+UHSiNaGTsS/rlD7nfYxBTI4zM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Mm9itYYQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Mm9itYYQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EB901F00893; Sat, 30 May 2026 20:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780173890; bh=sdnNQtoXvYOfEgsqTMi8GxFAxnCBOiGAg8PbKzq08Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Mm9itYYQnrRSPDMQKlC/wBQ4OEOLXGJ43w9PAyKoGqYaV1pPSHlzwNKOISrlnWEfT 5GsUXUrUFuXlgyiiFlshUbP4NCctZ7O00O5NZj/qNrPdUMmKOE1nSiZNNhBXS2LhRe o4Y8gaRycL84EZuPA/u2ZoJ874uzxL/WFieHbLas6CaHwH9Ga15nW8/uMUWblhc43T H07k6LXfftgvGrY/WbrjCxAC/04Hg+5Hw3lK+kjCavQNHXln43bZq+uf/Ad7bbJf/Y wYD3X6s37HYqeNGth+qCC+2w3E+vZ8zoYkLPPTFSHjUbLgGij+9Y0uFEfqbZo4UMYt 6dlgQ0PSxwZ0Q== From: srini@kernel.org To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Bjorn Andersson , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 8/8] slimbus: qcom-ngd-ctrl: Avoid ABBA on tx_lock/ctrl->lock Date: Sat, 30 May 2026 21:44:21 +0100 Message-ID: <20260530204421.116824-9-srini@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530204421.116824-1-srini@kernel.org> References: <20260530204421.116824-1-srini@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Andersson During the SSR/PDR down notification the tx_lock is taken with the intent to provide synchronization with active DMA transfers. But during this period qcom_slim_ngd_down() is invoked, which ends up in slim_report_absent(), which takes the slim_controller lock. In multiple other codepaths these two locks are taken in the opposite order (i.e. slim_controller then tx_lock). The result is a lockdep splat, and a possible deadlock: rprocctl/449 is trying to acquire lock: ffff00009793e620 (&ctrl->lock){+.+.}-{4:4}, at: slim_report_absent (drivers/slimbus/core.c:322) slimbus but task is already holding lock: ffff00009793fb50 (&ctrl->tx_lock){+.+.}-{4:4}, at: qcom_slim_ngd_ssr_pdr_notify (drivers/slimbus/qcom-ngd-ctrl.c:1475) slim_qcom_ngd_ctrl which lock already depends on the new lock. Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&ctrl->tx_lock); lock(&ctrl->lock); lock(&ctrl->tx_lock); lock(&ctrl->lock); The assumption is that the comment refers to the desire to not call qcom_slim_ngd_exit_dma() while we have an ongoing DMA TX transaction. But any such transaction is initiated and completed within a single qcom_slim_ngd_xfer_msg(). Prior to calling qcom_slim_ngd_exit_dma() the slim_controller is torn down, all child devices are notified that the slimbus is gone and the child devices are removed. Stop taking the tx_lock in qcom_slim_ngd_ssr_pdr_notify() to avoid the deadlock. Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart support") Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ngd-ctrl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 8b207efeadbc..3071e46d03be 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1471,15 +1471,12 @@ static int qcom_slim_ngd_ssr_pdr_notify(struct qcom_slim_ngd_ctrl *ctrl, switch (action) { case QCOM_SSR_BEFORE_SHUTDOWN: case SERVREG_SERVICE_STATE_DOWN: - /* Make sure the last dma xfer is finished */ - mutex_lock(&ctrl->tx_lock); if (ctrl->state != QCOM_SLIM_NGD_CTRL_DOWN) { pm_runtime_get_noresume(ctrl->ctrl.dev); ctrl->state = QCOM_SLIM_NGD_CTRL_DOWN; qcom_slim_ngd_down(ctrl); qcom_slim_ngd_exit_dma(ctrl); } - mutex_unlock(&ctrl->tx_lock); break; case QCOM_SSR_AFTER_POWERUP: case SERVREG_SERVICE_STATE_UP: -- 2.53.0