linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
@ 2017-10-25 10:07 Kees Cook
  2017-10-31 15:49 ` Martin K. Petersen
  0 siblings, 1 reply; 9+ messages in thread
From: Kees Cook @ 2017-10-25 10:07 UTC (permalink / raw)
  To: Martin K. Petersen
  Cc: qla2xxx-upstream, James E.J. Bottomley, linux-scsi, linux-kernel

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: qla2xxx-upstream@qlogic.com
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/scsi/qla2xxx/qla_gbl.h    |  6 +++---
 drivers/scsi/qla2xxx/qla_init.c   |  4 ++--
 drivers/scsi/qla2xxx/qla_inline.h |  4 +---
 drivers/scsi/qla2xxx/qla_mid.c    |  2 +-
 drivers/scsi/qla2xxx/qla_os.c     | 11 +++++------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index f852ca60c49f..3ad375f85b59 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -206,8 +206,8 @@ int qla24xx_async_abort_cmd(srb_t *);
  */
 extern struct scsi_host_template qla2xxx_driver_template;
 extern struct scsi_transport_template *qla2xxx_transport_vport_template;
-extern void qla2x00_timer(scsi_qla_host_t *);
-extern void qla2x00_start_timer(scsi_qla_host_t *, void *, unsigned long);
+extern void qla2x00_timer(struct timer_list *);
+extern void qla2x00_start_timer(scsi_qla_host_t *, unsigned long);
 extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
 extern int qla24xx_disable_vp (scsi_qla_host_t *);
 extern int qla24xx_enable_vp (scsi_qla_host_t *);
@@ -753,7 +753,7 @@ extern int qla82xx_restart_isp(scsi_qla_host_t *);
 /* IOCB related functions */
 extern int qla82xx_start_scsi(srb_t *);
 extern void qla2x00_sp_free(void *);
-extern void qla2x00_sp_timeout(unsigned long);
+extern void qla2x00_sp_timeout(struct timer_list *);
 extern void qla2x00_bsg_job_done(void *, int);
 extern void qla2x00_bsg_sp_free(void *);
 extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 4c53199db371..0f834f7a923a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -45,9 +45,9 @@ static void qla24xx_handle_prli_done_event(struct scsi_qla_host *,
 /* SRB Extensions ---------------------------------------------------------- */
 
 void
-qla2x00_sp_timeout(unsigned long __data)
+qla2x00_sp_timeout(struct timer_list *t)
 {
-	srb_t *sp = (srb_t *)__data;
+	srb_t *sp = from_timer(sp, t, u.iocb_cmd.timer);
 	struct srb_iocb *iocb;
 	scsi_qla_host_t *vha = sp->vha;
 	struct req_que *req;
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 9a2c86eacf44..17d2c20f1f75 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -269,10 +269,8 @@ qla2x00_rel_sp(srb_t *sp)
 static inline void
 qla2x00_init_timer(srb_t *sp, unsigned long tmo)
 {
-	init_timer(&sp->u.iocb_cmd.timer);
+	timer_setup(&sp->u.iocb_cmd.timer, qla2x00_sp_timeout, 0);
 	sp->u.iocb_cmd.timer.expires = jiffies + tmo * HZ;
-	sp->u.iocb_cmd.timer.data = (unsigned long)sp;
-	sp->u.iocb_cmd.timer.function = qla2x00_sp_timeout;
 	add_timer(&sp->u.iocb_cmd.timer);
 	sp->free = qla2x00_sp_free;
 	if (IS_QLAFX00(sp->vha->hw) && (sp->type == SRB_FXIOCB_DCMD))
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index c0f8f6c17b79..cbf544dbf883 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -487,7 +487,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 	atomic_set(&vha->loop_state, LOOP_DOWN);
 	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 
-	qla2x00_start_timer(vha, qla2x00_timer, WATCH_INTERVAL);
+	qla2x00_start_timer(vha, WATCH_INTERVAL);
 
 	vha->req = base_vha->req;
 	host->can_queue = base_vha->req->length + 128;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 937209805baf..3b585d4e548d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -330,12 +330,10 @@ struct scsi_transport_template *qla2xxx_transport_vport_template = NULL;
  */
 
 __inline__ void
-qla2x00_start_timer(scsi_qla_host_t *vha, void *func, unsigned long interval)
+qla2x00_start_timer(scsi_qla_host_t *vha, unsigned long interval)
 {
-	init_timer(&vha->timer);
+	timer_setup(&vha->timer, qla2x00_timer, 0);
 	vha->timer.expires = jiffies + interval * HZ;
-	vha->timer.data = (unsigned long)vha;
-	vha->timer.function = (void (*)(unsigned long))func;
 	add_timer(&vha->timer);
 	vha->timer_active = 1;
 }
@@ -3246,7 +3244,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	base_vha->host->irq = ha->pdev->irq;
 
 	/* Initialized the timer */
-	qla2x00_start_timer(base_vha, qla2x00_timer, WATCH_INTERVAL);
+	qla2x00_start_timer(base_vha, WATCH_INTERVAL);
 	ql_dbg(ql_dbg_init, base_vha, 0x00ef,
 	    "Started qla2x00_timer with "
 	    "interval=%d.\n", WATCH_INTERVAL);
@@ -5995,8 +5993,9 @@ qla2x00_rst_aen(scsi_qla_host_t *vha)
 * Context: Interrupt
 ***************************************************************************/
 void
-qla2x00_timer(scsi_qla_host_t *vha)
+qla2x00_timer(struct timer_list *t)
 {
+	scsi_qla_host_t *vha = from_timer(vha, t, timer);
 	unsigned long	cpu_flags = 0;
 	int		start_dpc = 0;
 	int		index;
-- 
2.7.4


-- 
Kees Cook
Pixel Security

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-25 10:07 [PATCH] scsi: qla2xxx: Convert timers to use timer_setup() Kees Cook
@ 2017-10-31 15:49 ` Martin K. Petersen
  2017-10-31 18:03   ` Madhani, Himanshu
  0 siblings, 1 reply; 9+ messages in thread
From: Martin K. Petersen @ 2017-10-31 15:49 UTC (permalink / raw)
  To: Kees Cook
  Cc: Martin K. Petersen, qla2xxx-upstream, James E.J. Bottomley,
	linux-scsi, linux-kernel


Kees,

> 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.

Cavium folks: Please verify!

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 15:49 ` Martin K. Petersen
@ 2017-10-31 18:03   ` Madhani, Himanshu
  2017-10-31 18:12     ` Bart Van Assche
  0 siblings, 1 reply; 9+ messages in thread
