Skip to contentSkip to conversation

md: Convert timers to use timer_setup()

PATCH In review Kees Cook 5 participants 8 messages Oct 17, 2017 – Oct 24, 2017

Subsystems (3)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 md: Convert timers to use timer_setup()

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.

---
 drivers/md/bcache/stats.c | 8 +++-----
 drivers/md/dm-delay.c     | 6 +++---
 drivers/md/dm-integrity.c | 6 +++---
 drivers/md/dm-raid1.c     | 8 +++-----
 drivers/md/md.c           | 9 ++++-----
 5 files changed, 16 insertions(+), 21 deletions(-)
drivers/md/bcache/stats.c +3 -5
index 0ca072c20d0d..93a89c528760 100644
@@ -146,9 +146,9 @@ static void scale_stats(struct cache_stats *stats, unsigned long rescale_at)
 	}
 }
 
-static void scale_accounting(unsigned long data)
+static void scale_accounting(struct timer_list *t)
 {
-	struct cache_accounting *acc = (struct cache_accounting *) data;
+	struct cache_accounting *acc = from_timer(acc, t, timer);
 
 #define move_stat(name) do {						\
 	unsigned t = atomic_xchg(&acc->collector.name, 0);		\
@@ -233,9 +233,7 @@ void bch_cache_accounting_init(struct cache_accounting *acc,
 	kobject_init(&acc->day.kobj,		&bch_stats_ktype);
 
 	closure_init(&acc->cl, parent);
-	init_timer(&acc->timer);
+	timer_setup(&acc->timer, scale_accounting, 0);
 	acc->timer.expires	= jiffies + accounting_delay;
-	acc->timer.data		= (unsigned long) acc;
-	acc->timer.function	= scale_accounting;
 	add_timer(&acc->timer);
 }
drivers/md/dm-delay.c +3 -3
index 2209a9700acd..288386bfbfb5 100644
@@ -44,9 +44,9 @@ struct dm_delay_info {
 
 static DEFINE_MUTEX(delayed_bios_lock);
 
-static void handle_delayed_timer(unsigned long data)
+static void handle_delayed_timer(struct timer_list *t)
 {
-	struct delay_c *dc = (struct delay_c *)data;
+	struct delay_c *dc = from_timer(dc, t, delay_timer);
 
 	queue_work(dc->kdelayd_wq, &dc->flush_expired_bios);
 }
@@ -195,7 +195,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		goto bad_queue;
 	}
 
-	setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
+	timer_setup(&dc->delay_timer, handle_delayed_timer, 0);
 
 	INIT_WORK(&dc->flush_expired_bios, flush_expired_bios);
 	INIT_LIST_HEAD(&dc->delayed_bios);
drivers/md/dm-integrity.c +3 -3
index 096fe9b66c50..98f0b645b839 100644
@@ -1093,9 +1093,9 @@ static void sleep_on_endio_wait(struct dm_integrity_c *ic)
 	__remove_wait_queue(&ic->endio_wait, &wait);
 }
 
-static void autocommit_fn(unsigned long data)
+static void autocommit_fn(struct timer_list *t)
 {
-	struct dm_integrity_c *ic = (struct dm_integrity_c *)data;
+	struct dm_integrity_c *ic = from_timer(ic, t, autocommit_timer);
 
 	if (likely(!dm_integrity_failed(ic)))
 		queue_work(ic->commit_wq, &ic->commit_work);
@@ -2941,7 +2941,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
 
 	ic->autocommit_jiffies = msecs_to_jiffies(sync_msec);
 	ic->autocommit_msec = sync_msec;
-	setup_timer(&ic->autocommit_timer, autocommit_fn, (unsigned long)ic);
+	timer_setup(&ic->autocommit_timer, autocommit_fn, 0);
 
 	ic->io = dm_io_client_create();
 	if (IS_ERR(ic->io)) {
drivers/md/dm-raid1.c +3 -5
index c0b82136b2d1..580c49cc8079 100644
@@ -94,9 +94,9 @@ static void wakeup_mirrord(void *context)
 	queue_work(ms->kmirrord_wq, &ms->kmirrord_work);
 }
 
-static void delayed_wake_fn(unsigned long data)
+static void delayed_wake_fn(struct timer_list *t)
 {
-	struct mirror_set *ms = (struct mirror_set *) data;
+	struct mirror_set *ms = from_timer(ms, t, timer);
 
 	clear_bit(0, &ms->timer_pending);
 	wakeup_mirrord(ms);
@@ -108,8 +108,6 @@ static void delayed_wake(struct mirror_set *ms)
 		return;
 
 	ms->timer.expires = jiffies + HZ / 5;
-	ms->timer.data = (unsigned long) ms;
-	ms->timer.function = delayed_wake_fn;
 	add_timer(&ms->timer);
 }
 
@@ -1133,7 +1131,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		goto err_free_context;
 	}
 	INIT_WORK(&ms->kmirrord_work, do_mirror);
