From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Stefan Richter <stefanr@s5r6.in-berlin.de>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Julian Wiedmann <jwi@linux.vnet.ibm.com>,
Ursula Braun <ubraun@linux.vnet.ibm.com>,
Michael Reed <mdr@sgi.com>,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Linux PM <linux-pm@vger.kernel.org>,
linux1394-devel@lists.sourceforge.net,
linux-s390@vger.kernel.org,
"open list:TARGET SUBSYSTEM" <linux-scsi@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Chris Metcalf <cmetcalf@mellanox.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Guenter Roeck <linux@roeck-us.net>,
Harish Patil <harish.patil@cavium.com>,
John Stultz <john.stultz@linaro.org>,
Kalle Valo <kvalo@qca.qualcomm.com>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Manish Chopra <manish.chopra@cavium.com>,
Mark Gross <mark.gross@intel.com>,
Michael Ellerman <mpe@ellerman.id.au>,
netdev@vger.kernel.org, Oleg Nesterov <oleg@redhat.com>,
Paul Mackerras <paulus@samba.org>, Petr Mladek <pmladek@suse.com>,
Ralf Baechle <ralf@linux-mips.org>,
Sebastian Reichel <sre@kernel.org>,
Stephen Boyd <sboyd@codeaurora.org>, Tejun Heo <tj@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Wim Van Sebroeck <wim@iguana.be>,
MIPS Linux Kernel List <linux-mips@linux-mips.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
"linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
"open list:NETWORKING DRIVERS (WIRELESS)"
<linux-wireless@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 03/13] timer: Remove init_timer_on_stack() in favor of timer_setup_on_stack()
Date: Thu, 5 Oct 2017 15:18:32 +0200 [thread overview]
Message-ID: <CAJZ5v0iMxSDj0gR0n3YF+zRvR3e2XHpiMR9hKjjon_EXSbB89w@mail.gmail.com> (raw)
In-Reply-To: <1507159627-127660-4-git-send-email-keescook@chromium.org>
On Thu, Oct 5, 2017 at 1:26 AM, Kees Cook <keescook@chromium.org> wrote:
> Remove uses of init_timer_on_stack() with open-coded function and data
> assignments that could be expressed using timer_setup_on_stack(). Several
> were removed from the stack entirely since there was a one-to-one mapping
> of parent structure to timer, those are switched to using timer_setup()
> instead. All related callbacks were adjusted to use from_timer().
>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Len Brown <len.brown@intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com>
> Cc: Ursula Braun <ubraun@linux.vnet.ibm.com>
> Cc: Michael Reed <mdr@sgi.com>
> Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: linux-pm@vger.kernel.org
> Cc: linux1394-devel@lists.sourceforge.net
> Cc: linux-s390@vger.kernel.org
> Cc: linux-scsi@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/base/power/main.c | 8 +++-----
> drivers/firewire/core-transaction.c | 10 +++++-----
> drivers/parport/ieee1284.c | 21 +++++++--------------
> drivers/s390/char/tape.h | 1 +
> drivers/s390/char/tape_std.c | 18 ++++++------------
> drivers/s390/net/lcs.c | 16 ++++++----------
> drivers/s390/net/lcs.h | 1 +
> drivers/scsi/qla1280.c | 14 +++++---------
> drivers/scsi/qla1280.h | 1 +
> include/linux/parport.h | 1 +
> include/linux/timer.h | 2 --
> 11 files changed, 36 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
> index 770b1539a083..ae47b2ec84b4 100644
> --- a/drivers/base/power/main.c
> +++ b/drivers/base/power/main.c
> @@ -478,9 +478,9 @@ struct dpm_watchdog {
> * There's not much we can do here to recover so panic() to
> * capture a crash-dump in pstore.
> */
> -static void dpm_watchdog_handler(unsigned long data)
> +static void dpm_watchdog_handler(struct timer_list *t)
> {
> - struct dpm_watchdog *wd = (void *)data;
> + struct dpm_watchdog *wd = from_timer(wd, t, timer);
>
> dev_emerg(wd->dev, "**** DPM device timeout ****\n");
> show_stack(wd->tsk, NULL);
> @@ -500,11 +500,9 @@ static void dpm_watchdog_set(struct dpm_watchdog *wd, struct device *dev)
> wd->dev = dev;
> wd->tsk = current;
>
> - init_timer_on_stack(timer);
> + timer_setup_on_stack(timer, dpm_watchdog_handler, 0);
> /* use same timeout value for both suspend and resume */
> timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_TIMEOUT;
> - timer->function = dpm_watchdog_handler;
> - timer->data = (unsigned long)wd;
> add_timer(timer);
> }
For the above:
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
next prev parent reply other threads:[~2017-10-05 13:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 23:26 [PATCH 00/13] timer: Start conversion to timer_setup() Kees Cook
2017-10-04 23:26 ` [PATCH 01/13] timer: Convert schedule_timeout() to use from_timer() Kees Cook
2017-10-04 23:26 ` [PATCH 02/13] timer: Remove init_timer_pinned_deferrable() in favor of timer_setup() Kees Cook
2017-10-04 23:26 ` [PATCH 03/13] timer: Remove init_timer_on_stack() in favor of timer_setup_on_stack() Kees Cook
2017-10-05 13:18 ` Rafael J. Wysocki [this message]
2017-10-05 13:18 ` Rafael J. Wysocki
2017-10-04 23:26 ` [PATCH 04/13] timer: Remove init_timer_pinned() in favor of timer_setup() Kees Cook
2017-10-05 0:41 ` David Miller
2017-10-04 23:26 ` [PATCH 05/13] timer: Remove init_timer_deferrable() " Kees Cook
2017-10-05 0:41 ` David Miller
2017-10-05 1:02 ` Sebastian Reichel
2017-10-04 23:27 ` [PATCH 06/13] timer: Remove users of TIMER_DEFERRED_INITIALIZER Kees Cook
2017-10-04 23:27 ` [PATCH 07/13] timer: Remove last user of TIMER_INITIALIZER Kees Cook
2017-10-05 22:39 ` Gross, Mark
2017-10-05 22:39 ` Gross, Mark
2017-10-04 23:27 ` [PATCH 08/13] timer: Remove unused static initializer macros Kees Cook
2017-10-04 23:27 ` [PATCH 09/13] timer: Remove users of expire and data arguments to DEFINE_TIMER Kees Cook
2017-10-05 0:12 ` Guenter Roeck
2017-10-09 13:23 ` Ralf Baechle
2017-10-04 23:27 ` [PATCH 10/13] timer: Remove expires and data arguments from DEFINE_TIMER Kees Cook
2017-10-05 0:13 ` Guenter Roeck
2017-10-05 0:40 ` David Miller
2017-10-05 5:28 ` Greg Kroah-Hartman
2017-10-05 6:54 ` Kalle Valo
2017-10-05 6:54 ` Kalle Valo
2017-10-05 8:59 ` Arnd Bergmann
2017-10-09 13:27 ` Ralf Baechle
2017-10-04 23:27 ` [PATCH 11/13] timer: Remove expires argument from __TIMER_INITIALIZER() Kees Cook
2017-10-11 10:15 ` Petr Mladek
2017-10-04 23:27 ` [PATCH 12/13] kthread: Convert callback to use from_timer() Kees Cook
2017-10-11 10:20 ` Petr Mladek
2017-10-04 23:27 ` [PATCH 13/13] workqueue: " Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJZ5v0iMxSDj0gR0n3YF+zRvR3e2XHpiMR9hKjjon_EXSbB89w@mail.gmail.com \
--to=rafael@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=cmetcalf@mellanox.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=harish.patil@cavium.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=jiangshanlai@gmail.com \
--cc=john.stultz@linaro.org \
--cc=jwi@linux.vnet.ibm.com \
--cc=keescook@chromium.org \
--cc=kvalo@qca.qualcomm.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=manish.chopra@cavium.com \
--cc=mark.gross@intel.com \
--cc=martin.petersen@oracle.com \
--cc=mdr@sgi.com \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=pavel@ucw.cz \
--cc=pmladek@suse.com \
--cc=ralf@linux-mips.org \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=schwidefsky@de.ibm.com \
--cc=sre@kernel.org \
--cc=stefanr@s5r6.in-berlin.de \
--cc=sudipm.mukherjee@gmail.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=ubraun@linux.vnet.ibm.com \
--cc=viresh.kumar@linaro.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).