From: Madhani, Himanshu @ 2017-10-31 18:03 UTC (permalink / raw)
  To: Martin K. Petersen
  Cc: Kees Cook, Dept-Eng QLA2xxx Upstream, James E.J. Bottomley,
	linux-scsi, linux-kernel

Hi Martin/Kees, 

> On Oct 31, 2017, at 8:49 AM, Martin K. Petersen <martin.petersen@oracle.com> wrote:
> 
> 
> Kees,
> 
>> 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.
> 
> Cavium folks: Please verify!
> 

I’ve checked on my setup and i am seeing regression with this patch applied. 

Driver load locks up the system with this patch applied. 

NACK 

> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
> 
> -- 
> Martin K. Petersen	Oracle Linux Engineering

Thanks,
- Himanshu

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 18:03   ` Madhani, Himanshu
@ 2017-10-31 18:12     ` Bart Van Assche
  2017-10-31 18:16       ` Madhani, Himanshu
  0 siblings, 1 reply; 9+ messages in thread
From: Bart Van Assche @ 2017-10-31 18:12 UTC (permalink / raw)
  To: Himanshu.Madhani, martin.petersen
  Cc: keescook, jejb, linux-kernel, linux-scsi, qla2xxx-upstream

On Tue, 2017-10-31 at 18:03 +0000, Madhani, Himanshu wrote:
> On Oct 31, 2017, at 8:49 AM, Martin K. Petersen <martin.petersen@oracle.com> 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.
> > 
> > Cavium folks: Please verify!
> 
> I’ve checked on my setup and i am seeing regression with this patch applied. 
> 
> Driver load locks up the system with this patch applied. 
> 
> NACK 

That feedback is not very helpful ...

Anyway, what kernel source tree did you use in your testing? I may be able to
free up some time to look into this myself.

Bart.

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 18:12     ` Bart Van Assche
@ 2017-10-31 18:16       ` Madhani, Himanshu
  2017-10-31 18:28         ` Kees Cook
  0 siblings, 1 reply; 9+ messages in thread
