From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: bump stable kernel version ranges for clock work-around
Date: Thu, 13 Oct 2016 15:56:55 +0200 [thread overview]
Message-ID: <1476367015-21624-1-git-send-email-mathieu.desnoyers@efficios.com> (raw)
Linux commit 27727df240c7 ("Avoid taking lock in NMI path with
CONFIG_DEBUG_TIMEKEEPING"), changed the logic to open-code
the timekeeping_get_ns() function, but forgot to include
the unit conversion from cycles to nanoseconds, breaking the
function's output, which impacts LTTng.
We expected Linux commit 58bfea9532 "timekeeping: Fix
__ktime_get_fast_ns() regression" to make its way into stable
kernels promptly, but it appears new stable kernel releases were
done before the fix was cherry-picked from the master branch.
We therefore need to bump the version ranges for the work-around
in lttng-modules.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
CC: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
CC: John Stultz <john.stultz at linaro.org>
---
wrapper/trace-clock.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 14d41af..496fec4 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -52,10 +52,10 @@ extern struct lttng_trace_clock *lttng_trace_clock;
* CONFIG_DEBUG_TIMEKEEPING") introduces a buggy ktime_get_mono_fast_ns().
* This is fixed by patch "timekeeping: Fix __ktime_get_fast_ns() regression".
*/
-#if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,1) \
- || LTTNG_KERNEL_RANGE(4,7,4, 4,7,7) \
- || LTTNG_KERNEL_RANGE(4,4,20, 4,4,24) \
- || LTTNG_KERNEL_RANGE(4,1,32, 4,1,34))
+#if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,2) \
+ || LTTNG_KERNEL_RANGE(4,7,4, 4,7,8) \
+ || LTTNG_KERNEL_RANGE(4,4,20, 4,4,25) \
+ || LTTNG_KERNEL_RANGE(4,1,32, 4,1,35))
#define LTTNG_CLOCK_NMI_SAFE_BROKEN
#endif
--
2.1.4
next reply other threads:[~2016-10-13 13:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 13:56 Mathieu Desnoyers [this message]
2016-10-13 15:00 ` Greg Kroah-Hartman
2016-10-13 15:09 ` Mathieu Desnoyers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476367015-21624-1-git-send-email-mathieu.desnoyers@efficios.com \
--to=mathieu.desnoyers@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox