mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Anna-Maria Behnsen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Anna-Maria Behnsen" <anna-maria@linutronix.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	Frederic Weisbecker <frederic@kernel.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] timers: Check if timers base is handled already
Date: Thu, 22 Feb 2024 17:12:08 -0000	[thread overview]
Message-ID: <170862192800.398.8318015316746640187.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240221090548.36600-16-anna-maria@linutronix.de>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     89f01e10c99a5ca2ff88b545fad763d360cdbfc8
Gitweb:        https://git.kernel.org/tip/89f01e10c99a5ca2ff88b545fad763d360cdbfc8
Author:        Anna-Maria Behnsen <anna-maria@linutronix.de>
AuthorDate:    Wed, 21 Feb 2024 10:05:43 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 22 Feb 2024 17:52:32 +01:00

timers: Check if timers base is handled already

Due to the conversion of the NOHZ timer placement to a pull at expiry
time model, the per CPU timer bases with non pinned timers are no
longer handled only by the local CPU. In case a remote CPU already
expires the non pinned timers base of the local CPU, nothing more
needs to be done by the local CPU. A check at the begin of the expire
timers routine is required, because timer base lock is dropped before
executing the timer callback function.

This is a preparatory work, but has no functional impact right now.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20240221090548.36600-16-anna-maria@linutronix.de

---
 kernel/time/timer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 51053af..4420cdf 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -2285,6 +2285,9 @@ static inline void __run_timers(struct timer_base *base)
 
 	lockdep_assert_held(&base->lock);
 
+	if (base->running_timer)
+		return;
+
 	while (time_after_eq(jiffies, base->clk) &&
 	       time_after_eq(jiffies, base->next_expiry)) {
 		levels = collect_expired_timers(base, heads);

  reply	other threads:[~2024-02-22 17:12 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-21  9:05 [PATCH v11 00/20] timers: Move from a push remote at enqueue to a pull at expiry model Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 01/20] timers: Restructure get_next_timer_interrupt() Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 02/20] timers: Split out get next timer interrupt Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 03/20] timers: Move marking timer bases idle into tick_nohz_stop_tick() Anna-Maria Behnsen
2024-02-21 20:36   ` Frederic Weisbecker
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 04/20] timers: Optimization for timer_base_try_to_set_idle() Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 05/20] timers: Introduce add_timer() variants which modify timer flags Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 06/20] workqueue: Use global variant for add_timer() Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 07/20] timers: add_timer_on(): Make sure TIMER_PINNED flag is set Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] timers: Make sure TIMER_PINNED flag is set in add_timer_on() tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 08/20] timers: Ease code in run_local_timers() Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] timers: Simplify " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 09/20] timers: Split next timer interrupt logic Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 10/20] timers: Keep the pinned timers separate from the others Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 11/20] timers: Retrieve next expiry of pinned/non-pinned timers separately Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 12/20] timers: Split out "get next timer interrupt" functionality Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 13/20] timers: Add get next timer interrupt functionality for remote CPUs Anna-Maria Behnsen
2024-02-21 20:50   ` Frederic Weisbecker
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 14/20] timers: Restructure internal locking Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Richard Cochran (linutronix GmbH)
2024-02-21  9:05 ` [PATCH v11 15/20] timers: Check if timers base is handled already Anna-Maria Behnsen
2024-02-22 17:12   ` tip-bot2 for Anna-Maria Behnsen [this message]
2024-02-21  9:05 ` [PATCH v11 16/20] tick/sched: Split out jiffies update helper function Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Richard Cochran (linutronix GmbH)
2024-02-21  9:05 ` [PATCH v11 17/20] timers: Introduce function to check timer base is_idle flag Anna-Maria Behnsen
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 18/20] timers: Implement the hierarchical pull model Anna-Maria Behnsen
2024-02-21 10:37   ` [PATCH v11a] " Anna-Maria Behnsen
2024-02-21 22:45   ` [PATCH v11 18/20] " Frederic Weisbecker
2024-02-22  8:17     ` Anna-Maria Behnsen
2024-02-22 10:25       ` Frederic Weisbecker
2024-02-22 10:37   ` [PATCH v11b " Anna-Maria Behnsen
2024-02-22 10:50     ` Frederic Weisbecker
2024-02-22 17:12     ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 19/20] timer_migration: Add tracepoints Anna-Maria Behnsen
2024-02-21 22:46   ` Frederic Weisbecker
2024-02-21 23:17   ` Steven Rostedt
2024-02-22 10:34   ` [PATCH v11a " Anna-Maria Behnsen
2024-02-22 14:59     ` Steven Rostedt
2024-02-22 17:12     ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-21  9:05 ` [PATCH v11 20/20] timers: Always queue timers on the local CPU Anna-Maria Behnsen
2024-02-21 22:57   ` Frederic Weisbecker
2024-02-22 17:12   ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-22 13:33 ` [PATCH] timers/timer_migration: Fix memory barrier comment Anna-Maria Behnsen
2024-02-22 13:44   ` Frederic Weisbecker

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=170862192800.398.8318015316746640187.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=anna-maria@linutronix.de \
    --cc=frederic@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.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

all inboxes | Powered by JetHome®