Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 515939f

Browse files
Jim Lingregkh
Jim Lin
authored andcommitted
pinctrl: Fix two deadlocks
commit db93fac upstream. This patch is to fix two deadlock cases. Deadlock 1: CPU #1 pinctrl_register-> pinctrl_get -> create_pinctrl (Holding lock pinctrl_maps_mutex) -> get_pinctrl_dev_from_devname (Trying to acquire lock pinctrldev_list_mutex) CPU #0 pinctrl_unregister (Holding lock pinctrldev_list_mutex) -> pinctrl_put ->> pinctrl_free -> pinctrl_dt_free_maps -> pinctrl_unregister_map (Trying to acquire lock pinctrl_maps_mutex) Simply to say CPU#1 is holding lock A and trying to acquire lock B, CPU#0 is holding lock B and trying to acquire lock A. Deadlock 2: CPU #3 pinctrl_register-> pinctrl_get -> create_pinctrl (Holding lock pinctrl_maps_mutex) -> get_pinctrl_dev_from_devname (Trying to acquire lock pinctrldev_list_mutex) CPU #2 pinctrl_unregister (Holding lock pctldev->mutex) -> pinctrl_put ->> pinctrl_free -> pinctrl_dt_free_maps -> pinctrl_unregister_map (Trying to acquire lock pinctrl_maps_mutex) CPU #0 tegra_gpio_request (Holding lock pinctrldev_list_mutex) -> pinctrl_get_device_gpio_range (Trying to acquire lock pctldev->mutex) Simply to say CPU#3 is holding lock A and trying to acquire lock D, CPU#2 is holding lock B and trying to acquire lock A, CPU#0 is holding lock D and trying to acquire lock B. Signed-off-by: Jim Lin <jilin@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ce441cb commit 515939f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/pinctrl/core.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1801,14 +1801,15 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
18011801
if (pctldev == NULL)
18021802
return;
18031803

1804-
mutex_lock(&pinctrldev_list_mutex);
18051804
mutex_lock(&pctldev->mutex);
1806-
18071805
pinctrl_remove_device_debugfs(pctldev);
1806+
mutex_unlock(&pctldev->mutex);
18081807

18091808
if (!IS_ERR(pctldev->p))
18101809
pinctrl_put(pctldev->p);
18111810

1811+
mutex_lock(&pinctrldev_list_mutex);
1812+
mutex_lock(&pctldev->mutex);
18121813
/* TODO: check that no pinmuxes are still active? */
18131814
list_del(&pctldev->node);
18141815
/* Destroy descriptor tree */

0 commit comments

Comments
 (0)