* Re: [PATCH net-next v16 3/6] driver core: add device_schedule_reprobe()
@ 2026-09-17 16:11 netdev-bot+sashiko
0 siblings, 0 replies; 2+ messages in thread
From: netdev-bot+sashiko @ 2026-09-17 16:11 UTC (permalink / raw)
To: daniel
Cc: jiri, davem, edumazet, kuba, pabeni, horms, corbet, skhan,
rdunlap, gregkh, rafael, dakr, andrew, olteanv, netdev,
linux-doc, linux-kernel, driver-core
Thank you for your contribution! Sashiko AI review found 8 potential
issue(s) to consider:
Critical: 0 · High: 1 · Medium: 3 · Low: 4
- [High] The new `abort_if_blocked` protection stops at @dev.
- [Medium] `__device_release_driver()` (drivers/base/dd.c:1341-1345) can
now abandon a release *inside* the `while (device_links_busy(dev))`…
- [Medium] Only the detach half of the re-probe is gated on
`defer_all_probes`; the attach half is not.
- [Medium] The detach and the re-attach are not one serialized operation,
so an administrative unbind can be acknowledged and then undone.
- [Low] `device_schedule_reprobe()` stores only a raw `const struct
device_driver *` (`drv = READ_ONCE(dev->driver)`, no reference, no…
- [Low] The kernel-doc of `device_schedule_reprobe()` says "Nothing is
locked in the caller's context, so this may be called from any process…
- [Low] Reported for completeness; my baseline decision is that this is
NOT a defect to act on.
- [Low] Reported for completeness; my baseline decision is FALSE
POSITIVE.
--
driver core: add device_schedule_reprobe()
This adds a driver-core helper that schedules a delayed detach and
re-probe of a device from built-in work, replacing the open-coded work
items drivers use today. __device_release_driver() gains a return value
and an abort_if_blocked flag so a re-probe can abandon the unbind when
probing has been blocked meanwhile.
A few questions about the new helper and the new flag.
> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
> index f6525a7ee8c54..f521ddefc4a88 100644
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@ -1314,8 +1314,12 @@ EXPORT_SYMBOL_GPL(driver_attach);
> /*
> * __device_release_driver() must be called with @dev lock held.
> * When called for a USB interface, @dev->parent lock must be held as well.
> + * @abort_if_blocked gives up the release instead when probing has been
> + * blocked while the locks were dropped; only a caller that may abandon
> + * the unbind altogether can ask for it.
> */
> -static void __device_release_driver(struct device *dev, struct device *parent)
> +static bool __device_release_driver(struct device *dev, struct device *parent,
> + bool abort_if_blocked)
> {
> struct device_driver *drv;
>
> @@ -1334,9 +1338,10 @@ static void __device_release_driver(struct device *dev, struct device *parent)
> * have released the driver successfully while this one
> * was waiting, so check for that.
> */
> - if (dev->driver != drv) {
> + if (dev->driver != drv ||
> + (abort_if_blocked && defer_all_probes)) {
> pm_runtime_put(dev);
> - return;
> + return false;
> }
> }
>
[Severity: Medium]
When the new abort_if_blocked && defer_all_probes arm fires, is the
device-links state left half torn down?
By the time this check runs, device_links_busy() has already done:
drivers/base/core.c:device_links_busy() {
...
WRITE_ONCE(link->status, DL_STATE_SUPPLIER_UNBIND);
}
dev->links.status = DL_DEV_UNBINDING;
...
}
and device_links_unbind_consumers() has already force-released the drivers
of the active consumers.
Returning false here leaves @dev bound, so device_links_driver_cleanup() -
the only code that moves those links back to DL_STATE_DORMANT and clears
DL_DEV_UNBINDING - never runs, and device_links_driver_bound() cannot run
either because the supplier never rebinds.
Can the already-detached consumers then re-probe?
device_links_check_suppliers() looks like it would defer them forever:
drivers/base/core.c:device_links_check_suppliers() {
...
if (link->status != DL_STATE_AVAILABLE &&
!device_link_test(link, DL_FLAG_SYNC_STATE_ONLY)) {
...
ret = dev_err_probe(dev, -EPROBE_DEFER, ...);
...
}
and any new device_link_add() against this still-bound supplier starts at
DL_STATE_SUPPLIER_UNBIND because supplier->links.status is DL_DEV_UNBINDING.
The pre-existing dev->driver != drv arm is different in that a concurrent
releaser completes the state machine. Here the only caller passing true,
device_reprobe_work_fn(), treats false as "nothing happened" and does no
compensating cleanup. Should the kernel-doc and commit message mention this,
or should the abort undo the links state it inherits?
[ ... ]
> @@ -1369,7 +1377,7 @@ void device_release_driver_internal(struct device *dev,
> __device_driver_lock(dev, parent);
>
> if (!drv || drv == dev->driver)
> - __device_release_driver(dev, parent);
> + __device_release_driver(dev, parent, false);
>
> __device_driver_unlock(dev, parent);
> }
[Severity: High]
Does the new flag actually close the ->shutdown()/->remove() interleaving
for the consumers, or only for @dev?
The commit message says:
"__device_release_driver() drops the device lock while busy consumer
links are unbound, which would let a ->shutdown() interleave in the
middle of a release already under way, so it now re-checks on
re-acquisition and abandons the release."
But the consumer unbinds happen inside that dropped-lock window, before the
new check is evaluated:
drivers/base/dd.c:__device_release_driver() {
...
while (device_links_busy(dev)) {
__device_driver_unlock(dev, parent);
device_links_unbind_consumers(dev);
__device_driver_lock(dev, parent);
...
}
and each consumer goes through this wrapper, which hardcodes the flag off:
drivers/base/core.c:device_links_unbind_consumers() {
...
device_release_driver_internal(consumer, NULL,
consumer->parent);
...
}
So the sequence looks reachable:
device_reprobe_work_fn()
device_lock(dev) /* defer_all_probes == false */
__device_release_driver(dev, NULL, true)
device_links_busy(dev) == true
device_unlock(dev)
device_links_unbind_consumers(dev)
meanwhile:
device_shutdown()
device_block_probing() /* defer_all_probes = true */
device_lock(consumer)
consumer->driver->shutdown(consumer)
device_unlock(consumer)
back in device_links_unbind_consumers():
device_release_driver_internal(consumer, ...)
__device_release_driver(consumer, ..., false)
device_remove(consumer) /* consumer ->remove() */
Is the consumer's ->remove() then run after its ->shutdown() has already
quiesced it? Nothing else serialises the two beyond the consumer's own
device lock, and wait_for_device_probe() cannot see the new delayed work:
drivers/base/dd.c:wait_for_device_probe() {
flush_work(&deferred_probe_work);
wait_event(probe_waitqueue, atomic_read(&probe_count) == 0);
async_synchronize_full();
}
Should the abort decision be propagated into the consumer releases before
their removal callbacks run, or should shutdown be synchronised against the
whole in-flight re-probe?
> @@ -1436,3 +1444,98 @@ void driver_detach(const struct device_driver *drv)
> put_device(dev);
> }
> }
> +
> +struct device_reprobe {
> + struct delayed_work work;
> + const struct device_driver *drv;
> + struct device *dev;
> +};
> +
> +static void device_reprobe_work_fn(struct work_struct *work)
> +{
> + struct device_reprobe *rp = container_of(work, struct device_reprobe,
> + work.work);
> + struct device *dev = rp->dev;
> + bool detached = false;
> + int ret;
> +
> + device_lock(dev);
> + /*
> + * rp->drv is only ever compared, never dereferenced: the driver it
> + * points to may have been unregistered and freed by now.
> + * device_shutdown() blocks probing before its walk reaches @dev.
> + */
> + if (!defer_all_probes && !dev->p->dead && dev->driver == rp->drv)
> + detached = __device_release_driver(dev, NULL, true);
> + device_unlock(dev);
> +
> + if (detached) {
> + ret = device_attach(dev);
> + if (ret < 0 && ret != -EPROBE_DEFER)
> + dev_err_probe(dev, ret,
> + "re-probe failed, device left unbound\n");
> + }
[Severity: Medium]
Only the detach half is gated on defer_all_probes here; is the attach half
also meant to be?
device_attach() runs after device_unlock(dev) with no re-check, and
__device_attach() resumes the parent before anything tests defer_all_probes:
drivers/base/dd.c:__device_attach() {
...
if (dev->parent)
pm_runtime_get_sync(dev->parent);
ret = bus_for_each_drv(dev->bus, NULL, &data,
__device_attach_driver);
...
}
really_probe() only rejects the probe later. device_shutdown() itself only
does pm_runtime_get_noresume() plus a barrier, so a parent that is
RPM_SUSPENDED stays suspended - can this work then runtime-resume a parent
whose ->shutdown() has already run, and add @dev to the deferred-probe list
while probing is blocked?
Nothing cancels or flushes this work either, and wait_for_device_probe()
(which device_block_probing() relies on) only flushes deferred_probe_work,
waits for probe_count and calls async_synchronize_full(), none of which
observe a system_freezable_wq delayed work.
[Severity: Medium]
Can an administrative unbind be acknowledged and then undone here, since the
detach and the re-attach are not one serialised operation?
drivers/base/bus.c:unbind_store() {
...
if (dev && dev->driver == drv) {
device_driver_detach(dev);
err = count;
...
}
That dev->driver == drv test is unlocked, and device_driver_detach() ends up
in device_release_driver_internal(), which blocks on the device lock this
work holds. When it gets the lock, dev->driver is NULL, so it does nothing,
and unbind_store() still returns count. Then this work calls
device_attach(dev) and the device is bound again. The same applies to an
unbind arriving in the window between device_unlock(dev) and
device_attach(dev).
The commit message lists "a stale re-probe undoes an administrative unbind"
among the things the new helper addresses, while the new return value only
covers an unbind that wins inside the busy-consumer-links loop. Could that
wording be narrowed, or the gap between detach and re-attach closed?
> +
> + put_device(dev);
> + kfree(rp);
> +}
> +
> +/**
> + * device_schedule_reprobe - schedule a deferred detach and re-probe
> + * @dev: device to detach and re-probe
> + * @delay_ms: delay in milliseconds before the re-probe runs
> + *
> + * Schedule a detach and re-probe of @dev after @delay_ms milliseconds.
> + * The re-probe is skipped if, by the time the scheduled work runs, the
> + * device has been removed, probing has been blocked for a system
> + * shutdown, or @dev is no longer bound to the driver that was bound at
> + * scheduling time.
> + *
> + * The work function is built-in text, so the bound driver may call this
> + * from its own code without holding a module reference. If the driver
> + * module is unloaded before the work runs, driver unregistration unbinds
> + * @dev first and the scheduled work does nothing.
[ ... ]
> + *
> + * Nothing is locked in the caller's context, so this may be called from
> + * any process context, @dev's own device lock held included, but not
> + * from @dev's ->probe(), which the scheduled work would detach.
[ ... ]
> + */
> +int device_schedule_reprobe(struct device *dev, unsigned int delay_ms)
> +{
> + const struct device_driver *drv;
> + struct device_reprobe *rp;
> +
> + drv = READ_ONCE(dev->driver);
[Severity: Low]
The recorded identity of the binding is a bare struct device_driver pointer,
with no reference, no module pin and no generation counter, and
device_reprobe_work_fn() gates the destructive detach only on
dev->driver == rp->drv
Is pointer identity enough here? An unbind followed by a rebind of the same
driver within @delay_ms makes the test pass for a binding the caller never
scheduled against. After a module unload, can the same address be reused by
another module's struct device_driver, in which case the kernel-doc promise
"If the driver module is unloaded before the work runs, driver
unregistration unbinds @dev first and the scheduled work does nothing."
no longer holds, and the work would drive __device_release_driver() -
including device_links_unbind_consumers() and an unrelated driver's
->remove() - followed by device_attach()?
There is also no cancel or flush counterpart, so a caller cannot gate this
itself. Would a bind generation counter, a per-binding token, or at least
comparing the driver name as well, match the documented semantics?
> + /*
> + * A bus taking the parent lock would need @dev's parent pinned until
> + * the work runs, which device_move() can invalidate.
> + */
> + if (!drv || !dev->bus || dev->bus->need_parent_lock || !dev->p ||
> + dev->p->dead || !device_is_registered(dev))
> + return -EINVAL;
> +
> + rp = kzalloc_obj(*rp);
> + if (!rp)
> + return -ENOMEM;
[Severity: Low]
The kernel-doc says this "may be called from any process context", but
kzalloc_obj() with no gfp argument resolves to GFP_KERNEL and may sleep:
include/linux/gfp.h:
#define __default_gfp(a,b,...) b
#define default_gfp(...) __default_gfp(,##__VA_ARGS__,GFP_KERNEL)
The commit message invites callers from the PM callbacks, whose _late and
_noirq phases run with interrupts disabled. Could a Context: line stating
that this helper may sleep be added, or the gfp flags be passed explicitly?
> +
> + rp->dev = get_device(dev);
> + rp->drv = drv;
> +
> + INIT_DELAYED_WORK(&rp->work, device_reprobe_work_fn);
> + queue_delayed_work(system_freezable_wq, &rp->work,
> + msecs_to_jiffies(delay_ms));
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(device_schedule_reprobe);
[Severity: Low]
This isn't a bug, just a wording note. The commit message opens by
describing live defects in iwlwifi's iwl_trans_reprobe_wk() and hci_h5's
h5_btrtl_reprobe_worker():
"both end that work function with put_device(); kfree();
module_put(THIS_MODULE);, where a concurrent rmmod can free the module
text the epilogue is still executing."
Neither driver is converted here and there is no Fixes: tag, while the newly
exported symbol has no in-tree caller until the mxl862xx patches later in
the series. Splitting the core helper from its first user is normal, so
nothing needs changing in the code; would leading with the motivation rather
than with those two drivers read more clearly?
--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/cover.1789477568.git.daniel%40makrotopia.org
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH net-next v16 0/6] net: dsa: mxl862xx: devlink flash and rescue
@ 2026-09-15 13:09 Daniel Golle
2026-09-15 13:09 ` [PATCH net-next v16 3/6] driver core: add device_schedule_reprobe() Daniel Golle
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Golle @ 2026-09-15 13:09 UTC (permalink / raw)
To: Jiri Pirko, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Jonathan Corbet, Shuah Khan,
Randy Dunlap, Daniel Golle, Greg Kroah-Hartman,
Rafael J. Wysocki, Danilo Krummrich, Andrew Lunn,
Vladimir Oltean, netdev, linux-doc, linux-kernel, driver-core
This series adds "devlink dev flash" and "devlink dev info" support to
the MaxLinear MxL862xx DSA driver, and makes a switch stuck in its
MCUboot loader recoverable through the same path.
The switch is flashed over the loader's clause-22 SMDIO download
interface after the firmware API has rebooted it into MCUboot, and the
driver reinitialises through a deferred detach and re-probe once the
new image runs. A switch found in MCUboot at probe registers in a
reduced rescue mode with firmware version 0.0.0, so the same flash flow
recovers it; an interrupted download is drained in the background
first. The deferred re-probe comes from a new driver-core helper,
device_schedule_reprobe(), since a driver-owned work item cannot
survive a racing rmmod, nor give up its detach once the core has
blocked probing for a shutdown. fwupd's devlink plugin carries the
matching quirks [17].
Patch 3 is a driver-core change and patch 4 does not link without it,
so the series needs a driver-core ack before net-next can take it.
Tested on an MxL86252C switch of the BananaPi R4 Pro 8X: an upgrade
through fwupd; a reboot issued while a flash was running, which waits
for the transfer to finish; a host crash mid-transfer, whose wedged
download the background drain recovered; and a power cut mid-transfer,
after which the loader came up ready and fwupd flashed the switch from
0.0.0 back to a released firmware.
Changes since v15 [20]:
- patch 1: the commit message no longer puts a notification pair
around a missing firmware file; the core fails that before the pair,
which wraps the call into the trampoline only
- patch 3: take no lock in the caller's context and drop the parent
snapshot, refusing buses that need the parent lock instead. The
caller-context device lock inverted against the devlink instance
lock, which a flash holds across the call, and against the
synchronous cancel of the rescue self-heal work; a pinned parent can
also be freed by device_move(). Only usb_bus_type sets
need_parent_lock, and the conversions posted separately re-probe PCI
and serdev devices, so none of them is refused. Patches 4 and 5 need
no change of their own for either inversion (all found by Sashiko AI
review)
- patch 3: abandon the release when probing gets blocked while
__device_release_driver() has the locks dropped to unbind busy
consumer links, closing the one window where a ->remove() could
follow a ->shutdown(). Earlier versions called it pre-existing, which
it is, but a deferred re-probe is the one unbind that may be
abandoned, so it takes a flag the other callers do not (found by
Sashiko AI review)
- patch 3: the commit message now describes what this patch changes
rather than bugs in the drivers it does not convert (found by Sashiko
AI review)
- patch 3: the commit message no longer claims the detach is
synchronised with device_shutdown() in every case. Probing is
blocked only once wait_for_device_probe() has returned, so a
re-probe already past the check detaches the device, which then runs
->remove() in place of ->shutdown()
- patch 4: a firmware write blocked by a running flash reports success
instead of -EBUSY. Tearing a bridge down over a flash, as a reboot
does, made port_vlan_del() fail; the bridge then leaves the VLAN on
its list and __vlan_group_free() warns and frees the group with the
entries still linked
- patch 4: ->shutdown() now waits for a flash in flight and refuses
one requested after it, so a reboot cannot cut the image in half.
The devlink core already serialises .remove() through the instance
lock; ->shutdown() does not go through devlink and takes that lock
itself
- patch 4: the -EBUSY extack of a pending reprobe states a fact rather
than advising a retry, and the comment on mxl862xx_read_chip_id()
drops the rescue-mode cache that only patch 5 creates
- patch 4: select CRC32, which nothing else selects for the image
checksum validation (found by Sashiko AI review)
- patch 5: treat a byte count outliving the settle step as a busy
loader and wait out an erase a dead session left running before
draining, so a host that died during the loader's erase no longer
fails probe with the -ETIMEDOUT this series exists to avoid; drop the
loader's clean ready state with the cached identity when a flash
fails; state facts only in the extack of a failed recovery (all found
by Sashiko AI review)
- patch 5: the commit message and the comments no longer say the
clause-45 API floods the log with CRC errors when no firmware
answers. The mailbox commands run into their timeouts instead, and
testing the stuck-in-MCUboot paths produces no such message; what
probing SB PDI first saves is the ten seconds of polling and the
-ETIMEDOUT that ends probe
- patch 5: move the rescue branch of mxl862xx_setup() into a function
of its own, which brings its messages back inside 100 columns; state
a fact in the -EBUSY extack of a running recovery; trim the drain
comment, whose protocol detail is in the file header, and order its
declarations
- patch 6: document that the ports come back down, which recovery
failure needs a power cycle and which a rebind, and what a re-probe
that cannot be scheduled leaves behind (found by Sashiko AI review)
- patch 6: document that a reboot waits for a running flash, that a
flash requested after it is refused, and that a bus error ends the
download recovery for good; title-case the "Flash Update" heading
like the other devlink driver documents
- Andrew's Reviewed-by is kept on patches 1, 2 and 6: patch 1 gained
commit message text only and patch 6 the documentation sentences
above. It is dropped on patch 4, which gained the shutdown
serialisation
- patch 3 has drawn no driver-core reply here or in its three
standalone postings [11][14]. The helper is no longer an RFC: Hans
de Goede reviewed and tested it there [15][16], and the conversions
of the open-coded users in iwlwifi, hci_h5 and btintel_pcie follow
once this series is merged
- the remaining findings of that review are not acted on: patch 1 is
asked once more to install .flash_update only for drivers
implementing the callback, as v4 did, and stays unconditional as
Andrew asked in v9; the empty supported_interfaces a rescue-mode
probe leaves for the quad-mode sub-interfaces can only reach phylink
through a CPU port on one of them, which the chip does not support;
and the driver pointer patch 3 records could in theory match a
different driver loaded at the same address within the delay, at the
cost of one spurious re-probe
- the changes to patches 1 and 3 to 6, the commit message of patch 1
included, were written with an LLM coding assistant working from the
Sashiko findings and from a local review of the posted series, and
reviewed by hand; the Assisted-by tags on patches 3 to 6 record this
Changes since v14 [19]:
- patch 3: skip the detach while probing is blocked, which
device_shutdown() does before its walk reaches any device, instead of
a per-device flag set only once the walk arrives; validate the device
and snapshot the parent, its locking requirement and the bound driver
under the device lock; keep -EPROBE_DEFER out of the re-probe error
path so it cannot overwrite a deferred probe reason (all found by
Sashiko AI review)
- patch 4: treat the closing END write as advisory, since the loader
has verified the image by then, and admit only the flash task's own
firmware reads past block_host instead of every read from every
context (found by Sashiko AI review)
- patch 5: classify a status register left in the download handshake as
a loader needing a power cycle rather than as running firmware, give
the loader one step to publish its next state before ruling it out
after a failed clause-45 wait, abort the drain polls as soon as
teardown asks for it instead of stalling unbind for up to 17 s, and
pair the rescue_mode accesses with WRITE_ONCE()/READ_ONCE() (all
found by Sashiko AI review)
- patch 6: asic.rev comes from the CHIP ID registers as well, and -EIO
means the driver gave up on the recovery, which may need a rebind
rather than a power cycle (found by Sashiko AI review)
- Andrew's Reviewed-by is kept on patches 1, 2, 4 and 6; the changes to
4 and 6 are the two small ones above and a documentation reword
- the same review asks again whether patch 1 should install
.flash_update only for drivers implementing the callback, as v4 did;
it stays unconditional as Andrew asked in v9. Its remaining findings
are not acted on either: the pre-existing window in
__device_release_driver() where a ->shutdown() can interleave with a
release, which every unbind path shares; the recorded driver pointer,
which an unbind and rebind within the delay can match again at the
cost of one spurious re-probe; and the get_stats64() re-arm race in
remove(), which predates this series and is fixed separately for net
- the changes to patches 3 to 6 were written with an LLM coding
assistant working from the Sashiko findings and reviewed by hand; the
Assisted-by tags on those patches record this
Changes since v13 [18]:
- patch 5: initialise the SerDes state once mxl862xx_wait_ready() has
cached the firmware version, still before the rescue-mode early
return, so PCS setup can depend on the running firmware
- picked up Andrew's Reviewed-by on patches 1 and 4; the one on patch 5
is not carried as that patch changed
- the Sashiko review of v13 repeats the ABA finding on patch 3 dismissed
in v13 and marks the two __device_release_driver() windows and the
get_stats64() re-arm race as pre-existing; no change
- the change to patch 5 was written with an LLM coding assistant
working from a report against a downstream tree and reviewed by
hand; the Assisted-by tag on that patch records this
Changes since v12 [13]:
- v12 went out just as net-next closed for the 7.3 merge window. The
helper of patch 3 was then posted on its own, with conversions of the
existing open-coded users in iwlwifi, hci_h5 and btintel_pcie, most
recently as v3 [14], which Greg's patch bot deferred past the merge
window; Hans de Goede reviewed and tested the helper and the hci_h5
conversion there on RTL8723BS hardware [15][16]. The Sashiko review
of that posting found the same issues in the helper as the review of
v12 did, so patch 3 here supersedes the helper patch of that series;
once this series is merged, the conversions follow as patches for
bluetooth-next and wireless-next. On the userspace side, fwupd's
devlink plugin has meanwhile gained the quirks for these switches
[17]
- patch 3: queue the re-probe on system_freezable_wq, so one pending
across system suspend runs after resume instead of detaching a
suspended device or racing its late suspend callbacks; record at
scheduling time whether the parent needs locking instead of reading
dev->bus, which may be gone with its module once the device was
unregistered; let __device_release_driver() report whether it
released the driver, so an administrative unbind that wins the race
inside the device links loop is not undone by the re-attach (all
found by Sashiko AI review); use dev_err_probe() for the re-probe
error path (Hans de Goede)
- patch 4: stop the stats poll with disable_delayed_work_sync() in the
flash path, so a racing get_stats64() re-arm is a no-op, and drop the
early return in the work function; the v12 reordering of remove()
is gone as well, since the get_stats64() race it addressed predates
this series and needs a fix of its own (found by Sashiko AI review)
- two further findings of the same review are not acted on: the
recorded driver pointer could in theory match a different driver
loaded at the same address within the delay, which would cost that
driver one spurious detach and re-probe; and the final put_device()
from the work could call a release() whose module was unloaded in
the meantime, which is the same hazard every asynchronous device
reference in the core carries, the async probe helper included
- the changes to patches 3 and 4 were written with an LLM coding
assistant working from the Sashiko findings and reviewed by hand; the
Assisted-by tags on those two patches record this
Changes since v11 [12]:
- patch 3: pin the parent device across the deferred re-probe and take
the parent lock across device_attach() on buses that need it; a
reference on the child alone left a freed dev->parent dereferenced
under __device_driver_lock() (found by Sashiko AI review)
- patch 4: cancel the stats poll after dsa_unregister_switch() so a
racing get_stats64() cannot re-arm it against freed priv; and keep
the host blocked for writes across the post-flash readiness poll,
letting only the flash path's own reads reach the new firmware
(found by Sashiko AI review)
Changes since v10 [10]:
- new patch 3: driver core: add device_schedule_reprobe(), as posted
in the RFC [11], used to schedule the post-flash and post-drain re-probe with
device_schedule_reprobe() instead of a driver-owned work item.
- the dsa_switch allocation returns to devres. Keeping it out of
devres only defused the remaining check-vs-detach window, which the
core helper closes outright
- scheduling the re-probe is now the one step that can fail after the
switch was flashed, since the helper allocates its work item
internally and v10's allocate-up-front dance is no longer possible.
An -ENOMEM there is a system-wide condition no driver-level message
or recovery improves, so flash_update just returns it (unbind and
rebind reinitialises the driver), and a drain whose hand-off fails
still marks recovery failed so devlink does not keep promising a
retry
Changes since v9 [9]:
- Harmonised the SB PDI timeouts. The verify wait is now one constant
shared by the flash and drain paths (15 s), the 1-byte mailbox step
is another (2 s) used by the drain and by both detection waits, and
the per-slice write budget drops from 120 s to 60 s. The last-slice
flush, which cannot see the boundary between programming and
verifying, gets the sum of the two.
- The post-flash and post-drain reprobe no longer detaches a device
that has been shut down or unbound, and the dsa_switch is allocated
outside devres so a lost race cannot leave dsa_switch_find() reading
freed memory. This was a live bug in v9's patch 3 as well, reachable
by rebooting within 500 ms of a flash.
- A failed reprobe hand-off after a successful drain now logs and
fails flashing outright, instead of leaving devlink answering "retry
shortly" for good. Dropped heal_lock and mxl862xx_stop_work() with
it: the lock only made the flag test and the queueing atomic, which
is not the guarantee the comment claimed, and the reprobe's own
check is what actually decides now.
- A loader that publishes READY but never services the register-read
challenge now reports -ENXIO rather than propagating -ETIMEDOUT, and
the documented return sets of mxl862xx_rescue_mode_detect() and
mxl862xx_rescue_drain_finish() match what the code returns.
- Commit message for patch 4 no longer claims a running firmware is
"left untouched" (the presence probe writes two mailbox scratch
registers, inert to a firmware that does not read them), says that
an SB PDI window away from the OTP reset offsets also yields
-ENODEV, and describes the -ENXIO outcome above.
- Commented why STAT == 0 during a drain is unambiguous: by the
r_remain == 0 rule the loader cannot be both inside the receive loop
asking for a chunk and publishing a verdict.
- Documented that a switch power cycled on its own needs the driver
unbound and rebound before a failed recovery is re-examined.
Changes since v8 [8]:
- install the flash_update devlink op unconditionally and return
-EOPNOTSUPP from the trampoline for drivers without the callback,
instead of a second devlink_ops permutation (Andrew Lunn)
- picked up Andrew's Reviewed-by on patches 2 and 5, given on v5
Changes since v7 [7]:
- most of the changes below address findings of the Sashiko AI reviews
of v7
- the MCUboot loader's transfer completion was reverse-engineered to
settle two of them: it publishes an image verification verdict in its
status register, finalises without the END magic once a 2 s timeout
expires, and keeps the host's byte count visible while it programs a
chunk. The interrupted-download drain therefore no longer sends END,
which a loader still in its receive loop consumes as a byte count and
underflows its receive counter on, and the flash path now reports a
rejected image instead of a write timeout
- refuse a second devlink dev flash while the previous one's reprobe is
still pending, and stop publishing a zeroed firmware version after a
failed transfer
- initialise the SerDes state before the rescue-mode early return, so a
successful rescue-mode flash cannot hand phylink an unconfigured PCS
- do not fail probe from the wedged-download branch of the rescue
detection, which a download interrupted with exactly one byte
outstanding would trigger, and report a failed recovery through
devlink rather than refusing every flash for good
- reset the SB PDI mailbox before probing it, log the drain's progress,
and correct the protocol and register comments throughout
Changes since v6 [6]:
- reprobe from a single delayed work item instead of a kthread spawned
by a workqueue kickoff; the kthread existed only to drop the module
reference from core code, but its creation-failure path did the racy
module_put() from module text anyway and could strand the driver
bound with skip_teardown set. The collapsed form matches
iwl_trans_reprobe_wk(), and a failed reprobe now leaves the device
unbound like a failed probe
- only signal END on a successful transfer; a failure leaves the loader
mid-payload, where END is read as a byte count and can underflow the
receive counter, so return the error and let the reprobe recover
- add cond_resched() to the payload loop so a long transfer over a
bit-banged MDIO bus under CONFIG_PREEMPT_NONE does not trip the
soft-lockup detector
- drop the cached firmware version and chip id on a failed flash so
devlink dev info stops reporting the pre-flash version until the
reprobe
- report the firmware version under DEVLINK_INFO_VERSION_GENERIC_FW
instead of a bare "fw" string
- correct the SB PDI header comment's SMDIO register map and expand the
note on why closing the shared conduit is safe
Changes since v5 [5]:
- run the post-flash reprobe from a kthread that drops the module
reference with module_put_and_kthread_exit() from core code, fixing
a use-after-free where a work item's trailing module_put() could
return into module text a racing rmmod had freed; a workqueue kickoff
spawns the kthread off the devlink caller where kthread_create() can
return -EINTR
- send END on every flash failure from the ready handshake onward so an
aborted transfer lets MCUboot reboot instead of leaving it waiting
- after the background drain finalises an interrupted download, reprobe
and let the probe-time detection re-classify the switch, so a valid
image a last-moment interruption left bootable comes up as running
firmware; rescue_drain() no longer inspects or reports the outcome
- re-read the SB PDI status register once more after a poll timeout
expires, so a preempted poll cannot report a spurious -ETIMEDOUT
- bail out of the periodic stats poll when the flash teardown has set
WORK_STOPPED, closing a get_stats64() re-arm race
- allocate the reprobe kickoff before disturbing the switch, so an
-ENOMEM cannot leave it flashed but never reprobed
- omit asic.id/asic.rev when the CHIP ID read returned 0, instead of
publishing a bogus "0000" for fwupd to match firmware against
- treat the flashless-download loop (STAT 0xc33c) as an unsupported
configuration and fail probe with -ENODEV instead of advertising it
as flashable
Changes since v4 [4]:
- report the numeric chip part number and version read from the
static CHIP ID registers as the "asic.id" and "asic.rev" fixed
versions instead of a model-name string, which does not belong in
a devlink version identifier (Jakub Kicinski)
- report the running firmware version as the "stored" version too,
since the switch boots it from its own flash, so userspace can
distinguish a flash-backed part from a flashless one by the
presence of "stored" without a future API change
- run the post-flash reprobe from a self-contained work item again
instead of the v4 kernel thread, which tripped the hung-task
watchdog while parked across the flash and returned -EINTR from
kthread_create() when the devlink command was interrupted
- re-read the new firmware version through the reprobe's fresh probe
and drop the SYS_MISC_FW_VERSION exemption from the host block
- raise the firmware command poll timeout so the FW_UPDATE command
that reboots into MCUboot is not cut short
- detect the switch state from the value MCUboot publishes in the SB
PDI STAT register (loader ready, wedged download, or running
firmware), confirming a live console loader with a register-read
challenge, instead of trusting a bare SMDIO scratch write
- fail probe with -ENODEV over SB PDI when the switch does not respond
at all (absent, unpowered, or misdescribed in the device tree)
instead of letting the clause-45 API flood the log with CRC errors
- drain a wedged interrupted download back to a clean ready state
from a background work item so the multi-minute recovery never
holds the devlink instance lock, reporting no firmware version and
refusing flash with -EBUSY until it completes
- report the rescue-mode null firmware version "0.0.0" as both the
running and stored version, matching the running/stored reporting
above
- split the devlink documentation into its own patch and add
Documentation/networking/devlink/mxl862xx.rst describing the info
versions and the flash update behaviour (Jakub Kicinski)
- include example "devlink dev info" outputs in the commit messages
of patches 3 and 4 (Jakub Kicinski)
Changes since v3 [3]:
- only install the flash_update devlink op for switches whose
driver implements it, so the devlink core rejects unsupported
requests before fetching the firmware file from userspace
- run the deferred reprobe from a kernel thread which ends in
module_put_and_kthread_exit() instead of a work item that
dropped its module reference while still executing module code
- fail firmware API read commands with -ENODEV after the update
has finished instead of faking success with an unfilled buffer,
which could send port_fdb_dump() into an endless loop
- keep the host block in place across the post-update version
query by exempting SYS_MISC_FW_VERSION from block_host instead
of briefly lifting the block, and write all blocking flags under
the MDIO bus lock
- check the return value of all SB PDI control writes; a failed
address write during the half-bank switch could otherwise place
the second half of the payload at the wrong flash offset
- initialise the progress notification deadline from jiffies so
notifications are not suppressed on 32-bit systems shortly
after boot
- log a distinct diagnostic when rescue mode detection fails on an
SMDIO bus error instead of silently treating it as not being in
rescue mode
- flush the switchdev deferred queue after closing the ports so
the bridge's deferred STP DISABLED transitions reach the
firmware while it is still running instead of failing against
the host block with "failed to set STP state" errors
- treat -ENODEV as successful deletion in port_mdb_del() so the
post-update teardown no longer leaves host MDB entries behind
for the DSA core to report when the tree is torn down
Changes since v2 [2]:
- validate the firmware image, including both CRCs, before taking
down any ports, so that a malformed file is rejected without
disturbing the running switch and without the needless flash and
reprobe cycle it previously triggered
- reject images whose declared payload sizes overflow when summed
(check_add_overflow) or sum up to zero; the latter previously
erased the flash without writing anything back
- allocate the reprobe work item and take the module and device
references before starting the update, so scheduling the reprobe
can no longer fail after the switch has been pushed into MCUboot
- prevent the stats poll work from being re-armed and cancel the
CRC error work before starting the transfer
- check the host-blocking flags in mxl862xx_api_wrap() under the
MDIO bus lock to close the race window where an API command
which had already passed the check could reach the bus after the
switch rebooted into MCUboot
- check the return value of SB PDI data word writes so a failed
MDIO transaction aborts the transfer instead of being noticed
only through a corrupted image
- report a per-model chip name (e.g. "MaxLinear MxL86252") as the
devlink "asic.id" fixed version instead of the devicetree
compatible string, whose comma is awkward for userspace
consumers such as fwupd (see discussion on v2 patch 3)
- report the canonical null version "0.0.0" instead of
"mcuboot-rescue" as the running firmware version in rescue mode,
so that version-comparing update tools like fwupd treat every
available release as an upgrade and offer it for recovery
Changes since RFC [1]:
- detect a switch stuck in MCUboot rescue mode at probe, register
the switch without any ports and report "mcuboot-rescue" as the
running firmware version, so devlink flash can recover from a
failed or interrupted update (Andrew Lunn)
- clarify in the commit message of patch 2 that the per-transaction
MDIO bus locking is about other, non-switch devices on the same
MDIO bus (Andrew Lunn)
- mention in the commit message of patch 3 that closing the ports
also stops phylib from polling the switch-internal PHYs during
the transfer (Andrew Lunn)
- split up run-on sentence and explain the dynamically allocated
reprobe work item instead of just pointing at iwlwifi in the
commit message of patch 3 (Manuel Ebner)
- use kzalloc_obj() (Manuel Ebner)
- state the actual duration of a complete flash and reprobe cycle
(just under a minute) in comments and the commit message, and
clarify that the timeout values are generous upper bounds
(Manuel Ebner)
[1] https://lore.kernel.org/all/ak0J-HgzMRea53om@makrotopia.org/
[2] https://lore.kernel.org/all/cover.1783988826.git.daniel@makrotopia.org/
[3] https://lore.kernel.org/all/cover.1784513694.git.daniel@makrotopia.org/
[4] https://lore.kernel.org/all/cover.1784665017.git.daniel@makrotopia.org/
[5] https://lore.kernel.org/all/cover.1784945329.git.daniel@makrotopia.org/
[6] https://lore.kernel.org/all/cover.1785119999.git.daniel@makrotopia.org/
[7] https://lore.kernel.org/all/cover.1785274610.git.daniel@makrotopia.org/
[8] https://lore.kernel.org/all/cover.1785389905.git.daniel@makrotopia.org/
[9] https://lore.kernel.org/all/cover.1785728574.git.daniel@makrotopia.org/
[10] https://lore.kernel.org/all/cover.1786294649.git.daniel@makrotopia.org/
[11] https://lore.kernel.org/all/anpxFdwNxk0XwPjQ@makrotopia.org/
[12] https://lore.kernel.org/all/cover.1786773971.git.daniel@makrotopia.org/
[13] https://lore.kernel.org/all/cover.1786922210.git.daniel@makrotopia.org/
[14] https://lore.kernel.org/all/cover.1787281239.git.daniel@makrotopia.org/
[15] https://lore.kernel.org/all/c461462f-de0b-43e8-ac9e-541013f5f8da@oss.qualcomm.com/
[16] https://lore.kernel.org/all/7ffe0c2e-0742-488a-ab6c-1dc2fabc049c@oss.qualcomm.com/
[17] https://github.com/fwupd/fwupd/commit/e50c9e5ab39d31242e664efbbf441fd46d15a0cd
[18] https://lore.kernel.org/all/cover.1788783126.git.daniel@makrotopia.org/
[19] https://lore.kernel.org/all/cover.1788976064.git.daniel@makrotopia.org/
[20] https://lore.kernel.org/all/cover.1789175618.git.daniel@makrotopia.org/
Daniel Golle (6):
net: dsa: add devlink flash_update callback to dsa_switch_ops
net: dsa: mxl862xx: add SMDIO clause-22 register access
driver core: add device_schedule_reprobe()
net: dsa: mxl862xx: add devlink flash_update and info_get
net: dsa: mxl862xx: recover switch stuck in MCUboot rescue mode
net: dsa: mxl862xx: document devlink flash and info support
Documentation/networking/devlink/index.rst | 1 +
Documentation/networking/devlink/mxl862xx.rst | 91 ++
MAINTAINERS | 1 +
drivers/base/dd.c | 111 +-
drivers/net/dsa/mxl862xx/Kconfig | 1 +
drivers/net/dsa/mxl862xx/Makefile | 2 +-
drivers/net/dsa/mxl862xx/mxl862xx-api.h | 10 +
drivers/net/dsa/mxl862xx/mxl862xx-cmd.h | 2 +
drivers/net/dsa/mxl862xx/mxl862xx-fw.c | 1135 +++++++++++++++++
drivers/net/dsa/mxl862xx/mxl862xx-fw.h | 21 +
drivers/net/dsa/mxl862xx/mxl862xx-host.c | 68 +
drivers/net/dsa/mxl862xx/mxl862xx-host.h | 2 +
drivers/net/dsa/mxl862xx/mxl862xx-phylink.c | 2 +
drivers/net/dsa/mxl862xx/mxl862xx.c | 165 ++-
drivers/net/dsa/mxl862xx/mxl862xx.h | 41 +
include/linux/device.h | 2 +
include/net/dsa.h | 3 +
net/dsa/devlink.c | 13 +
18 files changed, 1653 insertions(+), 18 deletions(-)
create mode 100644 Documentation/networking/devlink/mxl862xx.rst
create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-fw.c
create mode 100644 drivers/net/dsa/mxl862xx/mxl862xx-fw.h
base-commit: 1142eb185b05db61a78130890fc4ed268f4cb4e6
prerequisite-patch-id: 0000000000000000000000000000000000000000
--
2.55.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH net-next v16 3/6] driver core: add device_schedule_reprobe()
2026-09-15 13:09 [PATCH net-next v16 0/6] net: dsa: mxl862xx: devlink flash and rescue Daniel Golle
@ 2026-09-15 13:09 ` Daniel Golle
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Golle @ 2026-09-15 13:09 UTC (permalink / raw)
To: Jiri Pirko, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, Jonathan Corbet, Shuah Khan,
Randy Dunlap, Daniel Golle, Greg Kroah-Hartman,
Rafael J. Wysocki, Danilo Krummrich, Andrew Lunn,
Vladimir Oltean, netdev, linux-doc, linux-kernel, driver-core
Drivers that need a deferred re-probe of their own device open-code a
work item in module text. iwlwifi (iwl_trans_schedule_reprobe(), for a
firmware crash a lighter restart cannot fix) and hci_h5
(h5_btrtl_resume(), RTL devices lose their firmware state over suspend)
both end that work function with put_device(); kfree();
module_put(THIS_MODULE);, where a concurrent rmmod can free the module
text the epilogue is still executing. Neither checks any bound state
before calling device_reprobe(), and a driver cannot make that check
stick because device_reprobe() takes the device lock internally, so a
stale re-probe undoes an administrative unbind and the detach half runs
against a device whose ->shutdown() has already run.
Add device_schedule_reprobe(), which detaches and re-probes a device
after a caller-specified delay. The work function is built-in text and
the recorded driver pointer is only ever compared, never dereferenced,
so a caller needs no module reference. The bound-state check and
__device_release_driver() run under one hold of the device lock, and
__device_release_driver() now reports whether it was this call that
released the driver, so an unbind winning the race while busy consumer
links are unbound is not followed by a re-attach. The first user is the
mxl862xx devlink flash path added later in this series.
Nothing is locked or validated in the caller's context, so the helper
may be called with the device lock held, as the PM callbacks, ->remove()
and ->shutdown() hold it. Buses that take the parent lock to bind are
refused with -EINVAL: that lock has to be taken before @dev's own, so
the parent would have to be recorded before either is held, where
device_move() can replace it without taking any device lock.
usb_bus_type is the only such bus and no caller needs it today;
supporting one means deriving the parent inside the work and re-checking
it once both locks are held.
The detach is skipped once probing is blocked, which device_shutdown()
and dpm_prepare() both do before they touch any device. dpm_prepare()
leaves no window, its callers having frozen the freezable workqueues
first; device_shutdown() blocks probing only once
wait_for_device_probe() has returned, so a re-probe already past the
test completes its detach and the device runs ->remove() in place of
->shutdown(). __device_release_driver()
drops the device lock while busy consumer links are unbound, which would
let a ->shutdown() interleave in the middle of a release already under
way, so it now re-checks on re-acquisition and abandons the release. That
is offered as a flag, because only a caller free to leave the device
bound can take it: an administrative unbind has to complete, and
driver_detach() would spin on a device it never released. Past that loop
the lock is held until the driver is gone, so ->remove() cannot follow a
->shutdown() on the same device.
Assisted-by: LLM
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
v16:
- commit message: device_shutdown() blocks probing only once
wait_for_device_probe() has returned, so a re-probe already past the
test detaches the device instead of leaving it bound for its
->shutdown()
- take no lock in the caller's context and drop the parent snapshot,
refusing buses that need the parent lock instead: the caller-context
device lock inverted against the devlink instance lock on the flash
path and against a synchronous work cancel on the rescue path, and a
pinned parent can be freed by device_move() (found by Sashiko AI
review)
- abandon the release when probing is blocked while the device links
loop has the locks dropped, rather than calling that window
pre-existing: a deferred re-probe is the one unbind that may be
abandoned, so it is the one that can close it (found by Sashiko AI
review)
- commit message: describe what this patch changes rather than bugs in
drivers it does not convert, and name the first user (found by
Sashiko AI review)
- kernel-doc: drop the promise that an administrative unbind always
wins, which unbind_store() does not guarantee (found by Sashiko AI
review)
v15:
- skip the detach while probing is blocked instead of adding a
per-device shutdown_done flag: device_shutdown() blocks probing
before its walk starts, so the flag left a window where the work
detached a device that then neither re-attached nor got its
->shutdown() call (found by Sashiko AI review)
- validate the device and snapshot the parent, its locking requirement
and the bound driver under the device lock, so an unregister racing
the allocation can neither leave a freed parent pinned nor pair a
NULL parent with a request to lock it (found by Sashiko AI review)
- keep -EPROBE_DEFER out of the re-probe error path, where
dev_err_probe() would record the message as the device's deferred
probe reason (found by Sashiko AI review)
- kernel-doc: a stale re-probe leaves an unbound device unbound, which
an unbind followed by a rebind within the delay does not (found by
Sashiko AI review)
v14: no changes
v13:
- queue the work on system_freezable_wq, so a re-probe pending across
system suspend can neither detach a device the PM core has suspended
nor race its late suspend callbacks; it runs after resume instead
(found by Sashiko AI review)
- record at scheduling time whether the parent needs locking, instead
of reading dev->bus in the work, which may be gone with its module
once the device has been unregistered (found by Sashiko AI review)
- let __device_release_driver() report whether it released the driver,
so an administrative unbind that wins the race inside the device
links loop is not undone by the re-attach (found by Sashiko AI
review)
- use dev_err_probe() for the re-probe error path, so a re-probe
deferred at resume no longer logs a spurious error (Hans de Goede,
on the standalone posting of this helper)
- describe the parent pinning and locking in the commit message, as in
the standalone posting
v12:
- pin the parent device across the deferred work; a reference on the
child alone left device_reprobe_work_fn() dereferencing a freed
dev->parent under __device_driver_lock() when the device was
unregistered before the work ran (found by Sashiko AI review)
- take the parent lock across device_attach() on buses that require
it, matching bus_rescan_devices_helper() (found by Sashiko AI review)
v11: new patch: add device_schedule_reprobe() to the driver core (posted
earlier as an RFC) so mxl862xx can schedule its post-flash and
post-drain re-probe through the core instead of open-coding a work
item
drivers/base/dd.c | 111 +++++++++++++++++++++++++++++++++++++++--
include/linux/device.h | 2 +
2 files changed, 109 insertions(+), 4 deletions(-)
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index f6525a7ee8c5..f521ddefc4a8 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -1314,8 +1314,12 @@ EXPORT_SYMBOL_GPL(driver_attach);
/*
* __device_release_driver() must be called with @dev lock held.
* When called for a USB interface, @dev->parent lock must be held as well.
+ * @abort_if_blocked gives up the release instead when probing has been
+ * blocked while the locks were dropped; only a caller that may abandon
+ * the unbind altogether can ask for it.
*/
-static void __device_release_driver(struct device *dev, struct device *parent)
+static bool __device_release_driver(struct device *dev, struct device *parent,
+ bool abort_if_blocked)
{
struct device_driver *drv;
@@ -1334,9 +1338,10 @@ static void __device_release_driver(struct device *dev, struct device *parent)
* have released the driver successfully while this one
* was waiting, so check for that.
*/
- if (dev->driver != drv) {
+ if (dev->driver != drv ||
+ (abort_if_blocked && defer_all_probes)) {
pm_runtime_put(dev);
- return;
+ return false;
}
}
@@ -1359,7 +1364,10 @@ static void __device_release_driver(struct device *dev, struct device *parent)
bus_notify(dev, BUS_NOTIFY_UNBOUND_DRIVER);
kobject_uevent(&dev->kobj, KOBJ_UNBIND);
+ return true;
}
+
+ return false;
}
void device_release_driver_internal(struct device *dev,
@@ -1369,7 +1377,7 @@ void device_release_driver_internal(struct device *dev,
__device_driver_lock(dev, parent);
if (!drv || drv == dev->driver)
- __device_release_driver(dev, parent);
+ __device_release_driver(dev, parent, false);
__device_driver_unlock(dev, parent);
}
@@ -1436,3 +1444,98 @@ void driver_detach(const struct device_driver *drv)
put_device(dev);
}
}
+
+struct device_reprobe {
+ struct delayed_work work;
+ const struct device_driver *drv;
+ struct device *dev;
+};
+
+static void device_reprobe_work_fn(struct work_struct *work)
+{
+ struct device_reprobe *rp = container_of(work, struct device_reprobe,
+ work.work);
+ struct device *dev = rp->dev;
+ bool detached = false;
+ int ret;
+
+ device_lock(dev);
+ /*
+ * rp->drv is only ever compared, never dereferenced: the driver it
+ * points to may have been unregistered and freed by now.
+ * device_shutdown() blocks probing before its walk reaches @dev.
+ */
+ if (!defer_all_probes && !dev->p->dead && dev->driver == rp->drv)
+ detached = __device_release_driver(dev, NULL, true);
+ device_unlock(dev);
+
+ if (detached) {
+ ret = device_attach(dev);
+ if (ret < 0 && ret != -EPROBE_DEFER)
+ dev_err_probe(dev, ret,
+ "re-probe failed, device left unbound\n");
+ }
+
+ put_device(dev);
+ kfree(rp);
+}
+
+/**
+ * device_schedule_reprobe - schedule a deferred detach and re-probe
+ * @dev: device to detach and re-probe
+ * @delay_ms: delay in milliseconds before the re-probe runs
+ *
+ * Schedule a detach and re-probe of @dev after @delay_ms milliseconds.
+ * The re-probe is skipped if, by the time the scheduled work runs, the
+ * device has been removed, probing has been blocked for a system
+ * shutdown, or @dev is no longer bound to the driver that was bound at
+ * scheduling time.
+ *
+ * The work function is built-in text, so the bound driver may call this
+ * from its own code without holding a module reference. If the driver
+ * module is unloaded before the work runs, driver unregistration unbinds
+ * @dev first and the scheduled work does nothing.
+ *
+ * Multiple pending re-probes for the same device are individually safe;
+ * a caller that wants at most one pending re-probe must gate scheduling
+ * itself.
+ *
+ * The work is freezable: a re-probe pending across system suspend runs
+ * once the system has resumed.
+ *
+ * Nothing is locked in the caller's context, so this may be called from
+ * any process context, @dev's own device lock held included, but not
+ * from @dev's ->probe(), which the scheduled work would detach.
+ *
+ * Returns: 0 on success, -EINVAL if @dev is not a registered device
+ * bound to a driver or sits on a bus which takes the parent lock to
+ * bind, -ENOMEM on allocation failure.
+ */
+int device_schedule_reprobe(struct device *dev, unsigned int delay_ms)
+{
+ const struct device_driver *drv;
+ struct device_reprobe *rp;
+
+ drv = READ_ONCE(dev->driver);
+ /*
+ * A bus taking the parent lock would need @dev's parent pinned until
+ * the work runs, which device_move() can invalidate.
+ */
+ if (!drv || !dev->bus || dev->bus->need_parent_lock || !dev->p ||
+ dev->p->dead || !device_is_registered(dev))
+ return -EINVAL;
+
+ rp = kzalloc_obj(*rp);
+ if (!rp)
+ return -ENOMEM;
+
+ rp->dev = get_device(dev);
+ rp->drv = drv;
+
+ INIT_DELAYED_WORK(&rp->work, device_reprobe_work_fn);
+ queue_delayed_work(system_freezable_wq, &rp->work,
+ msecs_to_jiffies(delay_ms));
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(device_schedule_reprobe);
diff --git a/include/linux/device.h b/include/linux/device.h
index aee79fd6b32b..7a9916950577 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1314,6 +1314,8 @@ int __must_check device_attach(struct device *dev);
int __must_check driver_attach(const struct device_driver *drv);
void device_initial_probe(struct device *dev);
int __must_check device_reprobe(struct device *dev);
+int __must_check device_schedule_reprobe(struct device *dev,
+ unsigned int delay_ms);
bool device_is_bound(struct device *dev);
--
2.55.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-17 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17 16:11 [PATCH net-next v16 3/6] driver core: add device_schedule_reprobe() netdev-bot+sashiko
-- strict thread matches above, loose matches on Subject: below --
2026-09-15 13:09 [PATCH net-next v16 0/6] net: dsa: mxl862xx: devlink flash and rescue Daniel Golle
2026-09-15 13:09 ` [PATCH net-next v16 3/6] driver core: add device_schedule_reprobe() Daniel Golle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®