From patchwork Mon Sep 10 13:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: subash X-Patchwork-Id: 968024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=zilogic.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4287wZ5zcZz9s3x for ; Mon, 10 Sep 2018 23:21:17 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 48F0E3E6295 for ; Mon, 10 Sep 2018 15:21:14 +0200 (CEST) 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 [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 1D02B3E6280 for ; Mon, 10 Sep 2018 15:21:11 +0200 (CEST) Received: from mail.zilogic.com (mail.zilogic.com [45.33.14.236]) by in-5.smtp.seeweb.it (Postfix) with ESMTP id CF4DE600902 for ; Mon, 10 Sep 2018 15:21:10 +0200 (CEST) Date: Mon, 10 Sep 2018 13:19:53 -0000 To: ltp@lists.linux.it Message-ID: <20180910131953.10668-1-subash@zilogic.com> From: "subash" Received: from localhost.localdomain (broadband.actcorp.in [106.51.154.17]) by mail.zilogic.com; Mon, 10 Sep 2018 13:20:21 -0000 X-Mailer: git-send-email 2.11.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.0 required=7.0 tests=MSGID_FROM_MTA_HEADER, 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/4] Testing statx syscall Timestamp fields 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: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" * statx07.c:The time before and after the execution of the create system call is noted. It is checked whether the birth time returned by statx lies in this range. Signed-off-by: Subash Signed-off-by: Vaishnavi.D --- include/safe_macros_fn.h | 5 ++ include/tst_safe_macros.h | 6 ++ lib/safe_macros.c | 23 ++++++ runtest/syscalls | 1 + testcases/kernel/syscalls/statx/.gitignore | 1 + testcases/kernel/syscalls/statx/Makefile | 4 ++ testcases/kernel/syscalls/statx/statx07.c | 84 ++++++++++++++++++++++ testcases/kernel/syscalls/statx/timestamp_helper.c | 30 ++++++++ testcases/kernel/syscalls/statx/timestamp_helper.h | 15 ++++ 9 files changed, 169 insertions(+) create mode 100644 testcases/kernel/syscalls/statx/statx07.c create mode 100644 testcases/kernel/syscalls/statx/timestamp_helper.c create mode 100644 testcases/kernel/syscalls/statx/timestamp_helper.h diff --git a/include/safe_macros_fn.h b/include/safe_macros_fn.h index 3df952811..578ac08e2 100644 --- a/include/safe_macros_fn.h +++ b/include/safe_macros_fn.h @@ -184,4 +184,9 @@ int safe_closedir(const char *file, const int lineno, void (cleanup_fn)(void), DIR *dirp); +void safe_clock_getres(const char *file, const int lineno, + clockid_t clk_id, struct timespec *res); + +void safe_clock_gettime(const char *file, const int lineno, + clockid_t clk_id, struct timespec *tp); #endif /* SAFE_MACROS_FN_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h index 03657a410..c47342446 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -512,4 +512,10 @@ int safe_personality(const char *filename, unsigned int lineno, } \ } while (0) +#define SAFE_CLOCK_GETRES(clk_id, res)\ + safe_clock_getres(__FILE__, __LINE__, (clk_id), (res)) + +#define SAFE_CLOCK_GETTIME(clk_id, tp)\ + safe_clock_gettime(__FILE__, __LINE__, (clk_id), (tp)) + #endif /* SAFE_MACROS_H__ */ diff --git a/lib/safe_macros.c b/lib/safe_macros.c index 5cc80d035..85643c743 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -1048,3 +1048,26 @@ int safe_mincore(const char *file, const int lineno, void *start, return rval; } + +void safe_clock_getres(const char *file, const int lineno, + clockid_t clk_id, struct timespec *res) +{ + int rval; + + rval = clock_getres(clk_id, res); + if (rval == -1) + tst_brkm(TBROK | TERRNO, NULL, + "%s:%d:, clock_getres() failed", file, lineno); + +} + +void safe_clock_gettime(const char *file, const int lineno, + clockid_t clk_id, struct timespec *tp) +{ + int rval; + + rval = clock_gettime(clk_id, tp); + if (rval == -1) + tst_brkm(TBROK | TERRNO, NULL, + "%s:%d:, clock_gettime() failed", file, lineno); +} diff --git a/runtest/syscalls b/runtest/syscalls index 0d0be7713..da2f8c090 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1504,3 +1504,4 @@ statx02 statx02 statx03 statx03 statx04 statx04 statx05 statx05 +statx07 statx07 \ No newline at end of file diff --git a/testcases/kernel/syscalls/statx/.gitignore b/testcases/kernel/syscalls/statx/.gitignore index 209fc3a33..14cb1ec43 100644 --- a/testcases/kernel/syscalls/statx/.gitignore +++ b/testcases/kernel/syscalls/statx/.gitignore @@ -3,3 +3,4 @@ /statx03 /statx04 /statx05 +/statx07 \ No newline at end of file diff --git a/testcases/kernel/syscalls/statx/Makefile b/testcases/kernel/syscalls/statx/Makefile index 3a9c66d6d..81420497d 100644 --- a/testcases/kernel/syscalls/statx/Makefile +++ b/testcases/kernel/syscalls/statx/Makefile @@ -21,6 +21,10 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk +FILTER_OUT_MAKE_TARGETS := timestamp_helper + %_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 include $(top_srcdir)/include/mk/generic_leaf_target.mk + +$(MAKE_TARGETS): %: %.o timestamp_helper.o diff --git a/testcases/kernel/syscalls/statx/statx07.c b/testcases/kernel/syscalls/statx/statx07.c new file mode 100644 index 000000000..8edcc1974 --- /dev/null +++ b/testcases/kernel/syscalls/statx/statx07.c @@ -0,0 +1,84 @@ +//SPDX-License-Identifier:GPL-2.0-or-later +/* + * Copyright (c) Zilogic Systems Pvt. Ltd., 2018 + * Email : code@zilogic.com + * + */ + +/* + * Test case for statx07. + * + * DESCRIPTION : The time before and after the execution of the create + * system call is noted. It is checked whether the birth time + * returned by statx lies in this range. + * + */ + +#include + + +#include "tst_test.h" +#include "lapi/stat.h" +#include "tst_safe_macros.h" +#include "tst_timer.h" +#include +#include "timestamp_helper.h" + +#define MOUNT_POINT "mount_ext" +#define TEST_FILE MOUNT_POINT"/test_file.txt" + +static void create_file(void) +{ + int test_file_fd; + + test_file_fd = SAFE_CREAT(TEST_FILE, 0666); + SAFE_CLOSE(test_file_fd); +} + +static void test_statx_btime(void) +{ + struct statx buff; + struct timespec before_time; + struct timespec after_time; + struct timespec statx_time; + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME_COARSE, &before_time); + clock_wait_tick(); + create_file(); + clock_wait_tick(); + SAFE_CLOCK_GETTIME(CLOCK_REALTIME_COARSE, &after_time); + + + TEST(statx(AT_FDCWD, TEST_FILE, 0, STATX_ALL, &buff)); + if (TST_RET != 0) + tst_brk(TFAIL | TTERRNO, + "statx(AT_FDCWD, %s, 0, STATX_ALL, &buff)", TEST_FILE); + + statx_timestamp_to_timespec(&buff.stx_btime, &statx_time); + + if (tst_timespec_lt(statx_time, before_time)) + tst_res(TFAIL, "Birth time < before time"); + else if (tst_timespec_lt(after_time, statx_time)) + tst_res(TFAIL, "Birth time > after_time"); + else + tst_res(TPASS, "Birth Time Passed\n"); + +} + +void cleanup(void) +{ + SAFE_UNLINK(TEST_FILE); +} + +static struct tst_test test = { + .test_all = test_statx_btime, + .min_kver = "4.11", + .needs_root = 1, + .needs_tmpdir = 1, + .mntpoint = MOUNT_POINT, + .mount_device = 1, + .dev_fs_type = "ext4", + .dev_min_size = 512, + .mnt_flags = MS_STRICTATIME, + .cleanup = cleanup, +}; diff --git a/testcases/kernel/syscalls/statx/timestamp_helper.c b/testcases/kernel/syscalls/statx/timestamp_helper.c new file mode 100644 index 000000000..cea76b7fa --- /dev/null +++ b/testcases/kernel/syscalls/statx/timestamp_helper.c @@ -0,0 +1,30 @@ +//SPDX-License-Identifier:GPL-2.0-or-later +/* + * Copyright (c) Zilogic Systems Pvt. Ltd., 2018 + * Email: code@zilogic.com + */ + +#define TST_NO_DEFAULT_MAIN + +#include "tst_test.h" +#include "lapi/stat.h" +#include "tst_safe_macros.h" +#include "timestamp_helper.h" + +void statx_timestamp_to_timespec(const struct statx_timestamp *timestamp, + struct timespec *timespec) +{ + timespec->tv_sec = timestamp->tv_sec; + timespec->tv_nsec = timestamp->tv_nsec; +} + +void clock_wait_tick(void) +{ + struct timespec res; + unsigned int usecs; + + SAFE_CLOCK_GETRES(CLOCK_REALTIME_COARSE, &res); + usecs = ((res.tv_sec * 1000000) + (res.tv_nsec / 1000)) * 1.5; + + usleep(usecs); +} diff --git a/testcases/kernel/syscalls/statx/timestamp_helper.h b/testcases/kernel/syscalls/statx/timestamp_helper.h new file mode 100644 index 000000000..8dcd8d6d8 --- /dev/null +++ b/testcases/kernel/syscalls/statx/timestamp_helper.h @@ -0,0 +1,15 @@ +//SPDX-License-Identifier:GPL-2.0-or-later +/* + * Copyright (c) Zilogic Systems Pvt. Ltd., 2018 + * Email: code@zilogic.com + */ + +#ifndef TIMESTAMP_HELPER +#define TIMESTAMP_HELPER + +#include + +void statx_timestamp_to_timespec(const struct statx_timestamp *timestamp, + struct timespec *timespec); +void clock_wait_tick(void); +#endif