Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soundwire: bus: Prevent lockdep asserts when stream has multiple buses

Give the bus_lock and msg_lock of each bus a different unique key
so that it is possible to acquire the locks of multiple buses
without lockdep asserting a possible deadlock.

Using mutex_init() to initialize a mutex gives all those mutexes
the same lock class. Lockdep checking treats it as an error to
attempt to take a mutex while already holding a mutex of the same
class. This causes a lockdep assert when sdw_acquire_bus_lock()
attempts to lock multiple buses, and when do_bank_switch() takes
multiple msg_lock.

[ 138.697350] WARNING: possible recursive locking detected
[ 138.697366] 6.3.0-test #1 Tainted: G E
[ 138.697380] --------------------------------------------
[ 138.697394] play/903 is trying to acquire lock:
[ 138.697409] ffff99b8c41aa8c8 (&bus->bus_lock){+.+.}-{3:3}, at:
sdw_prepare_stream+0x52/0x2e0
[ 138.697443]
but task is already holding lock:
[ 138.697468] ffff99b8c41af8c8 (&bus->bus_lock){+.+.}-{3:3}, at:
sdw_prepare_stream+0x52/0x2e0
[ 138.697493]
other info that might help us debug this:
[ 138.697521] Possible unsafe locking scenario:

[ 138.697540] CPU0
[ 138.697550] ----
[ 138.697559] lock(&bus->bus_lock);
[ 138.697570] lock(&bus->bus_lock);
[ 138.697581]
*** DEADLOCK ***

Giving each mutex a unique key allows multiple to be held
without triggering a lockdep assert. But note that it does not
allow them to be taken in one order then a different order.
If two mutexes are taken in the order A, B then they must
always be taken in that order otherwise they could deadlock.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230615141208.679011-1-rf@opensource.cirrus.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Richard Fitzgerald and committed by
Vinod Koul
256a9978 490937d4

+16 -2
+13 -2
drivers/soundwire/bus.c
··· 69 69 return -EINVAL; 70 70 } 71 71 72 - mutex_init(&bus->msg_lock); 73 - mutex_init(&bus->bus_lock); 72 + /* 73 + * Give each bus_lock and msg_lock a unique key so that lockdep won't 74 + * trigger a deadlock warning when the locks of several buses are 75 + * grabbed during configuration of a multi-bus stream. 76 + */ 77 + lockdep_register_key(&bus->msg_lock_key); 78 + __mutex_init(&bus->msg_lock, "msg_lock", &bus->msg_lock_key); 79 + 80 + lockdep_register_key(&bus->bus_lock_key); 81 + __mutex_init(&bus->bus_lock, "bus_lock", &bus->bus_lock_key); 82 + 74 83 INIT_LIST_HEAD(&bus->slaves); 75 84 INIT_LIST_HEAD(&bus->m_rt_list); 76 85 ··· 190 181 sdw_master_device_del(bus); 191 182 192 183 sdw_bus_debugfs_exit(bus); 184 + lockdep_unregister_key(&bus->bus_lock_key); 185 + lockdep_unregister_key(&bus->msg_lock_key); 193 186 ida_free(&sdw_bus_ida, bus->id); 194 187 } 195 188 EXPORT_SYMBOL(sdw_bus_master_delete);
+3
include/linux/soundwire/sdw.h
··· 5 5 #define __SOUNDWIRE_H 6 6 7 7 #include <linux/bug.h> 8 + #include <linux/lockdep_types.h> 8 9 #include <linux/mod_devicetable.h> 9 10 #include <linux/bitfield.h> 10 11 ··· 908 907 struct list_head slaves; 909 908 DECLARE_BITMAP(assigned, SDW_MAX_DEVICES); 910 909 struct mutex bus_lock; 910 + struct lock_class_key bus_lock_key; 911 911 struct mutex msg_lock; 912 + struct lock_class_key msg_lock_key; 912 913 int (*compute_params)(struct sdw_bus *bus); 913 914 const struct sdw_master_ops *ops; 914 915 const struct sdw_master_port_ops *port_ops;