[PATCH 06/10 V4] workqueue: simple clear WORKER_REBIND
WORKER_REBIND is not used for other purpose, idle_worker_rebind() can directly clear it. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 13 ++--- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 55864d1..9466d91 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1332,6 +1332,7 @@ static void idle_worker_rebind(struct worker *worker) { /* CPU must be online at this point */ WARN_ON(!worker_maybe_bind_and_lock(worker)); + worker_clr_flags(worker, WORKER_REBIND); ++worker->idle_rebind->ref_cnt; if (!--worker->idle_rebind->idle_cnt) complete(>idle_rebind->idle_done); @@ -1420,7 +1421,7 @@ retry: /* set REBIND and kick idle ones, we'll wait for these later */ for_each_worker_pool(pool, gcwq) { list_for_each_entry(worker, >idle_list, entry) { - if (worker->flags & WORKER_REBIND) + if (!(worker->flags & WORKER_UNBOUND)) continue; /* morph UNBOUND to REBIND */ @@ -1443,16 +1444,6 @@ retry: goto retry; } - /* -* All idle workers are rebound and waiting for %WORKER_REBIND to -* be cleared inside idle_worker_rebind(). Clear and release. -* Clearing %WORKER_REBIND from this foreign context is safe -* because these workers are still guaranteed to be idle. -*/ - for_each_worker_pool(pool, gcwq) - list_for_each_entry(worker, >idle_list, entry) - worker->flags &= ~WORKER_REBIND; - complete_all(_rebind.rebind_hold); /* rebind busy workers */ -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 06/10 V4] workqueue: simple clear WORKER_REBIND
WORKER_REBIND is not used for other purpose, idle_worker_rebind() can directly clear it. Signed-off-by: Lai Jiangshan la...@cn.fujitsu.com --- kernel/workqueue.c | 13 ++--- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 55864d1..9466d91 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1332,6 +1332,7 @@ static void idle_worker_rebind(struct worker *worker) { /* CPU must be online at this point */ WARN_ON(!worker_maybe_bind_and_lock(worker)); + worker_clr_flags(worker, WORKER_REBIND); ++worker-idle_rebind-ref_cnt; if (!--worker-idle_rebind-idle_cnt) complete(worker-idle_rebind-idle_done); @@ -1420,7 +1421,7 @@ retry: /* set REBIND and kick idle ones, we'll wait for these later */ for_each_worker_pool(pool, gcwq) { list_for_each_entry(worker, pool-idle_list, entry) { - if (worker-flags WORKER_REBIND) + if (!(worker-flags WORKER_UNBOUND)) continue; /* morph UNBOUND to REBIND */ @@ -1443,16 +1444,6 @@ retry: goto retry; } - /* -* All idle workers are rebound and waiting for %WORKER_REBIND to -* be cleared inside idle_worker_rebind(). Clear and release. -* Clearing %WORKER_REBIND from this foreign context is safe -* because these workers are still guaranteed to be idle. -*/ - for_each_worker_pool(pool, gcwq) - list_for_each_entry(worker, pool-idle_list, entry) - worker-flags = ~WORKER_REBIND; - complete_all(idle_rebind.rebind_hold); /* rebind busy workers */ -- 1.7.4.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/