lkml.org 
[lkml]   [2015]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH resend] clocksource: modify the cycle_last validation to fit for non-64bit clocksourece mask
From
Date
From: Yang Yingliang <yangyingliang@huawei.com>

Check the delta of now and last to make sure it's not
negative while the clocksource mask is not 64-bits.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
kernel/time/timekeeping_internal.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/time/timekeeping_internal.h
b/kernel/time/timekeeping_internal.h
index 4ea005a..cbfcd2d 100644
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
@@ -16,8 +16,9 @@ extern void tk_debug_account_sleep_time(struct
timespec64 *t);
static inline cycle_t clocksource_delta(cycle_t now, cycle_t last,
cycle_t mask)
{
cycle_t ret = (now - last) & mask;
+ cycle_t negative = ret & ~(mask >> 1);

- return (s64) ret > 0 ? ret : 0;
+ return negative ? 0 : ret;
}
#else
static inline cycle_t clocksource_delta(cycle_t now, cycle_t last,
cycle_t mask)
--
2.5.0


\
 
 \ /
  Last update: 2015-10-31 11:41    [W:0.069 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site