]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
timekeeping: Avoid taking lock in NMI path with CONFIG_DEBUG_TIMEKEEPING
authorJohn Stultz <john.stultz@linaro.org>
Tue, 23 Aug 2016 23:08:21 +0000 (16:08 -0700)
committerSasha Levin <alexander.levin@verizon.com>
Wed, 31 Aug 2016 23:21:09 +0000 (19:21 -0400)
commit0c7b2c2aea55b4e940e3de8b41658855aebcbca4
tree64e1b9a74e9fcca467204fcdb8f14a5eb19be1fe
parent2d701beb5dd816fa4c1115c88d464a6cc0e7271f
timekeeping: Avoid taking lock in NMI path with CONFIG_DEBUG_TIMEKEEPING

[ Upstream commit 27727df240c7cc84f2ba6047c6f18d5addfd25ef ]

When I added some extra sanity checking in timekeeping_get_ns() under
CONFIG_DEBUG_TIMEKEEPING, I missed that the NMI safe __ktime_get_fast_ns()
method was using timekeeping_get_ns().

Thus the locking added to the debug checks broke the NMI-safety of
__ktime_get_fast_ns().

This patch open-codes the timekeeping_get_ns() logic for
__ktime_get_fast_ns(), so can avoid any deadlocks in NMI.

Fixes: 4ca22c2648f9 "timekeeping: Add warnings when overflows or underflows are observed"
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Reported-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: stable <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/1471993702-29148-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
kernel/time/timekeeping.c