From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Tejun Heo <tj@kernel.org>, linux-kernel@vger.kernel.org
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [PATCH 05/10 V4] workqueue: move rebind_hold to idle_rebind
Date: Sun, 2 Sep 2012 00:28:23 +0800 [thread overview]
Message-ID: <1346516916-1991-6-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1346516916-1991-1-git-send-email-laijs@cn.fujitsu.com>
By the help of @idle_rebind.ref_done, the life time of idle_rebind
is expanded enough and it can include the whole reference-time
of @rebind_hold, so we can move @rebind_hold from gcwq to idle_rebind.
Also we change it to completion instead. we need to ease the pain of WORKER_REBIND.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
kernel/workqueue.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index d40e8d7..55864d1 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -185,8 +185,6 @@ struct global_cwq {
/* L: hash of busy workers */
struct worker_pool pools[2]; /* normal and highpri pools */
-
- wait_queue_head_t rebind_hold; /* rebind hold wait */
} ____cacheline_aligned_in_smp;
/*
@@ -1309,15 +1307,16 @@ struct idle_rebind {
int idle_cnt; /* # idle workers to be rebound */
struct completion idle_done; /* all idle workers rebound */
+ /* idle workers wait all idles to be rebound */
+ struct completion rebind_hold;
+
/*
* notify the rebind_workers() that:
- * 0. All worker leave rebind_hold:
* 1. All idle workers are rebound.
* 2. No idle worker has ref to this struct
*
* @ref_cnt: # idle workers which has ref to this struct
* @ref_done: any idle workers has no ref to this struct,
- * nor rebind_hold.
* it also implies that all idle workers are rebound.
*/
int ref_cnt;
@@ -1331,8 +1330,6 @@ struct idle_rebind {
*/
static void idle_worker_rebind(struct worker *worker)
{
- struct global_cwq *gcwq = worker->pool->gcwq;
-
/* CPU must be online at this point */
WARN_ON(!worker_maybe_bind_and_lock(worker));
++worker->idle_rebind->ref_cnt;
@@ -1341,7 +1338,7 @@ static void idle_worker_rebind(struct worker *worker)
spin_unlock_irq(&worker->pool->gcwq->lock);
/* we did our part, wait for rebind_workers() to finish up */
- wait_event(gcwq->rebind_hold, !(worker->flags & WORKER_REBIND));
+ wait_for_completion(&worker->idle_rebind->rebind_hold);
/* noify if all idle worker are done(rebond & wait) */
spin_lock_irq(&worker->pool->gcwq->lock);
@@ -1408,11 +1405,12 @@ static void rebind_workers(struct global_cwq *gcwq)
/*
* Rebind idle workers. Interlocked both ways in triple waits.
* We wait for workers to rebind via @idle_rebind.idle_done.
- * Workers will wait for us to finish up by watching %WORKER_REBIND.
+ * Workers will wait for us via @idle_rebind.rebind_hold.
* And them we wait for workers to leave rebind_hold
* via @idle_rebind.ref_done.
*/
init_completion(&idle_rebind.idle_done);
+ init_completion(&idle_rebind.rebind_hold);
init_completion(&idle_rebind.ref_done);
idle_rebind.ref_cnt = 1;
retry:
@@ -1455,7 +1453,7 @@ retry:
list_for_each_entry(worker, &pool->idle_list, entry)
worker->flags &= ~WORKER_REBIND;
- wake_up_all(&gcwq->rebind_hold);
+ complete_all(&idle_rebind.rebind_hold);
/* rebind busy workers */
for_each_busy_worker(worker, i, pos, gcwq) {
@@ -1481,7 +1479,7 @@ retry:
/*
* we will leave rebind_workers(), have to wait until no worker
- * has ref to this idle_rebind nor rebind_hold.
+ * has ref to this idle_rebind.
*/
if (--idle_rebind.ref_cnt) {
spin_unlock_irq(&gcwq->lock);
@@ -3848,8 +3846,6 @@ static int __init init_workqueues(void)
mutex_init(&pool->manager_mutex);
ida_init(&pool->worker_ida);
}
-
- init_waitqueue_head(&gcwq->rebind_hold);
}
/* create the initial worker */
--
1.7.4.4
next prev parent reply other threads:[~2012-09-01 17:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-01 16:28 [PATCH 00/10 V4] workqueue: fix and cleanup hotplug/rebind_workers() Lai Jiangshan
2012-09-01 16:28 ` [PATCH 01/10 V4] workqueue: ensure the wq_worker_sleeping() see the right flags Lai Jiangshan
2012-09-04 23:39 ` [PATCH] workqueue: UNBOUND -> REBIND morphing in rebind_workers() should be atomic Tejun Heo
2012-09-04 23:58 ` [PATCH -stable] " Tejun Heo
2012-09-16 15:49 ` Ben Hutchings
2012-09-05 1:05 ` [PATCH] " Lai Jiangshan
2012-09-05 1:17 ` Tejun Heo
2012-09-01 16:28 ` [PATCH 02/10 V4] workqueue: fix deadlock in rebind_workers() Lai Jiangshan
2012-09-05 0:54 ` Tejun Heo
2012-09-05 1:28 ` Lai Jiangshan
2012-09-05 1:33 ` Tejun Heo
2012-09-01 16:28 ` [PATCH 03/10 V4] workqueue: add POOL_MANAGING_WORKERS Lai Jiangshan
2012-09-01 16:28 ` [PATCH 04/10 V4] workqueue: add manage_workers_slowpath() Lai Jiangshan
2012-09-05 1:12 ` Tejun Heo
2012-09-06 1:55 ` Lai Jiangshan
2012-09-01 16:28 ` Lai Jiangshan [this message]
2012-09-01 16:28 ` [PATCH 06/10 V4] workqueue: simple clear WORKER_REBIND Lai Jiangshan
2012-09-01 16:28 ` [PATCH 07/10 V4] workqueue: move idle_rebind pointer to gcwq Lai Jiangshan
2012-09-01 16:28 ` [PATCH 08/10 V4] workqueue: explicit way to wait for idles workers to finish Lai Jiangshan
2012-09-01 16:28 ` [PATCH 09/10] workqueue: single pass rebind_workers Lai Jiangshan
2012-09-01 16:28 ` [PATCH 10/10 V4] workqueue: merge the role of rebind_hold to idle_done Lai Jiangshan
2012-09-05 1:15 ` Tejun Heo
2012-09-05 1:48 ` Lai Jiangshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346516916-1991-6-git-send-email-laijs@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).