The name of may_start_working() became misleading due to the semantics of "!pool->nr_idle" is changed and any worker can start working in spite of the value of pool->nr_idle.
So we remove the may_start_working() and use "!pool->nr_idle" directly, need_to_create_worker() is also removed along with it. Signed-off-by: Lai Jiangshan <la...@cn.fujitsu.com> --- kernel/workqueue.c | 37 +++++++++++++------------------------ 1 files changed, 13 insertions(+), 24 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index ce8e3fc..e1ab4f9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -735,12 +735,6 @@ static bool need_more_worker(struct worker_pool *pool) return !list_empty(&pool->worklist) && __need_more_worker(pool); } -/* Can I start working? Called from busy but !running workers. */ -static bool may_start_working(struct worker_pool *pool) -{ - return pool->nr_idle; -} - /* Do I need to keep working? Called from currently running workers. */ static bool keep_working(struct worker_pool *pool) { @@ -748,12 +742,6 @@ static bool keep_working(struct worker_pool *pool) atomic_read(&pool->nr_running) <= 1; } -/* Do we need a new worker? Called from manager. */ -static bool need_to_create_worker(struct worker_pool *pool) -{ - return need_more_worker(pool) && !may_start_working(pool); -} - /* Do we have too many workers and should some go away? */ static bool too_many_workers(struct worker_pool *pool) { @@ -1815,19 +1803,20 @@ static void pool_mayday_timeout(unsigned long __pool) spin_lock_irq(&wq_mayday_lock); /* for wq->maydays */ spin_lock(&pool->lock); - if (need_to_create_worker(pool)) { - /* - * We've been trying to create a new worker but - * haven't been successful. We might be hitting an - * allocation deadlock. Send distress signals to - * rescuers. - */ - list_for_each_entry(work, &pool->worklist, entry) - send_mayday(work); - } + if (!pool->nr_idle) { + if (need_more_worker(pool)) { + /* + * We've been trying to create a new worker but + * haven't been successful. We might be hitting an + * allocation deadlock. Send distress signals to + * rescuers. + */ + list_for_each_entry(work, &pool->worklist, entry) + send_mayday(work); + } - if (!pool->nr_idle) mod_timer(&pool->mayday_timer, jiffies + MAYDAY_INTERVAL); + } spin_unlock(&pool->lock); spin_unlock_irq(&wq_mayday_lock); @@ -2097,7 +2086,7 @@ woke_up: goto sleep; /* do we need to create worker? */ - if (unlikely(!may_start_working(pool))) + if (unlikely(!pool->nr_idle)) start_creater_work(pool); /* -- 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/