From: Anna-Maria Behnsen <anna-maria@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
John Stultz <jstultz@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Eric Dumazet <edumazet@google.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Arjan van de Ven <arjan@infradead.org>,
"Paul E . McKenney" <paulmck@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Rik van Riel <riel@surriel.com>,
Anna-Maria Behnsen <anna-maria@linutronix.de>
Subject: [PATCH v5 11/18] timer: Split out "get next timer interrupt" functionality
Date: Wed, 1 Mar 2023 15:17:37 +0100 [thread overview]
Message-ID: <20230301141744.16063-12-anna-maria@linutronix.de> (raw)
In-Reply-To: <20230301141744.16063-1-anna-maria@linutronix.de>
The functionallity for getting the next timer interrupt in
get_next_timer_interrupt() is splitted into a separate function
fetch_next_timer_interrupt() to be usable by other callsides.
This is preparatory work for the conversion of the NOHZ timer
placement to a pull at expiry time model. No functional change.
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
---
v5: Update commit message
---
kernel/time/timer.c | 91 +++++++++++++++++++++++++--------------------
1 file changed, 50 insertions(+), 41 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index ff41d978cb22..dfc744545159 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1944,6 +1944,46 @@ static unsigned long next_timer_interrupt(struct timer_base *base)
return base->next_expiry;
}
+static unsigned long fetch_next_timer_interrupt(struct timer_base *base_local,
+ struct timer_base *base_global,
+ unsigned long basej, u64 basem,
+ struct timer_events *tevt)
+{
+ unsigned long nextevt_local, nextevt_global;
+ bool local_first;
+
+ nextevt_local = next_timer_interrupt(base_local);
+ nextevt_global = next_timer_interrupt(base_global);
+
+ /*
+ * Check whether the local event is expiring before or at the same
+ * time as the global event.
+ *
+ * Note, that nextevt_global and nextevt_local might be based on
+ * different base->clk values. So it's not guaranteed that
+ * comparing with empty bases results in a correct local_first.
+ */
+ if (base_local->timers_pending && base_global->timers_pending)
+ local_first = time_before_eq(nextevt_local, nextevt_global);
+ else
+ local_first = base_local->timers_pending;
+
+ /*
+ * Update tevt->* values:
+ *
+ * If the local queue expires first, then the global event can
+ * be ignored. If the global queue is empty, nothing to do
+ * either.
+ */
+ if (!local_first && base_global->timers_pending)
+ tevt->global = basem + (u64)(nextevt_global - basej) * TICK_NSEC;
+
+ if (base_local->timers_pending)
+ tevt->local = basem + (u64)(nextevt_local - basej) * TICK_NSEC;
+
+ return local_first ? nextevt_local : nextevt_global;
+}
+
/*
* Forward base clock is done only when @basej is past base->clk, otherwise
* base-clk might be rewind.
@@ -1976,7 +2016,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
struct timer_events tevt = { .local = KTIME_MAX, .global = KTIME_MAX };
unsigned long nextevt, nextevt_local, nextevt_global;
struct timer_base *base_local, *base_global;
- bool local_first, is_idle;
+ bool is_idle;
/*
* Pretend that there is no timer pending if the cpu is offline.
@@ -1991,8 +2031,11 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
raw_spin_lock(&base_local->lock);
raw_spin_lock_nested(&base_global->lock, SINGLE_DEPTH_NESTING);
- nextevt_local = next_timer_interrupt(base_local);
- nextevt_global = next_timer_interrupt(base_global);
+ nextevt = fetch_next_timer_interrupt(base_local, base_global,
+ basej, basem, &tevt);
+
+ nextevt_local = base_local->next_expiry;
+ nextevt_global = base_global->next_expiry;
/*
* We have a fresh next event. Check whether we can forward the
@@ -2001,21 +2044,6 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
forward_base_clk(base_local, nextevt_local, basej);
forward_base_clk(base_global, nextevt_global, basej);
- /*
- * Check whether the local event is expiring before or at the same
- * time as the global event.
- *
- * Note, that nextevt_global and nextevt_local might be based on
- * different base->clk values. So it's not guaranteed that
- * comparing with empty bases results in a correct local_first.
- */
- if (base_local->timers_pending && base_global->timers_pending)
- local_first = time_before_eq(nextevt_local, nextevt_global);
- else
- local_first = base_local->timers_pending;
-
- nextevt = local_first ? nextevt_local : nextevt_global;
-
/*
* Bases are idle if the next event is more than a tick away. Also
* the tick is stopped so any added timer must forward the base clk
@@ -2028,6 +2056,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
/* We need to mark both bases in sync */
base_local->is_idle = base_global->is_idle = is_idle;
+ raw_spin_unlock(&base_global->lock);
+ raw_spin_unlock(&base_local->lock);
+
/*
* If the bases are not marked idle, i.e one of the events is at
* max. one tick away, then the CPU can't go into a NOHZ idle
@@ -2040,31 +2071,9 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
if (time_before(nextevt, basej))
nextevt = basej;
tevt.local = basem + (u64)(nextevt - basej) * TICK_NSEC;
- goto unlock;
+ tevt.global = KTIME_MAX;
}
- /*
- * If the bases are marked idle, i.e. the next event on both the
- * local and the global queue are farther away than a tick,
- * evaluate both bases. No need to check whether one of the bases
- * has an already expired timer as this is caught by the !is_idle
- * condition above.
- */
- if (base_local->timers_pending)
- tevt.local = basem + (u64)(nextevt_local - basej) * TICK_NSEC;
-
- /*
- * If the local queue expires first, then the global event can be
- * ignored. The CPU wakes up before that. If the global queue is
- * empty, nothing to do either.
- */
- if (!local_first && base_global->timers_pending)
- tevt.global = basem + (u64)(nextevt_global - basej) * TICK_NSEC;
-
-unlock:
- raw_spin_unlock(&base_global->lock);
- raw_spin_unlock(&base_local->lock);
-
tevt.local = min_t(u64, tevt.local, tevt.global);
return cmp_next_hrtimer_event(basem, tevt.local);
--
2.30.2
next prev parent reply other threads:[~2023-03-01 14:19 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-01 14:17 [PATCH v5 00/18] timer: Move from a push remote at enqueue to a pull at expiry model Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 01/18] tick-sched: Warn when next tick seems to be in the past Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 02/18] timer: Add comment to get_next_timer_interrupt() description Anna-Maria Behnsen
2023-04-11 9:36 ` Frederic Weisbecker
2023-04-11 16:10 ` Anna-Maria Behnsen
2023-04-12 11:29 ` Frederic Weisbecker
2023-03-01 14:17 ` [PATCH v5 03/18] timer: Move store of next event into __next_timer_interrupt() Anna-Maria Behnsen
2023-03-21 12:48 ` Peter Zijlstra
2023-04-12 11:32 ` Frederic Weisbecker
2023-03-01 14:17 ` [PATCH v5 04/18] timer: Split next timer interrupt logic Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 05/18] timer: Rework idle logic Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 06/18] add_timer_on(): Make sure callers have TIMER_PINNED flag Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 07/18] timers: Ease code in run_local_timers() Anna-Maria Behnsen
2023-04-12 14:32 ` Frederic Weisbecker
2023-03-01 14:17 ` [PATCH v5 08/18] timers: Create helper function to forward timer base clk Anna-Maria Behnsen
2023-04-12 14:40 ` Frederic Weisbecker
2023-03-01 14:17 ` [PATCH v5 09/18] timer: Keep the pinned timers separate from the others Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 10/18] timer: Retrieve next expiry of pinned/non-pinned timers seperately Anna-Maria Behnsen
2023-03-01 14:17 ` Anna-Maria Behnsen [this message]
2023-03-09 16:30 ` [PATCH v5 11/18] timer: Split out "get next timer interrupt" functionality Frederic Weisbecker
2023-03-09 17:45 ` Frederic Weisbecker
2023-03-21 14:30 ` Peter Zijlstra
2023-04-12 20:34 ` Frederic Weisbecker
2023-03-01 14:17 ` [PATCH v5 12/18] timer: Add get next timer interrupt functionality for remote CPUs Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 13/18] timer: Restructure internal locking Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 14/18] timer: Check if timers base is handled already Anna-Maria Behnsen
2023-03-21 14:43 ` Peter Zijlstra
2023-03-01 14:17 ` [PATCH v5 15/18] tick/sched: Split out jiffies update helper function Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 16/18] timer: Implement the hierarchical pull model Anna-Maria Behnsen
2023-03-14 13:24 ` Frederic Weisbecker
2023-03-14 14:49 ` Anna-Maria Behnsen
2023-03-14 16:01 ` Frederic Weisbecker
2023-03-21 11:17 ` Frederic Weisbecker
2023-04-04 14:05 ` Anna-Maria Behnsen
2023-04-04 14:32 ` Frederic Weisbecker
2023-03-21 13:25 ` Frederic Weisbecker
2023-04-06 9:12 ` Anna-Maria Behnsen
2023-03-21 15:29 ` Peter Zijlstra
2023-03-21 15:34 ` Peter Zijlstra
2023-03-21 15:40 ` Peter Zijlstra
2023-03-23 9:22 ` Peter Zijlstra
2023-03-23 9:34 ` Peter Zijlstra
2023-03-23 9:47 ` Peter Zijlstra
2023-03-23 12:47 ` Peter Zijlstra
2023-03-23 14:24 ` Peter Zijlstra
2023-04-04 14:56 ` Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 17/18] timer_migration: Add tracepoints Anna-Maria Behnsen
2023-03-01 14:17 ` [PATCH v5 18/18] timer: Always queue timers on the local CPU Anna-Maria Behnsen
2023-03-21 12:46 ` [PATCH v5 00/18] timer: Move from a push remote at enqueue to a pull at expiry model Peter Zijlstra
2023-04-04 13:35 ` Anna-Maria Behnsen
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=20230301141744.16063-12-anna-maria@linutronix.de \
--to=anna-maria@linutronix.de \
--cc=arjan@infradead.org \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jstultz@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=riel@surriel.com \
--cc=tglx@linutronix.de \
/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).