[LTP] [PATCH v2 1/2] open12: Convert to new API

Martin Doucha mdoucha@suse.cz
Tue Jun 3 18:13:24 CEST 2025


Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---

Changes since v1:
- Fixed missing TST_PASS check in test_cloexec()
- Use snprintf() to convert file descriptor to string
- Calculate large lseek() offset without floating point arithmetic
- Better result check in test_largefile()

 testcases/kernel/syscalls/open/open12.c | 249 +++++++++---------------
 1 file changed, 93 insertions(+), 156 deletions(-)

diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c
index 188d17946..45984cd0e 100644
--- a/testcases/kernel/syscalls/open/open12.c
+++ b/testcases/kernel/syscalls/open/open12.c
@@ -1,134 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2014 Fujitsu Ltd.
  * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.
+ * Copyright (c) 2025 SUSE LLC <mdoucha@suse.cz>
  */
-/*
- * DESCRIPTION
- *	This test case will verify basic function of open(2) with the flags
- *	O_APPEND, O_NOATIME, O_CLOEXEC and O_LARGEFILE.
+/*\
+ * This test case will verify basic function of open(2) with the flags
+ * O_APPEND, O_NOATIME, O_CLOEXEC and O_LARGEFILE.
  */
 
 #define _GNU_SOURCE
 
-#include <stdio.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
-#include <mntent.h>
-#include <errno.h>
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
+#include "tst_safe_macros.h"
 #include "lapi/fcntl.h"
 #include "lapi/mount.h"
 
 #define MNTPOINT	"mntpoint"
-#define TEST_FILE	MNTPOINT"/test_file"
-#define LARGE_FILE	"large_file"
-
-#define DIR_MODE 0755
-
-char *TCID = "open12";
+#define TEST_FILE	MNTPOINT "/test_file"
+#define LARGE_FILE	MNTPOINT "/large_file"
 
-static const char *device;
-static unsigned int mount_flag, skip_noatime;
+static int fd = -1;
 
-static void setup(void);
-static void cleanup(void);
 static void test_append(void);
 static void test_noatime(void);
 static void test_cloexec(void);
 static void test_largefile(void);
 
-static void (*test_func[])(void) = { test_append, test_noatime, test_cloexec,
-				     test_largefile };
+static void (*test_func[])(void) = {
+	test_append, test_noatime, test_cloexec, test_largefile
+};
 
-int TST_TOTAL = ARRAY_SIZE(test_func);
-
-int main(int argc, char **argv)
+static void run(unsigned int n)
 {
-	int lc;
-	int i;
-
-	tst_parse_opts(argc, argv, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-		for (i = 0; i < TST_TOTAL; i++)
-			(*test_func[i])();
-	}
-
-	cleanup();
-	tst_exit();
+	test_func[n]();
 }
 
 static void setup(void)
 {
-	const char *mount_flags[] = {"noatime", "relatime", NULL};
-
-	TEST_PAUSE;
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	SAFE_MKDIR(cleanup, MNTPOINT, DIR_MODE);
-
-	if (tst_path_has_mnt_flags(cleanup, NULL, mount_flags)) {
-		const char *fs_type;
-
-		fs_type = tst_dev_fs_type();
-		device = tst_acquire_device(cleanup);
-
-		if (!device) {
-			tst_resm(TINFO, "Failed to obtain block device");
-			skip_noatime = 1;
-			goto end;
-		}
-
-		tst_mkfs(cleanup, device, fs_type, NULL, NULL);
-
-		SAFE_MOUNT(cleanup, device, MNTPOINT, fs_type, MS_STRICTATIME, NULL);
-		mount_flag = 1;
-	}
-
-end:
-	SAFE_FILE_PRINTF(cleanup, TEST_FILE, TEST_FILE);
+	SAFE_FILE_PRINTF(TEST_FILE, TEST_FILE);
 }
 
 static void test_append(void)
 {
 	off_t len1, len2;
 
-	TEST(open(TEST_FILE, O_RDWR | O_APPEND, 0777));
+	tst_res(TINFO, "Testing O_APPEND");
+
+	fd = TST_EXP_FD_SILENT(open(TEST_FILE, O_RDWR | O_APPEND, 0644));
 
-	if (TEST_RETURN == -1) {
-		tst_resm(TFAIL | TTERRNO, "open failed");
+	if (!TST_PASS)
 		return;
-	}
 
-	len1 = SAFE_LSEEK(cleanup, TEST_RETURN, 0, SEEK_CUR);
-	SAFE_WRITE(cleanup, SAFE_WRITE_ALL, TEST_RETURN, TEST_FILE,
-		sizeof(TEST_FILE));
-	len2 = SAFE_LSEEK(cleanup, TEST_RETURN, 0, SEEK_CUR);
-	SAFE_CLOSE(cleanup, TEST_RETURN);
+	len1 = SAFE_LSEEK(fd, 0, SEEK_CUR);
+	SAFE_WRITE(1, fd, TEST_FILE, strlen(TEST_FILE));
+	len2 = SAFE_LSEEK(fd, 0, SEEK_CUR);
+	SAFE_CLOSE(fd);
 
 	if (len2 > len1)
-		tst_resm(TPASS, "test O_APPEND for open success");
+		tst_res(TPASS, "O_APPEND works as expected");
 	else
-		tst_resm(TFAIL, "test O_APPEND for open failed");
+		tst_res(TFAIL, "O_APPEND did not move write cursor");
 }
 
 static void test_noatime(void)
