From patchwork Wed Sep 9 23:07:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 53357 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 0C96922B05 for ; Wed, 9 Sep 2015 23:07:46 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf1041208wic.1 for ; Wed, 09 Sep 2015 16:07:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=q9tQ+PTHxseA0zlk9zCtSDYLazvUZDDDFHuhDv2DKtc=; b=QOJ0lwS2OzjkBFbYcPOGNEaO0yzRIwz+blLKW4ixXheK0/zknm9tEOWlfBKqnPZAIJ 7uz8M4ZCiV5L2ApQZEoPg1SmZISqQkJawKS4+tiD/+3xVw0DZHV+zYLe60Qpe7SVEdtB KWaQLbmezeBHU0Yd7x1FM1l4k1GR0z4ISe3Ec0ibYm56N/hQA77B/X9zRFIaZAreiZVl 9Hep9+DowXD4uu+IVfKCnswxo/HByQI5JunD0XNW9u28GkO+zVI13LM7v3Fi2DGldL+v CkHX+dA4QPyojLbFPEekwVnaNW57ksdU2tpZgxAyHWpe/vB/3UJoPvPkopAzFREicn3Q RSLg== X-Gm-Message-State: ALoCoQmqIYjFPrNak4JX5UemxUfcaJkt3oWDzm3cH2xEPaU0lZOretsBEZ0v+rAF5SVX05tHiEM4 X-Received: by 10.180.106.197 with SMTP id gw5mr5411596wib.7.1441840065075; Wed, 09 Sep 2015 16:07:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.194 with SMTP id e2ls127263lae.49.gmail; Wed, 09 Sep 2015 16:07:44 -0700 (PDT) X-Received: by 10.112.55.33 with SMTP id o1mr31287644lbp.96.1441840064779; Wed, 09 Sep 2015 16:07:44 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id ps9si5970319lbb.163.2015.09.09.16.07.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 16:07:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbpo4 with SMTP id o4so14065114lbp.2 for ; Wed, 09 Sep 2015 16:07:44 -0700 (PDT) X-Received: by 10.152.18.133 with SMTP id w5mr21711069lad.72.1441840064609; Wed, 09 Sep 2015 16:07:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.59.35 with SMTP id w3csp608928lbq; Wed, 9 Sep 2015 16:07:43 -0700 (PDT) X-Received: by 10.68.109.97 with SMTP id hr1mr75309200pbb.110.1441840063415; Wed, 09 Sep 2015 16:07:43 -0700 (PDT) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com. [209.85.220.44]) by mx.google.com with ESMTPS id zn4si14035691pbc.212.2015.09.09.16.07.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 16:07:43 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.44 as permitted sender) client-ip=209.85.220.44; Received: by pacex6 with SMTP id ex6so23284445pac.0 for ; Wed, 09 Sep 2015 16:07:42 -0700 (PDT) X-Received: by 10.66.165.106 with SMTP id yx10mr67311435pab.102.1441840062478; Wed, 09 Sep 2015 16:07:42 -0700 (PDT) Received: from localhost.localdomain (c-76-115-103-22.hsd1.or.comcast.net. [76.115.103.22]) by smtp.gmail.com with ESMTPSA id hz5sm8169922pbb.39.2015.09.09.16.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Sep 2015 16:07:41 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , =?UTF-8?q?Nuno=20Gon=C3=A7alves?= , Miroslav Lichvar , Prarit Bhargava , Richard Cochran , Ingo Molnar , Thomas Gleixner , Shuah Khan Subject: [PATCH 2/2 (v2)] kselftest: timers: Add adjtick test to validate adjtimex() tick adjustments Date: Wed, 9 Sep 2015 16:07:31 -0700 Message-Id: <1441840051-20244-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441840051-20244-1-git-send-email-john.stultz@linaro.org> References: <1441840051-20244-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Recently an issue was reported that was difficult to detect except by tweaking the adjtimex tick value, and noticing how quickly the adjustment took to be made: https://lkml.org/lkml/2015/9/1/488 Thus this patch introduces a new test which manipulates the adjtimex tick value and validates the results are what we expect. Cc: Nuno Gonçalves Cc: Miroslav Lichvar Cc: Prarit Bhargava Cc: Richard Cochran Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Shuah Khan Signed-off-by: John Stultz --- v2: Use sysconf(_SC_CLK_TCK) to properly get USER_HZ value. tools/testing/selftests/timers/Makefile | 3 +- tools/testing/selftests/timers/adjtick.c | 199 +++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timers/adjtick.c diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index 89a3f44..4a1be1b 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile @@ -8,7 +8,7 @@ LDFLAGS += -lrt -lpthread TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ inconsistency-check raw_skew threadtest rtctest -TEST_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex change_skew \ +TEST_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew \ skew_consistency clocksource-switch leap-a-day \ leapcrash set-tai set-2038 @@ -24,6 +24,7 @@ include ../lib.mk run_destructive_tests: run_tests ./alarmtimer-suspend ./valid-adjtimex + ./adjtick ./change_skew ./skew_consistency ./clocksource-switch diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c new file mode 100644 index 0000000..c6efcec --- /dev/null +++ b/tools/testing/selftests/timers/adjtick.c @@ -0,0 +1,199 @@ +/* adjtimex() tick adjustment test + * by: John Stultz + * (C) Copyright Linaro Limited 2015 + * Licensed under the GPLv2 + * + * To build: + * $ gcc adjtick.c -o adjtick -lrt + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#ifdef KTEST +#include "../kselftest.h" +#else +static inline int ksft_exit_pass(void) +{ + exit(0); +} +static inline int ksft_exit_fail(void) +{ + exit(1); +} +#endif + + +#define CLOCK_MONOTONIC_RAW 4 +#define NSEC_PER_SEC 1000000000LL +#define USEC_PER_SEC 1000000 +#define MILLION 1000000 + +long systick; + +long long llabs(long long val) +{ + if (val < 0) + val = -val; + return val; +} + +unsigned long long ts_to_nsec(struct timespec ts) +{ + return ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec; +} + +struct timespec nsec_to_ts(long long ns) +{ + struct timespec ts; + + ts.tv_sec = ns/NSEC_PER_SEC; + ts.tv_nsec = ns%NSEC_PER_SEC; + return ts; +} + +long long diff_timespec(struct timespec start, struct timespec end) +{ + long long start_ns, end_ns; + + start_ns = ts_to_nsec(start); + end_ns = ts_to_nsec(end); + return end_ns - start_ns; +} + +void get_monotonic_and_raw(struct timespec *mon, struct timespec *raw) +{ + struct timespec start, mid, end; + long long diff = 0, tmp; + int i; + + clock_gettime(CLOCK_MONOTONIC, mon); + clock_gettime(CLOCK_MONOTONIC_RAW, raw); + + /* Try to get a more tightly bound pairing */ + for (i = 0; i < 3; i++) { + long long newdiff; + + clock_gettime(CLOCK_MONOTONIC, &start); + clock_gettime(CLOCK_MONOTONIC_RAW, &mid); + clock_gettime(CLOCK_MONOTONIC, &end); + + newdiff = diff_timespec(start, end); + if (diff == 0 || newdiff < diff) { + diff = newdiff; + *raw = mid; + tmp = (ts_to_nsec(start) + ts_to_nsec(end))/2; + *mon = nsec_to_ts(tmp); + } + } +} + +long long get_ppm_drift(void) +{ + struct timespec mon_start, raw_start, mon_end, raw_end; + long long delta1, delta2, eppm; + + get_monotonic_and_raw(&mon_start, &raw_start); + + sleep(15); + + get_monotonic_and_raw(&mon_end, &raw_end); + + delta1 = diff_timespec(mon_start, mon_end); + delta2 = diff_timespec(raw_start, raw_end); + + eppm = (delta1*MILLION)/delta2 - MILLION; + return eppm; +} + +int check_tick_adj(long tickval) +{ + long long eppm, ppm; + struct timex tx1; + + tx1.modes = ADJ_TICK; + tx1.modes |= ADJ_OFFSET; + tx1.modes |= ADJ_FREQUENCY; + tx1.offset = 0; + tx1.freq = 0; + tx1.tick = tickval; + adjtimex(&tx1); + sleep(1); + + ppm = ((long long)tickval * MILLION)/systick - MILLION; + printf("Estimating tick (act: %ld usec, %lld ppm): ", tickval, ppm); + + eppm = get_ppm_drift(); + printf("%lld usec, %lld ppm", systick + (systick * eppm / MILLION), eppm); + + tx1.modes = 0; + adjtimex(&tx1); + if (tx1.offset || tx1.freq || tx1.tick != tickval) { + printf("WARNING: Unexpected adjtimex return values, make sure ntpd is not running. "); + return -1; + } + + if (llabs(eppm - ppm) > 10) { + printf(" [FAILED]\n"); + return -1; + } + printf(" [OK]\n"); + return 0; +} + +int main(int argv, char **argc) +{ + struct timespec raw; + long tick, max, interval, err; + struct timex tx1; + + err = 0; + setbuf(stdout, NULL); + + if (clock_gettime(CLOCK_MONOTONIC_RAW, &raw)) { + printf("ERR: NO CLOCK_MONOTONIC_RAW\n"); + return -1; + } + + + systick = sysconf(_SC_CLK_TCK); + systick = USEC_PER_SEC/sysconf(_SC_CLK_TCK); + printf("systick: %ld\n", systick); + + max = systick/10; /* +/- 10% */ + interval = max/4; /* in 4 steps each side */ + + for (tick = (systick - max); tick < (systick + max); + tick += interval) { + if (check_tick_adj(tick)) { + err = 1; + break; + } + } + + /* Reset things to zero */ + tx1.modes = ADJ_TICK; + tx1.modes |= ADJ_OFFSET; + tx1.modes |= ADJ_FREQUENCY; + tx1.offset = 0; + tx1.freq = 0; + tx1.tick = systick; + adjtimex(&tx1); + + if (err) + return ksft_exit_fail(); + return ksft_exit_pass(); +}