Hey Thomas, I had a few other items in my stack here, but you've already queued them in -tip, so here's what I have left.
Let me know if you have any objections or feedback for change.
thanks -john
Cc: Thomas Gleixner tglx@linutronix.de Cc: Ingo Molnar mingo@kernel.org Cc: Miroslav Lichvar mlichvar@redhat.com Cc: Richard Cochran richardcochran@gmail.com Cc: Prarit Bhargava prarit@redhat.com Cc: Stephen Boyd sboyd@kernel.org Cc: Shuah Khan shuah@kernel.org Cc: linux-kselftest@vger.kernel.org
The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063:
Linux 4.18-rc3 (2018-07-01 16:04:53 -0700)
are available in the git repository at:
https://git.linaro.org/people/john.stultz/linux.git fortglx/4.19/time
for you to fetch changes up to b061c7a513afe14a68af41cec7c3476befc40e95:
timekeeping: Update multiplier when NTP frequency is set directly (2018-07-10 12:44:25 -0700)
---------------------------------------------------------------- John Stultz (1): selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress
Miroslav Lichvar (1): timekeeping: Update multiplier when NTP frequency is set directly
kernel/time/timekeeping.c | 36 ++++++++++++++++++++++++++++++------ tools/testing/selftests/timers/raw_skew.c | 5 +++++ 2 files changed, 35 insertions(+), 6 deletions(-)
In the past we've warned when ADJ_OFFSET was in progress, usually caused by ntpd or some other time adjusting daemon running in non steady sate, which can cause the skew calculations to be incorrect.
Thus, this patch checks to see if the clock was being adjusted when we fail so that we don't cause false negatives.
Cc: Thomas Gleixner tglx@linutronix.de Cc: Ingo Molnar mingo@kernel.org Cc: Miroslav Lichvar mlichvar@redhat.com Cc: Richard Cochran richardcochran@gmail.com Cc: Prarit Bhargava prarit@redhat.com Cc: Stephen Boyd sboyd@kernel.org Cc: Shuah Khan shuah@kernel.org Cc: linux-kselftest@vger.kernel.org Suggested-by: Miroslav Lichvar mlichvar@redhat.com Signed-off-by: John Stultz john.stultz@linaro.org --- v2: Widened the checks to look for other clock adjustments that could happen, as suggested by Miroslav v3: Fixed up commit message --- tools/testing/selftests/timers/raw_skew.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c index ca6cd14..dcf73c5 100644 --- a/tools/testing/selftests/timers/raw_skew.c +++ b/tools/testing/selftests/timers/raw_skew.c @@ -134,6 +134,11 @@ int main(int argv, char **argc) printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000)));
if (llabs(eppm - ppm) > 1000) { + if (tx1.offset || tx2.offset || + tx1.freq != tx2.freq || tx1.tick != tx2.tick) { + printf(" [SKIP]\n"); + return ksft_exit_skip("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n"); + } printf(" [FAILED]\n"); return ksft_exit_fail(); }
John,
On Thu, 12 Jul 2018, John Stultz wrote:
I had a few other items in my stack here, but you've already queued them in -tip, so here's what I have left.
Did I miss you replying on them that you picked them up? Normally when I see that you or Daniel picked something up I happily move the mails to the done folder unless I see something horrible.
Let me know if you have any objections or feedback for change.
One small request for the next pull request. Please write a short summary, optionally in a tag, then pulling the tag adds it to the merge commit message. But plain in the pull request mail is fine as well.
Thanks,
tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 12, 2018 at 1:26 PM, Thomas Gleixner tglx@linutronix.de wrote:
On Thu, 12 Jul 2018, John Stultz wrote:
I had a few other items in my stack here, but you've already queued them in -tip, so here's what I have left.
Did I miss you replying on them that you picked them up? Normally when I see that you or Daniel picked something up I happily move the mails to the done folder unless I see something horrible.
No, that's my fault. I'll try to be better about making that clear so you don't duplicate work. You're just much faster then I am :)
Let me know if you have any objections or feedback for change.
One small request for the next pull request. Please write a short summary, optionally in a tag, then pulling the tag adds it to the merge commit message. But plain in the pull request mail is fine as well.
Sure, I'll try to take a swing at this next time, I've not done much with git tags (other then trying to do a signature tag long ago when I still had a valid gpg key :)
thanks -john -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
linux-kselftest-mirror@lists.linaro.org
-
John Stultz -
Thomas Gleixner