@@ -136,31 +69,23 @@ static void test_noatime(void)
 	char read_buf;
 	struct stat old_stat, new_stat;
 
-	if (skip_noatime) {
-		tst_resm(TCONF,
-		         "test O_NOATIME flag for open needs filesystems which "
-		         "is mounted without noatime and relatime");
-		return;
-	}
-
-	SAFE_STAT(cleanup, TEST_FILE, &old_stat);
+	tst_res(TINFO, "Testing O_NOATIME");
 
+	SAFE_STAT(TEST_FILE, &old_stat);
 	sleep(1);
+	fd = TST_EXP_FD_SILENT(open(TEST_FILE, O_RDONLY | O_NOATIME, 0644));
 
-	TEST(open(TEST_FILE, O_RDONLY | O_NOATIME, 0777));
-
-	if (TEST_RETURN == -1) {
-		tst_resm(TFAIL | TTERRNO, "open failed");
+	if (!TST_PASS)
 		return;
-	}
-	SAFE_READ(cleanup, 1, TEST_RETURN, &read_buf, 1);
-	SAFE_CLOSE(cleanup, TEST_RETURN);
-	SAFE_STAT(cleanup, TEST_FILE, &new_stat);
+
+	SAFE_READ(1, fd, &read_buf, 1);
+	SAFE_CLOSE(fd);
+	SAFE_STAT(TEST_FILE, &new_stat);
 
 	if (old_stat.st_atime == new_stat.st_atime)
-		tst_resm(TPASS, "test O_NOATIME for open success");
+		tst_res(TPASS, "File access time was not modified");
 	else
-		tst_resm(TFAIL, "test O_NOATIME for open failed");
+		tst_res(TFAIL, "File access time changed");
 }
 
 static void test_cloexec(void)
@@ -169,80 +94,92 @@ static void test_cloexec(void)
 	int status;
 	char buf[20];
 
-	TEST(open(TEST_FILE, O_RDWR | O_APPEND | O_CLOEXEC, 0777));
+	tst_res(TINFO, "Testing O_CLOEXEC");
 
-	if (TEST_RETURN == -1) {
-		tst_resm(TFAIL | TTERRNO, "open failed");
-		return;
-	}
+	fd = TST_EXP_FD_SILENT(open(TEST_FILE, O_RDWR | O_APPEND | O_CLOEXEC,
+		0644));
 
-	sprintf(buf, "%ld", TEST_RETURN);
+	if (!TST_PASS)
+		return;
 
-	pid = tst_fork();
-	if (pid < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "fork() failed");
+	snprintf(buf, sizeof(buf), "%d", fd);
+	buf[sizeof(buf) - 1] = '\0';
+	pid = SAFE_FORK();
 
 	if (pid == 0) {
 		if (execlp("open12_child", "open12_child", buf, NULL))
 			exit(2);
 	}
 
