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 12/13] workqueue: add worker's global worker ID
Date: Fri, 1 Feb 2013 02:41:35 +0800 [thread overview]
Message-ID: <1359657696-2767-13-git-send-email-laijs@cn.fujitsu.com> (raw)
In-Reply-To: <1359657696-2767-1-git-send-email-laijs@cn.fujitsu.com>
Add worker->gwid which is allocated from worker_idr. This
will be used to record the last running worker in work->data.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
kernel/workqueue.c | 28 ++++++++++++++++++++++++++++
kernel/workqueue_internal.h | 1 +
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 04d1286..bc57faf 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -439,6 +439,10 @@ static atomic_t unbound_std_pool_nr_running[NR_STD_WORKER_POOLS] = {
static DEFINE_MUTEX(worker_pool_idr_mutex);
static DEFINE_IDR(worker_pool_idr);
+/* idr of all workers */
+static DEFINE_MUTEX(worker_gwid_idr_mutex);
+static DEFINE_IDR(worker_gwid_idr);
+
static int worker_thread(void *__worker);
static struct worker_pool *std_worker_pools(int cpu)
@@ -454,6 +458,26 @@ static int std_worker_pool_pri(struct worker_pool *pool)
return pool - std_worker_pools(pool->cpu);
}
+/* allocate ID and assign it to @worker */
+static int worker_assign_gwid(struct worker *worker)
+{
+ int ret;
+
+ mutex_lock(&worker_gwid_idr_mutex);
+ idr_pre_get(&worker_gwid_idr, GFP_KERNEL);
+ ret = idr_get_new(&worker_gwid_idr, worker, &worker->gwid);
+ mutex_unlock(&worker_gwid_idr_mutex);
+
+ return ret;
+}
+
+static void free_worker_gwid(struct worker *worker)
+{
+ mutex_lock(&worker_gwid_idr_mutex);
+ idr_remove(&worker_gwid_idr, worker->gwid);
+ mutex_unlock(&worker_gwid_idr_mutex);
+}
+
/* allocate ID and assign it to @pool */
static int worker_pool_assign_id(struct worker_pool *pool)
{
@@ -1814,6 +1838,9 @@ static struct worker *create_worker(struct worker_pool *pool)
worker->pool = pool;
worker->id = id;
+ if (worker_assign_gwid(worker))
+ goto fail;
+
if (pool->cpu != WORK_CPU_UNBOUND)
worker->task = kthread_create_on_node(worker_thread,
worker, cpu_to_node(pool->cpu),
@@ -1900,6 +1927,7 @@ static void destroy_worker(struct worker *worker)
spin_unlock_irq(&pool->lock);
kthread_stop(worker->task);
+ free_worker_gwid(worker);
kfree(worker);
spin_lock_irq(&pool->lock);
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
index 328be4a..eccd50c 100644
--- a/kernel/workqueue_internal.h
+++ b/kernel/workqueue_internal.h
@@ -36,6 +36,7 @@ struct worker {
unsigned long last_active; /* L: last active timestamp */
unsigned int flags; /* X: flags */
int id; /* I: worker id */
+ int gwid; /* I: global worker id */
/* for rebinding worker to CPU */
struct work_struct rebind_work; /* L: for busy worker */
--
1.7.7.6
next prev parent reply other threads:[~2013-01-31 18:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 18:41 [PATCH 00/13] workqueue: enhance locking and record global worker id for work data Lai Jiangshan
2013-01-31 18:41 ` [PATCH 01/13] workqueue: remove WORK_CPU_NONE Lai Jiangshan
2013-02-04 19:49 ` Tejun Heo
2013-02-05 12:03 ` Lai Jiangshan
2013-02-06 22:34 ` [PATCH wq/for-3.9] workqueue: replace WORK_CPU_NONE/LAST with WORK_CPU_END Tejun Heo
2013-01-31 18:41 ` [PATCH 02/13] workqueue: fix work_busy() Lai Jiangshan
2013-02-04 19:54 ` Tejun Heo
2013-02-05 12:06 ` Lai Jiangshan
2013-02-05 18:53 ` Tejun Heo
2013-02-06 11:42 ` Lai Jiangshan
2013-02-06 14:05 ` Tejun Heo
2013-02-06 23:02 ` [PATCH wq/for-3.9] workqueue: make work_busy() test WORK_STRUCT_PENDING first Tejun Heo
2013-01-31 18:41 ` [PATCH 03/13] workqueue: don't set work cwq until we queued it on pool Lai Jiangshan
2013-02-04 21:28 ` Tejun Heo
2013-02-05 15:00 ` Lai Jiangshan
2013-02-05 16:45 ` Tejun Heo
2013-02-06 11:35 ` Lai Jiangshan
2013-02-06 14:18 ` Tejun Heo
2013-02-05 15:06 ` Lai Jiangshan
2013-02-07 0:28 ` [PATCH wq/for-3.9 workqueue]: add delayed_work->wq to simplify reentrancy handling Tejun Heo
2013-01-31 18:41 ` [PATCH 04/13] workqueue: clear cwq when cancel the work Lai Jiangshan
2013-02-07 0:53 ` [PATCH wq/for-3.9] workqueue: make work->data point to pool after try_to_grab_pending() Tejun Heo
2013-01-31 18:41 ` [PATCH 05/13] workqueue: change queued detection and remove *mb()s Lai Jiangshan
2013-02-07 1:52 ` [PATCH wq/for-3.9] workqueue: simplify is-work-item-queued-here test Tejun Heo
2013-02-07 2:03 ` [PATCH wq/for-3.9] workqueue: cosmetic update in try_to_grab_pending() Tejun Heo
2013-01-31 18:41 ` [PATCH 06/13] workqueue: get pool id from work->data directly if it is offq Lai Jiangshan
2013-02-07 20:16 ` [PATCH wq/for-3.9] workqueue: make get_work_pool_id() cheaper Tejun Heo
2013-01-31 18:41 ` [PATCH 07/13] workqueue: get pool from wq/cwq Lai Jiangshan
2013-02-07 21:13 ` [PATCH wq/for-3.9] workqueue: pick cwq instead of pool in __queue_work() Tejun Heo
2013-01-31 18:41 ` [PATCH 08/13] workqueue: add lock_pool_executing_work() Lai Jiangshan
2013-02-04 21:34 ` Tejun Heo
2013-02-05 12:15 ` Lai Jiangshan
2013-02-05 19:09 ` Tejun Heo
2013-01-31 18:41 ` [PATCH 09/13] workqueue: add lock_pool_queued_work() Lai Jiangshan
2013-01-31 18:41 ` [PATCH 10/13] workqueue: add lock_pool_own_work() and remove get_work_pool() Lai Jiangshan
2013-02-04 21:38 ` Tejun Heo
2013-01-31 18:41 ` [PATCH 11/13] workqueue: allow more work_pool id space Lai Jiangshan
2013-01-31 18:41 ` Lai Jiangshan [this message]
2013-02-04 21:39 ` [PATCH 12/13] workqueue: add worker's global worker ID Tejun Heo
2013-01-31 18:41 ` [PATCH 13/13] workqueue: record global worker ID instead of pool ID in work->data when off-queue Lai Jiangshan
2013-02-04 21:40 ` Tejun Heo
2013-02-04 22:12 ` Tejun Heo
2013-02-05 15:18 ` Lai Jiangshan
2013-02-07 22:02 ` Tejun Heo
2013-02-13 22:23 ` Tejun Heo
2013-02-04 21:04 ` [PATCH 00/13] workqueue: enhance locking and record global worker id for work data Tejun Heo
2013-02-05 16:19 ` Lai Jiangshan
2013-02-05 16:50 ` 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=1359657696-2767-13-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).