linux-kernel - [PATCH v3 4/5] clocksource: Enable clocksource

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:	Wed,  6 Mar 2013 15:17:50 +0800
From:	Feng Tang <feng.tang@...el.com>
To:	Thomas Gleixner <tglx@...utronix.de>,
	John Stultz <john.stultz@...aro.org>,
	Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...ux.intel.com>,
	Jason Gunthorpe <jgunthorpe@...idianresearch.com>,
	x86@...nel.org, Len Brown <lenb@...nel.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
	linux-kernel@...r.kernel.org
Cc:	gong.chen@...ux.intel.com, Feng Tang <feng.tang@...el.com>
Subject: [PATCH v3 4/5] clocksource: Enable clocksource_cyc2ns() to cover big cycles

Current clocksource_cyc2ns() has a implicit limit that the (cycles * mult)
can not exceed 64 bits limit. Jason Gunthorpe proposed a way to
handle this big cycles case, and this patch put the handling into
clocksource_cyc2ns() so that it could be used unconditionally.

Suggested-by: Jason Gunthorpe <jgunthorpe@...idianresearch.com>
Signed-off-by: Feng Tang <feng.tang@...el.com>
---
 include/linux/clocksource.h |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index aa7032c..1ecc872 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -274,7 +274,16 @@ static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant)
  */
 static inline s64 clocksource_cyc2ns(cycle_t cycles, u32 mult, u32 shift)
 {
-	return ((u64) cycles * mult) >> shift;
+	u64 max = ULLONG_MAX / mult;
+	s64 nsec = 0;
+
+	/* The (mult * cycles) may overflow 64 bits, so add a max check */
+	if (cycles > max) {
+		nsec = ((max * mult) >> shift) * (cycles / max);
+		cycles %= max;
+	}
+	nsec += ((u64) cycles * mult) >> shift;
+	return nsec;
 }
 
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/