From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751962AbdJENWu (ORCPT ); Thu, 5 Oct 2017 09:22:50 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57787 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbdJENWq (ORCPT ); Thu, 5 Oct 2017 09:22:46 -0400 Date: Thu, 5 Oct 2017 06:08:34 -0700 From: tip-bot for Kees Cook Message-ID: Cc: kvalo@qca.qualcomm.com, heiko.carstens@de.ibm.com, jejb@linux.vnet.ibm.com, mdr@sgi.com, schwidefsky@de.ibm.com, geert@linux-m68k.org, ubraun@linux.vnet.ibm.com, jiangshanlai@gmail.com, sudipm.mukherjee@gmail.com, tj@kernel.org, martin.petersen@oracle.com, sboyd@codeaurora.org, paulus@samba.org, mark.gross@intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, john.stultz@linaro.org, benh@kernel.crashing.org, keescook@chromium.org, oleg@redhat.com, wim@iguana.be, akpm@linux-foundation.org, ralf@linux-mips.org, gregkh@linuxfoundation.org, viresh.kumar@linaro.org, sre@kernel.org, mingo@kernel.org, mpe@ellerman.id.au, cmetcalf@mellanox.com, jwi@linux.vnet.ibm.com, manish.chopra@cavium.com, pavel@ucw.cz, tglx@linutronix.de, stefanr@s5r6.in-berlin.de, pmladek@suse.com, arnd@arndb.de, len.brown@intel.com, rjw@rjwysocki.net, harish.patil@cavium.com, linux@roeck-us.net Reply-To: linux-kernel@vger.kernel.org, john.stultz@linaro.org, hpa@zytor.com, mark.gross@intel.com, paulus@samba.org, martin.petersen@oracle.com, sboyd@codeaurora.org, tj@kernel.org, sudipm.mukherjee@gmail.com, geert@linux-m68k.org, ubraun@linux.vnet.ibm.com, jiangshanlai@gmail.com, jejb@linux.vnet.ibm.com, mdr@sgi.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, kvalo@qca.qualcomm.com, harish.patil@cavium.com, rjw@rjwysocki.net, linux@roeck-us.net, len.brown@intel.com, arnd@arndb.de, pmladek@suse.com, stefanr@s5r6.in-berlin.de, pavel@ucw.cz, tglx@linutronix.de, manish.chopra@cavium.com, jwi@linux.vnet.ibm.com, cmetcalf@mellanox.com, mpe@ellerman.id.au, mingo@kernel.org, sre@kernel.org, viresh.kumar@linaro.org, gregkh@linuxfoundation.org, akpm@linux-foundation.org, ralf@linux-mips.org, wim@iguana.be, oleg@redhat.com, benh@kernel.crashing.org, keescook@chromium.org In-Reply-To: <1507159627-127660-14-git-send-email-keescook@chromium.org> References: <1507159627-127660-14-git-send-email-keescook@chromium.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] workqueue: Convert callback to use from_timer() Git-Commit-ID: 8c20feb60604d91a29cd7fef8ac758bd92d9fd2c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8c20feb60604d91a29cd7fef8ac758bd92d9fd2c Gitweb: https://git.kernel.org/tip/8c20feb60604d91a29cd7fef8ac758bd92d9fd2c Author: Kees Cook AuthorDate: Wed, 4 Oct 2017 16:27:07 -0700 Committer: Thomas Gleixner CommitDate: Thu, 5 Oct 2017 15:01:22 +0200 workqueue: Convert callback to use from_timer() In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch workqueue to use from_timer() and pass the timer pointer explicitly. Signed-off-by: Kees Cook Signed-off-by: Thomas Gleixner Cc: linux-mips@linux-mips.org Cc: Petr Mladek Cc: Benjamin Herrenschmidt Cc: Lai Jiangshan Cc: Sebastian Reichel Cc: Kalle Valo Cc: Paul Mackerras Cc: Pavel Machek Cc: linux1394-devel@lists.sourceforge.net Cc: Chris Metcalf Cc: linux-s390@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: "James E.J. Bottomley" Cc: Wim Van Sebroeck Cc: Michael Ellerman Cc: Ursula Braun Cc: Geert Uytterhoeven Cc: Viresh Kumar Cc: Harish Patil Cc: Stephen Boyd Cc: Guenter Roeck Cc: Manish Chopra Cc: Len Brown Cc: Arnd Bergmann Cc: linux-pm@vger.kernel.org Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Julian Wiedmann Cc: John Stultz Cc: Mark Gross Cc: linux-watchdog@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: "Martin K. Petersen" Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Oleg Nesterov Cc: Ralf Baechle Cc: Stefan Richter Cc: Michael Reed Cc: netdev@vger.kernel.org Cc: Tejun Heo Cc: Andrew Morton Cc: linuxppc-dev@lists.ozlabs.org Cc: Sudip Mukherjee Link: https://lkml.kernel.org/r/1507159627-127660-14-git-send-email-keescook@chromium.org --- include/linux/workqueue.h | 15 ++++++++------- kernel/workqueue.c | 7 +++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index f496026..f3c47a0 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -17,7 +17,7 @@ struct workqueue_struct; struct work_struct; typedef void (*work_func_t)(struct work_struct *work); -void delayed_work_timer_fn(unsigned long __data); +void delayed_work_timer_fn(struct timer_list *t); /* * The first word is the work queue pointer and the flags rolled into @@ -175,8 +175,8 @@ struct execute_work { #define __DELAYED_WORK_INITIALIZER(n, f, tflags) { \ .work = __WORK_INITIALIZER((n).work, (f)), \ - .timer = __TIMER_INITIALIZER(delayed_work_timer_fn, \ - (unsigned long)&(n), \ + .timer = __TIMER_INITIALIZER((TIMER_FUNC_TYPE)delayed_work_timer_fn,\ + (TIMER_DATA_TYPE)&(n.timer), \ (tflags) | TIMER_IRQSAFE), \ } @@ -241,8 +241,9 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } #define __INIT_DELAYED_WORK(_work, _func, _tflags) \ do { \ INIT_WORK(&(_work)->work, (_func)); \ - __setup_timer(&(_work)->timer, delayed_work_timer_fn, \ - (unsigned long)(_work), \ + __setup_timer(&(_work)->timer, \ + (TIMER_FUNC_TYPE)delayed_work_timer_fn, \ + (TIMER_DATA_TYPE)&(_work)->timer, \ (_tflags) | TIMER_IRQSAFE); \ } while (0) @@ -250,8 +251,8 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } do { \ INIT_WORK_ONSTACK(&(_work)->work, (_func)); \ __setup_timer_on_stack(&(_work)->timer, \ - delayed_work_timer_fn, \ - (unsigned long)(_work), \ + (TIMER_FUNC_TYPE)delayed_work_timer_fn,\ + (TIMER_DATA_TYPE)&(_work)->timer,\ (_tflags) | TIMER_IRQSAFE); \ } while (0) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index a5361fc..c77fdf6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1492,9 +1492,9 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq, } EXPORT_SYMBOL(queue_work_on); -void delayed_work_timer_fn(unsigned long __data) +void delayed_work_timer_fn(struct timer_list *t) { - struct delayed_work *dwork = (struct delayed_work *)__data; + struct delayed_work *dwork = from_timer(dwork, t, timer); /* should have been called from irqsafe timer with irq already off */ __queue_work(dwork->cpu, dwork->wq, &dwork->work); @@ -1508,8 +1508,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, struct work_struct *work = &dwork->work; WARN_ON_ONCE(!wq); - WARN_ON_ONCE(timer->function != delayed_work_timer_fn || - timer->data != (unsigned long)dwork); + WARN_ON_ONCE(timer->function != (TIMER_FUNC_TYPE)delayed_work_timer_fn); WARN_ON_ONCE(timer_pending(timer)); WARN_ON_ONCE(!list_empty(&work->entry));