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; +} +