From: Madhani, Himanshu @ 2017-10-31 18:16 UTC (permalink / raw)
  To: Bart Van Assche
  Cc: martin.petersen, keescook, jejb, linux-kernel, linux-scsi,
	Dept-Eng QLA2xxx Upstream

Hi Bart, 

> On Oct 31, 2017, at 11:12 AM, Bart Van Assche <bart.vanassche@wdc.com> wrote:
> 
> On Tue, 2017-10-31 at 18:03 +0000, Madhani, Himanshu wrote:
>> On Oct 31, 2017, at 8:49 AM, Martin K. Petersen <martin.petersen@oracle.com> 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.
>>> 
>>> Cavium folks: Please verify!
>> 
>> I’ve checked on my setup and i am seeing regression with this patch applied. 
>> 
>> Driver load locks up the system with this patch applied. 
>> 
>> NACK 
> 
> That feedback is not very helpful …
> 

Here’s my setup details

4.14.0-rc7 + scsi_misc-4.15 qla2xxx patches from Martin’s tree + current patch. 

System has 3 adapters 8G/16G/32G. 

> Anyway, what kernel source tree did you use in your testing? I may be able to
> free up some time to look into this myself.
> 
> Bart.

Thanks,
- Himanshu

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 18:16       ` Madhani, Himanshu
@ 2017-10-31 18:28         ` Kees Cook
  2017-10-31 18:36           ` Madhani, Himanshu
  0 siblings, 1 reply; 9+ messages in thread
From: Kees Cook @ 2017-10-31 18:28 UTC (permalink / raw)
  To: Madhani, Himanshu
  Cc: Bart Van Assche, martin.petersen, jejb, linux-kernel, linux-scsi,
	Dept-Eng QLA2xxx Upstream

On Tue, Oct 31, 2017 at 11:16 AM, Madhani, Himanshu
<Himanshu.Madhani@cavium.com> wrote:
> Hi Bart,
>
>> On Oct 31, 2017, at 11:12 AM, Bart Van Assche <bart.vanassche@wdc.com> wrote:
>>
>> On Tue, 2017-10-31 at 18:03 +0000, Madhani, Himanshu wrote:
>>> On Oct 31, 2017, at 8:49 AM, Martin K. Petersen <martin.petersen@oracle.com> 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.
>>>>
>>>> Cavium folks: Please verify!
>>>
>>> I’ve checked on my setup and i am seeing regression with this patch applied.
>>>
>>> Driver load locks up the system with this patch applied.

How very strange. I don't see any code change with this patch. Even
the passed arguments are the same; it's only enforcing the types now.
And the system is fine with only this patch reverted?

-Kees

>>>
>>> NACK
>>
>> That feedback is not very helpful …
>>
>
> Here’s my setup details
>
> 4.14.0-rc7 + scsi_misc-4.15 qla2xxx patches from Martin’s tree + current patch.
>
> System has 3 adapters 8G/16G/32G.
>
>> Anyway, what kernel source tree did you use in your testing? I may be able to
>> free up some time to look into this myself.
>>
>> Bart.
>
> Thanks,
> - Himanshu



-- 
Kees Cook
Pixel Security

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 18:28         ` Kees Cook
@ 2017-10-31 18:36           ` Madhani, Himanshu
  2017-10-31 18:45             ` Kees Cook
  0 siblings, 1 reply; 9+ messages in thread
From: Madhani, Himanshu @ 2017-10-31 18:36 UTC (permalink / raw)
  To: Kees Cook
  Cc: Bart Van Assche, martin.petersen, jejb, linux-kernel, linux-scsi,
	Dept-Eng QLA2xxx Upstream

Hi Kees, 

> On Oct 31, 2017, at 11:28 AM, Kees Cook <keescook@chromium.org> wrote:
> 
> How very strange. I don't see any code change with this patch. Even
> the passed arguments are the same; it's only enforcing the types now.
> And the system is fine with only this patch reverted?

