netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linuxfoundation.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Anna-Maria Behnsen <anna-maria@linutronix.de>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephen Boyd <sboyd@kernel.org>,
	Guenter Roeck <linux@roeck-us.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	Julia Lawall <Julia.Lawall@inria.fr>,
	Arnd Bergmann <arnd@arndb.de>,
	Viresh Kumar <viresh.kumar@linaro.org>,
	Marc Zyngier <maz@kernel.org>,
	Marcel Holtmann <marcel@holtmann.org>,
	Johan Hedberg <johan.hedberg@gmail.com>,
	Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
	linux-bluetooth@vger.kernel.org,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	netdev@vger.kernel.org
Subject: [patch 07/15] timers: Use del_timer_sync() even on UP
Date: Tue, 15 Nov 2022 21:28:44 +0100 (CET)	[thread overview]
Message-ID: <20221115202117.381022914@linutronix.de> (raw)
In-Reply-To: 20221115195802.415956561@linutronix.de

del_timer_sync() is assumed to be pointless on uniprocessor systems and can
be mapped to del_timer() because in theory del_timer() can never be invoked
while the timer callback function is executed.

This is not entirely true because del_timer() can be invoked from interrupt
context and therefore hit in the middle of a running timer callback.

Contrary to that del_timer_sync() is not allowed to be invoked from
interrupt context unless the affected timer is marked with TIMER_IRQSAFE.
del_timer_sync() has proper checks in place to detect such a situation.

Give up on the UP optimization and make del_timer_sync() unconditionally
available.

Co-developed-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20220407161745.7d6754b3@gandalf.local.home
Link: https://lore.kernel.org/all/20221110064101.429013735@goodmis.org
---
 include/linux/timer.h |    7 +------
 kernel/time/timer.c   |    2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -183,12 +183,7 @@ extern int timer_reduce(struct timer_lis
 extern void add_timer(struct timer_list *timer);
 
 extern int try_to_del_timer_sync(struct timer_list *timer);
-
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT)
-  extern int del_timer_sync(struct timer_list *timer);
-#else
-# define del_timer_sync(t)		del_timer(t)
-#endif
+extern int del_timer_sync(struct timer_list *timer);
 
 extern void init_timers(void);
 struct hrtimer;
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1387,7 +1387,6 @@ static inline void timer_sync_wait_runni
 static inline void del_timer_wait_running(struct timer_list *timer) { }
 #endif
 
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT)
 /**
  * del_timer_sync - Deactivate a timer and wait for the handler to finish.
  * @timer:	The timer to be deactivated
@@ -1468,7 +1467,6 @@ int del_timer_sync(struct timer_list *ti
 	return ret;
 }
 EXPORT_SYMBOL(del_timer_sync);
-#endif
 
 static void call_timer_fn(struct timer_list *timer,
 			  void (*fn)(struct timer_list *),


  parent reply	other threads:[~2022-11-15 20:29 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-15 20:28 [patch 00/15] timers: Provide timer_shutdown[_sync]() Thomas Gleixner
2022-11-15 20:28 ` [patch 01/15] ARM: spear: Do not use timer namespace for timer_shutdown() function Thomas Gleixner
2022-11-15 20:28 ` [patch 02/15] clocksource/drivers/arm_arch_timer: " Thomas Gleixner
2022-11-15 20:28 ` [patch 03/15] clocksource/drivers/sp804: " Thomas Gleixner
2022-11-15 20:28 ` [patch 04/15] timers: Get rid of del_singleshot_timer_sync() Thomas Gleixner
2022-11-21 20:08   ` Steven Rostedt
2022-11-15 20:28 ` [patch 05/15] timers: Replace BUG_ON()s Thomas Gleixner
2022-11-21 20:18   ` Steven Rostedt
2022-11-15 20:28 ` [patch 06/15] timers: Update kernel-doc for various functions Thomas Gleixner
2022-11-21 20:43   ` Steven Rostedt
2022-11-22  0:09     ` Randy Dunlap
2022-11-22  0:21       ` Steven Rostedt
2022-11-22 15:18     ` Thomas Gleixner
2022-11-22 15:38       ` Steven Rostedt
2022-11-22 15:41       ` Steven Rostedt
2022-11-22 16:42         ` Thomas Gleixner
2022-11-15 20:28 ` Thomas Gleixner [this message]
2022-11-15 20:28 ` [patch 08/15] timers: Rename del_timer_sync() to timer_delete_sync() Thomas Gleixner
2022-11-21 20:52   ` Steven Rostedt
2022-11-15 20:28 ` [patch 09/15] timers: Rename del_timer() to timer_delete() Thomas Gleixner
2022-11-21 21:08   ` Steven Rostedt
2022-11-15 20:28 ` [patch 10/15] timers: Silently ignore timers with a NULL function Thomas Gleixner
2022-11-21 21:35   ` Steven Rostedt
2022-11-21 21:46     ` Thomas Gleixner
2022-11-15 20:28 ` [patch 11/15] timers: Split [try_to_]del_timer[_sync]() to prepare for shutdown mode Thomas Gleixner
2022-11-15 20:28 ` [patch 12/15] timers: Add shutdown mechanism to the internal functions Thomas Gleixner
2022-11-21 22:18   ` Steven Rostedt
2022-11-15 20:28 ` [patch 13/15] timers: Provide timer_shutdown[_sync]() Thomas Gleixner
2022-11-21 22:21   ` Steven Rostedt
2022-11-15 20:28 ` [patch 14/15] timers: Update the documentation to reflect on the new timer_shutdown() API Thomas Gleixner
2022-11-15 20:28 ` [patch 15/15] Bluetooth: hci_qca: Fix the teardown problem for real Thomas Gleixner
2022-11-15 21:29   ` Luiz Augusto von Dentz
2022-11-17 14:10 ` [patch 00/15] timers: Provide timer_shutdown[_sync]() Guenter Roeck
2022-11-21 15:15 ` Thomas Gleixner
2022-11-21 15:26   ` Steven Rostedt
2022-11-22  2:38 ` Steven Rostedt

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=20221115202117.381022914@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=Julia.Lawall@inria.fr \
    --cc=akpm@linux-foundation.org \
    --cc=anna-maria@linutronix.de \
    --cc=arnd@arndb.de \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=johan.hedberg@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=luiz.dentz@gmail.com \
    --cc=marcel@holtmann.org \
    --cc=maz@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=sboyd@kernel.org \
    --cc=torvalds@linuxfoundation.org \
    --cc=viresh.kumar@linaro.org \
    /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).