From: Anna-Maria Behnsen <anna-maria@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
John Stultz <john.stultz@linaro.org>,
Eric Dumazet <edumazet@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-pm@vger.kernel.org, Arjan van de Ven <arjan@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Rik van Riel <riel@redhat.com>,
Anna-Maria Behnsen <anna-maria@linutronix.de>
Subject: [PATCH v3 04/17] timer: Split next timer interrupt logic
Date: Tue, 25 Oct 2022 15:58:37 +0200 [thread overview]
Message-ID: <20221025135850.51044-5-anna-maria@linutronix.de> (raw)
In-Reply-To: <20221025135850.51044-1-anna-maria@linutronix.de>
Logic for getting next timer interrupt (no matter of recalculated or
already stored in base->next_expiry) is split into a separate function
"next_timer_interrupt()" to make it available for new call sites.
No functional change.
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/time/timer.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 7695c733dfa5..f34bc75ff848 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1681,6 +1681,15 @@ static u64 cmp_next_hrtimer_event(u64 basem, u64 expires)
return DIV_ROUND_UP_ULL(nextevt, TICK_NSEC) * TICK_NSEC;
}
+
+static unsigned long next_timer_interrupt(struct timer_base *base)
+{
+ if (base->next_expiry_recalc)
+ __next_timer_interrupt(base);
+
+ return base->next_expiry;
+}
+
/**
* get_next_timer_interrupt - return the time (clock mono) of the next timer
* @basej: base time jiffies
@@ -1703,9 +1712,8 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
return expires;
raw_spin_lock(&base->lock);
- if (base->next_expiry_recalc)
- __next_timer_interrupt(base);
- nextevt = base->next_expiry;
+
+ nextevt = next_timer_interrupt(base);
/*
* We have a fresh next event. Check whether we can forward the
--
2.30.2
next prev parent reply other threads:[~2022-10-25 13:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-25 13:58 [PATCH v3 00/17] timer: Move from a push remote at enqueue to a pull at expiry model Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 01/17] cpufreq: Prepare timer flags for hierarchical timer pull model Anna-Maria Behnsen
2022-10-26 13:54 ` Frederic Weisbecker
2022-10-31 15:22 ` Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 02/17] tick-sched: Warn when next tick seems to be in the past Anna-Maria Behnsen
2022-10-25 22:11 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 03/17] timer: Move store of next event into __next_timer_interrupt() Anna-Maria Behnsen
2022-10-26 9:33 ` Frederic Weisbecker
2022-10-25 13:58 ` Anna-Maria Behnsen [this message]
2022-10-26 9:40 ` [PATCH v3 04/17] timer: Split next timer interrupt logic Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 05/17] timer: Rework idle logic Anna-Maria Behnsen
2022-10-26 13:27 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 06/17] timer: Keep the pinned timers separate from the others Anna-Maria Behnsen
2022-10-26 15:26 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 07/17] timer: Retrieve next expiry of pinned/non-pinned timers seperately Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 08/17] timer: Rename get_next_timer_interrupt() Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 09/17] timer: Split out "get next timer interrupt" functionality Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 10/17] timer: Add get next timer interrupt functionality for remote CPUs Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 11/17] timer: Restructure internal locking Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 12/17] timer: Check if timers base is handled already Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 13/17] tick/sched: Split out jiffies update helper function Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 14/17] timer: Implement the hierarchical pull model Anna-Maria Behnsen
2022-10-25 16:36 ` kernel test robot
2022-10-26 5:35 ` kernel test robot
2022-10-27 7:38 ` kernel test robot
2022-10-25 13:58 ` [PATCH v3 15/17] timer_migration: Add tracepoints Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 16/17] add_timer_on(): Make sure callers have TIMER_PINNED flag Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 17/17] timer: Always queue timers on the local CPU Anna-Maria Behnsen
2022-10-27 7:22 ` kernel test robot
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=20221025135850.51044-5-anna-maria@linutronix.de \
--to=anna-maria@linutronix.de \
--cc=arjan@infradead.org \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=riel@redhat.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).