mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Adrian Hunter" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Adrian Hunter <adrian.hunter@intel.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] vdso: Make delta calculation overflow safe
Date: Mon, 08 Apr 2024 13:10:40 -0000	[thread overview]
Message-ID: <171258184044.10875.9117228310710193606.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240325064023.2997-8-adrian.hunter@intel.com>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     456e3788bc7164c1c8298045e04068b8e3d8e413
Gitweb:        https://git.kernel.org/tip/456e3788bc7164c1c8298045e04068b8e3d8e413
Author:        Adrian Hunter <adrian.hunter@intel.com>
AuthorDate:    Mon, 25 Mar 2024 08:40:11 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 08 Apr 2024 15:03:07 +02:00

vdso: Make delta calculation overflow safe

Kernel timekeeping is designed to keep the change in cycles (since the last
timer interrupt) below max_cycles, which prevents multiplication overflow
when converting cycles to nanoseconds. However, if timer interrupts stop,
the calculation will eventually overflow.

Add protection against that, enabled by config option
CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT. Check against max_cycles, falling
back to a slower higher precision calculation.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240325064023.2997-8-adrian.hunter@intel.com

---
 lib/vdso/gettimeofday.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index 9fa90e0..9c3a8d2 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -13,6 +13,18 @@
 # define VDSO_DELTA_MASK(vd)	(vd->mask)
 #endif
 
+#ifdef CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT
+static __always_inline bool vdso_delta_ok(const struct vdso_data *vd, u64 delta)
+{
+	return delta < vd->max_cycles;
+}
+#else
+static __always_inline bool vdso_delta_ok(const struct vdso_data *vd, u64 delta)
+{
+	return true;
+}
+#endif
+
 #ifndef vdso_shift_ns
 static __always_inline u64 vdso_shift_ns(u64 ns, u32 shift)
 {
@@ -28,7 +40,10 @@ static __always_inline u64 vdso_calc_ns(const struct vdso_data *vd, u64 cycles, 
 {
 	u64 delta = (cycles - vd->cycle_last) & VDSO_DELTA_MASK(vd);
 
-	return vdso_shift_ns((delta * vd->mult) + base, vd->shift);
+	if (likely(vdso_delta_ok(vd, delta)))
+		return vdso_shift_ns((delta * vd->mult) + base, vd->shift);
+
+	return mul_u64_u32_add_u64_shr(delta, vd->mult, base, vd->shift);
 }
 #endif /* vdso_calc_ns */
 

  reply	other threads:[~2024-04-08 13:10 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-25  6:40 [PATCH V2 00/19] timekeeping: Handle potential multiplication overflow Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 01/19] vdso: Consolidate vdso_calc_delta() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 02/19] vdso: Consolidate nanoseconds calculation Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 03/19] vdso: Add CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 04/19] math64: Tidy mul_u64_u32_shr() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] math64: Tidy up mul_u64_u32_shr() tip-bot2 for Adrian Hunter
2024-04-24 15:11   ` [PATCH V2 04/19] math64: Tidy mul_u64_u32_shr() Peter Zijlstra
2024-03-25  6:40 ` [PATCH V2 05/19] vdso: math64: Provide mul_u64_u32_add_u64_shr() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] vdso, " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 06/19] vdso: Add vdso_data::max_cycles Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] vdso: Add vdso_data:: Max_cycles tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 07/19] vdso: Make delta calculation overflow safe Adrian Hunter
2024-04-08 13:10   ` tip-bot2 for Adrian Hunter [this message]
2024-03-25  6:40 ` [PATCH V2 08/19] x86/vdso: " Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 09/19] timekeeping: Move timekeeping helper functions Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 10/19] timekeeping: Rename fast_tk_get_delta_ns() to __timekeeping_get_ns() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 11/19] timekeeping: Tidy timekeeping_cycles_to_ns() slightly Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 12/19] timekeeping: Reuse timekeeping_cycles_to_ns() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 13/19] timekeeping: Refactor timekeeping helpers Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 14/19] timekeeping: Consolidate " Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 15/19] timekeeping: Fold in timekeeping_delta_to_ns() Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 16/19] timekeeping: Prepare timekeeping_cycles_to_ns() for overflow safety Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 17/19] timekeeping: Make delta calculation overflow safe Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 18/19] timekeeping: Let timekeeping_cycles_to_ns() handle both under and overflow Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25  6:40 ` [PATCH V2 19/19] clocksource: Make watchdog and suspend-timing multiplication overflow safe Adrian Hunter
2024-04-08 13:10   ` [tip: timers/core] " tip-bot2 for Adrian Hunter
2024-03-25 18:11 ` [PATCH V2 00/19] timekeeping: Handle potential multiplication overflow Arnd Bergmann

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=171258184044.10875.9117228310710193606.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=adrian.hunter@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@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®