Skip to contentSkip to conversation

workqueue: Convert timers to use timer_setup() (part 2)

PATCH In review Kees Cook 3 participants 3 messages Oct 16, 2017 – Oct 18, 2017 Workqueue

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 workqueue: Convert timers to use timer_setup() (part 2)

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. (The prior workqueue patch missed a few timers.)

Cc Tejun Heo <[email protected]>
Cc Lai Jiangshan <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
 kernel/workqueue.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
kernel/workqueue.c +6 -8
index 0fca63fab060..3b67c0a0df16 100644
@@ -1832,9 +1832,9 @@ static void destroy_worker(struct worker *worker)
 	wake_up_process(worker->task);
 }
 
-static void idle_worker_timeout(unsigned long __pool)
+static void idle_worker_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, idle_timer);
 
 	spin_lock_irq(&pool->lock);
 

@@ -1880,9 +1880,9 @@ static void send_mayday(struct work_struct *work)
 	}
 }
 
-static void pool_mayday_timeout(unsigned long __pool)
+static void pool_mayday_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, mayday_timer);
 	struct work_struct *work;
 
 	spin_lock_irq(&pool->lock);

@@ -3235,11 +3235,9 @@ static int init_worker_pool(struct worker_pool *pool)
 	INIT_LIST_HEAD(&pool->idle_list);
 	hash_init(pool->busy_hash);
 
-	setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
-			       (unsigned long)pool);
+	timer_setup(&pool->idle_timer, idle_worker_timeout, TIMER_DEFERRABLE);
 
-	setup_timer(&pool->mayday_timer, pool_mayday_timeout,
-		    (unsigned long)pool);
+	timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0);
 
 	mutex_init(&pool->attach_mutex);
 	INIT_LIST_HEAD(&pool->workers);
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Kees Cook

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. (The prior workqueue patch missed a few timers.)

Cc Tejun Heo <[email protected]>
Cc Lai Jiangshan <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Acked-by Tejun Heo <[email protected]>

Please feel free to route with other timer patches.

Thanks.

Signature · 1 line
tejun
merge bot
#2 lore raw
In reply to Kees Cook
workqueue: Convert timers to use timer_setup() (part 2)
Commit-ID:  32a6c7233c41216f5dd41fc7bf100eedb1063dfc
Gitweb:     https://git.kernel.org/tip/32a6c7233c41216f5dd41fc7bf100eedb1063dfc
Author:     Kees Cook <[email protected]>
AuthorDate: Mon, 16 Oct 2017 15:58:25 -0700
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 18 Oct 2017 17:04:25 +0200

workqueue: Convert timers to use timer_setup() (part 2)

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. (The prior workqueue patch missed a few timers.)

Signed-off-by Kees Cook <[email protected]>
Acked-by Tejun Heo <[email protected]>
Cc Lai Jiangshan <[email protected]>
Link https://lkml.kernel.org/r/20171016225825.GA99101@beast open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 kernel/workqueue.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
kernel/workqueue.c +6 -8
index c77fdf6..6e5eed58 100644
@@ -1831,9 +1831,9 @@ static void destroy_worker(struct worker *worker)
 	wake_up_process(worker->task);
 }
 
-static void idle_worker_timeout(unsigned long __pool)
+static void idle_worker_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, idle_timer);
 
 	spin_lock_irq(&pool->lock);
 

@@ -1879,9 +1879,9 @@ static void send_mayday(struct work_struct *work)
 	}
 }
 
-static void pool_mayday_timeout(unsigned long __pool)
+static void pool_mayday_timeout(struct timer_list *t)
 {
-	struct worker_pool *pool = (void *)__pool;
+	struct worker_pool *pool = from_timer(pool, t, mayday_timer);
 	struct work_struct *work;
 
 	spin_lock_irq(&pool->lock);

@@ -3241,11 +3241,9 @@ static int init_worker_pool(struct worker_pool *pool)
 	INIT_LIST_HEAD(&pool->idle_list);
 	hash_init(pool->busy_hash);
 
-	setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
-			       (unsigned long)pool);
+	timer_setup(&pool->idle_timer, idle_worker_timeout, TIMER_DEFERRABLE);
 
-	setup_timer(&pool->mayday_timer, pool_mayday_timeout,
-		    (unsigned long)pool);
+	timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0);
 
 	mutex_init(&pool->manager_arb);
 	mutex_init(&pool->attach_mutex);