public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
	Rob Clark <robdclark@chromium.org>,
	Georgi Djakov <djakov@kernel.org>,
	linux-pm@vger.kernel.org (open list:INTERCONNECT API),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v4 7/9] interconnect: Teach lockdep about icc_bw_lock order
Date: Mon,  7 Aug 2023 10:11:41 -0700	[thread overview]
Message-ID: <20230807171148.210181-8-robdclark@gmail.com> (raw)
In-Reply-To: <20230807171148.210181-1-robdclark@gmail.com>

From: Rob Clark <robdclark@chromium.org>

Teach lockdep that icc_bw_lock is needed in code paths that could
deadlock if they trigger reclaim.

Signed-off-by: Rob Clark <robdclark@chromium.org>
---
 drivers/interconnect/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index e15a92a79df1..1afbc4f7c6e7 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1041,13 +1041,21 @@ void icc_sync_state(struct device *dev)
 			}
 		}
 	}
+	mutex_unlock(&icc_bw_lock);
 	mutex_unlock(&icc_lock);
 }
 EXPORT_SYMBOL_GPL(icc_sync_state);
 
 static int __init icc_init(void)
 {
-	struct device_node *root = of_find_node_by_path("/");
+	struct device_node *root;
+
+	/* Teach lockdep about lock ordering wrt. shrinker: */
+	fs_reclaim_acquire(GFP_KERNEL);
+	might_lock(&icc_bw_lock);
+	fs_reclaim_release(GFP_KERNEL);
+
+	root = of_find_node_by_path("/");
 
 	providers_count = of_count_icc_providers(root);
 	of_node_put(root);
-- 
2.41.0


  parent reply	other threads:[~2023-08-07 17:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-07 17:11 [PATCH v4 0/9] drm/msm+PM+icc: Make job_run() reclaim-safe Rob Clark
2023-08-07 17:11 ` [PATCH v4 1/9] PM / devfreq: Drop unneed locking to appease lockdep Rob Clark
2023-08-07 17:11 ` [PATCH v4 2/9] PM / devfreq: Teach lockdep about locking order Rob Clark
2023-08-07 17:11 ` [PATCH v4 3/9] PM / QoS: Fix constraints alloc vs reclaim locking Rob Clark
2023-08-07 17:11 ` [PATCH v4 4/9] PM / QoS: Decouple request alloc from dev_pm_qos_mtx Rob Clark
2023-08-07 17:11 ` [PATCH v4 5/9] PM / QoS: Teach lockdep about dev_pm_qos_mtx locking order Rob Clark
2023-08-07 17:11 ` [PATCH v4 6/9] interconnect: Fix locking for runpm vs reclaim Rob Clark
2023-08-07 17:11 ` Rob Clark [this message]
2023-08-07 17:11 ` [PATCH v4 8/9] drm/sched: Add (optional) fence signaling annotation Rob Clark
2023-08-07 17:11 ` [PATCH v4 9/9] drm/msm: Enable fence signalling annotations Rob Clark

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230807171148.210181-8-robdclark@gmail.com \
    --to=robdclark@gmail.com \
    --cc=djakov@kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=robdclark@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox