2023-01-04 14:53:26

by Zqiang

Subject: [PATCH v2] kthread_worker: Check all delayed works when destroy kthread worker

This commit add a check for delayed works, when destroy kthread worker
if there are still some pending delayed works will trigger warnning,
this remind caller should clear all pending delayed works before destroy
kthread worker.

Signed-off-by: Zqiang <[email protected]>
---
v1->v2:
Only add WARN_ON() and function description

kernel/kthread.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/kernel/kthread.c b/kernel/kthread.c
index f97fd01a2932..7e6751b29101 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -1382,6 +1382,10 @@ EXPORT_SYMBOL_GPL(kthread_flush_worker);
* Flush and destroy @worker. The simple flush is enough because the kthread
* worker API is used only in trivial scenarios. There are no multi-step state
* machines needed.
+ *
+ * Note that this function is not responsible for handling delayed work, so
+ * caller should be responsible for queuing or canceling all delayed work items
+ * before invoke this function.
*/
void kthread_destroy_worker(struct kthread_worker *worker)
{
@@ -1393,6 +1397,7 @@ void kthread_destroy_worker(struct kthread_worker *worker)

kthread_flush_worker(worker);
kthread_stop(task);
+ WARN_ON(!list_empty(&worker->delayed_work_list));
WARN_ON(!list_empty(&worker->work_list));
kfree(worker);
}
--
2.25.1

2023-01-04 21:16:14

by Tejun Heo

Subject: Re: [PATCH v2] kthread_worker: Check all delayed works when destroy kthread worker

On Wed, Jan 04, 2023 at 10:42:30PM +0800, Zqiang wrote:
> This commit add a check for delayed works, when destroy kthread worker
> if there are still some pending delayed works will trigger warnning,
> this remind caller should clear all pending delayed works before destroy
> kthread worker.
>
> Signed-off-by: Zqiang <[email protected]>

Acked-by: Tejun Heo <[email protected]>

Andrew, can you please pick up this one? If you'd prefer it to be routed
through the workqueue tree, please let me know.

Thanks.

--
tejun

2023-01-06 13:01:17

by Petr Mladek

Subject: Re: [PATCH v2] kthread_worker: Check all delayed works when destroy kthread worker

On Wed 2023-01-04 22:42:30, Zqiang wrote:
> This commit add a check for delayed works, when destroy kthread worker
> if there are still some pending delayed works will trigger warnning,
> this remind caller should clear all pending delayed works before destroy
> kthread worker.
>
> Signed-off-by: Zqiang <[email protected]>

Reviewed-by: Petr Mladek <[email protected]>

Best Regards,
Petr