[LTP] [PATCH v1 1/3] Rewrite eventfd2_01 test using new LTP API

Andrea Cervesato
2023-03-08T13:26:20Z

From: Andrea Cervesato <andrea.cervesato@suse.com>

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/syscalls/eventfd2/eventfd2.h | 18 +++
.../kernel/syscalls/eventfd2/eventfd2_01.c | 148 ++++--------------
2 files changed, 51 insertions(+), 115 deletions(-)
create mode 100644 testcases/kernel/syscalls/eventfd2/eventfd2.h

diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2.h b/testcases/kernel/syscalls/eventfd2/eventfd2.h
new file mode 100644
index 000000000..5350820b8
--- /dev/null
+++ b/testcases/kernel/syscalls/eventfd2/eventfd2.h
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+#include "tst_test.h"
+#include "lapi/syscalls.h"
+
+static inline int eventfd2(unsigned int count, unsigned int flags)
+{
+ int ret;
+
+ ret = tst_syscall(__NR_eventfd2, count, flags);
+ if (ret == -1)
+ tst_brk(TBROK | TERRNO, "eventfd2");
+
+ return ret;
+}
diff --git a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
index 85ad86d42..3303ca0db 100644
--- a/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
+++ b/testcases/kernel/syscalls/eventfd2/eventfd2_01.c
@@ -1,119 +1,37 @@
-/******************************************************************************/
-/* */
-/* Copyright (c) Ulrich Drepper <drepper@redhat.com> */
-/* Copyright (c) International Business Machines Corp., 2009 */
-/* */
-/* This program is free software; you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */
-/* the GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-/* */
-/******************************************************************************/
-/******************************************************************************/
-/* */
-/* File: eventfd2_01.c */
-/* */
-/* Description: This Program tests the new system call introduced in 2.6.27. */
-/* Ulrich´s comment as in: */
-/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b087498eb5605673b0f260a7620d91818cd72304 */
-/* says: */
-/* This patch adds the new eventfd2 syscall. It extends the old eventfd */
-/* syscall by one parameter which is meant to hold a flag value. In this */
-/* patch the only flag support is EFD_CLOEXEC which causes the close-on-exec */
-/* flag for the returned file descriptor to be set. A new name EFD_CLOEXEC is */
-/* introduced which in this implementation must have the same value as */
-/* O_CLOEXEC. The following test must be adjusted for architectures other than*/
-/* x86 and x86-64 and in case the syscall numbers changed. */
-/* */
-/* Usage: <for command-line> */
-/* eventfd2_01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */
-/* where, -c n : Run n copies concurrently. */
-/* -e : Turn on errno logging. */
-/* -i n : Execute test n times. */
-/* -I x : Execute test for x seconds. */
-/* -P x : Pause for x seconds between iterations. */
-/* -t : Turn on syscall timing. */
-/* */
-/* Total Tests: 1 */
-/* */
-/* Test Name: eventfd2_01 */
-/* */
-/* Author: Ulrich Drepper <drepper@redhat.com> */
-/* */
-/* History: Created - Jan 08 2009 - Ulrich Drepper <drepper@redhat.com> */
-/* Ported to LTP */
-/* - Jan 08 2009 - Subrata <subrata@linux.vnet.ibm.com> */
-/******************************************************************************/
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include <errno.h>
-
-#include "test.h"
-#include "lapi/fcntl.h"
-#include "lapi/syscalls.h"
-
-#define EFD_CLOEXEC O_CLOEXEC
-
-char *TCID = "eventfd2_01";
-int testno;
-int TST_TOTAL = 1;
-
-void cleanup(void)
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Ulrich Drepper <drepper@redhat.com>
+ * Copyright (c) International Business Machines Corp., 2009
+ * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that eventfd2 correctly set FD_CLOEXEC flag on file when
+ * EFD_CLOEXEC flag is used.
+ */
+
+#include <fcntl.h>
+#include <sys/eventfd.h>
+#include "tst_test.h"
+#include "eventfd2.h"
+
+static void run(void)
{
- tst_rmdir();
-}
+ int fd, flags;

-void setup(void)
-{
- TEST_PAUSE;
- tst_tmpdir();
-}
+ fd = eventfd2(1, 0);
+ flags = SAFE_FCNTL(fd, F_GETFD);
+ TST_EXP_EXPR((flags & FD_CLOEXEC) == 0, "FD_CLOEXEC is not set");
+ SAFE_CLOSE(fd);

-int main(int argc, char *argv[])
-{
- int fd, coe;
-
- tst_parse_opts(argc, argv, NULL, NULL);
-
- setup();
-
- fd = tst_syscall(__NR_eventfd2, 1, 0);
- if (fd == -1) {
- tst_brkm(TFAIL, cleanup, "eventfd2(0) failed");
- }
- coe = fcntl(fd, F_GETFD);
- if (coe == -1) {
- tst_brkm(TBROK, cleanup, "fcntl failed");
- }
- if (coe & FD_CLOEXEC) {
- tst_brkm(TFAIL, cleanup, "eventfd2(0) set close-on-exec flag");
- }
- close(fd);
-
- fd = tst_syscall(__NR_eventfd2, 1, EFD_CLOEXEC);
- if (fd == -1) {
- tst_brkm(TFAIL, cleanup, "eventfd2(EFD_CLOEXEC) failed");
- }
- coe = fcntl(fd, F_GETFD);
- if (coe == -1) {
- tst_brkm(TBROK, cleanup, "fcntl failed");
- }
- if ((coe & FD_CLOEXEC) == 0) {
- tst_brkm(TFAIL, cleanup,
- "eventfd2(EFD_CLOEXEC) does not set close-on-exec flag");
- }
- close(fd);
- tst_resm(TPASS, "eventfd2(EFD_CLOEXEC) Passed");
- cleanup();
- tst_exit();
+ fd = eventfd2(1, EFD_CLOEXEC);
+ flags = SAFE_FCNTL(fd, F_GETFD);
+ TST_EXP_EXPR((flags & FD_CLOEXEC) > 0, "FD_CLOEXEC is set");
+ SAFE_CLOSE(fd);
}
+
+static struct tst_test test = {
+ .test_all = run,
+};
--
2.35.3