From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBA90C31E46 for ; Wed, 12 Jun 2019 19:27:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9572E2173C for ; Wed, 12 Jun 2019 19:27:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="oclm8AVG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388292AbfFLT1g (ORCPT ); Wed, 12 Jun 2019 15:27:36 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:52755 "EHLO mail-wm1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729031AbfFLT1F (ORCPT ); Wed, 12 Jun 2019 15:27:05 -0400 Received: by mail-wm1-f43.google.com with SMTP id s3so7725848wms.2 for ; Wed, 12 Jun 2019 12:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xB4BKK0rKD1Yr6+/PDJJP2p+OtOC/CpKgFN6/nohqnE=; b=oclm8AVGlEQnxLXEI9FHPqnN1+M0kQAI16c7b84Kk0Fg7+EpxY46jg21E15ZTrkHE3 R8Uus8KJE67K5ajUmCSIQCeJkWoqY1duZ1KPmbTG63/5pw2ZUISy+IuQ+1SRFKcHUJ1h GtSzAUEtI8hth5s0V3KKVSnOQwOrAdxSx5RsLnX2baHVfDVTxoytkTCCKwQO/KTrPUHm Ra2q3vOFrmWHLIPyIBfX8nC7Bh5oakz4RH0Pm7NWuPntD2fGlAkdF7fW9PgOsqku8mSe 7+T/lf+97uaDu1GlYKTZlvzeHp6k5Py9IyMxDLOJfK9x1iteKR6GgE61YQhWirJBe3Uo 8HdQ== 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:mime-version:content-transfer-encoding; bh=xB4BKK0rKD1Yr6+/PDJJP2p+OtOC/CpKgFN6/nohqnE=; b=QF9HzgMHJ+buzZFcnIgtlkkfkzwnO02b8O2pMLqA1Bf2FJhghv9KpVRwu80dS7JwX3 lGMdZ5NwHDf5GxnOI/GbIwuOBSgVIJbyY8vvM1dDkWH31VO+0Q4FYv60LFLgvy0zzR96 nmXPhcfG67/vfJd38QqJMmnsRHmJsHCozkoM/CsWEZYxlbqzlWTAbsGeuEPJZQ28HwtY qmrMq6Cy9OfdIECjHAEXFZ7W5xrg3Y6OyQTEtySP+0UYXj6b5KCmbiGEDXpC7+jqIFwW iuXU8lqndSLI1lUMp5syvgBHP3eq+Glf3CnWFidar6oet7Hv+nYS9C1G5KeeDYhw8Ksg MEjw== X-Gm-Message-State: APjAAAVuiilQ/dN4rxVqPFiDZ8Tlc6tazhBXQm0y/XTvVZNTUTqn+kcq pgtKrTu8xjtmP0byBk9yPElefilL3Y8= X-Google-Smtp-Source: APXvYqwBoA5ZN/+6A2RGZ3893fxUct95+ZmVXU/QC1qe1iwHsiXNyqcSC2GOodR3wfWuwQ0Dka0q1w== X-Received: by 2002:a1c:5f85:: with SMTP id t127mr549147wmb.104.1560367623474; Wed, 12 Jun 2019 12:27:03 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id r5sm612526wrg.10.2019.06.12.12.27.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 12 Jun 2019 12:27:02 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Andrei Vagin , Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Arnd Bergmann , Christian Brauner , Cyrill Gorcunov , Dmitry Safonov <0x7f454c46@gmail.com>, "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , Vincenzo Frascino , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org Subject: [PATCHv4 23/28] selftest/timens: Add a test for clock_nanosleep() Date: Wed, 12 Jun 2019 20:26:22 +0100 Message-Id: <20190612192628.23797-24-dima@arista.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190612192628.23797-1-dima@arista.com> References: <20190612192628.23797-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrei Vagin Check that clock_nanosleep() takes into account clock offsets. Signed-off-by: Andrei Vagin Co-developed-by: Dmitry Safonov Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- .../selftests/timens/clock_nanosleep.c | 100 ++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/clock_nanosleep.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore index b609f6ee9fb9..9b6c8ddac2c8 100644 --- a/tools/testing/selftests/timens/.gitignore +++ b/tools/testing/selftests/timens/.gitignore @@ -1,2 +1,3 @@ +clock_nanosleep timens timerfd diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index 66b90cd28e5c..76a1dc891184 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd +TEST_GEN_PROGS := timens timerfd clock_nanosleep CFLAGS := -Wall -Werror diff --git a/tools/testing/selftests/timens/clock_nanosleep.c b/tools/testing/selftests/timens/clock_nanosleep.c new file mode 100644 index 000000000000..dfd4e3429c75 --- /dev/null +++ b/tools/testing/selftests/timens/clock_nanosleep.c @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "timens.h" + +static long long get_elapsed_time(int clockid, struct timespec *start) +{ + struct timespec curr; + long long secs, nsecs; + + if (clock_gettime(clockid, &curr) == -1) + return pr_perror("clock_gettime"); + + secs = curr.tv_sec - start->tv_sec; + nsecs = curr.tv_nsec - start->tv_nsec; + if (nsecs < 0) { + secs--; + nsecs += 1000000000; + } + if (nsecs > 1000000000) { + secs++; + nsecs -= 1000000000; + } + return secs * 1000 + nsecs / 1000000; +} + +int run_test(int clockid) +{ + long long elapsed; + int i; + + for (i = 0; i < 2; i++) { + struct timespec now = {}; + struct timespec start; + + if (clock_gettime(clockid, &start) == -1) + return pr_perror("clock_gettime"); + + + if (i == 1) { + now.tv_sec = start.tv_sec; + now.tv_nsec = start.tv_nsec; + } + + now.tv_sec += 2; + clock_nanosleep(clockid, i ? TIMER_ABSTIME : 0, &now, NULL); + + elapsed = get_elapsed_time(clockid, &start); + if (elapsed < 1900 || elapsed > 2100) { + pr_fail("clockid: %d abs: %d elapsed: %lld\n", + clockid, i, elapsed); + return 1; + } + ksft_test_result_pass("clockid: %d abs:%d\n", clockid, i); + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret, nsfd; + + nscheck(); + + if (unshare(CLONE_NEWTIME)) + return pr_perror("unshare"); + + if (_settime(CLOCK_MONOTONIC, 7 * 24 * 3600)) + return 1; + if (_settime(CLOCK_BOOTTIME, 9 * 24 * 3600)) + return 1; + + nsfd = open("/proc/self/ns/time_for_children", O_RDONLY); + if (nsfd < 0) + return pr_perror("Unable to open timens_for_children"); + + if (setns(nsfd, CLONE_NEWTIME)) + return pr_perror("Unable to set timens"); + + ret = 0; + ret |= run_test(CLOCK_MONOTONIC); + ret |= run_test(CLOCK_BOOTTIME_ALARM); + + if (ret) + ksft_exit_fail(); + ksft_exit_pass(); + return ret; +} + -- 2.22.0