From patchwork Thu Jul 12 20:17:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 141836 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1932132ljj; Thu, 12 Jul 2018 13:17:27 -0700 (PDT) X-Received: by 2002:a62:c410:: with SMTP id y16-v6mr3855369pff.161.1531426647095; Thu, 12 Jul 2018 13:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531426647; cv=none; d=google.com; s=arc-20160816; b=FvectAYJy5YktIhIKS6ARE7FhcrNDfYq/7YddgkNacX7LfXBwpFVUWRflIQ4nsoJkk Jc2olPf3A9gmWwbSG7HCU2SRjYCKUQwZC0+QbKBNQMa643PqSjF4HuC8ZF3EwuWZu487 Fwwj5D3l0E1LHlrHSUk2wgNRt11ZALOGZNVzd5ZJL53ONGkFNf+Xpee6JqTmoUJ/aarn Sh7Q84RuPKS5yv7qebSDBhoLYJnswEKpH5yFaQ62HKLOKVLQkLhzYWGHc+1XpbziNGwe Pqw+pKDjfwnIEqLH3J5riylcSyMhZGBDVgJ2RMJ7Hjm8ulMYLe7FIrUbZhJdYahcTQ+Z GK9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=dAwq1mkAVXiY0/cfgYJalGRPhrDv9DLxOQ4uYGDmhxI=; b=RWzNaJ56qEX0rDJn9jeK+lTHHns6DwRW/J+VXxgnIZb6D0uT3gjIIz5GS8bE4y3Nqp XiFnqga/qo8xKJM3HpCeYpZC9UHO0gfW8gvOx/60ChibMNcyIFgum6rSXPyPfEeGMGZy lsyc5kCzojrxS9uYHTabPE+BM7H2fZqU5hz4vXwQz08OQ2F43ALs7gvILyox0k9zlxF/ Wyf59Hu3lsj7FA3z2xPxUa1caUKqMLcKuUQe5jiew3rLVoenbyfenc03frLs8sgiMxBt 7iG1j+Sef9wIfXHZhPeai0xJGEc7aMuwUhoE/0r9iTkq0FjIXQ3bZR3VqC96NbwdXHZp hAoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jOsn/rV2"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id s3-v6sor2190776pgn.405.2018.07.12.13.17.26 for (Google Transport Security); Thu, 12 Jul 2018 13:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jOsn/rV2"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dAwq1mkAVXiY0/cfgYJalGRPhrDv9DLxOQ4uYGDmhxI=; b=jOsn/rV269hQMYahSiYnGT0KhcbsEoeFGeTe9e1CA1Z7T7K9amJ4xyA3/4wDXr4YjN YJbM2THUiDBHdGyZureu1f5z3XWdnM9asZhCWrKOzY1TZQuZzxPGA1zLsatvGBE3McNU KbXWA6SF0W09rwSf78pD9JMUD8lt+IfJTlyvQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dAwq1mkAVXiY0/cfgYJalGRPhrDv9DLxOQ4uYGDmhxI=; b=pwLYLUsV28VomzAB2SH+xXk7r6qSuVJrLDepokzyFJ0QLTVlEse4E1jPhr6cXqz1T3 LbrUZj2bCb0i4kchmHNiTs+CMGPSQpQrImKjR2gGZ/ZKQdsZqVJ9EqcJuGblgH3gmmUt 8WnrlxZeTdE51EbITRSclM5iEGQIuViuc3JiVvnxldoeDlhtX3KBXO08hhAGiMBv0763 gp6R90jOS9fLs3G2kT5Vwb5vcgRE8sb48A9KqXuDDYqOdypsbo+XF13lRPqFPqRS3Tv2 vkA0vuWpkxAkUUbEkXUhT+k28M322iznBdKHwe0QxLFr+r7lO3jEbWXIdPcfLvfQuz7K FceA== X-Gm-Message-State: AOUpUlEjzU/YVl5CnkIm592OMHP1P8Z0jL7/SpEDfOp6WAfCY236G7F0 R6ecOJszAXVDFj5dyYH9l9lkIgoB X-Google-Smtp-Source: AAOMgpcxXG8zppfEzhP4X7Dd4URpMRKbWeb5IjdvmXArLCfXaO9YnvcfjBkG6Eekx6+xGOlyyW6BOQ== X-Received: by 2002:a63:c742:: with SMTP id v2-v6mr3351953pgg.331.1531426646491; Thu, 12 Jul 2018 13:17:26 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id e7-v6sm22647000pgc.55.2018.07.12.13.17.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Jul 2018 13:17:25 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Thomas Gleixner , Ingo Molnar , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Stephen Boyd , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH 1/2] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Date: Thu, 12 Jul 2018 13:17:20 -0700 Message-Id: <1531426641-20076-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531426641-20076-1-git-send-email-john.stultz@linaro.org> References: <1531426641-20076-1-git-send-email-john.stultz@linaro.org> 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 Cc: Ingo Molnar Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Suggested-by: Miroslav Lichvar Signed-off-by: John Stultz --- 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(+) -- 2.7.4 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(); }