summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZqiang <qiang.zhang@windriver.com>2021-02-18 06:16:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-14 09:47:22 +0300
commit2f09eec28aabbfdaea61eed8b2ed5b63db88b47d (patch)
tree86d63500620904693df7725299094ceca740ea22
parente3561eea3e6cd99cad3ab18431cfe0347f6eeeac (diff)
downloadlinux-2f09eec28aabbfdaea61eed8b2ed5b63db88b47d.tar.xz
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>
-rw-r--r--kernel/workqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 894bb885b40b..6326a872510b 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1412,7 +1412,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) &&
@@ -1494,6 +1493,7 @@ retry:
worklist = &pwq->delayed_works;
}
+ debug_work_activate(work);
insert_work(pwq, work, worklist, work_flags);
out: