From patchwork Thu Jul 5 17:50:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 141225 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2218452ljj; Thu, 5 Jul 2018 10:50:36 -0700 (PDT) X-Received: by 2002:a62:8389:: with SMTP id h131-v6mr6685722pfe.105.1530813036413; Thu, 05 Jul 2018 10:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530813036; cv=none; d=google.com; s=arc-20160816; b=cla9JXj7UhtWkHbuiC2RSFaR5iVwItZsluqHL+Kyby9omzupA53FaNV/Ny1AhydJ3d 1sdgIFJDx+47bjCxab4qnN8wEOB1y47qOP3a3SqKmX2iAB/LrP0PMf5YlPj2cPjidMvk Eyto18Tyeys5OY7ZRePXOB+ECgt1imUmTOICktJJNUGUO53HNOlVeehZ+PYJWwdGGJpW VSHn23sV9NHtReqrsE3yocV0F6e08+OoGcSJ32zatfVr66hyd1pS3OYVhZgHEeLyMEkX kitNT5D+U6CgK9vuTBnRqrXXRhIyDu4v2xb1d2BhaSdJDzg1YCckWzZk175e2xjngSdF gGfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=DkMcqAFaeEJxjYoWVDK4vidf6ScNNCBtbd/QZR2sM7g=; b=JhJP3JzuV+RFtycNczHkvYnGC3p5sNENyafbkml4w6YN8DVmj8KBDh14d+XLHEvXu8 Dux6QbJsKTZ5whRFItjS2umANHQDWRthzgem7eTCcwAENYiCrx1HjkikQDau+9rwLcZp nZUKW8dQWMadl3QsEsYz6YiLi4AV/tqpCM3wFezxaOi1n0lS9YhIiK3NSWlC1jwi9EVy FxpQTHxhd70Mmzd/Kx4V1YysDkstDn9vTVQZ51hWhaTmyvLeZMLLn+MBwg+t+Olvcjw+ 5LQjCmxrHZ9Gjy+1mk9u13BK0LyKefAcXo47syZFxU2Hn5VAjEaG6tthNFunfVYIP9pY FXtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZfjY5yFm; 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 e33-v6sor2143629pld.91.2018.07.05.10.50.36 for (Google Transport Security); Thu, 05 Jul 2018 10:50:36 -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=ZfjY5yFm; 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; bh=DkMcqAFaeEJxjYoWVDK4vidf6ScNNCBtbd/QZR2sM7g=; b=ZfjY5yFmf56PfUY5i6emE8zGLjNobk93Mc6KvOTjNACuizCqvNa744Ze/ue6aHGUB9 7IL0b5pnC1pKqsVmmyhj3gUz5mu5jJCGf+zqZnBHw55YPWB+ju877etyWEHqANvP3sWs bDEfrOzFtGuviRXjpa9dkONpZruqvY+uT1a+A= 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; bh=DkMcqAFaeEJxjYoWVDK4vidf6ScNNCBtbd/QZR2sM7g=; b=JlvanqDu+DiZTNyXz5ojNQkc95JJzZgVhbMkylJ+tqHgKn3KXGz6GVSHEO29I/yi2u EeO6h18UCGZrf07jRBzCi/kjUMJelXL6Rrl9k0LSKJGliqn8QwUx45uotXIyJrZ6uhqU EYO46DGBYs/ZLTfeuoQDq1yEloCyJt1gCGNElrO4gur8Te2uQ2sAcxM8NgxrgPW4CZus X5lWkNRqt2TkVjvdgXLizJ51HPw/fEn+JQlhTymPJJVRSQA8ehfSirYfKCCKXx5Ev4aD JrAqolXVEMsdJL2/w7lDR/EBfBzEJDHtBT70kOsuFL7JGWnpIBLBrcnJ1+LQFvyA+jGn X0YQ== X-Gm-Message-State: APt69E2hfNWtMnOpys0sUxh9EhcmCaTfOystLJjo/xX2JLdyNNC0U4oI ZomeZUcjCAs1pcKRXFocsmwXMf9C X-Google-Smtp-Source: AAOMgpc9noROr0YWrf+EAJvAGOyZeHURgVubBrlLQA2XEFwa/67WquJvWxdqfNbdBvHXzfWofcViyw== X-Received: by 2002:a17:902:7202:: with SMTP id ba2-v6mr6998911plb.119.1530813035699; Thu, 05 Jul 2018 10:50:35 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id b123-v6sm11922633pfb.156.2018.07.05.10.50.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jul 2018 10:50:34 -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: [RFC][PATCH v2] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Date: Thu, 5 Jul 2018 10:50:31 -0700 Message-Id: <1530813031-19243-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 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 sets a flag which we check 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 --- 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(); }