Hi, On 2/13/21 1:16 PM, Greg Kroah-Hartman wrote: > On Sat, Feb 13, 2021 at 01:58:44PM +0200, Matti Vaittinen wrote: >> A few drivers which need a delayed work-queue must cancel work at exit. >> Some of those implement remove solely for this purpose. Help drivers >> to avoid unnecessary remove and error-branch implementation by adding >> managed verision of delayed work initialization >> >> Signed-off-by: Matti Vaittinen <matti.vaittinen@xxxxxxxxxxxxxxxxx> > > That's not a good idea. As this would kick in when the device is > removed from the system, not when it is unbound from the driver, right? Erm, no devm managed resources get released when the driver is detached: drivers/base/dd.c: __device_release_driver() calls devres_release_all(dev); > >> --- >> drivers/base/devres.c | 33 +++++++++++++++++++++++++++++++++ >> include/linux/device.h | 5 +++++ >> 2 files changed, 38 insertions(+) >> >> diff --git a/drivers/base/devres.c b/drivers/base/devres.c >> index fb9d5289a620..2879595bb5a4 100644 >> --- a/drivers/base/devres.c >> +++ b/drivers/base/devres.c >> @@ -1231,3 +1231,36 @@ void devm_free_percpu(struct device *dev, void __percpu *pdata) >> (void *)pdata)); >> } >> EXPORT_SYMBOL_GPL(devm_free_percpu); >> + >> +static void dev_delayed_work_drop(struct device *dev, void *res) >> +{ >> + cancel_delayed_work_sync(*(struct delayed_work **)res); >> +} >> + >> +/** >> + * devm_delayed_work_autocancel - Resource-managed work allocation >> + * @dev: Device which lifetime work is bound to >> + * @pdata: work to be cancelled when device exits >> + * >> + * Initialize work which is automatically cancelled when device exits. > > There is no such thing in the driver model as "when device exits". > Please use the proper terminology as I do not understand what you think > this is doing here... I agree that this needs better wording I always talk about driver-unbinding because sysfs has /sys/bus/*/drivers/*/bind and /sys/bus/*/drivers/*/unbind attributes. But I see that the relevant driver-core functions all call it driver detaching, so lets be consistent and use that here too. > >> + * A few drivers need delayed work which must be cancelled before driver >> + * is unload to avoid accessing removed resources. >> + * devm_delayed_work_autocancel() can be used to omit the explicit >> + * cancelleation when driver is unload. >> + */ >> +int devm_delayed_work_autocancel(struct device *dev, struct delayed_work *w, >> + void (*worker)(struct work_struct *work)) >> +{ >> + struct delayed_work **ptr; >> + >> + ptr = devres_alloc(dev_delayed_work_drop, sizeof(*ptr), GFP_KERNEL); >> + if (!ptr) >> + return -ENOMEM; >> + >> + INIT_DELAYED_WORK(w, worker); >> + *ptr = w; >> + devres_add(dev, ptr); >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(devm_delayed_work_autocancel); >> diff --git a/include/linux/device.h b/include/linux/device.h >> index 1779f90eeb4c..192456198de7 100644 >> --- a/include/linux/device.h >> +++ b/include/linux/device.h >> @@ -27,6 +27,7 @@ >> #include <linux/uidgid.h> >> #include <linux/gfp.h> >> #include <linux/overflow.h> >> +#include <linux/workqueue.h> >> #include <linux/device/bus.h> >> #include <linux/device/class.h> >> #include <linux/device/driver.h> >> @@ -249,6 +250,10 @@ void __iomem *devm_of_iomap(struct device *dev, >> struct device_node *node, int index, >> resource_size_t *size); >> >> +/* delayed work which is cancelled when driver exits */ > > Not when the "driver exits". Right this should be detached not exits. > There is two different lifespans here (well 3). Code and data*2. Don't > confuse them as that will just cause lots of problems. > > The move toward more and more "devm" functions is not the way to go as > they just more and more make things easier to get wrong. > > APIs should be impossible to get wrong, this one is going to be almost > impossible to get right. I have to disagree here devm generally makes it easier to get things right, it is when some devm functions are missing and devm and non devm resources are mixed that things get tricky. Lets look for example at the drivers/extcon/extcon-intel-int3496.c code from patch 2/7 from this set. The removed driver-remove function looks like this: -static int int3496_remove(struct platform_device *pdev) -{ - struct int3496_data *data = platform_get_drvdata(pdev); - - devm_free_irq(&pdev->dev, data->usb_id_irq, data); - cancel_delayed_work_sync(&data->work); - - return 0; -} - This is a good example where the mix of devm and non devm (the workqueue) resources makes things tricky. The IRQ must be freed first to avoid the work potentially getting re-queued after the sync cancel. In this case using devm for the IRQ may cause the driver author to forget about this, leaving a race. Bit with the new proposed devm_delayed_work_autocancel() function things will just work. This work gets queued by the IRQ handler, so the work must be initialized (1) *before* devm_request_irq() gets called. Any different order would be a bug in the probe function since then the IRQ might run before the work is initialized. Since devm unrolls / releases resources in reverse order, this means that it will automatically free the IRQ (which was requested later) before cancelling the work. So by switching to the new devm_delayed_work_autocancel() function we avoid a case where a driver author can cause a race on driver detach because it is relying on devm to free the IRQ, which may cause it to requeue a just cancelled work. IOW introducing this function (and using it where appropriate) actually removes a possible class of bugs. patch 2/7 actually has a nice example of this, drivers/extcon/extcon-gpio.c also uses a delayed work queued by an interrupt, together with devm managing the interrupt, yet the removed driver_remove callback: -static int gpio_extcon_remove(struct platform_device *pdev) -{ - struct gpio_extcon_data *data = platform_get_drvdata(pdev); - - cancel_delayed_work_sync(&data->work); - - return 0; -} - Is missing the explicit free on the IRQ which is necessary to avoid the race. One the one hand this illustrates your (Greg's) argument that devm managed IRQs may be a bad idea. OTOH it shows that if we have devm managed IRQs anyways that then also having devm managed autocancel works is a good idea, since this RFC patch-set not only results in some cleanup, but is actually fixing at least 1 driver detach race condition. Regards, Hans 1) devm_delayed_work_autocancel() replaces INIT_DELAYED_WORK()