Yes. Agree patch looks okay, but with the patch built into driver I see
system going into infinite loop of trying to bring link up and lock up 
after few minutes, Only way to recover is hard reboot. 

I reverted this patch after system boot up and rebuild qla2xxx and able
to load driver.

Thanks,
- Himanshu

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
  2017-10-31 18:36           ` Madhani, Himanshu
@ 2017-10-31 18:45             ` Kees Cook
  0 siblings, 0 replies; 9+ messages in thread
From: Kees Cook @ 2017-10-31 18:45 UTC (permalink / raw)
  To: Madhani, Himanshu
  Cc: Bart Van Assche, martin.petersen, jejb, linux-kernel, linux-scsi,
	Dept-Eng QLA2xxx Upstream

On Tue, Oct 31, 2017 at 11:36 AM, Madhani, Himanshu
<Himanshu.Madhani@cavium.com> wrote:
> Hi Kees,
>
>> On Oct 31, 2017, at 11:28 AM, Kees Cook <keescook@chromium.org> wrote:
>>
>> How very strange. I don't see any code change with this patch. Even
>> the passed arguments are the same; it's only enforcing the types now.
>> And the system is fine with only this patch reverted?
>
> Yes. Agree patch looks okay, but with the patch built into driver I see
> system going into infinite loop of trying to bring link up and lock up
> after few minutes, Only way to recover is hard reboot.
>
> I reverted this patch after system boot up and rebuild qla2xxx and able
> to load driver.

The patch is a result of three logical steps, so maybe something
unexpected is happening. I'll send the 3 steps broken out...

-Kees

-- 
Kees Cook
Pixel Security

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] scsi: qla2xxx: Convert timers to use timer_setup()
@ 2017-10-05  0:48 Kees Cook
  0 siblings, 0 replies; 9+ messages in thread
