Skip to content

Commit

Permalink
interconnect: Teach lockdep about icc_bw_lock order
Browse files Browse the repository at this point in the history
commit 1361917 upstream.

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>
Link: https://lore.kernel.org/r/20230807171148.210181-8-robdclark@gmail.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
robclark authored and gregkh committed Sep 23, 2023
1 parent 2575ef6 commit 4b0ccd8
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/interconnect/core.c
Expand Up @@ -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);
Expand Down

0 comments on commit 4b0ccd8

Please sign in to comment.