From patchwork Wed Sep 19 20:50:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 10606541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CC8D157B for ; Wed, 19 Sep 2018 20:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DB5C2CBF1 for ; Wed, 19 Sep 2018 20:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B9DA2CC20; Wed, 19 Sep 2018 20:51:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 479BD2CC41 for ; Wed, 19 Sep 2018 20:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733065AbeITCao (ORCPT ); Wed, 19 Sep 2018 22:30:44 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:34122 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733060AbeITCan (ORCPT ); Wed, 19 Sep 2018 22:30:43 -0400 Received: by mail-ed1-f67.google.com with SMTP id u1-v6so6053269eds.1 for ; Wed, 19 Sep 2018 13:51:03 -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; bh=XVsAEZIAO24DX407WQOdaal6kpoSXlvVRNC6hFkL3KI=; b=dLBybjOQ2St8/sLtE6mQW0nimZOW6w45TrEptBVwfRNNPe4H0hT4aekPpMNnlr3b1l Sxf6GzFuqSebldwVwtSVPy5jwjNIS/ChTvBMae1RKJtWs+POuaZZtXoD9SDOOvbqtE+W NxSkFdBmZ6bQYazhq72PuxsQiLFPaqhJeYVXu++xKnQkMCH3BIKdL94LHvVPfuHNeeQN LI9IOMKvt4g0OWpCDHDOg43C8z8GfRuoY+q4x6OMjQQj4ekhYkJ1FaU8sv4K5Ore+pWa DNfly+TiABtbeEt7V6MXvi4MxS66/lkObAxTsQsmHG5lDCRP4NJLbmpMzRkptzhPRc9q oZ5w== 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=XVsAEZIAO24DX407WQOdaal6kpoSXlvVRNC6hFkL3KI=; b=Ok4GJNC2ifVN45DZt4pYsdaYgE1sXRfc5vQMtEP0H/SZtke5BfHd6vImtGNEgj0rAn 2TnX7C5vHWO2+vv859t6Fy8e2lKO5uXzDzritjSUyEl9RxCkUM4pEnqrhiR9TLnEvcJ+ 51B9XugQdVVBUbrprXBo78gi3L+JL8IFAS/pEcHwY239ZtWvEERymVseLtSCG3UcwLgv evrXYCdvRbYVzLPC6osQMZgS6t1m9qN/2I3UGtD4dUMDquPiW6ylk6OzZbYwWilZmC4V R2UpvVqwiEFWsHltPL3PsXKL1ef3S7ngyyjpuRjkI6HlYgcMhoLQyTKqEhmr9VLKzujo /++A== X-Gm-Message-State: APzg51ACUwOGnW8BkjsPVRLpbrilwzaKDtuL2632pgalEwvO7oRoOPxZ jyGc7mfY09PR6X1m7etNEC3thA== X-Google-Smtp-Source: ANB0VdZCHV6xPQTA0kvuyZrVJ9uJSCa1/fsm3I5rMtT5YInVorVoVHMRwDiXAmQ7iKd7cQAN/Pz/Zw== X-Received: by 2002:a50:afa3:: with SMTP id h32-v6mr60771252edd.129.1537390263117; Wed, 19 Sep 2018 13:51:03 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id t17-v6sm1747729edb.27.2018.09.19.13.51.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 13:51:02 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC 16/20] selftest: Add Time Namespace test for supported clocks Date: Wed, 19 Sep 2018 21:50:33 +0100 Message-Id: <20180919205037.9574-17-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180919205037.9574-1-dima@arista.com> References: <20180919205037.9574-1-dima@arista.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This test checks that all supported clocks can be changed by clock_settime. Cc: linux-kselftest@vger.kernel.org Signed-off-by: Andrei Vagin Co-developed-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 5 + tools/testing/selftests/timens/config | 1 + tools/testing/selftests/timens/log.h | 21 ++++ tools/testing/selftests/timens/timens.c | 196 ++++++++++++++++++++++++++++++ 5 files changed, 224 insertions(+) create mode 100644 tools/testing/selftests/timens/.gitignore create mode 100644 tools/testing/selftests/timens/Makefile create mode 100644 tools/testing/selftests/timens/config create mode 100644 tools/testing/selftests/timens/log.h create mode 100644 tools/testing/selftests/timens/timens.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore new file mode 100644 index 000000000000..27a693229ce1 --- /dev/null +++ b/tools/testing/selftests/timens/.gitignore @@ -0,0 +1 @@ +timens diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile new file mode 100644 index 000000000000..b877efb78974 --- /dev/null +++ b/tools/testing/selftests/timens/Makefile @@ -0,0 +1,5 @@ +TEST_GEN_PROGS := timens + +CFLAGS := -Wall -Werror + +include ../lib.mk diff --git a/tools/testing/selftests/timens/config b/tools/testing/selftests/timens/config new file mode 100644 index 000000000000..4480620f6f49 --- /dev/null +++ b/tools/testing/selftests/timens/config @@ -0,0 +1 @@ +CONFIG_TIME_NS=y diff --git a/tools/testing/selftests/timens/log.h b/tools/testing/selftests/timens/log.h new file mode 100644 index 000000000000..05fec7f97870 --- /dev/null +++ b/tools/testing/selftests/timens/log.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __SELFTEST_TIMENS_LOG_H__ +#define __SELFTEST_TIMENS_LOG_H__ + +#define pr_msg(fmt, lvl, ...) \ + fprintf(stderr, "[%s] (%s:%d)\t" fmt "\n", \ + lvl, __FILE__, __LINE__, ##__VA_ARGS__) + +#define pr_p(func, fmt, ...) func(fmt ": %m", ##__VA_ARGS__) + +#define pr_err(fmt, ...) \ + ({ \ + pr_msg(fmt, "ERR", ##__VA_ARGS__) \ + -1; \ + }) +#define pr_fail(fmt, ...) pr_msg(fmt, "FAIL", ##__VA_ARGS__) + +#define pr_perror(fmt, ...) pr_p(pr_err, fmt, ##__VA_ARGS__) + +#endif diff --git a/tools/testing/selftests/timens/timens.c b/tools/testing/selftests/timens/timens.c new file mode 100644 index 000000000000..dfa6701214b1 --- /dev/null +++ b/tools/testing/selftests/timens/timens.c @@ -0,0 +1,196 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" + +#ifndef CLONE_NEWTIME +# define CLONE_NEWTIME 0x00001000 +#endif + +/* + * Test shouldn't be run for a day, so add 10 days to child + * time and check parent's time to be in the same day. + */ +#define DAY_IN_SEC (60*60*24) +#define TEN_DAYS_IN_SEC (10*DAY_IN_SEC) + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +#define CLOCK_TYPES \ + ct(CLOCK_BOOTTIME), \ + ct(CLOCK_MONOTONIC), \ + ct(CLOCK_MONOTONIC_COARSE), \ + ct(CLOCK_MONOTONIC_RAW), \ + + +#define ct(clock) clock +static clockid_t clocks[] = { + CLOCK_TYPES +}; +#undef ct +#define ct(clock) #clock +static char *clock_names[] = { + CLOCK_TYPES +}; + +static int child_ns, parent_ns; + +static int switch_ns(int fd) +{ + if (setns(fd, CLONE_NEWTIME)) { + pr_perror("setns()"); + return -1; + } + + return 0; +} + +static int init_namespaces(void) +{ + char path[] = "/proc/self/ns/time"; + struct stat st1, st2; + + parent_ns = open(path, O_RDONLY); + if (parent_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(parent_ns, &st1)) + return pr_perror("Unable to stat the parent timens"); + + if (unshare(CLONE_NEWTIME)) + return pr_perror("Can't unshare() timens"); + + child_ns = open(path, O_RDONLY); + if (child_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(child_ns, &st2)) + return pr_perror("Unable to stat the timens"); + + if (st1.st_ino == st2.st_ino) + return pr_perror("The same child_ns after CLONE_NEWTIME"); + + return 0; +} + +static int _gettime(clockid_t clk_id, struct timespec *res, bool raw_syscall) +{ + int err; + + if (!raw_syscall) { + if (clock_gettime(clk_id, res)) { + pr_perror("clock_gettime(%d)", (int)clk_id); + return -1; + } + return 0; + } + + err = syscall(SYS_clock_gettime, clk_id, res); + if (err) + pr_perror("syscall(SYS_clock_gettime(%d))", (int)clk_id); + + return err; +} + +static int _settime(clockid_t clk_id, struct timespec *res, bool raw_syscall) +{ + int err; + + if (!raw_syscall) { + if (clock_settime(clk_id, res)) + return pr_perror("clock_settime(%d)", (int)clk_id); + return 0; + } + + err = syscall(SYS_clock_settime, clk_id, res); + if (err) + pr_perror("syscall(SYS_clock_settime(%d))", (int)clk_id); + + return err; +} + +static int test_gettime(clockid_t clock_index, bool raw_syscall, time_t offset) +{ + struct timespec child_ts_new, parent_ts_old, cur_ts; + char *entry = raw_syscall ? "syscall" : "vdso"; + double precision = 0.0; + + switch (clocks[clock_index]) { + case CLOCK_MONOTONIC_COARSE: + case CLOCK_MONOTONIC_RAW: + precision = -2.0; + break; + } + + if (switch_ns(parent_ns)) + return pr_err("switch_ns(%d)", child_ns); + + if (_gettime(clocks[clock_index], &parent_ts_old, raw_syscall)) + return -1; + + if (switch_ns(child_ns)) + return pr_err("switch_ns(%d)", child_ns); + + child_ts_new.tv_nsec = parent_ts_old.tv_nsec; + child_ts_new.tv_sec = parent_ts_old.tv_sec + offset; + + if (_settime(clocks[clock_index], &child_ts_new, raw_syscall)) + return -1; + + if (_gettime(clocks[clock_index], &cur_ts, raw_syscall)) + return -1; + + if (difftime(cur_ts.tv_sec, child_ts_new.tv_sec) < precision) { + pr_fail("Child's %s (%s) time has not changed: %lu -> %lu [%lu]", + clock_names[clock_index], entry, parent_ts_old.tv_sec, + child_ts_new.tv_sec, cur_ts.tv_sec); + return -1; + } + + if (switch_ns(parent_ns)) + return pr_err("switch_ns(%d)", parent_ns); + + if (_gettime(clocks[clock_index], &cur_ts, raw_syscall)) + return -1; + + if (difftime(cur_ts.tv_sec, parent_ts_old.tv_sec) > DAY_IN_SEC) { + pr_fail("Parent's %s (%s) time has changed: %lu -> %lu [%lu]", + clock_names[clock_index], entry, parent_ts_old.tv_sec, + child_ts_new.tv_sec, cur_ts.tv_sec); + /* Let's play nice and put it closer to original */ + clock_settime(clocks[clock_index], &cur_ts); + return -1; + } + + pr_msg("Passed for %s (%s)", "OK", clock_names[clock_index], entry); + return 0; +} + +int main(int argc, char *argv[]) +{ + unsigned int i; + int ret = 0; + + if (init_namespaces()) + return 1; + + for (i = 0; i < ARRAY_SIZE(clocks); i++) { + ret |= test_gettime(i, true, TEN_DAYS_IN_SEC); + ret |= test_gettime(i, true, -TEN_DAYS_IN_SEC); + ret |= test_gettime(i, false, TEN_DAYS_IN_SEC); + ret |= test_gettime(i, false, -TEN_DAYS_IN_SEC); + } + + return !!ret; +} From patchwork Wed Sep 19 20:50:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 10606543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D090C1508 for ; Wed, 19 Sep 2018 20:51:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C08792CBF7 for ; Wed, 19 Sep 2018 20:51:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE4B92CC43; Wed, 19 Sep 2018 20:51:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 360862CC0A for ; Wed, 19 Sep 2018 20:51:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733101AbeITCaq (ORCPT ); Wed, 19 Sep 2018 22:30:46 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38070 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733070AbeITCap (ORCPT ); Wed, 19 Sep 2018 22:30:45 -0400 Received: by mail-ed1-f68.google.com with SMTP id h33-v6so6046643edb.5 for ; Wed, 19 Sep 2018 13:51:05 -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; bh=IWl+BsB9BfevdUY2WNa0fYCOuIWf1cvA+H9ptzwfKtc=; b=T+GbgY2rJRZcmW0Pnz/ocICcE6cmIe5Dqnz2XO4s+Jw0UfHOg0JDk/nl1QgrYgVgXe oxHjNWCWXlxJmFhRS+/nIKnJ9DSaYYMVuZgXXQo10koRWHP1cP8WKMjeAVn4VkXbh0Ak LDe/53p7rZaQB2LqWupbnfUrcm6lsQGMM0/W7kk/uIZGMMYHgqRfqc4qkFk/Fc80lnWP rjS+x40PDGYLawc1RFpCEw51WPeJaPAMcRPwVS9x4uUzn0zThrorWhmTFYGaHJeksEU/ uqF+yOzNLsm9Vj7XuYcvAeX+UgY9l9j7/fxmdai6mfeuwBj3wcTYwF612L82VVJegur9 +g7A== 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=IWl+BsB9BfevdUY2WNa0fYCOuIWf1cvA+H9ptzwfKtc=; b=Vcht2qTpxtfkd+5TlrEl6mr3xYS0F/u6SkYI6K77IAiXzSaplsNMjLhFFif2ztT3es wCu8jso1e/4krsIJGb0BOQxEUokDR7mQJFqMDihD5YKCt6tPpuvGXzYg+0SQpRHjrGAB GqGybDUfl8vbnzvSgdEQRzkEmKLweGUQL0SaxbycBHURRudgfrlepuZrK8gkMKkT1wec F7cGN6/oyuFff5JcynZE+VYeDDSBRmCdF4w+QOTOrcEkTfT4BMEI3vX+CTRMo2G+KPP6 ACexQ19vDQQvp2SJqVQUke0Am79lymC5WsZ9DgP0Nzxvnf3gDNM2S4gyJAcgOSEymqCe /Tyg== X-Gm-Message-State: APzg51AEZ1VY8EUFglCGTsMxhbJ59pHIKB5FbAvBA+MFkX26x+L3gIWM ERezD/DOvNuwwuGVgsowHa7CMw== X-Google-Smtp-Source: ANB0Vdb/vmWbrce2pDgWj184qzrAel450u17meixyH+nIh0zfHrdIOxYQHnGbq34iZH+WQZ1Q+hBjA== X-Received: by 2002:a50:82c5:: with SMTP id 63-v6mr61268513edg.200.1537390264720; Wed, 19 Sep 2018 13:51:04 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id t17-v6sm1747729edb.27.2018.09.19.13.51.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 13:51:04 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC 17/20] selftest/timens: Add test for timerfd Date: Wed, 19 Sep 2018 21:50:34 +0100 Message-Id: <20180919205037.9574-18-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180919205037.9574-1-dima@arista.com> References: <20180919205037.9574-1-dima@arista.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrei Vagin Check that timerfd_create takes into account clock offsets. Cc: linux-kselftest@vger.kernel.org Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/timerfd.c | 96 +++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/timerfd.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore index 27a693229ce1..b609f6ee9fb9 100644 --- a/tools/testing/selftests/timens/.gitignore +++ b/tools/testing/selftests/timens/.gitignore @@ -1 +1,2 @@ timens +timerfd diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index b877efb78974..66b90cd28e5c 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens +TEST_GEN_PROGS := timens timerfd CFLAGS := -Wall -Werror diff --git a/tools/testing/selftests/timens/timerfd.c b/tools/testing/selftests/timens/timerfd.c new file mode 100644 index 000000000000..914a4cd9a0df --- /dev/null +++ b/tools/testing/selftests/timens/timerfd.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" + +#ifndef CLONE_NEWTIME +# define CLONE_NEWTIME 0x00001000 +#endif + +int run_test(int clockid) +{ + struct itimerspec new_value; + struct timespec now; + long long elapsed; + int fd, i; + + if (clock_gettime(clockid, &now)) + return pr_perror("clock_gettime"); + + for (i = 0; i < 2; i++) { + int flags = 0; + + pr_msg("timerfd_settime: %d", "INFO", clockid); + new_value.it_value.tv_sec = 3600; + new_value.it_value.tv_nsec = 0; + new_value.it_interval.tv_sec = 1; + new_value.it_interval.tv_nsec = 0; + + if (i == 1) { + new_value.it_value.tv_sec += now.tv_sec; + new_value.it_value.tv_nsec += now.tv_nsec; + } + + fd = timerfd_create(clockid, 0); + if (fd == -1) + return pr_perror("timerfd_create"); + + if (i == 1) + flags |= TFD_TIMER_ABSTIME; + + if (timerfd_settime(fd, flags, &new_value, NULL)) + return pr_perror("timerfd_settime"); + + if (timerfd_gettime(fd, &new_value)) + return pr_perror("timerfd_gettime"); + + elapsed = new_value.it_value.tv_sec; + if (abs(elapsed - 3600) > 60) { + printf("FAIL\n"); + return 1; + } + + close(fd); + } + + printf("PASS\n"); + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct timespec tp; + int ret; + + if (unshare(CLONE_NEWTIME)) + return pr_perror("unshare"); + + if (clock_gettime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec = 7 * 24 * 3600; + if (clock_settime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_settime"); + + if (clock_gettime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec += 9 * 24 * 3600; + tp.tv_nsec = 0; + if (clock_settime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_settime"); + + ret = 0; + ret |= run_test(CLOCK_BOOTTIME); + ret |= run_test(CLOCK_MONOTONIC); + return ret; +} + From patchwork Wed Sep 19 20:50:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 10606549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F685157B for ; Wed, 19 Sep 2018 20:51:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90CF02CC3F for ; Wed, 19 Sep 2018 20:51:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EB132CC47; Wed, 19 Sep 2018 20:51:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11D8A2CC3F for ; Wed, 19 Sep 2018 20:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733109AbeITCar (ORCPT ); Wed, 19 Sep 2018 22:30:47 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42332 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733061AbeITCar (ORCPT ); Wed, 19 Sep 2018 22:30:47 -0400 Received: by mail-ed1-f68.google.com with SMTP id l5so6024646edw.9 for ; Wed, 19 Sep 2018 13:51:06 -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; bh=pi9FAVaiInjT79/JwXdoUp3uJgJi1NJmkooIr7Bn2DI=; b=H56SVmnGBbZQaDsQ8FctnByLb0AITxSptuEFN9bR6t+bG8ajE76dWXjdIsfRB8GEcJ wiqffgqrCjlz9YXnmzPoQbajRrKswXNVIQ38CfL94K3Rlsk5Azs3YN3bfZUvB6t7arqQ NtgH8Tpqs9lqlBO7kfRhlN/3vk2wI5OhnnQfPTD0qt7xUPa1YyHHloue2MvfEfWYrOZE NknEnPwbDThhWuOjAZpC24Cn9bUHUHCklHz7Kc2dFXEdCsNKteE3z2Beq0e+F3bLqCip vFX41ntGKpPaWZiyjeZ8lVRUmPkzqd/4ZNtjNKw/u2snKi3k5X+4/lHsju4lAr+IgHfZ GeVQ== 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=pi9FAVaiInjT79/JwXdoUp3uJgJi1NJmkooIr7Bn2DI=; b=K+h4168mY+e/xWiDWAo7oW6HHfnOX6ms3TSBMhzN0YmVGoDgqOeYL4pou7iI0fVtYZ ycwsY2VRvF+00YRULrJncVDHCYfea9d8rzw65nwbGVdF4iqMdjlvltMhnYC5nZiBkvEa dBAVxMkiTwX3e9/g99OCsF2eeK8qOmEscyXZLIePUqt3kL2WNmpVCzOjjMiqSf0fs0uQ 2faLEUjuB1pPTdB5gHprpZA1YxP7WiNjyEqcmo+qf3Vp6lVxglJuEwge1l5l/Rjuh1DQ FklL0c14SYN48WWc7Pr3+Hr/XYhPKrWN1RGmUMvo/dwXpo53/N9mNoB0rslTlCZCYL71 A7Zg== X-Gm-Message-State: APzg51D+WZ26VfbyRm0N5giv5MiNV0U1ILadKWARTdkWFpoE1sQw+vMz zO13XHSyrIYU38hTTiTOuYcxtQ== X-Google-Smtp-Source: ANB0VdZPfapdMSgyd8GJqk7fGXDcF48fHOng+VZGY+ujnYSaZAIjDISmtytsF4ekHXk92o9pCwACtQ== X-Received: by 2002:aa7:c441:: with SMTP id n1-v6mr58385073edr.55.1537390266123; Wed, 19 Sep 2018 13:51:06 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id t17-v6sm1747729edb.27.2018.09.19.13.51.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 13:51:05 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC 18/20] selftest/timens: Add test for clock_nanosleep Date: Wed, 19 Sep 2018 21:50:35 +0100 Message-Id: <20180919205037.9574-19-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180919205037.9574-1-dima@arista.com> References: <20180919205037.9574-1-dima@arista.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrei Vagin Check that clock_nanosleep() takes into account clock offsets. Cc: linux-kselftest@vger.kernel.org Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/clock_nanosleep.c | 98 ++++++++++++++++++++++++ 3 files changed, 100 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..5af780b4cfe0 --- /dev/null +++ b/tools/testing/selftests/timens/clock_nanosleep.c @@ -0,0 +1,98 @@ +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" + +#ifndef CLONE_NEWTIME +#define CLONE_NEWTIME 0x00001000 +#endif + +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; + } + + printf("clock_nanosleep: %d\n", clockid); + 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("elapsed %lld\n", elapsed); + return 1; + } + } + + printf("PASS\n"); + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct timespec tp; + int ret; + + if (unshare(CLONE_NEWTIME)) + return pr_perror("unshare");; + + if (clock_gettime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec += 7 * 24 * 3600; + if (clock_settime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_settime"); + + if (clock_gettime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec += 9 * 24 * 3600; + tp.tv_nsec = 0; + if (clock_settime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_settime"); + + ret = 0; + ret |= run_test(CLOCK_MONOTONIC); + return ret; +} + From patchwork Wed Sep 19 20:50:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 10606547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93C271508 for ; Wed, 19 Sep 2018 20:51:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FBFA2CC48 for ; Wed, 19 Sep 2018 20:51:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D9342CC4D; Wed, 19 Sep 2018 20:51:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7A682CC4A for ; Wed, 19 Sep 2018 20:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733156AbeITCau (ORCPT ); Wed, 19 Sep 2018 22:30:50 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42333 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733105AbeITCat (ORCPT ); Wed, 19 Sep 2018 22:30:49 -0400 Received: by mail-ed1-f65.google.com with SMTP id l5so6024738edw.9 for ; Wed, 19 Sep 2018 13:51:08 -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; bh=VopBSEwitIpT7IZdHiVx92lBu5moRZLzTfTwrrJI6+8=; b=e93Uq9IBYm9NN9aZ/ySLPhC2Ht1aroFGRJ1X2C8xsIrnDQdJS6tDzv2e2x7WU4eTht WEA5swLJ6fxfWANc2AeZmWAzNHjSGkfoYCl2GSuhbYF6eSTswetxDgWxl7hn4U4r3krp vIYEY5Fffv3nWTydhA+lDxx/R5CcZsE/xbL/x0iAuD1hl+FCq5RfJlwAdd3389lR6OW9 CFmOLRkB9mYl1ATk7vDiGMC5AVP7Cu/Dr2X7QgGi5HL5JB7kJ3IwBS7ehP3a2Jcjam7z UbFIOpcZauNzPa7heN3rfmX5V9UR7JjG0Yc+BaBhyJLjJRCtx86d+ghcPET5f3XeGzg+ nJXA== 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=VopBSEwitIpT7IZdHiVx92lBu5moRZLzTfTwrrJI6+8=; b=sLdK35U0GXq09WpYvtZihS0tECUC77JmbC6QsSzWVfF2LhpCr6sUcFTFaHNMAOSBnk je7yAQ/B4W/Nxy2vRnvBoG/n80QZ0R9nA6gjkopC/jnGospIwtrNB/BYDhPJ3Nz5VQTf zdDIkP8QYe3vZvN3DcAiPymnVDjTXmVwO16z6kryx0+MBbQ+Nl9coeMBrKGtatTNw04f yu1zhe2FEOlBTccfLAsV6+WZAX3FKRGZsgxL2570MiKK9GPpzW9PKOuI8mTfkPVPXj8d 7uYlhj1xOAM4Km+bhVQrWvkEUdqYoxK5R+/ZffE09qQ2Ot1cDj5S5r9F9cruG8412EVd baKQ== X-Gm-Message-State: APzg51AGSYTGAu3sIyDiVym5vdAiN11K/ay4Hj8v+tsP+bCilCD2lMQR IxPQoanHumtQXdQejOVKDct03A== X-Google-Smtp-Source: ANB0VdYF7Lyopp8bBaKHYeCJR6ZzchHHzBtLj9aNnEVctM+qZ2vHaBkri0znS/328tWNpyIjqS9n7Q== X-Received: by 2002:a50:b702:: with SMTP id g2-v6mr61136789ede.139.1537390268127; Wed, 19 Sep 2018 13:51:08 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id t17-v6sm1747729edb.27.2018.09.19.13.51.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 13:51:07 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC 19/20] timens/selftest: Add procfs selftest Date: Wed, 19 Sep 2018 21:50:36 +0100 Message-Id: <20180919205037.9574-20-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180919205037.9574-1-dima@arista.com> References: <20180919205037.9574-1-dima@arista.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently only uptime check, but procfs checks for REALTIME might be added in future. Cc: linux-kselftest@vger.kernel.org Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/procfs.c | 145 ++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/procfs.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore index 9b6c8ddac2c8..94ffdd9cead7 100644 --- a/tools/testing/selftests/timens/.gitignore +++ b/tools/testing/selftests/timens/.gitignore @@ -1,3 +1,4 @@ clock_nanosleep +procfs timens timerfd diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index 76a1dc891184..f96f50d1fef8 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep +TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs CFLAGS := -Wall -Werror diff --git a/tools/testing/selftests/timens/procfs.c b/tools/testing/selftests/timens/procfs.c new file mode 100644 index 000000000000..5067cbbddcc5 --- /dev/null +++ b/tools/testing/selftests/timens/procfs.c @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" + +#ifndef CLONE_NEWTIME +# define CLONE_NEWTIME 0x00001000 +#endif + +/* + * Test shouldn't be run for a day, so add 10 days to child + * time and check parent's time to be in the same day. + */ +#define MAX_TEST_TIME_SEC (60*5) +#define DAY_IN_SEC (60*60*24) +#define TEN_DAYS_IN_SEC (10*DAY_IN_SEC) + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +static int child_ns, parent_ns; + +static int switch_ns(int fd) +{ + if (setns(fd, CLONE_NEWTIME)) + return pr_perror("setns()"); + + return 0; +} + +static int init_namespaces(void) +{ + char path[] = "/proc/self/ns/time"; + struct stat st1, st2; + + parent_ns = open(path, O_RDONLY); + if (parent_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(parent_ns, &st1)) + return pr_perror("Unable to stat the parent timens"); + + if (unshare(CLONE_NEWTIME)) + return pr_perror("Can't unshare() timens"); + + child_ns = open(path, O_RDONLY); + if (child_ns <= 0) + return pr_perror("Unable to open %s", path); + + if (fstat(child_ns, &st2)) + return pr_perror("Unable to stat the timens"); + + if (st1.st_ino == st2.st_ino) + return pr_err("The same child_ns after CLONE_NEWTIME"); + + return 0; +} + +static int read_proc_uptime(struct timespec *uptime) +{ + unsigned long up_sec, up_nsec; + FILE *proc; + + proc = fopen("/proc/uptime", "r"); + if (proc == NULL) { + pr_perror("Unable to open /proc/uptime"); + return -1; + } + + if (fscanf(proc, "%lu.%02lu", &up_sec, &up_nsec) != 2) { + if (errno) { + pr_perror("fscanf"); + return -errno; + } + pr_err("failed to parse /proc/uptime"); + return -1; + } + fclose(proc); + + uptime->tv_sec = up_sec; + uptime->tv_nsec = up_nsec; + return 0; +} + +static int check_uptime(void) +{ + struct timespec ts_btime, uptime_new, uptime_old; + time_t uptime_expected; + double prec = MAX_TEST_TIME_SEC; + + if (switch_ns(parent_ns)) + return pr_err("switch_ns(%d)", parent_ns); + + if (clock_gettime(CLOCK_BOOTTIME, &ts_btime)) + return pr_perror("clock_gettime()"); + + if (read_proc_uptime(&uptime_old)) + return 1; + + ts_btime.tv_sec += TEN_DAYS_IN_SEC; + + if (switch_ns(child_ns)) + return pr_err("switch_ns(%d)", child_ns); + + if (clock_settime(CLOCK_BOOTTIME, &ts_btime)) + return pr_perror("clock_settime()"); + + if (read_proc_uptime(&uptime_new)) + return 1; + + uptime_expected = uptime_old.tv_sec + TEN_DAYS_IN_SEC; + if (fabs(difftime(uptime_new.tv_sec, uptime_expected)) > prec) { + pr_fail("uptime in /proc/uptime: old %ld, new %ld [%ld]", + uptime_old.tv_sec, uptime_new.tv_sec, + uptime_old.tv_sec + TEN_DAYS_IN_SEC); + return 1; + } + + pr_msg("Passed for /proc/uptime", "OK"); + return 0; +} + +int main(int argc, char *argv[]) +{ + int ret = 0; + + if (init_namespaces()) + return 1; + + ret |= check_uptime(); + + return ret; +} From patchwork Wed Sep 19 20:50:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 10606545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 007BF1508 for ; Wed, 19 Sep 2018 20:51:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4B0A2CC34 for ; Wed, 19 Sep 2018 20:51:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2D1D2CC44; Wed, 19 Sep 2018 20:51:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C85C2CC34 for ; Wed, 19 Sep 2018 20:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733168AbeITCav (ORCPT ); Wed, 19 Sep 2018 22:30:51 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45670 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733151AbeITCau (ORCPT ); Wed, 19 Sep 2018 22:30:50 -0400 Received: by mail-ed1-f67.google.com with SMTP id p52-v6so6011189eda.12 for ; Wed, 19 Sep 2018 13:51:10 -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; bh=6WS+ZgnYZgB9hS1UsjCp2BVypHFJoS2o6YaRbqPUoaw=; b=LAO4KzWRzjl8bjZRaVaTVBNLYet4WqJXSuEL4Lz1ys7IHx7bMLU6Ho+VQJUwgd8j2V gEsvgNSUrHBYEaDHcnmU43fIZL4GN/ey1c7BVkuyGYlPqfJqgDrIfG3aXooXgFzsxAHE gVCQZKohC3Us3I0j0rtqf7Q9+c92sOEIzy+ehP/yLhLla5XjbQbycSUsUjH2BvS2zfjv m9A37IHjYUJmjHrC4ul/Ssh3hy4JKj9upFmDEuKsset33DdqAViNUlmk+n2ecTE0DPFu x6gLJhcTvjweK97aUUBtbpE/Ub9+Yxj5c53WoGxBBKG+q+OZnD/Vwfk5/ojWNq/BoNJD XD7A== 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=6WS+ZgnYZgB9hS1UsjCp2BVypHFJoS2o6YaRbqPUoaw=; b=fE2Q51AXcpmv8ji8FFncnwcosuoXe/4oHbtZ3ryrhuT5Fxal7prsv2KpcvLK4mgLJd D+oDSLeSh8f8V8jtjKicN5EvM7lAhxm00KDcxIWZzuGkldssfboMGemOoUrr958B2xQJ wc5f26Nab6UNPA+JeO5tgfe4C8x8iLudkYQp4bZhOI7TeUvm33+F97C0OkYkukIjRueM pj0bQjhQwTR4QeDoDYKWvH3fZ1BNKz21V5gnA71zkiw5/4WWDjT9DPHb22wSlO/CPTjl 7G1bmPGLeeAQH+sucez6qZ9ejHW96qGLxMIe1gIMgQHrYy6fgJC50erZ0SK5htywg+Ru yw3g== X-Gm-Message-State: APzg51AEAjzWpbedEKEC+eCa6ybcZUZYfzNusQbVs45ypeNDbH0Wk3S7 XHf8gjZsp/iy69u/7SiqFaLQDA== X-Google-Smtp-Source: ANB0VdaFODWpZFIKqe1QLhyn1jdD+jHxGzIuBcccyb7iVmcZHURRaVNX4CY/Ad6oMGH/h/K9SCBatw== X-Received: by 2002:a50:b3c8:: with SMTP id t8-v6mr61010739edd.95.1537390269440; Wed, 19 Sep 2018 13:51:09 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id t17-v6sm1747729edb.27.2018.09.19.13.51.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 13:51:08 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Andrei Vagin , Dmitry Safonov , Adrian Reber , Andy Lutomirski , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC 20/20] timens/selftest: Add timer offsets test Date: Wed, 19 Sep 2018 21:50:37 +0100 Message-Id: <20180919205037.9574-21-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180919205037.9574-1-dima@arista.com> References: <20180919205037.9574-1-dima@arista.com> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrei Vagin Check that timer_create takes into account clock offsets. Cc: linux-kselftest@vger.kernel.org Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- tools/testing/selftests/timens/.gitignore | 1 + tools/testing/selftests/timens/Makefile | 3 +- tools/testing/selftests/timens/timer.c | 95 +++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/timer.c diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore index 94ffdd9cead7..3b7eda8f35ce 100644 --- a/tools/testing/selftests/timens/.gitignore +++ b/tools/testing/selftests/timens/.gitignore @@ -1,4 +1,5 @@ clock_nanosleep procfs timens +timer timerfd diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index f96f50d1fef8..ae1ffd24cc43 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,5 +1,6 @@ -TEST_GEN_PROGS := timens timerfd clock_nanosleep procfs +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs CFLAGS := -Wall -Werror +LDFLAGS := -lrt include ../lib.mk diff --git a/tools/testing/selftests/timens/timer.c b/tools/testing/selftests/timens/timer.c new file mode 100644 index 000000000000..e3a0951aadc8 --- /dev/null +++ b/tools/testing/selftests/timens/timer.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" + +#ifndef CLONE_NEWTIME +#define CLONE_NEWTIME 0x00001000 /* New time namespace */ +#endif + +int run_test(int clockid) +{ + struct itimerspec new_value; + struct timespec now; + long long elapsed; + timer_t fd; + int i; + + if (clock_gettime(clockid, &now) == -1) + return pr_perror("clock_gettime"); + + for (i = 0; i < 2; i++) { + struct sigevent sevp = {.sigev_notify = SIGEV_NONE}; + int flags = 0; + + pr_msg("timerfd_settime: %d", "INFO", clockid); + new_value.it_value.tv_sec = 3600; + new_value.it_value.tv_nsec = 0; + new_value.it_interval.tv_sec = 1; + new_value.it_interval.tv_nsec = 0; + + if (i == 1) { + new_value.it_value.tv_sec += now.tv_sec; + new_value.it_value.tv_nsec += now.tv_nsec; + } + + if (timer_create(clockid, &sevp, &fd) == -1) + return pr_perror("timerfd_create"); + + if (i == 1) + flags |= TIMER_ABSTIME; + if (timer_settime(fd, flags, &new_value, NULL) == -1) + return pr_perror("timerfd_settime"); + + if (timer_gettime(fd, &new_value) == -1) + return pr_perror("timerfd_gettime"); + + elapsed = new_value.it_value.tv_sec; + if (abs(elapsed - 3600) > 60) { + pr_fail("elapsed: %lld\n", elapsed); + return 1; + } + } + + printf("PASS\n"); + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct timespec tp; + int ret; + + if (unshare(CLONE_NEWTIME)) + return pr_perror("unshare"); + + if (clock_gettime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec -= 70 * 24 * 3600; + if (clock_settime(CLOCK_MONOTONIC, &tp)) + return pr_perror("clock_settime"); + + if (clock_gettime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_gettime"); + tp.tv_sec -= 9 * 24 * 3600; + tp.tv_nsec = 0; + if (clock_settime(CLOCK_BOOTTIME, &tp)) + return pr_perror("clock_settime"); + + ret = 0; + ret |= run_test(CLOCK_BOOTTIME); + ret |= run_test(CLOCK_MONOTONIC); + return ret; +} +