From patchwork Thu Dec 6 19:07:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael David Tinoco X-Patchwork-Id: 153059 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10906455ljp; Thu, 6 Dec 2018 11:07:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/XvTD3k2L/jjURMB4VL/yXPh5gsDOKL8NaOMLdVK6SOEH0Q5iQRuuzrE0l7xcIIGRov0rMQ X-Received: by 2002:a1c:b456:: with SMTP id d83mr21904027wmf.115.1544123258143; Thu, 06 Dec 2018 11:07:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544123258; cv=none; d=google.com; s=arc-20160816; b=pFYG2jdO/GEA4JhtLsm9cHTveR4l+rETHB+/fG2Z7P03bUF4RDyxI13XC8g8rx4Cke 6LrXVkd/z6EOoTVJf+Jr13L1mvD/LzwRa1rBl2dcGMEC9tp0c8IRk0SaK1+Er7gS673m 14yQi4ZTcCsGOfNVagdvMG9Ky1F4qb/PJspZpNXEP5VUzf4NMY2igRbHKWKzjDRhlbM6 wTDogKnPBvfiBD7zzjbElRURW3n/pBBpU43MTvMK3yQOakDKp40qXhDsU1W+/SlHp819 Ljtz1oDbA8xDen/HsvSJOqRdziAGMj9ze2DGKRQ08V+pk3kE5Nkc1If8B4R1ySKrQdtU Glcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=AW9xR7UWZtyDHASsMG4SHg+VapnggA0R2Fb8zIrM6Uw=; b=MRJKEtmQdpd9BKL4G4I8ID6/6DRfHE+5hbPeszSuvSdzK1VYYkpLtKFAHxLHoouFCZ JpnJUv4CcISuHruLZo53BNBXiDknNCBWf4Q4yu75hAo3gR7IbZ53n0U4ZdMr5/rzxWeg iFnPdebQlT44f89T5YvlIeQXD1s2j7Nu6D0hdGQfDXgvjGyLXsPppeYHvjJJ4dprmv+x ZXKQ1SybQs6vkA6J1WY0BUL0a765r2P14IMGgSgyCRLDoWM5NwCUJLVmOupkqmhXQ0+8 K6usCXJ3LL1hJSOAK5GxTE3aSMKaFitFPEnTMuKoHXbJSct+UA30O3HnZQxjHTcfMyFc mf1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=B1Om2O1E; spf=pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) smtp.mailfrom="ltp-bounces+patch=linaro.org@lists.linux.it"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from picard.linux.it (picard.linux.it. [2001:1418:10:5::2]) by mx.google.com with ESMTPS id 62si1120761wmp.92.2018.12.06.11.07.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 11:07:38 -0800 (PST) Received-SPF: pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) client-ip=2001:1418:10:5::2; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=B1Om2O1E; spf=pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) smtp.mailfrom="ltp-bounces+patch=linaro.org@lists.linux.it"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A058A3E7091 for ; Thu, 6 Dec 2018 20:07:37 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id CBB7F3E702A for ; Thu, 6 Dec 2018 20:07:33 +0100 (CET) Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id D5037600C8C for ; Thu, 6 Dec 2018 20:07:29 +0100 (CET) Received: by mail-qt1-x842.google.com with SMTP id v11so1793684qtc.2 for ; Thu, 06 Dec 2018 11:07:29 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=dXawWjLS8e6ndy1JJWsUlm3Gdgoro0A1XGLeb7w/R9A=; b=B1Om2O1EQTb4iW1vq2A+kCo88Fk7/tS8FWznjGfEjamYGK8WQ1DZ7G3mSkb4mg3bvK +WpmtlVurQ+5BT1rPeaKxjwECxR63ShX9XyOKAthl+WMGmTXZst8Z1zcAGO8Nf/aYnMM LhlEM28vboLGOuwx2cYBbk7b6XybsLU8StYD4= 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=dXawWjLS8e6ndy1JJWsUlm3Gdgoro0A1XGLeb7w/R9A=; b=jnXacBJ33J9DOYY2F6puZm5y+IGReyu3nq3zI/5HJFeUO+hswo+leu7xBYkTI85moH di9SD/lX8PIKyjxSbSyRK6EOiu9DRygqP4geq6TJsf5s3TZkU+9ulMq4Af47zO2EjRcy ggOwnDlJRyF28OvZWlHwOnrg4EOUXDxwKfqoCeHMbK9x4ZcqjcR+DQQhAgdNPgl1TJSR gjDQvTXyzSgOj2EjS6RqoDgtMiYzHCnjNMaCFM31apOl6noq9w14ie3VBRmn2Pc54ikx MkM1EGqvq0y7Bl099pLivIkkc2VuApZw/BRmloYpqU5uoNPBP+jPZvFrTtNxkDSQ+JWT Ephw== X-Gm-Message-State: AA+aEWaqKkFTLziG9ttnVOKJhdWgHqTLf/RX466O8VM7pNvyrB8qXKqC PCfJVfhWBvzO3jXczKuJvyDqly4OwVRxfQ== X-Received: by 2002:a0c:ba24:: with SMTP id w36mr28217257qvf.60.1544123248200; Thu, 06 Dec 2018 11:07:28 -0800 (PST) Received: from workstation.celeiro.br ([168.181.50.200]) by smtp.gmail.com with ESMTPSA id h41sm815166qte.83.2018.12.06.11.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 11:07:27 -0800 (PST) From: Rafael David Tinoco To: ltp@lists.linux.it Date: Thu, 6 Dec 2018 17:07:09 -0200 Message-Id: <20181206190710.22471-1-rafael.tinoco@linaro.org> X-Mailer: git-send-email 2.20.0.rc1 In-Reply-To: <20181206130309.GA22250@rei> References: <20181206130309.GA22250@rei> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/2] syscalls/clock_settime01.c: create syscall clock_settime X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+patch=linaro.org@lists.linux.it Sender: "ltp" Fixes: 343 clock_settime01 creates a new test, using new API, based on existing and older kernel/timers/clock_settime tests. It includes tests from files clock_settime02 and clock_settime03, which will be deleted in next commits. Signed-off-by: Rafael David Tinoco Signed-off-by: Rafael David Tinoco --- runtest/syscalls | 3 + .../kernel/syscalls/clock_settime/.gitignore | 2 + .../kernel/syscalls/clock_settime/Makefile | 8 + .../syscalls/clock_settime/clock_settime01.c | 122 +++++++++++++ .../syscalls/clock_settime/clock_settime02.c | 171 ++++++++++++++++++ 5 files changed, 306 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_settime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_settime/Makefile create mode 100644 testcases/kernel/syscalls/clock_settime/clock_settime01.c create mode 100644 testcases/kernel/syscalls/clock_settime/clock_settime02.c diff --git a/runtest/syscalls b/runtest/syscalls index ac1d2d2cd..2e38ab37e 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -79,6 +79,9 @@ clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02 clock_nanosleep2_01 clock_nanosleep2_01 +clock_settime01 clock_settime01 +clock_settime02 clock_settime02 + clone01 clone01 clone02 clone02 clone03 clone03 diff --git a/testcases/kernel/syscalls/clock_settime/.gitignore b/testcases/kernel/syscalls/clock_settime/.gitignore new file mode 100644 index 000000000..281217550 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/.gitignore @@ -0,0 +1,2 @@ +clock_settime01 +clock_settime02 diff --git a/testcases/kernel/syscalls/clock_settime/Makefile b/testcases/kernel/syscalls/clock_settime/Makefile new file mode 100644 index 000000000..e6674a6b2 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/Makefile @@ -0,0 +1,8 @@ +# Copyright (c) 2018 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/clock_settime/clock_settime01.c b/testcases/kernel/syscalls/clock_settime/clock_settime01.c new file mode 100644 index 000000000..97d720fa2 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/clock_settime01.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2018 Linaro Limited. All rights reserved. + * Author: Rafael David Tinoco + */ + +/* + * Basic test for clock_settime(2) on REALTIME clock: + * + * 1) advance DELTA_SEC seconds + * 2) go backwards DELTA_SEC seconds + * + * Accept DELTA_PER deviation on both (specially going backwards). + */ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" + +#define DELTA_SEC 10 /* 10 seconds delta */ +#define DELTA_PER 0.1 /* 1 percent deviation */ + +static struct timespec real_begin, mono_begin, mono_end; + +static void clock_elapsed(struct timespec *begin, struct timespec *end, + struct timespec *elapsed) +{ + elapsed->tv_sec = end->tv_sec - begin->tv_sec; + elapsed->tv_nsec = end->tv_nsec - begin->tv_nsec; +} + +static void clock_return(void) +{ + static struct timespec elapsed, adjust; + + clock_elapsed(&mono_begin, &mono_end, &elapsed); + + adjust.tv_sec = real_begin.tv_sec + elapsed.tv_sec; + adjust.tv_nsec = real_begin.tv_nsec + elapsed.tv_nsec; + + if (clock_settime(CLOCK_REALTIME, &adjust) != 0) + tst_res(TBROK | TTERRNO, "could restore realtime clock"); +} + +static void clock_fixnow(void) +{ + if (clock_gettime(CLOCK_MONOTONIC_RAW, &mono_end) != 0) + tst_res(TBROK | TTERRNO, "could not get elapsed time"); + + clock_return(); +} + +static void setup(void) +{ + /* save initial monotonic time to restore it when needed */ + + if (clock_gettime(CLOCK_REALTIME, &real_begin) != 0) + tst_res(TBROK | TTERRNO, "could not get initial real time"); + + if (clock_gettime(CLOCK_MONOTONIC_RAW, &mono_begin) != 0) + tst_res(TBROK | TTERRNO, "couldn't get initial monotonic time"); +} + +static void cleanup(void) +{ + clock_fixnow(); +} + +static void verify_clock_settime(void) +{ + static struct timespec begin, change, end, elapsed; + + /* test 01: move forward */ + + if (clock_gettime(CLOCK_REALTIME, &begin) != 0) + tst_res(TBROK | TTERRNO, "could not get realtime at the begin"); + + change.tv_sec = begin.tv_sec + DELTA_SEC; + + if (clock_settime(CLOCK_REALTIME, &change) != 0) + tst_res(TBROK | TTERRNO, "could not set realtime change"); + + if (clock_gettime(CLOCK_REALTIME, &end) != 0) + tst_res(TBROK | TTERRNO, "could not get realtime after change"); + + clock_elapsed(&begin, &end, &elapsed); + + if (elapsed.tv_sec < (float) (DELTA_SEC - (DELTA_SEC * DELTA_PER))) + tst_res(TFAIL, "clock_settime(2): could not advance time"); + else + tst_res(TPASS, "clock_settime(2): was able to advance time"); + + /* test 02: move backward */ + + if (clock_gettime(CLOCK_REALTIME, &begin) != 0) + tst_res(TBROK | TTERRNO, "could not get realtime at the begin"); + + change.tv_sec = begin.tv_sec - DELTA_SEC; + + if (clock_settime(CLOCK_REALTIME, &change) != 0) + tst_res(TBROK | TTERRNO, "could not set realtime change"); + + if (clock_gettime(CLOCK_REALTIME, &end) != 0) + tst_res(TBROK | TTERRNO, "could not get realtime after change"); + + clock_elapsed(&begin, &end, &elapsed); + + elapsed.tv_sec = ~elapsed.tv_sec; + elapsed.tv_nsec = ~elapsed.tv_nsec; + + if (elapsed.tv_sec < (float) (DELTA_SEC - (DELTA_SEC * DELTA_PER))) + tst_res(TFAIL, "clock_settime(2): could not recede time"); + else + tst_res(TPASS, "clock_settime(2): was able to recede time"); +} + +static struct tst_test test = { + .setup = setup, + .test_all = verify_clock_settime, + .cleanup = cleanup, + .needs_root = 1, +}; diff --git a/testcases/kernel/syscalls/clock_settime/clock_settime02.c b/testcases/kernel/syscalls/clock_settime/clock_settime02.c new file mode 100644 index 000000000..710f37219 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/clock_settime02.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2018 Linaro Limited. All rights reserved. + * Author: Rafael David Tinoco + */ + +/* + * Basic tests for errors of clock_settime(2) on different clock types. + */ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" + +#define DELTA_SEC 10 +#define NSEC_PER_SEC (1000000000L) +#define MAX_CLOCKS 16 + +static struct timespec clock_realtime_saved; + +struct test_case { + clockid_t type; + struct timespec newtime; + int exp_err; + int replace; +}; + +struct test_case tc[] = { + { /* case 01: REALTIME: timespec NULL */ + .type = CLOCK_REALTIME, + .newtime.tv_sec = -2, + .exp_err = EFAULT, + .replace = 1, + }, + { /* case 02: REALTIME: tv_sec = -1 */ + .type = CLOCK_REALTIME, + .newtime.tv_sec = -1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 03: REALTIME: tv_nsec = -1 */ + .type = CLOCK_REALTIME, + .newtime.tv_nsec = -1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 04: REALTIME: tv_nsec = 1s+1 */ + .type = CLOCK_REALTIME, + .newtime.tv_nsec = NSEC_PER_SEC + 1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 05: MONOTONIC */ + .type = CLOCK_MONOTONIC, + .exp_err = EINVAL, + }, + { /* case 06: MAXCLOCK */ + .type = MAX_CLOCKS, + .exp_err = EINVAL, + }, + { /* case 07: MAXCLOCK+1 */ + .type = MAX_CLOCKS + 1, + .exp_err = EINVAL, + }, + /* Linux specific */ + { /* case 08: CLOCK_MONOTONIC_COARSE */ + .type = CLOCK_MONOTONIC_COARSE, + .exp_err = EINVAL, + }, + { /* case 09: CLOCK_MONOTONIC_RAW */ + .type = CLOCK_MONOTONIC_RAW, + .exp_err = EINVAL, + }, + { /* case 10: CLOCK_BOOTTIME */ + .type = CLOCK_BOOTTIME, + .exp_err = EINVAL, + }, + { /* case 11: CLOCK_PROCESS_CPUTIME_ID */ + .type = CLOCK_PROCESS_CPUTIME_ID, + .exp_err = EINVAL, + }, + { /* case 12: CLOCK_THREAD_CPUTIME_ID */ + .type = CLOCK_THREAD_CPUTIME_ID, + .exp_err = EINVAL, + }, +}; + +/* + * Some tests may cause libc to segfault when passing bad arguments. + */ +static int sys_clock_settime(clockid_t clk_id, struct timespec *tp) +{ + return tst_syscall(__NR_clock_settime, clk_id, tp); +} + +static int sys_clock_gettime(clockid_t clk_id, struct timespec *tp) +{ + return tst_syscall(__NR_clock_gettime, clk_id, tp); +} + +static void cleanup(void) +{ + /* restore realtime clock */ + + if (sys_clock_settime(CLOCK_REALTIME, &clock_realtime_saved) < 0) + tst_res(TBROK | TTERRNO, "clock_settime(2): could not set " + "current time back"); +} + +static void setup(void) +{ + if (sys_clock_gettime(CLOCK_REALTIME, &clock_realtime_saved) < 0) + tst_res(TBROK | TTERRNO, "clock_gettime(2): could not get " + "current time"); +} + +static void verify_clock_settime(unsigned int i) +{ + struct timespec spec, *specptr; + + if (tc[i].replace == 0) { + + /* add 1 sec to test clock */ + + specptr = &spec; + specptr->tv_sec = clock_realtime_saved.tv_sec + 1; + specptr->tv_nsec = clock_realtime_saved.tv_nsec; + + } else { + + /* bad pointer case */ + + if (tc[i].newtime.tv_sec == -2) + specptr = tst_get_bad_addr(cleanup); + + /* use given values */ + + else { + specptr = &spec; + specptr->tv_sec = tc[i].newtime.tv_sec; + specptr->tv_nsec = tc[i].newtime.tv_nsec; + } + } + + TEST(sys_clock_settime(tc[i].type, specptr)); + + if (TST_RET == -1) { + + if (tc[i].exp_err == TST_ERR) { + + tst_res(TPASS, "clock_settime(2): failed as expected"); + + } else { + tst_res(TFAIL | TTERRNO, "clock_settime(2): " + "failed with different error"); + } + + return; + } + + tst_res(TFAIL | TTERRNO, "clock_settime(2): clock type %d failed", + tc[i].type); +} + +static struct tst_test test = { + .setup = setup, + .test = verify_clock_settime, + .cleanup = cleanup, + .tcnt = ARRAY_SIZE(tc), + .needs_root = 1, +};