[PATCH][SRU][B] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH][SRU][B] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress

Dan Streetman
From: John Stultz <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1811194

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 <[hidden email]>
Cc: Ingo Molnar <[hidden email]>
Cc: Miroslav Lichvar <[hidden email]>
Cc: Richard Cochran <[hidden email]>
Cc: Prarit Bhargava <[hidden email]>
Cc: Stephen Boyd <[hidden email]>
Cc: Shuah Khan <[hidden email]>
Cc: [hidden email]
Suggested-by: Miroslav Lichvar <[hidden email]>
Signed-off-by: John Stultz <[hidden email]>
---
v2: Widened the checks to look for other clock adjustments that
    could happen, as suggested by Miroslav
v3: Fixed up commit message

Signed-off-by: Dan Streetman <[hidden email]>
(cherry-picked from upstream 1416270f4a1ae83ea84156ceba19a66a8f88be1f)
---
 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 ca6cd146aafe..dcf73c5dab6e 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();
  }
--
2.19.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH][SRU][B] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress

Stefan Bader-2
On 01.02.19 18:45, Dan Streetman wrote:

> From: John Stultz <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1811194
>
> 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 <[hidden email]>
> Cc: Ingo Molnar <[hidden email]>
> Cc: Miroslav Lichvar <[hidden email]>
> Cc: Richard Cochran <[hidden email]>
> Cc: Prarit Bhargava <[hidden email]>
> Cc: Stephen Boyd <[hidden email]>
> Cc: Shuah Khan <[hidden email]>
> Cc: [hidden email]
> Suggested-by: Miroslav Lichvar <[hidden email]>
> Signed-off-by: John Stultz <[hidden email]>
> ---
> v2: Widened the checks to look for other clock adjustments that
>     could happen, as suggested by Miroslav
> v3: Fixed up commit message
>
> Signed-off-by: Dan Streetman <[hidden email]>
> (cherry-picked from upstream 1416270f4a1ae83ea84156ceba19a66a8f88be1f)
Acked-by: Stefan Bader <[hidden email]>

> ---
>  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 ca6cd146aafe..dcf73c5dab6e 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();
>   }
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment