[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CANDhNCrwaJZr4XyqSAaWMgY98NkPnjKGoeZxaBMY5Z-dP6rf=Q@mail.gmail.com>
Date: Thu, 24 Oct 2024 14:57:20 -0700
From: John Stultz <jstultz@...gle.com>
To: Anna-Maria Behnsen <anna-maria@...utronix.de>
Cc: Frederic Weisbecker <frederic@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
Miroslav Lichvar <mlichvar@...hat.com>, Richard Cochran <richardcochran@...il.com>,
Christopher S Hall <christopher.s.hall@...el.com>
Subject: Re: [PATCH v2 17/25] timekeeping: Rework timekeeping_inject_offset()
to use shadow_timekeeper
On Wed, Oct 9, 2024 at 1:29 AM Anna-Maria Behnsen
<anna-maria@...utronix.de> wrote:
>
> From: Anna-Maria Behnsen <anna-maria@...utronix.de>
>
> Updates of the timekeeper can be done by operating on the shadow timekeeper
> and afterwards copying the result into the real timekeeper. This has the
> advantage, that the sequence count write protected region is kept as small
> as possible.
>
> Convert timekeeping_inject_offset() to use this scheme.
>
> That allows to use a scoped_guard() for locking the timekeeper lock as the
> usage of the shadow timekeeper allows a rollback in the error case instead
> of the full timekeeper update of the original code.
>
> Signed-off-by: Anna-Maria Behnsen <anna-maria@...utronix.de>
> ---
> kernel/time/timekeeping.c | 41 ++++++++++++++++-------------------------
> 1 file changed, 16 insertions(+), 25 deletions(-)
>
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index cc01ad53d96d..051041e92e54 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -1519,40 +1519,31 @@ EXPORT_SYMBOL(do_settimeofday64);
> */
> static int timekeeping_inject_offset(const struct timespec64 *ts)
> {
> - struct timekeeper *tk = &tk_core.timekeeper;
> - unsigned long flags;
> - struct timespec64 tmp;
> - int ret = 0;
> -
> if (ts->tv_nsec < 0 || ts->tv_nsec >= NSEC_PER_SEC)
> return -EINVAL;
>
> - raw_spin_lock_irqsave(&tk_core.lock, flags);
> - write_seqcount_begin(&tk_core.seq);
> -
> - timekeeping_forward_now(tk);
> -
> - /* Make sure the proposed value is valid */
> - tmp = timespec64_add(tk_xtime(tk), *ts);
> - if (timespec64_compare(&tk->wall_to_monotonic, ts) > 0 ||
> - !timespec64_valid_settod(&tmp)) {
> - ret = -EINVAL;
> - goto error;
> - }
> + scoped_guard (raw_spinlock_irqsave, &tk_core.lock) {
> + struct timekeeper *tk = &tk_core.shadow_timekeeper;
Nit: Same suggestion of naming this tk_shadow for added clarity.
Otherwise,
Acked-by: John Stultz <jstultz@...gle.com>
Powered by blists - more mailing lists