Skip to content

Commit 9de6839

Browse files
author
Danilo Krummrich
committed
Revert "driver core: enforce device_lock for driver_match_device()"
This reverts commit dc23806 ("driver core: enforce device_lock for driver_match_device()") and commit 289b145 ("driver core: fix inverted "locked" suffix of driver_match_device()"). While technically correct, there is a major downside to this approach: When a device is already present in the system and a driver is registered on the same bus, we iterate over all devices registered on this bus to see if one of them matches. If we come across an already bound one where the corresponding driver crashed while holding the device lock (e.g. in probe()) we can't make any progress anymore. However, drivers are typically the least tested code in the kernel and hence it is a case that is likely to happen regularly. Besides hurting developer ergonomics, it potentially decreases chances of shutting things down cleanly and obtaining logs in production environments as well [1]. This came up in the context of a firewire bug, which only in combination with the reverted commit, caused the machine to hang [2]. Additionally, it was observed in [3]. Thus, revert commit dc23806 ("driver core: enforce device_lock for driver_match_device()") and add a brief note clarifying that an implementer of struct bus_type must not expect match() to be called with the device lock held. Link: https://lore.kernel.org/driver-core/DGRGTIRHA62X.3RY09D9SOK77P@kernel.org/ [1] Link: https://lore.kernel.org/all/67f655bb-4d81-4609-b008-68d200255dd2@davidgow.net/ [2] Link: https://lore.kernel.org/lkml/CALbr=LZ4v7N=tO1vgOsyj9AS+XuNbn6kG-QcF+PacdMjSo0iyw@mail.gmail.com/ [3] Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Closes: https://lore.kernel.org/driver-core/CAHk-=wgJ_L1C=HjcYJotg_zrZEmiLFJaoic+PWthjuQrutrfJw@mail.gmail.com/ Reviewed-by: Gui-Dong Han <hanguidong02@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://patch.msgid.link/20260302002545.19389-1-dakr@kernel.org [ Add additional Link: reference. - Danilo ] Signed-off-by: Danilo Krummrich <dakr@kernel.org>
1 parent 11439c4 commit 9de6839

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

drivers/base/base.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,19 +179,10 @@ void device_release_driver_internal(struct device *dev, const struct device_driv
179179
void driver_detach(const struct device_driver *drv);
180180
void driver_deferred_probe_del(struct device *dev);
181181
void device_set_deferred_probe_reason(const struct device *dev, struct va_format *vaf);
182-
static inline int driver_match_device_locked(const struct device_driver *drv,
183-
struct device *dev)
184-
{
185-
device_lock_assert(dev);
186-
187-
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
188-
}
189-
190182
static inline int driver_match_device(const struct device_driver *drv,
191183
struct device *dev)
192184
{
193-
guard(device)(dev);
194-
return driver_match_device_locked(drv, dev);
185+
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
195186
}
196187

197188
static inline void dev_sync_state(struct device *dev)

drivers/base/dd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ static int __device_attach_driver(struct device_driver *drv, void *_data)
928928
bool async_allowed;
929929
int ret;
930930

931-
ret = driver_match_device_locked(drv, dev);
931+
ret = driver_match_device(drv, dev);
932932
if (ret == 0) {
933933
/* no match */
934934
return 0;

include/linux/device/bus.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ struct fwnode_handle;
3535
* otherwise. It may also return error code if determining that
3636
* the driver supports the device is not possible. In case of
3737
* -EPROBE_DEFER it will queue the device for deferred probing.
38+
* Note: This callback may be invoked with or without the device
39+
* lock held.
3840
* @uevent: Called when a device is added, removed, or a few other things
3941
* that generate uevents to add the environment variables.
4042
* @probe: Called when a new device or driver add to this bus, and callback

0 commit comments

Comments
 (0)