-	SAFE_CLOSE(cleanup, TEST_RETURN);
+	SAFE_CLOSE(fd);
 
 	if (wait(&status) != pid)
-		tst_brkm(TBROK | TERRNO, cleanup, "wait() failed");
+		tst_brk(TBROK | TERRNO, "wait() failed");
+
+	if (!WIFEXITED(status))
+		tst_brk(TBROK, "open12_child exited with unexpected error");
 
-	if (WIFEXITED(status)) {
-		switch ((int8_t)WEXITSTATUS(status)) {
-		case 0:
-			tst_resm(TPASS, "test O_CLOEXEC for open success");
+	switch (WEXITSTATUS(status)) {
+	case 0:
+		tst_res(TPASS, "File descriptor was closed by execlp()");
 		break;
-		case 1:
-			tst_resm(TFAIL, "test O_CLOEXEC for open failed");
+	case 1:
+		tst_res(TFAIL, "File descriptor remained open after execlp()");
 		break;
-		default:
-			tst_brkm(TBROK, cleanup, "execlp() failed");
-		}
-	} else {
-		tst_brkm(TBROK, cleanup,
-				 "open12_child exits with unexpected error");
+	default:
+		tst_brk(TBROK, "execlp() failed");
 	}
 }
 
 static void test_largefile(void)
 {
-	int fd;
 	off_t offset;
 
-	fd = SAFE_OPEN(cleanup, LARGE_FILE,
-				O_LARGEFILE | O_RDWR | O_CREAT, 0777);
+	tst_res(TINFO, "Testing O_LARGEFILE");
 
-	offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET);
-	if (offset == -1)
-		tst_brkm(TBROK | TERRNO, cleanup, "lseek failed");
+	fd = TST_EXP_FD_SILENT(open(LARGE_FILE, O_LARGEFILE | O_RDWR | O_CREAT,
+		0644));
 
-	SAFE_WRITE(cleanup, SAFE_WRITE_ALL, fd, LARGE_FILE,
-		sizeof(LARGE_FILE));
+	if (!TST_PASS)
+		return;
 
-	SAFE_CLOSE(cleanup, fd);
+	offset = lseek(fd, 4ULL * TST_GB + TST_MB, SEEK_SET);
 
-	TEST(open(LARGE_FILE, O_LARGEFILE | O_RDONLY, 0777));
+	if (offset < 0) {
+		tst_res(TFAIL | TERRNO, "lseek() past 4GB range failed");
+		return;
+	}
 
-	if (TEST_RETURN == -1) {
-		tst_resm(TFAIL, "test O_LARGEFILE for open failed");
-	} else {
-		tst_resm(TPASS, "test O_LARGEFILE for open success");
-		SAFE_CLOSE(cleanup, TEST_RETURN);
+	SAFE_WRITE(1, fd, LARGE_FILE, strlen(LARGE_FILE));
+	SAFE_CLOSE(fd);
+	fd = open(LARGE_FILE, O_LARGEFILE | O_RDONLY, 0644);
+
+	if (fd < 0) {
+		tst_res(TFAIL | TERRNO, "Cannot open large file again");
+		return;
 	}
+
+	tst_res(TPASS, "O_LARGEFILE works as expected");
+	SAFE_CLOSE(fd);
 }
 
 static void cleanup(void)
 {
-	if (mount_flag && tst_umount(MNTPOINT) == -1)
-		tst_brkm(TWARN | TERRNO, NULL, "umount(2) failed");
-
-	if (device)
-		tst_release_device(device);
-
-	tst_rmdir();
+	if (fd >= 0)
+		SAFE_CLOSE(fd);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.test = run,
+	.cleanup = cleanup,
+	.tcnt = ARRAY_SIZE(test_func),
+	.forks_child = 1,
+	.needs_root = 1,
+	.all_filesystems = 1,
+	.mntpoint = MNTPOINT,
+	.filesystems = (struct tst_fs[]){
+		{ .type = NULL, .mnt_flags = MS_STRICTATIME },
+		{}
+	}
+};
-- 
2.49.0



More information about the ltp mailing list