From: Zhan Xusheng <zhanxusheng1024@gmail.com>
To: tglx@kernel.org, luto@kernel.org, vincenzo.frascino@arm.com
Cc: thomas.weissschuh@linutronix.de, linux-kernel@vger.kernel.org,
zhanxusheng@xiaomi.com
Subject: [PATCH 1/3] vdso/math64: Add and use __iter_div64_u64_rem()
Date: Mon, 31 Aug 2026 20:55:55 +0800 [thread overview]
Message-ID: <20260831125557.1490398-2-zhanxusheng@xiaomi.com> (raw)
In-Reply-To: <20260831125557.1490398-1-zhanxusheng@xiaomi.com>
The vDSO basetimes for CLOCK_MONOTONIC and CLOCK_BOOTTIME are kept in the
scaled nanoseconds of tkr_mono, so normalising them means dividing by
NSEC_PER_SEC << shift, which does not fit the u32 divisor of
__iter_div_u64_rem().
update_vdso_time_data() therefore open-codes the iterative division twice.
Turning the loops into a plain modulo is not an option either, as the vDSO
has no 64-bit division helpers on 32-bit.
Add __iter_div64_u64_rem(), the u64-divisor counterpart of
__iter_div_u64_rem(), keeping the asm() barrier that stops the compiler
turning the loop into a division, and use it for both.
No functional change.
Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
---
include/vdso/math64.h | 21 +++++++++++++++++++++
kernel/time/vsyscall.c | 17 ++++++-----------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/include/vdso/math64.h b/include/vdso/math64.h
index 22ae212f8b28..eb39d3411981 100644
--- a/include/vdso/math64.h
+++ b/include/vdso/math64.h
@@ -21,6 +21,27 @@ __iter_div_u64_rem(u64 dividend, u32 divisor, u64 *remainder)
return ret;
}
+static __always_inline u64
+__iter_div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
+{
+ u64 ret = 0;
+
+ while (dividend >= divisor) {
+ /*
+ * Prevent the compiler from optimising this loop into a
+ * modulo operation.
+ */
+ asm("" : "+rm"(dividend));
+
+ dividend -= divisor;
+ ret++;
+ }
+
+ *remainder = dividend;
+
+ return ret;
+}
+
#if defined(CONFIG_ARCH_SUPPORTS_INT128) && defined(__SIZEOF_INT128__)
#ifndef mul_u64_u32_add_u64_shr
diff --git a/kernel/time/vsyscall.c b/kernel/time/vsyscall.c
index aa59919b8f2c..165ad9d7f154 100644
--- a/kernel/time/vsyscall.c
+++ b/kernel/time/vsyscall.c
@@ -30,21 +30,21 @@ static inline void update_vdso_time_data(struct vdso_time_data *vdata, struct ti
{
struct vdso_clock *vc = vdata->clock_data;
struct vdso_timestamp *vdso_ts;
- u64 nsec, sec;
+ u64 nsec_per_sec, nsec, sec;
fill_clock_configuration(&vc[CS_HRES_COARSE], &tk->tkr_mono);
fill_clock_configuration(&vc[CS_RAW], &tk->tkr_raw);
+ /* One second in the scaled nanoseconds of tkr_mono */
+ nsec_per_sec = (u64)NSEC_PER_SEC << tk->tkr_mono.shift;
+
/* CLOCK_MONOTONIC */
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC];
vdso_ts->sec = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
nsec = tk->tkr_mono.xtime_nsec;
nsec += ((u64)tk->wall_to_monotonic.tv_nsec << tk->tkr_mono.shift);
- while (nsec >= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
- nsec -= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift);
- vdso_ts->sec++;
- }
+ vdso_ts->sec += __iter_div64_u64_rem(nsec, nsec_per_sec, &nsec);
vdso_ts->nsec = nsec;
/* Copy MONOTONIC time for BOOTTIME */
@@ -55,12 +55,7 @@ static inline void update_vdso_time_data(struct vdso_time_data *vdata, struct ti
/* CLOCK_BOOTTIME */
vdso_ts = &vc[CS_HRES_COARSE].basetime[CLOCK_BOOTTIME];
- vdso_ts->sec = sec;
-
- while (nsec >= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
- nsec -= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift);
- vdso_ts->sec++;
- }
+ vdso_ts->sec = sec + __iter_div64_u64_rem(nsec, nsec_per_sec, &nsec);
vdso_ts->nsec = nsec;
/* CLOCK_MONOTONIC_RAW */
--
2.43.0
next prev parent reply other threads:[~2026-08-31 12:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-31 12:55 [PATCH 0/3] vdso: Keep the CLOCK_AUX base at full precision Zhan Xusheng
2026-08-31 12:55 ` Zhan Xusheng [this message]
2026-08-31 13:19 ` [PATCH 1/3] vdso/math64: Add and use __iter_div64_u64_rem() Thomas Weißschuh
2026-08-31 15:02 ` David Laight
2026-08-31 12:55 ` [PATCH 2/3] vdso/vsyscall: Keep the CLOCK_AUX base scaled Zhan Xusheng
2026-08-31 13:21 ` Thomas Weißschuh
2026-08-31 12:55 ` [PATCH 3/3] vdso/gettimeofday: Assert that the clock id fits the dispatch mask Zhan Xusheng
2026-08-31 13:22 ` Thomas Weißschuh
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=20260831125557.1490398-2-zhanxusheng@xiaomi.com \
--to=zhanxusheng1024@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=tglx@kernel.org \
--cc=thomas.weissschuh@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=zhanxusheng@xiaomi.com \
/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®