Commit-ID: fe5c3b69b540e3387223a696f327c1bb8880d1ac Gitweb: https://git.kernel.org/tip/fe5c3b69b540e3387223a696f327c1bb8880d1ac Author: Kees Cook <keesc...@chromium.org> AuthorDate: Wed, 4 Oct 2017 16:27:06 -0700 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 5 Oct 2017 15:01:22 +0200
kthread: Convert callback to use from_timer() In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch kthread to use from_timer() and pass the timer pointer explicitly. Signed-off-by: Kees Cook <keesc...@chromium.org> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: linux-m...@linux-mips.org Cc: Len Brown <len.br...@intel.com> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Lai Jiangshan <jiangshan...@gmail.com> Cc: Sebastian Reichel <s...@kernel.org> Cc: Kalle Valo <kv...@qca.qualcomm.com> Cc: Paul Mackerras <pau...@samba.org> Cc: Pavel Machek <pa...@ucw.cz> Cc: linux1394-de...@lists.sourceforge.net Cc: Chris Metcalf <cmetc...@mellanox.com> Cc: linux-s...@vger.kernel.org Cc: linux-wirel...@vger.kernel.org Cc: "James E.J. Bottomley" <j...@linux.vnet.ibm.com> Cc: Wim Van Sebroeck <w...@iguana.be> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Ursula Braun <ubr...@linux.vnet.ibm.com> Cc: Geert Uytterhoeven <ge...@linux-m68k.org> Cc: Viresh Kumar <viresh.ku...@linaro.org> Cc: Harish Patil <harish.pa...@cavium.com> Cc: Stephen Boyd <sb...@codeaurora.org> Cc: Guenter Roeck <li...@roeck-us.net> Cc: Manish Chopra <manish.cho...@cavium.com> Cc: Petr Mladek <pmla...@suse.com> Cc: Arnd Bergmann <a...@arndb.de> Cc: linux...@vger.kernel.org Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Julian Wiedmann <j...@linux.vnet.ibm.com> Cc: John Stultz <john.stu...@linaro.org> Cc: Mark Gross <mark.gr...@intel.com> Cc: linux-watch...@vger.kernel.org Cc: linux-s...@vger.kernel.org Cc: "Martin K. Petersen" <martin.peter...@oracle.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: "Rafael J. Wysocki" <r...@rjwysocki.net> Cc: Oleg Nesterov <o...@redhat.com> Cc: Ralf Baechle <r...@linux-mips.org> Cc: Stefan Richter <stef...@s5r6.in-berlin.de> Cc: Michael Reed <m...@sgi.com> Cc: net...@vger.kernel.org Cc: Tejun Heo <t...@kernel.org> Cc: Andrew Morton <a...@linux-foundation.org> Cc: linuxppc-...@lists.ozlabs.org Cc: Sudip Mukherjee <sudipm.mukher...@gmail.com> Link: https://lkml.kernel.org/r/1507159627-127660-13-git-send-email-keesc...@chromium.org --- include/linux/kthread.h | 10 +++++----- kernel/kthread.c | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/linux/kthread.h b/include/linux/kthread.h index 0d622b3..35cbe3b 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -75,7 +75,7 @@ extern int tsk_fork_get_node(struct task_struct *tsk); */ struct kthread_work; typedef void (*kthread_work_func_t)(struct kthread_work *work); -void kthread_delayed_work_timer_fn(unsigned long __data); +void kthread_delayed_work_timer_fn(struct timer_list *t); enum { KTW_FREEZABLE = 1 << 0, /* freeze during suspend */ @@ -116,8 +116,8 @@ struct kthread_delayed_work { #define KTHREAD_DELAYED_WORK_INIT(dwork, fn) { \ .work = KTHREAD_WORK_INIT((dwork).work, (fn)), \ - .timer = __TIMER_INITIALIZER(kthread_delayed_work_timer_fn, \ - (unsigned long)&(dwork), \ + .timer = __TIMER_INITIALIZER((TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\ + (TIMER_DATA_TYPE)&(dwork.timer), \ TIMER_IRQSAFE), \ } @@ -164,8 +164,8 @@ extern void __kthread_init_worker(struct kthread_worker *worker, do { \ kthread_init_work(&(dwork)->work, (fn)); \ __setup_timer(&(dwork)->timer, \ - kthread_delayed_work_timer_fn, \ - (unsigned long)(dwork), \ + (TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn,\ + (TIMER_DATA_TYPE)&(dwork)->timer, \ TIMER_IRQSAFE); \ } while (0) diff --git a/kernel/kthread.c b/kernel/kthread.c index 1c19edf..ba3992c 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -798,15 +798,14 @@ EXPORT_SYMBOL_GPL(kthread_queue_work); /** * kthread_delayed_work_timer_fn - callback that queues the associated kthread * delayed work when the timer expires. - * @__data: pointer to the data associated with the timer + * @t: pointer to the expired timer * * The format of the function is defined by struct timer_list. * It should have been called from irqsafe timer with irq already off. */ -void kthread_delayed_work_timer_fn(unsigned long __data) +void kthread_delayed_work_timer_fn(struct timer_list *t) { - struct kthread_delayed_work *dwork = - (struct kthread_delayed_work *)__data; + struct kthread_delayed_work *dwork = from_timer(dwork, t, timer); struct kthread_work *work = &dwork->work; struct kthread_worker *worker = work->worker; @@ -837,8 +836,7 @@ void __kthread_queue_delayed_work(struct kthread_worker *worker, struct timer_list *timer = &dwork->timer; struct kthread_work *work = &dwork->work; - WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn || - timer->data != (unsigned long)dwork); + WARN_ON_ONCE(timer->function != (TIMER_FUNC_TYPE)kthread_delayed_work_timer_fn); /* * If @delay is 0, queue @dwork->work immediately. This is for
