From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Anna-Maria Behnsen <anna-maria@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Marcelo Tosatti <mtosatti@redhat.com>,
Frederic Weisbecker <frederic@kernel.org>,
Peter Xu <peterx@redhat.com>,
Nitesh Narayan Lal <nitesh@redhat.com>,
Alex Belits <abelits@marvell.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
John Stultz <john.stultz@linaro.org>
Subject: [patch 5/8] time/timekeeping: Avoid invoking clock_was_set() twice
Date: Tue, 27 Apr 2021 10:25:42 +0200 [thread overview]
Message-ID: <20210427083724.542646194@linutronix.de> (raw)
In-Reply-To: 20210427082537.611978720@linutronix.de
do_adjtimex() might end up scheduling a delayed clock_was_set() via
timekeeping_advance() and then invoke clock_was_set() directly which is
pointless.
Make timekeeping_advance() return whether an invocation of clock_was_set()
is required and handle it at the call sites which allows do_adjtimex() to
issue a single direct call if required.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/time/timekeeping.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2126,7 +2126,7 @@ static u64 logarithmic_accumulation(stru
* timekeeping_advance - Updates the timekeeper to the current time and
* current NTP tick length
*/
-static void timekeeping_advance(enum timekeeping_adv_mode mode)
+static bool timekeeping_advance(enum timekeeping_adv_mode mode)
{
struct timekeeper *real_tk = &tk_core.timekeeper;
struct timekeeper *tk = &shadow_timekeeper;
@@ -2197,9 +2197,8 @@ static void timekeeping_advance(enum tim
write_seqcount_end(&tk_core.seq);
out:
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
- if (clock_set)
- /* Have to call _delayed version, since in irq context*/
- clock_was_set_delayed();
+
+ return !!clock_set;
}
/**
@@ -2208,7 +2207,8 @@ static void timekeeping_advance(enum tim
*/
void update_wall_time(void)
{
- timekeeping_advance(TK_ADV_TICK);
+ if (timekeeping_advance(TK_ADV_TICK))
+ clock_was_set_delayed();
}
/**
@@ -2388,8 +2388,9 @@ int do_adjtimex(struct __kernel_timex *t
{
struct timekeeper *tk = &tk_core.timekeeper;
struct audit_ntp_data ad;
- unsigned long flags;
+ bool clock_set = false;
struct timespec64 ts;
+ unsigned long flags;
s32 orig_tai, tai;
int ret;
@@ -2424,6 +2425,7 @@ int do_adjtimex(struct __kernel_timex *t
if (tai != orig_tai) {
__timekeeping_set_tai_offset(tk, tai);
timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);
+ clock_set = true;
}
tk_update_leap_state(tk);
@@ -2434,9 +2436,9 @@ int do_adjtimex(struct __kernel_timex *t
/* Update the multiplier immediately if frequency was set directly */
if (txc->modes & (ADJ_FREQUENCY | ADJ_TICK))
- timekeeping_advance(TK_ADV_FREQ);
+ clock_set |= timekeeping_advance(TK_ADV_FREQ);
- if (tai != orig_tai)
+ if (clock_set)
clock_was_set();
ntp_notify_cmos_timer();
next prev parent reply other threads:[~2021-04-27 8:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 8:25 [patch 0/8] hrtimers: Overhaul the clock_was_set() logic Thomas Gleixner
2021-04-27 8:25 ` [patch 1/8] hrtimer: Ensure timerfd notification for HIGHRES=n Thomas Gleixner
2021-04-27 8:25 ` [patch 2/8] hrtimer: Force clock_was_set() handling for the HIGHRES=n, NOHZ=y case Thomas Gleixner
2021-05-12 14:59 ` Peter Zijlstra
2021-05-12 16:40 ` Thomas Gleixner
2021-04-27 8:25 ` [patch 3/8] timerfd: Provide timerfd_resume() Thomas Gleixner
2021-04-27 8:25 ` [patch 4/8] timekeeping: Distangle resume and clock-was-set events Thomas Gleixner
2021-04-27 8:25 ` Thomas Gleixner [this message]
2021-04-27 8:25 ` [patch 6/8] hrtimer: Add bases argument to clock_was_set() Thomas Gleixner
2021-04-27 8:25 ` [patch 7/8] hrtimer: Avoid unnecessary SMP function calls in clock_was_set() Thomas Gleixner
2021-05-13 14:59 ` Peter Zijlstra
2021-05-14 18:52 ` Thomas Gleixner
2021-05-14 23:28 ` Peter Zijlstra
2021-05-15 0:24 ` Thomas Gleixner
2021-04-27 8:25 ` [patch 8/8] hrtimer: Avoid more " Thomas Gleixner
2021-04-27 15:11 ` Marcelo Tosatti
2021-04-27 19:59 ` Thomas Gleixner
2021-04-30 7:12 ` [patch V2 " Thomas Gleixner
2021-04-30 16:49 ` Marcelo Tosatti
2021-05-13 7:47 ` Peter Zijlstra
2021-05-14 19:08 ` Thomas Gleixner
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=20210427083724.542646194@linutronix.de \
--to=tglx@linutronix.de \
--cc=abelits@marvell.com \
--cc=anna-maria@linutronix.de \
--cc=frederic@kernel.org \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=nitesh@redhat.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
/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).