linux-kernel - [tip:timers/core] timekeeping: Use mul_u64_u32

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 9 Dec 2016 03:14:48 -0800
From:   tip-bot for Thomas Gleixner <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     cmetcalf@...lanox.com, richardcochran@...il.com, mingo@...nel.org,
        christopher.s.hall@...el.com, lvivier@...hat.com,
        linux-kernel@...r.kernel.org, tglx@...utronix.de,
        liavr@...lanox.com, peterz@...radead.org, prarit@...hat.com,
        hpa@...or.com, john.stultz@...aro.org, david@...son.dropbear.id.au
Subject: [tip:timers/core] timekeeping: Use mul_u64_u32_shr() instead of
 open coding it

Commit-ID:  c029a2bec66e42e57538cb65e28618baf6a4b311
Gitweb:     http://git.kernel.org/tip/c029a2bec66e42e57538cb65e28618baf6a4b311
Author:     Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Thu, 8 Dec 2016 20:49:38 +0000
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 9 Dec 2016 12:06:42 +0100

timekeeping: Use mul_u64_u32_shr() instead of open coding it

The resume code must deal with a clocksource delta which is potentially big
enough to overflow the 64bit mult.

Replace the open coded handling with the proper function.

Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: David Gibson <david@...son.dropbear.id.au>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Parit Bhargava <prarit@...hat.com>
Cc: Laurent Vivier <lvivier@...hat.com>
Cc: "Christopher S. Hall" <christopher.s.hall@...el.com>
Cc: Chris Metcalf <cmetcalf@...lanox.com>
Cc: Richard Cochran <richardcochran@...il.com>
Cc: Liav Rehana <liavr@...lanox.com>
Cc: John Stultz <john.stultz@...aro.org>
Link: http://lkml.kernel.org/r/20161208204228.921674404@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 kernel/time/timekeeping.c | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 82e1b5c..da233cd 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1644,7 +1644,7 @@ void timekeeping_resume(void)
 	struct clocksource *clock = tk->tkr_mono.clock;
 	unsigned long flags;
 	struct timespec64 ts_new, ts_delta;
-	cycle_t cycle_now, cycle_delta;
+	cycle_t cycle_now;
 
 	sleeptime_injected = false;
 	read_persistent_clock64(&ts_new);
@@ -1670,27 +1670,11 @@ void timekeeping_resume(void)
 	cycle_now = tk->tkr_mono.read(clock);
 	if ((clock->flags & CLOCK_SOURCE_SUSPEND_NONSTOP) &&
 		cycle_now > tk->tkr_mono.cycle_last) {
-		u64 num, max = ULLONG_MAX;
-		u32 mult = clock->mult;
-		u32 shift = clock->shift;
-		s64 nsec = 0;
-
-		cycle_delta = clocksource_delta(cycle_now, tk->tkr_mono.cycle_last,
-						tk->tkr_mono.mask);
-
-		/*
-		 * "cycle_delta * mutl" may cause 64 bits overflow, if the
-		 * suspended time is too long. In that case we need do the
-		 * 64 bits math carefully
-		 */
-		do_div(max, mult);
-		if (cycle_delta > max) {
-			num = div64_u64(cycle_delta, max);
-			nsec = (((u64) max * mult) >> shift) * num;
-			cycle_delta -= num * max;
-		}
-		nsec += ((u64) cycle_delta * mult) >> shift;
+		u64 nsec, cyc_delta;
 
+		cyc_delta = clocksource_delta(cycle_now, tk->tkr_mono.cycle_last,
+					      tk->tkr_mono.mask);
+		nsec = mul_u64_u32_shr(cyc_delta, clock->mult, clock->shift);
 		ts_delta = ns_to_timespec64(nsec);
 		sleeptime_injected = true;
 	} else if (timespec64_compare(&ts_new, &timekeeping_suspend_time) > 0) {