Add new worker->id which is allocated from worker_idr. This
will be used to record the last running worker in work->data.
Signed-off-by: Lai Jiangshan <la...@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 764ad45..5502188 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -435,6 +435,10 @@ static struct worker_pool
unbound_std_worker_pools[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_idr_mutex);
+static DEFINE_IDR(worker_idr);
+
static int worker_thread(void *__worker);
static struct worker_pool *std_worker_pools(int cpu)
@@ -450,6 +454,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_id(struct worker *worker)
+{
+ int ret;
+
+ mutex_lock(&worker_idr_mutex);
+ idr_pre_get(&worker_idr, GFP_KERNEL);
+ ret = idr_get_new(&worker_idr, worker, &worker->id);
+ mutex_unlock(&worker_idr_mutex);
+
+ return ret;
+}
+
+static void free_worker_id(struct worker *worker)
+{
+ mutex_lock(&worker_idr_mutex);
+ idr_remove(&worker_idr, worker->id);
+ mutex_unlock(&worker_idr_mutex);
+}
+
/* allocate ID and assign it to @pool */
static int worker_pool_assign_id(struct worker_pool *pool)
{
@@ -1740,6 +1764,9 @@ static struct worker *create_worker(struct worker_pool
*pool)
worker->pool = pool;
worker->id_in_pool = id_in_pool;
+ if (worker_assign_id(worker))
+ goto fail;
+
if (pool->cpu != WORK_CPU_UNBOUND)
worker->task = kthread_create_on_node(worker_thread,
worker, cpu_to_node(pool->cpu),
@@ -1828,6 +1855,7 @@ static void destroy_worker(struct worker *worker)
spin_unlock_irq(&pool->lock);
kthread_stop(worker->task);
+ free_worker_id(worker);
kfree(worker);
spin_lock_irq(&pool->lock);
diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
index e6afb59..3694bc1 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_in_pool; /* I: worker id in the pool */
+ int id; /* I: worker id (global) */
/* for rebinding worker to CPU */
struct work_struct rebind_work; /* L: for busy worker */
--
1.7.7.6
--
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/
