]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
workqueue: change value of lcpu in __queue_delayed_work_on()
authorJoonsoo Kim <js1304@gmail.com>
Wed, 15 Aug 2012 14:25:38 +0000 (23:25 +0900)
committerTejun Heo <tj@kernel.org>
Thu, 16 Aug 2012 21:21:15 +0000 (14:21 -0700)
commite42986de481238204f6e0b0f4434da428895c20b
tree613150adf76500507ca69d59d5448fa05affbc98
parentb75cac9368fa91636e17d0f7950b35d837154e14
workqueue: change value of lcpu in __queue_delayed_work_on()

We assign cpu id into work struct's data field in __queue_delayed_work_on().
In current implementation, when work is come in first time,
current running cpu id is assigned.
If we do __queue_delayed_work_on() with CPU A on CPU B,
__queue_work() invoked in delayed_work_timer_fn() go into
the following sub-optimal path in case of WQ_NON_REENTRANT.

gcwq = get_gcwq(cpu);
if (wq->flags & WQ_NON_REENTRANT &&
(last_gcwq = get_work_gcwq(work)) && last_gcwq != gcwq) {

Change lcpu to @cpu and rechange lcpu to local cpu if lcpu is WORK_CPU_UNBOUND.
It is sufficient to prevent to go into sub-optimal path.

tj: Slightly rephrased the comment.

Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/workqueue.c