mei: bus: use correct lock ordering
Subsystems (2)
PATCH 1/2 mei: bus: use correct lock ordering
The correct lock order is
cl_bus_lock
device_lock
me_clients_rwsem
This order was violated in bus rescan and remove routines when me_client_rwsem was locked before cl_bus_lock.
Chain exists of: [ 4.321653] &dev->device_lock --> &dev->me_clients_rwsem --> &dev->cl_bus_lock [ 4.321653] [ 4.321679] Possible unsafe locking scenario: [ 4.321679] [ 4.321693] CPU0 CPU1 [ 4.321701] ---- ---- [ 4.321709] lock(&dev->cl_bus_lock); [ 4.321720] lock(&dev->me_clients_rwsem); [ 4.321733] lock(&dev->cl_bus_lock); [ 4.321745] lock(&dev->device_lock); [ 4.321755] [ 4.321755] *** DEADLOCK *** [ 4.321755]
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/misc/mei/bus.c +13 -5
@@ -830,17 +830,20 @@ static void mei_cl_bus_dev_stop(struct mei_cl_device *cldev)* mei_cl_bus_dev_destroy - destroy me client devices object * * @cldev: me client device +* +* Locking: called under "dev->cl_bus_lock" lock */ static void mei_cl_bus_dev_destroy (struct mei_cl_device *cldev) { + +WARN_ON (!mutex_is_locked (&cldev->bus->cl_bus_lock)); +if (!cldev->is_added)return ;device_del (&cldev->dev); -mutex_lock (&cldev->bus->cl_bus_lock);list_del_init (&cldev->bus_list); -mutex_unlock (&cldev->bus->cl_bus_lock); cldev->is_added =0 ;put_device (&cldev->dev);
@@ -866,8 +869,10 @@ void mei_cl_bus_remove_devices(struct mei_device *bus) {struct mei_cl_device *cldev, *next; +mutex_lock (&bus->cl_bus_lock);list_for_each_entry_safe (cldev, next, &bus->device_list, bus_list)mei_cl_bus_remove_device (cldev); +mutex_unlock (&bus->cl_bus_lock); }
@@ -877,12 +882,16 @@ void mei_cl_bus_remove_devices(struct mei_device *bus)* * @bus: mei device * @me_cl: me client +* +* Locking: called under "dev->cl_bus_lock" lock */ static void mei_cl_bus_dev_init (struct mei_device *bus,struct mei_me_client *me_cl) {struct mei_cl_device *cldev; +WARN_ON (!mutex_is_locked (&bus->cl_bus_lock)); +dev_dbg (bus->dev,"initializing %pUl" ,mei_me_cl_uuid (me_cl));if (me_cl->bus_added)
@@ -892,10 +901,8 @@ static void mei_cl_bus_dev_init(struct mei_device *bus,if (!cldev)return ; -mutex_lock (&cldev->bus->cl_bus_lock); me_cl->bus_added = true;list_add_tail (&cldev->bus_list, &bus->device_list); -mutex_unlock (&cldev->bus->cl_bus_lock); }
@@ -910,12 +917,13 @@ void mei_cl_bus_rescan(struct mei_device *bus)struct mei_cl_device *cldev, *n;struct mei_me_client *me_cl; +mutex_lock (&bus->cl_bus_lock); +down_read (&bus->me_clients_rwsem);list_for_each_entry (me_cl, &bus->me_clients, list)mei_cl_bus_dev_init (bus, me_cl);up_read (&bus->me_clients_rwsem); -mutex_lock (&bus->cl_bus_lock);list_for_each_entry_safe (cldev, n, &bus->device_list, bus_list) {if (!mei_me_cl_is_active (cldev->me_cl)) {
Signature · 1 line
2.4.3
PATCH 2/2 mei: bus: set the device name before running fixup
The mei bus fixup use dev_xxx services for printing to kernel log so we need to setup the device name prior to running fixup hooks.
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/bus.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/misc/mei/bus.c +16 -4
@@ -742,6 +742,19 @@ static struct device_type mei_cl_device_type = { };/** +* mei_cl_bus_set_name - set device name for me client device +* +* @cldev: me client device +*/ +static inline void mei_cl_bus_set_name (struct mei_cl_device *cldev) +{ +dev_set_name (&cldev->dev,"mei:%s:%pUl:%02X" , + cldev->name, +mei_me_cl_uuid (cldev->me_cl), +mei_me_cl_ver (cldev->me_cl)); +} + +/** * mei_cl_bus_dev_alloc - initialize and allocate mei client device * * @bus: mei device
@@ -764,6 +777,7 @@ static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus, cldev->dev.type = &mei_cl_device_type; cldev->bus =mei_dev_bus_get (bus); cldev->me_cl =mei_me_cl_get (me_cl); +mei_cl_bus_set_name (cldev); cldev->is_added =0 ;INIT_LIST_HEAD (&cldev->bus_list);
@@ -785,11 +799,9 @@ static bool mei_cl_bus_dev_setup(struct mei_device *bus, cldev->do_match =1 ;mei_cl_bus_dev_fixup (cldev); +/* the device name can change during fix up */ if (cldev->do_match) -dev_set_name (&cldev->dev,"mei:%s:%pUl:%02X" , - cldev->name, -mei_me_cl_uuid (cldev->me_cl), -mei_me_cl_ver (cldev->me_cl)); +mei_cl_bus_set_name (cldev);return cldev->do_match ==1 ; }
Signature · 1 line
2.4.3