Skip to content

Commit 9086ea6

Browse files
Jim LinLuis Henriques
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 <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Luis Henriques <[email protected]>
1 parent 2adb920 commit 9086ea6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/pinctrl/core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,14 +1815,15 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
18151815
if (pctldev == NULL)
18161816
return;
18171817

1818-
mutex_lock(&pinctrldev_list_mutex);
18191818
mutex_lock(&pctldev->mutex);
1820-
18211819
pinctrl_remove_device_debugfs(pctldev);
1820+
mutex_unlock(&pctldev->mutex);
18221821

18231822
if (!IS_ERR(pctldev->p))
18241823
pinctrl_put(pctldev->p);
18251824

1825+
mutex_lock(&pinctrldev_list_mutex);
1826+
mutex_lock(&pctldev->mutex);
18261827
/* TODO: check that no pinmuxes are still active? */
18271828
list_del(&pctldev->node);
18281829
/* Destroy descriptor tree */

0 commit comments

Comments
 (0)