From: "tip-bot2 for Anna-Maria Behnsen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Anna-Maria Behnsen" <anna-maria@linutronix.de>,
Nam Cao <namcao@linutronix.de>,
thomas.weissschuh@linutronix.de,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] vdso/gettimeofday: Prepare helper functions for introduction of struct vdso_clock
Date: Sat, 08 Mar 2025 13:45:00 -0000 [thread overview]
Message-ID: <174144150071.14745.15574150625285232601.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250303-vdso-clock-v1-11-c1b5c69a166f@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 80801972a11b4c8610cd403e1f235e98cd799350
Gitweb: https://git.kernel.org/tip/80801972a11b4c8610cd403e1f235e98cd799350
Author: Anna-Maria Behnsen <anna-maria@linutronix.de>
AuthorDate: Mon, 03 Mar 2025 12:11:13 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sat, 08 Mar 2025 14:37:40 +01:00
vdso/gettimeofday: Prepare helper functions for introduction of struct vdso_clock
To support multiple PTP clocks, the VDSO data structure needs to be
reworked. All clock specific data will end up in struct vdso_clock and in
struct vdso_time_data there will be array of VDSO clocks. At the moment,
vdso_clock is simply a define which maps vdso_clock to vdso_time_data.
To prepare for the rework of the data structures, replace the struct
vdso_time_data pointer argument of the helper functions with struct
vdso_clock pointer where applicable.
No functional change.
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250303-vdso-clock-v1-11-c1b5c69a166f@linutronix.de
---
lib/vdso/gettimeofday.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index 03fa039..c6ff693 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -17,12 +17,12 @@
#endif
#ifdef CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT
-static __always_inline bool vdso_delta_ok(const struct vdso_time_data *vd, u64 delta)
+static __always_inline bool vdso_delta_ok(const struct vdso_clock *vc, u64 delta)
{
- return delta < vd->max_cycles;
+ return delta < vc->max_cycles;
}
#else
-static __always_inline bool vdso_delta_ok(const struct vdso_time_data *vd, u64 delta)
+static __always_inline bool vdso_delta_ok(const struct vdso_clock *vc, u64 delta)
{
return true;
}
@@ -39,14 +39,14 @@ static __always_inline u64 vdso_shift_ns(u64 ns, u32 shift)
* Default implementation which works for all sane clocksources. That
* obviously excludes x86/TSC.
*/
-static __always_inline u64 vdso_calc_ns(const struct vdso_time_data *vd, u64 cycles, u64 base)
+static __always_inline u64 vdso_calc_ns(const struct vdso_clock *vc, u64 cycles, u64 base)
{
- u64 delta = (cycles - vd->cycle_last) & VDSO_DELTA_MASK(vd);
+ u64 delta = (cycles - vc->cycle_last) & VDSO_DELTA_MASK(vc);
- if (likely(vdso_delta_ok(vd, delta)))
- return vdso_shift_ns((delta * vd->mult) + base, vd->shift);
+ if (likely(vdso_delta_ok(vc, delta)))
+ return vdso_shift_ns((delta * vc->mult) + base, vc->shift);
- return mul_u64_u32_add_u64_shr(delta, vd->mult, base, vd->shift);
+ return mul_u64_u32_add_u64_shr(delta, vc->mult, base, vc->shift);
}
#endif /* vdso_calc_ns */
@@ -58,9 +58,9 @@ static inline bool __arch_vdso_hres_capable(void)
#endif
#ifndef vdso_clocksource_ok
-static inline bool vdso_clocksource_ok(const struct vdso_time_data *vd)
+static inline bool vdso_clocksource_ok(const struct vdso_clock *vc)
{
- return vd->clock_mode != VDSO_CLOCKMODE_NONE;
+ return vc->clock_mode != VDSO_CLOCKMODE_NONE;
}
#endif
next prev parent reply other threads:[~2025-03-08 13:45 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-03 11:11 [PATCH 00/19] vdso: Rework struct vdso_time_data and introduce " Thomas Weißschuh
2025-03-03 11:11 ` Thomas Weißschuh
2025-03-03 11:11 ` [PATCH 01/19] vdso: Introduce vdso/cache.h Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-03-03 11:11 ` [PATCH 02/19] arm64: Make asm/cache.h compatible with vDSO Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-03-03 11:11 ` [PATCH 03/19] vdso: Make vdso_time_data cacheline aligned Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 04/19] vdso/datapage: Define for vdso_data to make rework of vdso possible Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] vdso/datapage: Define vdso_clock to prepare for multiple PTP clocks tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 05/19] vdso/helpers: Prepare introduction of struct vdso_clock Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 06/19] vdso/gettimeofday: " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 07/19] vdso/gettimeofday: Prepare do_hres() for " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 08/19] vdso/gettimeofday: Prepare do_hres_timens() " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-04-24 14:10 ` [PATCH 08/19] " Jan Stancek
2025-04-24 15:43 ` Thomas Weißschuh
2025-04-24 21:57 ` Jan Stancek
2025-04-25 8:58 ` Thomas Weißschuh
2025-04-25 10:03 ` Jan Stancek
2025-04-25 13:40 ` Thomas Weißschuh
2025-04-25 14:37 ` Jan Stancek
2025-04-25 15:34 ` Thomas Weißschuh
2025-03-03 11:11 ` [PATCH 09/19] vdso/gettimeofday: Prepare do_coarse() " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 10/19] vdso/gettimeofday: Prepare do_coarse_timens() " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 11/19] vdso/gettimeofday: Prepare helper functions " Thomas Weißschuh
2025-03-08 13:45 ` tip-bot2 for Anna-Maria Behnsen [this message]
2025-03-03 11:11 ` [PATCH 12/19] vdso/vsyscall: Prepare " Thomas Weißschuh
2025-03-08 13:45 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 13/19] vdso/namespace: Rename timens_setup_vdso_data() to reflect new vdso_clock struct Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 14/19] time/namespace: Prepare introduction of struct vdso_clock Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 15/19] x86/vdso: " Thomas Weißschuh
2025-03-03 11:11 ` Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 16/19] arm64/vdso: " Thomas Weißschuh
2025-03-03 11:11 ` Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Nam Cao
2025-03-03 11:11 ` [PATCH 17/19] powerpc/vdso: " Thomas Weißschuh
2025-03-03 11:11 ` Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Nam Cao
2025-03-03 11:11 ` [PATCH 18/19] vdso: Move arch related data before basetime Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] vdso: Move architecture related data before basetime data tip-bot2 for Anna-Maria Behnsen
2025-03-03 11:11 ` [PATCH 19/19] vdso: Rework struct vdso_time_data and introduce struct vdso_clock Thomas Weißschuh
2025-03-08 13:44 ` [tip: timers/vdso] " tip-bot2 for Anna-Maria Behnsen
-- strict thread matches above, loose matches on Subject: below --
2025-03-03 10:43 [tip: timers/vdso] vdso/gettimeofday: Prepare helper functions for introduction of " tip-bot2 for 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=174144150071.14745.15574150625285232601.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=namcao@linutronix.de \
--cc=tglx@linutronix.de \
--cc=thomas.weissschuh@linutronix.de \
--cc=x86@kernel.org \
/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®