s390/cio: Convert timers to use timer_setup()

PATCH Applied Kees Cook 2 participants 4 messages Oct 16, 2017 – Oct 17, 2017

Subsystems (2)

s390 s390 common I/O layer

lore

Share & tools

lore

Kees Cook

author

2017-10-16 23:43 UTC #0 lore raw

PATCH 1/1 s390/cio: 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.

Cc Sebastian Ott <[email protected]>

Cc Peter Oberparleiter <[email protected]>

Cc Martin Schwidefsky <[email protected]>

Cc Heiko Carstens <[email protected]>

Cc [email protected]

Signed-off-by Kees Cook <[email protected]>

---
 drivers/s390/cio/device.c     |  8 ++++----
 drivers/s390/cio/device.h     |  2 ++
 drivers/s390/cio/device_fsm.c | 10 ++++------
 drivers/s390/cio/eadm_sch.c   |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

drivers/s390/cio/device.c +4 -4

index e5c32f4b5287..318d8269f5de 100644
@@ -142,7 +142,7 @@ static void io_subchannel_shutdown(struct subchannel *);
 static int io_subchannel_sch_event(struct subchannel *, int);
 static int io_subchannel_chp_event(struct subchannel *, struct chp_link *,
 				   int);
-static void recovery_func(unsigned long data);
+static void recovery_func(struct timer_list *unused);
 
 static struct css_device_id io_subchannel_ids[] = {
 	{ .match_flags = 0x1, .type = SUBCHANNEL_TYPE_IO, },

@@ -194,7 +194,7 @@ int __init io_subchannel_init(void)
 {
 	int ret;
 
-	setup_timer(&recovery_timer, recovery_func, 0);
+	timer_setup(&recovery_timer, recovery_func, 0);
 	ret = bus_register(&ccw_bus_type);
 	if (ret)
 		return ret;

@@ -726,7 +726,7 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
 	INIT_WORK(&priv->todo_work, ccw_device_todo);
 	INIT_LIST_HEAD(&priv->cmb_list);
 	init_waitqueue_head(&priv->wait_q);
-	init_timer(&priv->timer);
+	timer_setup(&priv->timer, ccw_device_timeout, 0);
 
 	atomic_set(&priv->onoff, 0);
 	cdev->ccwlock = sch->lock;

@@ -1271,7 +1271,7 @@ static void recovery_work_func(struct work_struct *unused)
 
 static DECLARE_WORK(recovery_work, recovery_work_func);
 
-static void recovery_func(unsigned long data)
+static void recovery_func(struct timer_list *unused)
 {
 	/*
 	 * We can't do our recovery in softirq context and it's not

drivers/s390/cio/device.h +2 -0

index 69cb70f080a5..fef982ce082e 100644
@@ -3,6 +3,7 @@
 
 #include <asm/ccwdev.h>
 #include <linux/atomic.h>
+#include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/notifier.h>
 #include <linux/kernel_stat.h>

@@ -133,6 +134,7 @@ int ccw_device_notify(struct ccw_device *, int);
 void ccw_device_set_disconnected(struct ccw_device *cdev);
 void ccw_device_set_notoper(struct ccw_device *cdev);
 
+void ccw_device_timeout(struct timer_list *t);
 void ccw_device_set_timeout(struct ccw_device *, int);
 void ccw_device_schedule_recovery(void);

drivers/s390/cio/device_fsm.c +4 -6

index f98ea674c3d8..dd7d79d30edc 100644
@@ -91,12 +91,12 @@ static void ccw_timeout_log(struct ccw_device *cdev)
 /*
  * Timeout function. It just triggers a DEV_EVENT_TIMEOUT.
  */
-static void
-ccw_device_timeout(unsigned long data)
+void
+ccw_device_timeout(struct timer_list *t)
 {
-	struct ccw_device *cdev;
+	struct ccw_device_private *priv = from_timer(priv, t, timer);
+	struct ccw_device *cdev = priv->cdev;
 
-	cdev = (struct ccw_device *) data;
 	spin_lock_irq(cdev->ccwlock);
 	if (timeout_log_enabled)
 		ccw_timeout_log(cdev);

@@ -118,8 +118,6 @@ ccw_device_set_timeout(struct ccw_device *cdev, int expires)
 		if (mod_timer(&cdev->private->timer, jiffies + expires))
 			return;
 	}
-	cdev->private->timer.function = ccw_device_timeout;
-	cdev->private->timer.data = (unsigned long) cdev;
 	cdev->private->timer.expires = jiffies + expires;
 	add_timer(&cdev->private->timer);
 }

drivers/s390/cio/eadm_sch.c +4 -5

index 0f11f3bcac82..dbd309d957e0 100644
@@ -100,9 +100,10 @@ static int eadm_subchannel_clear(struct subchannel *sch)
 	return 0;
 }
 
-static void eadm_subchannel_timeout(unsigned long data)
+static void eadm_subchannel_timeout(struct timer_list *t)
 {
-	struct subchannel *sch = (struct subchannel *) data;
+	struct eadm_private *private = from_timer(private, t, timer);
+	struct subchannel *sch = private->sch;
 
 	spin_lock_irq(sch->lock);
 	EADM_LOG(1, "timeout");

@@ -124,8 +125,6 @@ static void eadm_subchannel_set_timeout(struct subchannel *sch, int expires)
 		if (mod_timer(&private->timer, jiffies + expires))
 			return;
 	}
-	private->timer.function = eadm_subchannel_timeout;
-	private->timer.data = (unsigned long) sch;
 	private->timer.expires = jiffies + expires;
 	add_timer(&private->timer);
 }

