diff options
| author |   Zqiang <qiang.zhang@windriver.com> | 2021-02-18 11:16:49 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-14 08:24:17 +0200 |
| commit | c88fa8d4f99419da2e0167ac15bffc56569d7ef9 (patch) | |
| tree | 635009bc5937fa244be8be23904c42ce0a4963fe /kernel | |
| parent | clk: fix invalid usage of list cursor in unregister (diff) | |
| download | wireguard-linux-c88fa8d4f99419da2e0167ac15bffc56569d7ef9.tar.xz wireguard-linux-c88fa8d4f99419da2e0167ac15bffc56569d7ef9.zip | |
workqueue: Move the position of debug_work_activate() in __queue_work()
[ Upstream commit 0687c66b5f666b5ad433f4e94251590d9bc9d10e ]
The debug_work_activate() is called on the premise that
the work can be inserted, because if wq be in WQ_DRAINING
status, insert work may be failed.
Fixes: e41e704bc4f4 ("workqueue: improve destroy_workqueue() debuggability")
Signed-off-by: Zqiang <qiang.zhang@windriver.com>
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 29c36c029062..5d7092e32912 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1411,7 +1411,6 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, */ lockdep_assert_irqs_disabled(); - debug_work_activate(work); /* if draining, only works from the same workqueue are allowed */ if (unlikely(wq->flags & __WQ_DRAINING) && @@ -1493,6 +1492,7 @@ retry: worklist = &pwq->delayed_works; } + debug_work_activate(work); insert_work(pwq, work, worklist, work_flags); out: |