[PATCH] s390/ap_bus: Convert timers to use timer_setup()

[PATCH] s390/ap_bus: Convert timers to use timer_setup()

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

Cc: Harald Freudenberger <freude@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/s390/crypto/ap_bus.c   | 10 +++++-----
 drivers/s390/crypto/ap_bus.h   |  2 +-
 drivers/s390/crypto/ap_queue.c |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 5f0be2040272..7bd18624e96e 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -362,13 +362,13 @@ void ap_wait(enum ap_wait wait)
 
 /**
  * ap_request_timeout(): Handling of request timeouts
- * @data: Holds the AP device.
+ * @t: timer making this callback
  *
  * Handles request timeouts.
  */
-void ap_request_timeout(unsigned long data)
+void ap_request_timeout(struct timer_list *t)
 {
-	struct ap_queue *aq = (struct ap_queue *) data;
+	struct ap_queue *aq = from_timer(aq, t, timeout);
 
 	if (ap_suspend_flag)
 		return;
@@ -1147,7 +1147,7 @@ static void ap_scan_bus(struct work_struct *unused)
 	mod_timer(&ap_config_timer, jiffies + ap_config_time * HZ);
 }
 
-static void ap_config_timeout(unsigned long ptr)
+static void ap_config_timeout(struct timer_list *unused)
 {
 	if (ap_suspend_flag)
 		return;
@@ -1250,7 +1250,7 @@ int __init ap_module_init(void)
 		goto out_bus;
 
 	/* Setup the AP bus rescan timer. */
-	setup_timer(&ap_config_timer, ap_config_timeout, 0);
+	timer_setup(&ap_config_timer, ap_config_timeout, 0);
 
 	/*
 	 * Setup the high resultion poll timer.
diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index 754cf2223cfb..e7077820ae46 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -241,7 +241,7 @@ void ap_flush_queue(struct ap_queue *aq);
 
 void *ap_airq_ptr(void);
 void ap_wait(enum ap_wait wait);
-void ap_request_timeout(unsigned long data);
+void ap_request_timeout(struct timer_list *t);
 void ap_bus_force_rescan(void);
 
 void ap_queue_init_reply(struct ap_queue *aq, struct ap_message *ap_msg);
diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index 56b96edffd5b..f4782113e4a3 100644
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -635,7 +635,7 @@ struct ap_queue *ap_queue_create(ap_qid_t qid, int device_type)
 	spin_lock_init(&aq->lock);
 	INIT_LIST_HEAD(&aq->pendingq);
 	INIT_LIST_HEAD(&aq->requestq);
-	setup_timer(&aq->timeout, ap_request_timeout, (unsigned long) aq);
+	timer_setup(&aq->timeout, ap_request_timeout, 0);
 
 	return aq;
 }
-- 
2.7.4


-- 
Kees Cook
Pixel Security

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Martin Schwidefsky]

On Wed, 25 Oct 2017 03:27:37 -0700
Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: linux-s390@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
>  drivers/s390/crypto/ap_bus.h   |  2 +-
>  drivers/s390/crypto/ap_queue.c |  2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)

Parked for the second part of the s390 updates for the next merge window.
Thanks.

-- 
blue skies,
   Martin.

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

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Kees Cook]

On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
<schwidefsky@de.ibm.com> wrote:
> On Wed, 25 Oct 2017 03:27:37 -0700
> Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
>> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>> Cc: linux-s390@vger.kernel.org
>> Signed-off-by: Kees Cook <keescook@chromium.org>
>> ---
>>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
>>  drivers/s390/crypto/ap_bus.h   |  2 +-
>>  drivers/s390/crypto/ap_queue.c |  2 +-
>>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> Parked for the second part of the s390 updates for the next merge window.
> Thanks.

Thanks for getting these staged. I just wanted to check with you,
since I don't see these in -next anywhere yet:

s390: qdio: Convert timers to use timer_setup()
s390/sclp: Convert timers to use timer_setup()
s390/cio: Convert timers to use timer_setup()
s390/scsi: Convert timers to use timer_setup()
s390/ap_bus: Convert timers to use timer_setup()

Are all of these expected to land for -rc1? (Would it help to carry
them in the timer tree?) I've got tree-wide changes ready to go once
all these conversions have landed.

Thanks!

-Kees

-- 
Kees Cook
Pixel Security

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Martin Schwidefsky]

On Thu, 2 Nov 2017 16:36:53 -0700
Kees Cook <keescook@chromium.org> wrote:

> On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
> <schwidefsky@de.ibm.com> wrote:
> > On Wed, 25 Oct 2017 03:27:37 -0700
> > Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> >> Cc: linux-s390@vger.kernel.org
> >> Signed-off-by: Kees Cook <keescook@chromium.org>
> >> ---
> >>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
> >>  drivers/s390/crypto/ap_bus.h   |  2 +-
> >>  drivers/s390/crypto/ap_queue.c |  2 +-
> >>  3 files changed, 7 insertions(+), 7 deletions(-)  
> >
> > Parked for the second part of the s390 updates for the next merge window.
> > Thanks.  
> 
> Thanks for getting these staged. I just wanted to check with you,
> since I don't see these in -next anywhere yet:
> 
> s390: qdio: Convert timers to use timer_setup()
> s390/sclp: Convert timers to use timer_setup()
> s390/cio: Convert timers to use timer_setup()
> s390/scsi: Convert timers to use timer_setup()
> s390/ap_bus: Convert timers to use timer_setup()
> 
> Are all of these expected to land for -rc1? (Would it help to carry
> them in the timer tree?) I've got tree-wide changes ready to go once
> all these conversions have landed.

These patches are parked on a private branches. The features branch
on s390/linux is the one that is used for -next AND for the upstream
merge. And since I do not want to rebase that branch the timer_setup
patches are not in -next as well. 

Four of you patches are safe with me, the s390/scsi patch is in
Steffens patch queue. All good I would say.

-- 
blue skies,
   Martin.

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

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Kees Cook]

On Thu, Nov 2, 2017 at 11:29 PM, Martin Schwidefsky
<schwidefsky@de.ibm.com> wrote:
> On Thu, 2 Nov 2017 16:36:53 -0700
> Kees Cook <keescook@chromium.org> wrote:
>
>> On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
>> <schwidefsky@de.ibm.com> wrote:
>> > On Wed, 25 Oct 2017 03:27:37 -0700
>> > Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
>> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>> >> Cc: linux-s390@vger.kernel.org
>> >> Signed-off-by: Kees Cook <keescook@chromium.org>
>> >> ---
>> >>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
>> >>  drivers/s390/crypto/ap_bus.h   |  2 +-
>> >>  drivers/s390/crypto/ap_queue.c |  2 +-
>> >>  3 files changed, 7 insertions(+), 7 deletions(-)
>> >
>> > Parked for the second part of the s390 updates for the next merge window.
>> > Thanks.
>>
>> Thanks for getting these staged. I just wanted to check with you,
>> since I don't see these in -next anywhere yet:
>>
>> s390: qdio: Convert timers to use timer_setup()
>> s390/sclp: Convert timers to use timer_setup()
>> s390/cio: Convert timers to use timer_setup()
>> s390/scsi: Convert timers to use timer_setup()
>> s390/ap_bus: Convert timers to use timer_setup()
>>
>> Are all of these expected to land for -rc1? (Would it help to carry
>> them in the timer tree?) I've got tree-wide changes ready to go once
>> all these conversions have landed.
>
> These patches are parked on a private branches. The features branch
> on s390/linux is the one that is used for -next AND for the upstream
> merge. And since I do not want to rebase that branch the timer_setup
> patches are not in -next as well.
>
> Four of you patches are safe with me, the s390/scsi patch is in
> Steffens patch queue. All good I would say.

Great, thanks very much for double-check! :)

-Kees

-- 
Kees Cook
Pixel Security

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Kees Cook]

On Thu, Nov 2, 2017 at 11:29 PM, Martin Schwidefsky
<schwidefsky@de.ibm.com> wrote:
> On Thu, 2 Nov 2017 16:36:53 -0700
> Kees Cook <keescook@chromium.org> wrote:
>
>> On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
>> <schwidefsky@de.ibm.com> wrote:
>> > On Wed, 25 Oct 2017 03:27:37 -0700
>> > Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
>> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>> >> Cc: linux-s390@vger.kernel.org
>> >> Signed-off-by: Kees Cook <keescook@chromium.org>
>> >> ---
>> >>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
>> >>  drivers/s390/crypto/ap_bus.h   |  2 +-
>> >>  drivers/s390/crypto/ap_queue.c |  2 +-
>> >>  3 files changed, 7 insertions(+), 7 deletions(-)
>> >
>> > Parked for the second part of the s390 updates for the next merge window.
>> > Thanks.
>>
>> Thanks for getting these staged. I just wanted to check with you,
>> since I don't see these in -next anywhere yet:
>>
>> s390: qdio: Convert timers to use timer_setup()
>> s390/sclp: Convert timers to use timer_setup()
>> s390/cio: Convert timers to use timer_setup()
>> s390/scsi: Convert timers to use timer_setup()
>> s390/ap_bus: Convert timers to use timer_setup()
>>
>> Are all of these expected to land for -rc1? (Would it help to carry
>> them in the timer tree?) I've got tree-wide changes ready to go once
>> all these conversions have landed.
>
> These patches are parked on a private branches. The features branch
> on s390/linux is the one that is used for -next AND for the upstream
> merge. And since I do not want to rebase that branch the timer_setup
> patches are not in -next as well.
>
> Four of you patches are safe with me, the s390/scsi patch is in
> Steffens patch queue. All good I would say.

Hi,

I saw s390 get merged for -rc1, but none of these timer_setup()
conversions were included. Given the possible short merge window,
what's the state of these? I can't do the bulk API changes at the end
of -rc1 without the s390 timer patches. Anything I can help with?

Thanks!

-Kees

-- 
Kees Cook
Pixel Security

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Martin Schwidefsky]

On Wed, 15 Nov 2017 23:58:44 -0800
Kees Cook <keescook@chromium.org> wrote:

> On Thu, Nov 2, 2017 at 11:29 PM, Martin Schwidefsky
> <schwidefsky@de.ibm.com> wrote:
> > On Thu, 2 Nov 2017 16:36:53 -0700
> > Kees Cook <keescook@chromium.org> wrote:
> >  
> >> On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
> >> <schwidefsky@de.ibm.com> wrote:  
> >> > On Wed, 25 Oct 2017 03:27:37 -0700
> >> > Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
> >> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> >> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> >> >> Cc: linux-s390@vger.kernel.org
> >> >> Signed-off-by: Kees Cook <keescook@chromium.org>
> >> >> ---
> >> >>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
> >> >>  drivers/s390/crypto/ap_bus.h   |  2 +-
> >> >>  drivers/s390/crypto/ap_queue.c |  2 +-
> >> >>  3 files changed, 7 insertions(+), 7 deletions(-)  
> >> >
> >> > Parked for the second part of the s390 updates for the next merge window.
> >> > Thanks.  
> >>
> >> Thanks for getting these staged. I just wanted to check with you,
> >> since I don't see these in -next anywhere yet:
> >>
> >> s390: qdio: Convert timers to use timer_setup()
> >> s390/sclp: Convert timers to use timer_setup()
> >> s390/cio: Convert timers to use timer_setup()
> >> s390/scsi: Convert timers to use timer_setup()
> >> s390/ap_bus: Convert timers to use timer_setup()
> >>
> >> Are all of these expected to land for -rc1? (Would it help to carry
> >> them in the timer tree?) I've got tree-wide changes ready to go once
> >> all these conversions have landed.  
> >
> > These patches are parked on a private branches. The features branch
> > on s390/linux is the one that is used for -next AND for the upstream
> > merge. And since I do not want to rebase that branch the timer_setup
> > patches are not in -next as well.
> >
> > Four of you patches are safe with me, the s390/scsi patch is in
> > Steffens patch queue. All good I would say.  
> 
> Hi,
> 
> I saw s390 get merged for -rc1, but none of these timer_setup()
> conversions were included. Given the possible short merge window,
> what's the state of these? I can't do the bulk API changes at the end
> of -rc1 without the s390 timer patches. Anything I can help with?

The remaining timer_setup changes are on the features branch of s390/linux,
I plan to send a please-pull request be the end of the week.

-- 
blue skies,
   Martin.

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

Re: [PATCH] s390/ap_bus: Convert timers to use timer_setup()

[Kees Cook]

On Thu, Nov 16, 2017 at 12:03 AM, Martin Schwidefsky
<schwidefsky@de.ibm.com> wrote:
> On Wed, 15 Nov 2017 23:58:44 -0800
> Kees Cook <keescook@chromium.org> wrote:
>
>> On Thu, Nov 2, 2017 at 11:29 PM, Martin Schwidefsky
>> <schwidefsky@de.ibm.com> wrote:
>> > On Thu, 2 Nov 2017 16:36:53 -0700
>> > Kees Cook <keescook@chromium.org> wrote:
>> >
>> >> On Wed, Oct 25, 2017 at 11:38 PM, Martin Schwidefsky
>> >> <schwidefsky@de.ibm.com> wrote:
>> >> > On Wed, 25 Oct 2017 03:27:37 -0700
>> >> > Kees Cook <keescook@chromium.org> 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: Harald Freudenberger <freude@de.ibm.com>
>> >> >> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>> >> >> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>> >> >> Cc: linux-s390@vger.kernel.org
>> >> >> Signed-off-by: Kees Cook <keescook@chromium.org>
>> >> >> ---
>> >> >>  drivers/s390/crypto/ap_bus.c   | 10 +++++-----
>> >> >>  drivers/s390/crypto/ap_bus.h   |  2 +-
>> >> >>  drivers/s390/crypto/ap_queue.c |  2 +-
>> >> >>  3 files changed, 7 insertions(+), 7 deletions(-)
>> >> >
>> >> > Parked for the second part of the s390 updates for the next merge window.
>> >> > Thanks.
>> >>
>> >> Thanks for getting these staged. I just wanted to check with you,
>> >> since I don't see these in -next anywhere yet:
>> >>
>> >> s390: qdio: Convert timers to use timer_setup()
>> >> s390/sclp: Convert timers to use timer_setup()
>> >> s390/cio: Convert timers to use timer_setup()
>> >> s390/scsi: Convert timers to use timer_setup()
>> >> s390/ap_bus: Convert timers to use timer_setup()
>> >>
>> >> Are all of these expected to land for -rc1? (Would it help to carry
>> >> them in the timer tree?) I've got tree-wide changes ready to go once
>> >> all these conversions have landed.
>> >
>> > These patches are parked on a private branches. The features branch
>> > on s390/linux is the one that is used for -next AND for the upstream
>> > merge. And since I do not want to rebase that branch the timer_setup
>> > patches are not in -next as well.
>> >
>> > Four of you patches are safe with me, the s390/scsi patch is in
>> > Steffens patch queue. All good I would say.
>>
>> Hi,
>>
>> I saw s390 get merged for -rc1, but none of these timer_setup()
>> conversions were included. Given the possible short merge window,
>> what's the state of these? I can't do the bulk API changes at the end
>> of -rc1 without the s390 timer patches. Anything I can help with?
>
> The remaining timer_setup changes are on the features branch of s390/linux,
> I plan to send a please-pull request be the end of the week.

Okay, thanks! Sorry for all my nail-biting. :)

-Kees

-- 
Kees Cook
Pixel Security