From: Kees Cook @ 2017-10-05  0:48 UTC (permalink / raw)
  To: linux-kernel
  Cc: qla2xxx-upstream, James E.J. Bottomley, Martin K. Petersen,
	linux-scsi, Thomas Gleixner

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: qla2xxx-upstream@qlogic.com
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
This requires commit 686fef928bba ("timer: Prepare to change timer
callback argument type") in v4.14-rc3, but should be otherwise
stand-alone.
---
 drivers/scsi/qla2xxx/qla_gbl.h    |  6 +++---
 drivers/scsi/qla2xxx/qla_init.c   |  4 ++--
 drivers/scsi/qla2xxx/qla_inline.h |  4 +---
 drivers/scsi/qla2xxx/qla_mid.c    |  2 +-
 drivers/scsi/qla2xxx/qla_os.c     | 11 +++++------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index f852ca60c49f..3ad375f85b59 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -206,8 +206,8 @@ int qla24xx_async_abort_cmd(srb_t *);
  */
 extern struct scsi_host_template qla2xxx_driver_template;
 extern struct scsi_transport_template *qla2xxx_transport_vport_template;
-extern void qla2x00_timer(scsi_qla_host_t *);
-extern void qla2x00_start_timer(scsi_qla_host_t *, void *, unsigned long);
+extern void qla2x00_timer(struct timer_list *);
+extern void qla2x00_start_timer(scsi_qla_host_t *, unsigned long);
 extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
 extern int qla24xx_disable_vp (scsi_qla_host_t *);
 extern int qla24xx_enable_vp (scsi_qla_host_t *);
@@ -753,7 +753,7 @@ extern int qla82xx_restart_isp(scsi_qla_host_t *);
 /* IOCB related functions */
 extern int qla82xx_start_scsi(srb_t *);
 extern void qla2x00_sp_free(void *);
-extern void qla2x00_sp_timeout(unsigned long);
+extern void qla2x00_sp_timeout(struct timer_list *);
 extern void qla2x00_bsg_job_done(void *, int);
 extern void qla2x00_bsg_sp_free(void *);
 extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b5b48ddca962..44cf875a484a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -45,9 +45,9 @@ static void qla24xx_handle_prli_done_event(struct scsi_qla_host *,
 /* SRB Extensions ---------------------------------------------------------- */
 
 void
-qla2x00_sp_timeout(unsigned long __data)
+qla2x00_sp_timeout(struct timer_list *t)
 {
-	srb_t *sp = (srb_t *)__data;
+	srb_t *sp = from_timer(sp, t, u.iocb_cmd.timer);
 	struct srb_iocb *iocb;
 	scsi_qla_host_t *vha = sp->vha;
 	struct req_que *req;
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 9a2c86eacf44..17d2c20f1f75 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -269,10 +269,8 @@ qla2x00_rel_sp(srb_t *sp)
 static inline void
 qla2x00_init_timer(srb_t *sp, unsigned long tmo)
 {
-	init_timer(&sp->u.iocb_cmd.timer);
+	timer_setup(&sp->u.iocb_cmd.timer, qla2x00_sp_timeout, 0);
 	sp->u.iocb_cmd.timer.expires = jiffies + tmo * HZ;
-	sp->u.iocb_cmd.timer.data = (unsigned long)sp;
-	sp->u.iocb_cmd.timer.function = qla2x00_sp_timeout;
 	add_timer(&sp->u.iocb_cmd.timer);
 	sp->free = qla2x00_sp_free;
 	if (IS_QLAFX00(sp->vha->hw) && (sp->type == SRB_FXIOCB_DCMD))
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index c0f8f6c17b79..cbf544dbf883 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -487,7 +487,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 	atomic_set(&vha->loop_state, LOOP_DOWN);
 	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 
-	qla2x00_start_timer(vha, qla2x00_timer, WATCH_INTERVAL);
+	qla2x00_start_timer(vha, WATCH_INTERVAL);
 
 	vha->req = base_vha->req;
 	host->can_queue = base_vha->req->length + 128;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5b2437a5ea44..c3b3daa797ff 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -330,12 +330,10 @@ struct scsi_transport_template *qla2xxx_transport_vport_template = NULL;
  */
 
 __inline__ void
-qla2x00_start_timer(scsi_qla_host_t *vha, void *func, unsigned long interval)
+qla2x00_start_timer(scsi_qla_host_t *vha, unsigned long interval)
 {
-	init_timer(&vha->timer);
+	timer_setup(&vha->timer, qla2x00_timer, 0);
 	vha->timer.expires = jiffies + interval * HZ;
-	vha->timer.data = (unsigned long)vha;
-	vha->timer.function = (void (*)(unsigned long))func;
 	add_timer(&vha->timer);
 	vha->timer_active = 1;
 }
@@ -3245,7 +3243,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	base_vha->host->irq = ha->pdev->irq;
 
 	/* Initialized the timer */
-	qla2x00_start_timer(base_vha, qla2x00_timer, WATCH_INTERVAL);
+	qla2x00_start_timer(base_vha, WATCH_INTERVAL);
 	ql_dbg(ql_dbg_init, base_vha, 0x00ef,
 	    "Started qla2x00_timer with "
 	    "interval=%d.\n", WATCH_INTERVAL);
@@ -5994,8 +5992,9 @@ qla2x00_rst_aen(scsi_qla_host_t *vha)
 * Context: Interrupt
 ***************************************************************************/
 void
-qla2x00_timer(scsi_qla_host_t *vha)
+qla2x00_timer(struct timer_list *t)
 {
+	scsi_qla_host_t *vha = from_timer(vha, t, timer);
 	unsigned long	cpu_flags = 0;
 	int		start_dpc = 0;
 	int		index;
-- 
2.7.4


-- 
Kees Cook
Pixel Security

^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-10-31 18:45 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-25 10:07 [PATCH] scsi: qla2xxx: Convert timers to use timer_setup() Kees Cook
2017-10-31 15:49 ` Martin K. Petersen
2017-10-31 18:03   ` Madhani, Himanshu
2017-10-31 18:12     ` Bart Van Assche
2017-10-31 18:16       ` Madhani, Himanshu
2017-10-31 18:28         ` Kees Cook
2017-10-31 18:36           ` Madhani, Himanshu
2017-10-31 18:45             ` Kees Cook
  -- strict thread matches above, loose matches on Subject: below --
2017-10-05  0:48 Kees Cook

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).