-	init_timer(&ms->timer);
+	timer_setup(&ms->timer, delayed_wake_fn, 0);
 	ms->timer_pending = 0;
 	INIT_WORK(&ms->trigger_event, trigger_event);
 
drivers/md/md.c +4 -5
index 97afb28c6f51..873a20f44197 100644
@@ -520,7 +520,7 @@ static void mddev_put(struct mddev *mddev)
 		bioset_free(sync_bs);
 }
 
-static void md_safemode_timeout(unsigned long data);
+static void md_safemode_timeout(struct timer_list *t);
 
 void mddev_init(struct mddev *mddev)
 {
@@ -529,8 +529,7 @@ void mddev_init(struct mddev *mddev)
 	mutex_init(&mddev->bitmap_info.mutex);
 	INIT_LIST_HEAD(&mddev->disks);
 	INIT_LIST_HEAD(&mddev->all_mddevs);
-	setup_timer(&mddev->safemode_timer, md_safemode_timeout,
-		    (unsigned long) mddev);
+	timer_setup(&mddev->safemode_timer, md_safemode_timeout, 0);
 	atomic_set(&mddev->active, 1);
 	atomic_set(&mddev->openers, 0);
 	atomic_set(&mddev->active_io, 0);
@@ -5386,9 +5385,9 @@ static int add_named_array(const char *val, struct kernel_param *kp)
 	return -EINVAL;
 }
 
-static void md_safemode_timeout(unsigned long data)
+static void md_safemode_timeout(struct timer_list *t)
 {
-	struct mddev *mddev = (struct mddev *) data;
+	struct mddev *mddev = from_timer(mddev, t, safemode_timer);
 
 	mddev->safemode = 1;
 	if (mddev->external)
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security
#1 lore raw
Quoted 3 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.

If you send the md.c part along, I'll apply. Or if you want this merged in other tree, you can add my 'reviewed-by: Shaohua Li <[email protected]>' for md.c part.

Quoted 173 lines
---
 drivers/md/bcache/stats.c | 8 +++-----
 drivers/md/dm-delay.c     | 6 +++---
 drivers/md/dm-integrity.c | 6 +++---
 drivers/md/dm-raid1.c     | 8 +++-----
 drivers/md/md.c           | 9 ++++-----
 5 files changed, 16 insertions(+), 21 deletions(-)
drivers/md/bcache/stats.c +3 -5
index 0ca072c20d0d..93a89c528760 100644
@@ -146,9 +146,9 @@ static void scale_stats(struct cache_stats *stats, unsigned long rescale_at)
 	}
 }
 
-static void scale_accounting(unsigned long data)
+static void scale_accounting(struct timer_list *t)
 {
-	struct cache_accounting *acc = (struct cache_accounting *) data;
+	struct cache_accounting *acc = from_timer(acc, t, timer);
 
 #define move_stat(name) do {						\
 	unsigned t = atomic_xchg(&acc->collector.name, 0);		\
@@ -233,9 +233,7 @@ void bch_cache_accounting_init(struct cache_accounting *acc,
 	kobject_init(&acc->day.kobj,		&bch_stats_ktype);
 
 	closure_init(&acc->cl, parent);
-	init_timer(&acc->timer);
+	timer_setup(&acc->timer, scale_accounting, 0);
 	acc->timer.expires	= jiffies + accounting_delay;
-	acc->timer.data		= (unsigned long) acc;
-	acc->timer.function	= scale_accounting;
 	add_timer(&acc->timer);
 }
drivers/md/dm-delay.c +3 -3
index 2209a9700acd..288386bfbfb5 100644
@@ -44,9 +44,9 @@ struct dm_delay_info {
 
 static DEFINE_MUTEX(delayed_bios_lock);
 
-static void handle_delayed_timer(unsigned long data)
+static void handle_delayed_timer(struct timer_list *t)
 {
-	struct delay_c *dc = (struct delay_c *)data;
+	struct delay_c *dc = from_timer(dc, t, delay_timer);
 
 	queue_work(dc->kdelayd_wq, &dc->flush_expired_bios);
 }
@@ -195,7 +195,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		goto bad_queue;
 	}
 
-	setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
+	timer_setup(&dc->delay_timer, handle_delayed_timer, 0);
 
 	INIT_WORK(&dc->flush_expired_bios, flush_expired_bios);
 	INIT_LIST_HEAD(&dc->delayed_bios);
drivers/md/dm-integrity.c +3 -3
index 096fe9b66c50..98f0b645b839 100644
@@ -1093,9 +1093,9 @@ static void sleep_on_endio_wait(struct dm_integrity_c *ic)
 	__remove_wait_queue(&ic->endio_wait, &wait);
 }
 
