From: Tejun Heo <tj@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>, Tejun Heo <tj@kernel.org>
Subject: [PATCH 14/17] workqueue: remove worker_pool->gcwq
Date: Wed, 16 Jan 2013 17:42:46 -0800 [thread overview]
Message-ID: <1358386969-945-15-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1358386969-945-1-git-send-email-tj@kernel.org>
The only remaining user of pool->gcwq is std_worker_pool_pri().
Reimplement it using get_gcwq() and remove worker_pool->gcwq.
This is part of an effort to remove global_cwq and make worker_pool
the top level abstraction, which in turn will help implementing worker
pools with user-specified attributes.
Signed-off-by: Tejun Heo <tj@kernel.org>
---
kernel/workqueue.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 81f041f..d37db53 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -150,7 +150,6 @@ struct worker {
};
struct worker_pool {
- struct global_cwq *gcwq; /* I: the owning gcwq */
spinlock_t lock; /* the pool lock */
unsigned int cpu; /* I: the associated cpu */
int id; /* I: pool ID */
@@ -478,11 +477,6 @@ static DEFINE_IDR(worker_pool_idr);
static int worker_thread(void *__worker);
-static int std_worker_pool_pri(struct worker_pool *pool)
-{
- return pool - pool->gcwq->pools;
-}
-
static struct global_cwq *get_gcwq(unsigned int cpu)
{
if (cpu != WORK_CPU_UNBOUND)
@@ -491,6 +485,11 @@ static struct global_cwq *get_gcwq(unsigned int cpu)
return &unbound_global_cwq;
}
+static int std_worker_pool_pri(struct worker_pool *pool)
+{
+ return pool - get_gcwq(pool->cpu)->pools;
+}
+
/* allocate ID and assign it to @pool */
static int worker_pool_assign_id(struct worker_pool *pool)
{
@@ -3827,7 +3826,6 @@ static int __init init_workqueues(void)
struct worker_pool *pool;
for_each_std_worker_pool(pool, cpu) {
- pool->gcwq = get_gcwq(cpu);
spin_lock_init(&pool->lock);
pool->cpu = cpu;
pool->flags |= POOL_DISASSOCIATED;
--
1.8.0.2
next prev parent reply other threads:[~2013-01-17 1:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-17 1:42 [PATCHSET] workqueue: remove gcwq and make worker_pool the only backend abstraction Tejun Heo
2013-01-17 1:42 ` [PATCH 01/17] workqueue: unexport work_cpu() Tejun Heo
2013-01-17 1:42 ` [PATCH 02/17] workqueue: use std_ prefix for the standard per-cpu pools Tejun Heo
2013-01-17 1:42 ` [PATCH 03/17] workqueue: make GCWQ_DISASSOCIATED a pool flag Tejun Heo
2013-01-17 1:42 ` [PATCH 04/17] workqueue: make GCWQ_FREEZING " Tejun Heo
2013-01-17 1:42 ` [PATCH 05/17] workqueue: introduce WORK_OFFQ_CPU_NONE Tejun Heo
2013-01-17 1:42 ` [PATCH 06/17] workqueue: add worker_pool->id Tejun Heo
2013-01-17 1:42 ` [PATCH 07/17] workqueue: record pool ID instead of CPU in work->data when off-queue Tejun Heo
2013-01-17 1:42 ` [PATCH 08/17] workqueue: move busy_hash from global_cwq to worker_pool Tejun Heo
2013-01-17 1:42 ` [PATCH 09/17] workqueue: move global_cwq->cpu " Tejun Heo
2013-01-17 1:42 ` [PATCH 10/17] workqueue: move global_cwq->lock " Tejun Heo
2013-01-17 1:42 ` [PATCH 11/17] workqueue: make hotplug processing per-pool Tejun Heo
2013-01-17 1:42 ` [PATCH 12/17] workqueue: make freezing/thawing per-pool Tejun Heo
2013-01-17 1:42 ` [PATCH 13/17] workqueue: replace for_each_worker_pool() with for_each_std_worker_pool() Tejun Heo
2013-01-17 1:42 ` Tejun Heo [this message]
2013-01-17 1:42 ` [PATCH 15/17] workqueue: remove global_cwq Tejun Heo
2013-01-22 6:50 ` Joonsoo Kim
2013-01-23 1:09 ` Tejun Heo
2013-01-23 18:09 ` [PATCH v2 " Tejun Heo
2013-01-24 9:29 ` Joonsoo Kim
2013-01-24 18:44 ` Tejun Heo
2013-01-17 1:42 ` [PATCH 16/17] workqueue: rename nr_running variables Tejun Heo
2013-01-17 1:42 ` [PATCH 17/17] workqueue: post global_cwq removal cleanups Tejun Heo
2013-01-17 1:48 ` [PATCHSET] workqueue: remove gcwq and make worker_pool the only backend abstraction Tejun Heo
2013-01-17 3:25 ` Wanlong Gao
2013-01-17 19:11 ` Tejun Heo
2013-01-22 5:37 ` Joonsoo Kim
2013-01-23 1:07 ` Tejun Heo
2013-01-24 13:36 ` Lai Jiangshan
2013-01-24 18:51 ` Tejun Heo
2013-01-24 19:03 ` Tejun Heo
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=1358386969-945-15-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.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