@@ -230,7 +229,7 @@ static int eadm_subchannel_probe(struct subchannel *sch)
 		return -ENOMEM;
 
 	INIT_LIST_HEAD(&private->head);
-	init_timer(&private->timer);
+	timer_setup(&private->timer, eadm_subchannel_timeout, 0);
 
 	spin_lock_irq(sch->lock);
 	set_eadm_private(sch, private);

Signature · 6 lines

2.7.4


-- 
Kees Cook
Pixel Security

Martin Schwidefsky

Applied

2017-10-17 08:58 UTC #1 lore raw

Quoted 10 lines · On Mon, 16 Oct 2017 16:43:25 -0700 Kees Cook <[email protected]> wrote:

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.
Cc Sebastian Ott <[email protected]>
Cc Peter Oberparleiter <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>

Quoted 6 lines

---
 drivers/s390/cio/device.c     |  8 ++++----
 drivers/s390/cio/device.h     |  2 ++
 drivers/s390/cio/device_fsm.c | 10 ++++------
 drivers/s390/cio/eadm_sch.c   |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

Applied to s390/linux:feature branch. Thanks.

Signature · 4 lines

blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.

Martin Schwidefsky

2017-10-17 09:06 UTC #2 lore raw

Quoted 20 lines · On Tue, 17 Oct 2017 10:58:47 +0200 Martin Schwidefsky <[email protected]>…

Quoted 10 lines · On Mon, 16 Oct 2017 16:43:25 -0700 Kees Cook <[email protected]> wrote:
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.
Cc Sebastian Ott <[email protected]>
Cc Peter Oberparleiter <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Quoted 6 lines
---
 drivers/s390/cio/device.c     |  8 ++++----
 drivers/s390/cio/device.h     |  2 ++
 drivers/s390/cio/device_fsm.c | 10 ++++------
 drivers/s390/cio/eadm_sch.c   |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)  

Quoted 1 line

Applied to s390/linux:feature branch. Thanks.

On second though, this will be postponed until the first merge of the s390/linux tree in 4.15 merge window has been done. I do not want to rebase the features branch and without the base timer code the branch will not compile. But be assured the patch is accepted and queued, just not visible yet.

Signature · 4 lines

blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.

Kees Cook

author

2017-10-17 15:17 UTC #3 lore raw

Quoted 23 lines · Martin Schwidefsky

Quoted 20 lines · On Tue, 17 Oct 2017 10:58:47 +0200 Martin Schwidefsky <[email protected]>…
Quoted 16 lines · On Mon, 16 Oct 2017 16:43:25 -0700 Kees Cook <[email protected]> wrote:
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.
Cc Sebastian Ott <[email protected]>
Cc Peter Oberparleiter <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/s390/cio/device.c     |  8 ++++----
 drivers/s390/cio/device.h     |  2 ++
 drivers/s390/cio/device_fsm.c | 10 ++++------
 drivers/s390/cio/eadm_sch.c   |  9 ++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

Quoted 7 lines

Quoted 1 line
Applied to s390/linux:feature branch. Thanks.
On second though, this will be postponed until the first merge of the s390/linux tree in 4.15 merge window has been done. I do not want to rebase the features branch and without the base timer code the branch will not compile. But be assured the patch is accepted and queued, just not visible yet.

Okay, thanks!

-Kees

Signature · 2 lines

Kees Cook
Pixel Security