-static void autocommit_fn(unsigned long data)
+static void autocommit_fn(struct timer_list *t)
 {
-	struct dm_integrity_c *ic = (struct dm_integrity_c *)data;
+	struct dm_integrity_c *ic = from_timer(ic, t, autocommit_timer);
 
 	if (likely(!dm_integrity_failed(ic)))
 		queue_work(ic->commit_wq, &ic->commit_work);
@@ -2941,7 +2941,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
 
 	ic->autocommit_jiffies = msecs_to_jiffies(sync_msec);
 	ic->autocommit_msec = sync_msec;
-	setup_timer(&ic->autocommit_timer, autocommit_fn, (unsigned long)ic);
+	timer_setup(&ic->autocommit_timer, autocommit_fn, 0);
 
 	ic->io = dm_io_client_create();
 	if (IS_ERR(ic->io)) {
drivers/md/dm-raid1.c +3 -5
index c0b82136b2d1..580c49cc8079 100644
@@ -94,9 +94,9 @@ static void wakeup_mirrord(void *context)
 	queue_work(ms->kmirrord_wq, &ms->kmirrord_work);
 }
 
-static void delayed_wake_fn(unsigned long data)
+static void delayed_wake_fn(struct timer_list *t)
 {
-	struct mirror_set *ms = (struct mirror_set *) data;
+	struct mirror_set *ms = from_timer(ms, t, timer);
 
 	clear_bit(0, &ms->timer_pending);
 	wakeup_mirrord(ms);
@@ -108,8 +108,6 @@ static void delayed_wake(struct mirror_set *ms)
 		return;
 
 	ms->timer.expires = jiffies + HZ / 5;
-	ms->timer.data = (unsigned long) ms;
-	ms->timer.function = delayed_wake_fn;
 	add_timer(&ms->timer);
 }
 
@@ -1133,7 +1131,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		goto err_free_context;
 	}
 	INIT_WORK(&ms->kmirrord_work, do_mirror);
-	init_timer(&ms->timer);
+	timer_setup(&ms->timer, delayed_wake_fn, 0);
 	ms->timer_pending = 0;
 	INIT_WORK(&ms->trigger_event, trigger_event);
 
drivers/md/md.c +4 -5
index 97afb28c6f51..873a20f44197 100644
@@ -520,7 +520,7 @@ static void mddev_put(struct mddev *mddev)
 		bioset_free(sync_bs);
 }
 
-static void md_safemode_timeout(unsigned long data);
+static void md_safemode_timeout(struct timer_list *t);
 
 void mddev_init(struct mddev *mddev)
 {
@@ -529,8 +529,7 @@ void mddev_init(struct mddev *mddev)
 	mutex_init(&mddev->bitmap_info.mutex);
 	INIT_LIST_HEAD(&mddev->disks);
 	INIT_LIST_HEAD(&mddev->all_mddevs);
-	setup_timer(&mddev->safemode_timer, md_safemode_timeout,
-		    (unsigned long) mddev);
+	timer_setup(&mddev->safemode_timer, md_safemode_timeout, 0);
 	atomic_set(&mddev->active, 1);
 	atomic_set(&mddev->openers, 0);
 	atomic_set(&mddev->active_io, 0);
@@ -5386,9 +5385,9 @@ static int add_named_array(const char *val, struct kernel_param *kp)
 	return -EINVAL;
 }
 
