Skip to content

Commit

Permalink
kdb: use ktime_get_mono_fast_ns() instead of ktime_get_ts()
Browse files Browse the repository at this point in the history
The kdb code will print the monotonic time by ktime_get_ts(), but
the ktime_get_ts() will be protected by a sequence lock, that will
introduce one deadlock risk if the lock was already held in the
context from which we entered the debugger.

Thus we can use the ktime_get_mono_fast_ns() to get the monotonic
time, which is NMI safe access to clock monotonic. Moreover we can
remove the 'struct timespec', which is not y2038 safe.

Signed-off-by: Baolin Wang <[email protected]>
Reviewed-by: Daniel Thompson <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
Signed-off-by: Jason Wessel <[email protected]>
  • Loading branch information
wangbaolin719 authored and jwessel committed Feb 1, 2018
1 parent 33f765f commit 40b90ef
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/debug/kdb/kdb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2512,10 +2512,10 @@ static int kdb_kill(int argc, const char **argv)
*/
static void kdb_sysinfo(struct sysinfo *val)
{
struct timespec uptime;
ktime_get_ts(&uptime);
u64 uptime = ktime_get_mono_fast_ns();

memset(val, 0, sizeof(*val));
val->uptime = uptime.tv_sec;
val->uptime = div_u64(uptime, NSEC_PER_SEC);
val->loads[0] = avenrun[0];
val->loads[1] = avenrun[1];
val->loads[2] = avenrun[2];
Expand Down

0 comments on commit 40b90ef

Please sign in to comment.