From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.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 v5 07/11] interconnect: Teach lockdep about icc_bw_lock order
Date: Tue, 22 Aug 2023 11:01:54 -0700 [thread overview]
Message-ID: <20230822180208.95556-8-robdclark@gmail.com> (raw)
In-Reply-To: <20230822180208.95556-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
WARNING: multiple messages have this Message-ID (diff)
From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Rob Clark <robdclark@chromium.org>,
"open list:INTERCONNECT API" <linux-pm@vger.kernel.org>,
linux-arm-msm@vger.kernel.org,
open list <linux-kernel@vger.kernel.org>,
Georgi Djakov <djakov@kernel.org>,
freedreno@lists.freedesktop.org
Subject: [PATCH v5 07/11] interconnect: Teach lockdep about icc_bw_lock order
Date: Tue, 22 Aug 2023 11:01:54 -0700 [thread overview]
Message-ID: <20230822180208.95556-8-robdclark@gmail.com> (raw)
In-Reply-To: <20230822180208.95556-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
next prev parent reply other threads:[~2023-08-22 18:02 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-22 18:01 [PATCH v5 00/11] drm/msm+PM+icc: Make job_run() reclaim-safe Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 01/11] PM / devfreq: Drop unneed locking to appease lockdep Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 02/11] PM / devfreq: Teach lockdep about locking order Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 03/11] PM / QoS: Fix constraints alloc vs reclaim locking Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:47 ` Rafael J. Wysocki
2023-08-22 18:47 ` Rafael J. Wysocki
2023-08-22 19:41 ` Rob Clark
2023-08-22 19:41 ` Rob Clark
2023-08-23 21:01 ` Rob Clark
2023-08-23 21:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 04/11] PM / QoS: Decouple request alloc from dev_pm_qos_mtx Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-09-22 7:14 ` kernel test robot
2023-09-22 7:14 ` kernel test robot
2023-08-22 18:01 ` [PATCH v5 05/11] PM / QoS: Teach lockdep about dev_pm_qos_mtx locking order Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 06/11] interconnect: Fix locking for runpm vs reclaim Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` Rob Clark [this message]
2023-08-22 18:01 ` [PATCH v5 07/11] interconnect: Teach lockdep about icc_bw_lock order Rob Clark
2023-08-22 18:01 ` [PATCH v5 08/11] drm/msm/a6xx: Remove GMU lock from runpm paths Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 09/11] drm/msm: Move runpm enable in submit path Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 10/11] drm/sched: Add (optional) fence signaling annotation Rob Clark
2023-08-22 18:01 ` Rob Clark
2023-08-22 18:01 ` [PATCH v5 11/11] drm/msm: Enable fence signalling annotations Rob Clark
2023-08-22 18:01 ` 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=20230822180208.95556-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.