-static void md_safemode_timeout(unsigned long data)
+static void md_safemode_timeout(struct timer_list *t)
 {
-	struct mddev *mddev = (struct mddev *) data;
+	struct mddev *mddev = from_timer(mddev, t, safemode_timer);
 
 	mddev->safemode = 1;
 	if (mddev->external)
Signature · 10 lines
2.7.4


-- 
Kees Cook
Pixel Security
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author
#2 lore raw
Quoted 8 lines · Shaohua Li
Quoted 3 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.

If you send the md.c part along, I'll apply. Or if you want this merged in other tree, you can add my 'reviewed-by: Shaohua Li <[email protected]>' for md.c part.

Should I split this by each driver? (Who's the correct maintainer to take all of these?)

Thanks!

-Kees

Quoted 174 lines
Quoted 174 lines
---
 drivers/md/bcache/stats.c | 8 +++-----
 drivers/md/dm-delay.c     | 6 +++---
 drivers/md/dm-integrity.c | 6 +++---
 drivers/md/dm-raid1.c     | 8 +++-----
 drivers/md/md.c           | 9 ++++-----
 5 files changed, 16 insertions(+), 21 deletions(-)
drivers/md/bcache/stats.c +3 -5
index 0ca072c20d0d..93a89c528760 100644
@@ -146,9 +146,9 @@ static void scale_stats(struct cache_stats *stats, unsigned long rescale_at)
      }
 }
 
-static void scale_accounting(unsigned long data)
+static void scale_accounting(struct timer_list *t)
 {
-     struct cache_accounting *acc = (struct cache_accounting *) data;
+     struct cache_accounting *acc = from_timer(acc, t, timer);
 
 #define move_stat(name) do {                                         \
      unsigned t = atomic_xchg(&acc->collector.name, 0);              \
@@ -233,9 +233,7 @@ void bch_cache_accounting_init(struct cache_accounting *acc,
      kobject_init(&acc->day.kobj,            &bch_stats_ktype);
 
      closure_init(&acc->cl, parent);
-     init_timer(&acc->timer);
+     timer_setup(&acc->timer, scale_accounting, 0);
      acc->timer.expires      = jiffies + accounting_delay;
-     acc->timer.data         = (unsigned long) acc;
-     acc->timer.function     = scale_accounting;
      add_timer(&acc->timer);
 }
drivers/md/dm-delay.c +3 -3
index 2209a9700acd..288386bfbfb5 100644
@@ -44,9 +44,9 @@ struct dm_delay_info {
 
 static DEFINE_MUTEX(delayed_bios_lock);
 
-static void handle_delayed_timer(unsigned long data)
+static void handle_delayed_timer(struct timer_list *t)
 {
-     struct delay_c *dc = (struct delay_c *)data;
+     struct delay_c *dc = from_timer(dc, t, delay_timer);
 
      queue_work(dc->kdelayd_wq, &dc->flush_expired_bios);
 }
@@ -195,7 +195,7 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
              goto bad_queue;
      }
 
-     setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
+     timer_setup(&dc->delay_timer, handle_delayed_timer, 0);
 
      INIT_WORK(&dc->flush_expired_bios, flush_expired_bios);
      INIT_LIST_HEAD(&dc->delayed_bios);
drivers/md/dm-integrity.c +3 -3
index 096fe9b66c50..98f0b645b839 100644
@@ -1093,9 +1093,9 @@ static void sleep_on_endio_wait(struct dm_integrity_c *ic)
      __remove_wait_queue(&ic->endio_wait, &wait);
 }
 
-static void autocommit_fn(unsigned long data)
+static void autocommit_fn(struct timer_list *t)
 {
-     struct dm_integrity_c *ic = (struct dm_integrity_c *)data;
+     struct dm_integrity_c *ic = from_timer(ic, t, autocommit_timer);
 
      if (likely(!dm_integrity_failed(ic)))
              queue_work(ic->commit_wq, &ic->commit_work);
@@ -2941,7 +2941,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
 
      ic->autocommit_jiffies = msecs_to_jiffies(sync_msec);
      ic->autocommit_msec = sync_msec;
-     setup_timer(&ic->autocommit_timer, autocommit_fn, (unsigned long)ic);
+     timer_setup(&ic->autocommit_timer, autocommit_fn, 0);
 
      ic->io = dm_io_client_create();
      if (IS_ERR(ic->io)) {
drivers/md/dm-raid1.c +3 -5
index c0b82136b2d1..580c49cc8079 100644
@@ -94,9 +94,9 @@ static void wakeup_mirrord(void *context)
      queue_work(ms->kmirrord_wq, &ms->kmirrord_work);
 }
 
-static void delayed_wake_fn(unsigned long data)
+static void delayed_wake_fn(struct timer_list *t)
 {
-     struct mirror_set *ms = (struct mirror_set *) data;
+     struct mirror_set *ms = from_timer(ms, t, timer);
 
      clear_bit(0, &ms->timer_pending);
      wakeup_mirrord(ms);
@@ -108,8 +108,6 @@ static void delayed_wake(struct mirror_set *ms)
              return;
 
      ms->timer.expires = jiffies + HZ / 5;
-     ms->timer.data = (unsigned long) ms;
-     ms->timer.function = delayed_wake_fn;
      add_timer(&ms->timer);
 }
 
@@ -1133,7 +1131,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
              goto err_free_context;
      }
      INIT_WORK(&ms->kmirrord_work, do_mirror);
