Skip to content

kthread_worker: Fix race between kthread_mod_delayed_work() and kthread_cancel_delayed_work_sync()

Petr Mladek lkml 1 version Applied

Status from this message: [merged] kthread_worker-fix-return-value-when-kthread_mod_delayed_work-races-with-kthread_cancel_delayed_work_sync.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesApplied 3/3

Patches in v1 All 3 applied

#Subject and filesSizeRepliesApplied
1/3kthread_worker: Split code for canceling the delayed work timer.kernel/kthread.c+29 -170 repliesApplied
2/3kthread: Prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()kernel/kthread.c+24 -114 repliesApplied
3/3kthread_worker: Fix return value when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()kernel/kthread.c+12 -70 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/3] kthread_worker: Fix race between kthread_mod_delayed_work() and kthread_cancel_delayed_work_sync()

This patchset fixes the race between kthread_mod_delayed_work() and kthread_cancel_delayed_work_sync() including proper return value handling.

The original fix, from Martin Liu [1], opened discussion [2] about the return value. It took me some time to realize that the original patch was not a correct fix.

The problem is that the return value might be used for reference counting of the queued works. The return value is boolean. It could distinguish only two situations where the work is:

+ newly queued => inc(refcnt) (ret == false)
+ was queued, removed, added => nope(refcntn) (ret == true)

The original fix, introduced another situation:

+ was queued, removed => dec(refcnt) (ret == ???)

The proper solution is to remove the work from the list only when it can be added again. Fortunately, it can be fixed relatively easily. I have split it into 3 small steps.

[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/20210520214737.MrGGKbPrJ%[email protected]

Petr Mladek (3):
kthread_worker: Split code for canceling the delayed work timer.
kthread: Prevent deadlock when kthread_mod_delayed_work() races with
kthread_cancel_delayed_work_sync()
kthread_worker: Fix return value when kthread_mod_delayed_work() races
with kthread_cancel_delayed_work_sync()

 kernel/kthread.c | 96 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 33 deletions(-)
Signature · 1 line
2.26.2