FAILED: patch "[PATCH] driver core: take parent lock on deferred probe" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 4059f8986c8f50102a04335cc1da4921dfd262d8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026110340-circus-eggnog-92d2@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4059f8986c8f50102a04335cc1da4921dfd262d8 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Wed, 14 Oct 2026 15:31:08 +0200
Subject: [PATCH] driver core: take parent lock on deferred probe
USB interfaces should be probed with the parent USB device lock held, but this is not honoured when probe is deferred.
Add a new bus_probe_device_deferred() helper to handle deferred probe where the parent device lock is not held.
drivers/base/base.h +1 -0
@@ -154,6 +154,7 @@ struct kobject *virtual_device_parent(void);int bus_add_device (struct device *dev);void bus_probe_device (struct device *dev); +void bus_probe_device_deferred (struct device *dev);void bus_remove_device (struct device *dev);void bus_notify (struct device *dev,enum bus_notifier_event value);bool bus_is_registered (const struct bus_type *bus);
drivers/base/bus.c +21 -7
@@ -603,13 +603,7 @@ int bus_add_device(struct device *dev)return error; } -/** -* bus_probe_device - probe drivers for a new device -* @dev: device to probe -* -* - Automatically probe for a driver if the bus allows it. -*/ -void bus_probe_device (struct device *dev) +static void __bus_probe_device (struct device *dev) {struct subsys_private *sp =bus_to_subsys (dev->bus);struct subsys_interface *sif;
@@ -627,6 +621,26 @@ void bus_probe_device(struct device *dev)subsys_put (sp); } +/** +* bus_probe_device - probe drivers for a new device +* @dev: device to probe +* +* - Automatically probe for a driver if the bus allows it. +*/ +void bus_probe_device (struct device *dev) +{ +__bus_probe_device (dev); +} + +void bus_probe_device_deferred (struct device *dev) +{ +if (dev->type && dev->type->need_parent_lock) +device_lock (dev->parent); +__bus_probe_device (dev); +if (dev->type && dev->type->need_parent_lock) +device_unlock (dev->parent); +} +/** * bus_remove_device - remove device from bus * @dev: device to be removed
drivers/base/dd.c +4 -3
@@ -86,8 +86,9 @@ static void deferred_probe_work_func(struct work_struct *work)/* * This block processes every device in the deferred 'active' list. * Each device is removed from the active list and passed to -* bus_probe_device() to re-attempt the probe. The loop continues -* until every device in the active list is removed and retried. +* bus_probe_device_deferred() to re-attempt the probe. The loop +* continues until every device in the active list is removed and +* retried. * * Note: Once the device is removed from the list and the mutex is * released, it is possible for the device get freed by another thread
@@ -121,7 +122,7 @@ static void deferred_probe_work_func(struct work_struct *work)device_pm_move_to_tail (dev);dev_dbg (dev,"Retrying from deferred list\n" ); -bus_probe_device (dev); +bus_probe_device_deferred (dev);mutex_lock (&deferred_probe_mutex);put_device (dev);