-     init_timer(&ms->timer);
+     timer_setup(&ms->timer, delayed_wake_fn, 0);
      ms->timer_pending = 0;
      INIT_WORK(&ms->trigger_event, trigger_event);
 
drivers/md/md.c +4 -6
index 97afb28c6f51..873a20f44197 100644
@@ -520,7 +520,7 @@ static void mddev_put(struct mddev *mddev)
              bioset_free(sync_bs);
 }
 
-static void md_safemode_timeout(unsigned long data);
+static void md_safemode_timeout(struct timer_list *t);
 
 void mddev_init(struct mddev *mddev)
 {
@@ -529,8 +529,7 @@ void mddev_init(struct mddev *mddev)
      mutex_init(&mddev->bitmap_info.mutex);
      INIT_LIST_HEAD(&mddev->disks);
      INIT_LIST_HEAD(&mddev->all_mddevs);
-     setup_timer(&mddev->safemode_timer, md_safemode_timeout,
-                 (unsigned long) mddev);
+     timer_setup(&mddev->safemode_timer, md_safemode_timeout, 0);
      atomic_set(&mddev->active, 1);
      atomic_set(&mddev->openers, 0);
      atomic_set(&mddev->active_io, 0);
@@ -5386,9 +5385,9 @@ static int add_named_array(const char *val, struct kernel_param *kp)
      return -EINVAL;
 }
 
-static void md_safemode_timeout(unsigned long data)
+static void md_safemode_timeout(struct timer_list *t)
 {
-     struct mddev *mddev = (struct mddev *) data;
+     struct mddev *mddev = from_timer(mddev, t, safemode_timer);
 
      mddev->safemode = 1;
      if (mddev->external)
--

2.7.4

--
Kees Cook
Pixel Security
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
Kees Cook
Pixel Security
Reviewed-by on v1 1/1
#3 lore raw
In reply to Kees Cook
Quoted 4 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.

Quoted 8 lines

This looks good to me-- I'm fine with Jens or someone else picking this up directly, or would take a bcache-specific one to apply to my tree.

Quoted 1 line

[snip]

author
#4 lore raw
Quoted 14 lines · Michael Lyle
Quoted 4 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.

Quoted 8 lines
Quoted 4 lines

This looks good to me-- I'm fine with Jens or someone else picking this up directly, or would take a bcache-specific one to apply to my tree.

Jens, can you pick this up, or would you prefer I split it up?

Thanks!

-Kees

Signature · 2 lines
Kees Cook
Pixel Security
#5 lore raw
Quoted 18 lines · Kees Cook
Quoted 16 lines · Michael Lyle
Quoted 13 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.

Quoted 6 lines
Quoted 4 lines

This looks good to me-- I'm fine with Jens or someone else picking this up directly, or would take a bcache-specific one to apply to my tree.

Jens, can you pick this up, or would you prefer I split it up?

I can pick it up, but I don’t think I was ever cc’ed on the original.

Reviewed-by
#6 lore raw
Quoted 18 lines · Jens Axboe
Quoted 18 lines · Kees Cook
Quoted 16 lines · Michael Lyle
Quoted 13 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.

Quoted 6 lines
Quoted 6 lines
Quoted 4 lines

This looks good to me-- I'm fine with Jens or someone else picking this up directly, or would take a bcache-specific one to apply to my tree.

Jens, can you pick this up, or would you prefer I split it up?

Jens, would you be OK picking it up from patchwork? If so, see:
https://patchwork.kernel.org/patch/10010303/

You can add mine too:

#7 lore raw
Quoted 26 lines · Mike Snitzer
Quoted 23 lines · Jens Axboe
Quoted 23 lines · Kees Cook
Quoted 20 lines · Michael Lyle
Quoted 5 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.

Quoted 8 lines

This looks good to me-- I'm fine with Jens or someone else picking this up directly, or would take a bcache-specific one to apply to my tree.

Quoted 7 lines
Quoted 1 line
Quoted 1 line

Jens, can you pick this up, or would you prefer I split it up?

Jens, would you be OK picking it up from patchwork? If so, see:
https://patchwork.kernel.org/patch/10010303/

You can add mine too:

Done, thanks all.

Signature · 1 line
Jens Axboe