Skip to contentSkip to conversation

symlink01 split

PATCH Superseded Andrea Cervesato 4 participants 20 messages Jul 2, 2024 – Jul 9, 2024

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover symlink01 split

This is a developement series (requested by Petr Vorel) that handle symlink01 split, which has been already merged in the master branch.

In this series we face the next part of symlink01 split that includes stat04, lstat03, open15 and chmod08.

---
Andrea Cervesato (5):
Add stat04 test
Fix TST_EXP_EXTR() stringification
Add lstat03 test
Add chmod08 test
Add open15 test

 include/tst_test_macros.h                  |   5 +-
 runtest/smoketest                          |   4 +-
 runtest/syscalls                           |  11 +--
 testcases/kernel/syscalls/chmod/.gitignore |   1 +
 testcases/kernel/syscalls/chmod/chmod08.c  |  45 +++++++++++
 testcases/kernel/syscalls/fork/fork04.c    |   6 +-
 testcases/kernel/syscalls/lstat/.gitignore |   2 +
 testcases/kernel/syscalls/lstat/lstat03.c  | 102 ++++++++++++++++++++++++
 testcases/kernel/syscalls/open/.gitignore  |   1 +
 testcases/kernel/syscalls/open/open15.c    |  86 ++++++++++++++++++++
 testcases/kernel/syscalls/stat/.gitignore  |   2 +
 testcases/kernel/syscalls/stat/stat04.c    | 121 +++++++++++++++++++++++++++++
 12 files changed, 374 insertions(+), 12 deletions(-)

---
base-commit: 072f359ac54395af1d5ade4ca8cc347c5afe6310
change-id: 20240702-stat04-ceeb58b80910

Best regards,

Signature · 5 lines
Andrea Cervesato <[email protected]>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

PATCH 1/5 Add stat04 test

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 test and it checks that stat() executed on file provide the same information of symlink linking to it.

---
 runtest/smoketest                         |   4 +-
 runtest/syscalls                          |   4 +-
 testcases/kernel/syscalls/stat/.gitignore |   2 +
 testcases/kernel/syscalls/stat/stat04.c   | 121 ++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+), 4 deletions(-)
runtest/smoketest +2 -2
index f6f14fd2b..5608417f9 100644
@@ -8,8 +8,8 @@ time01 time01
 wait02 wait02
 write01 write01
 symlink01 symlink01
-stat04 symlink01 -T stat04
-utime07 utime07
+stat04 stat04
+utime01A symlink01 -T utime01
 rename01A symlink01 -T rename01
 splice02 splice02 -s 20
 df01_sh df01.sh
runtest/syscalls +2 -2
index 44a577db3..3e7a5ca1b 100644
@@ -1535,8 +1535,8 @@ stat02 stat02
 stat02_64 stat02_64
 stat03 stat03
 stat03_64 stat03_64
-stat04 symlink01 -T stat04
-stat04_64 symlink01 -T stat04_64
+stat04 stat04
+stat04_64 stat04_64
 
 statfs01 statfs01
 statfs01_64 statfs01_64
testcases/kernel/syscalls/stat/.gitignore +2 -0
index fa0a4ce9f..0a62dc6ee 100644
@@ -4,3 +4,5 @@
 /stat02_64
 /stat03
 /stat03_64
+/stat04
+/stat04_64
testcases/kernel/syscalls/stat/stat04.c new file +121 -0

121 lines not on this page · raw message

Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Quoted 138 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 test and it checks that stat() executed on file provide the same information of symlink linking to it.

---
 runtest/smoketest                         |   4 +-
 runtest/syscalls                          |   4 +-
 testcases/kernel/syscalls/stat/.gitignore |   2 +
 testcases/kernel/syscalls/stat/stat04.c   | 121
++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+), 4 deletions(-)
runtest/smoketest +2 -2
index f6f14fd2b..5608417f9 100644
@@ -8,8 +8,8 @@ time01 time01
 wait02 wait02
 write01 write01
 symlink01 symlink01
-stat04 symlink01 -T stat04
-utime07 utime07
+stat04 stat04
+utime01A symlink01 -T utime01
 rename01A symlink01 -T rename01
 splice02 splice02 -s 20
 df01_sh df01.sh
runtest/syscalls +2 -2
index 44a577db3..3e7a5ca1b 100644
@@ -1535,8 +1535,8 @@ stat02 stat02
 stat02_64 stat02_64
 stat03 stat03
 stat03_64 stat03_64
-stat04 symlink01 -T stat04
-stat04_64 symlink01 -T stat04_64
+stat04 stat04
+stat04_64 stat04_64
 
 statfs01 statfs01
 statfs01_64 statfs01_64
testcases/kernel/syscalls/stat/.gitignore +2 -0
index fa0a4ce9f..0a62dc6ee 100644
@@ -4,3 +4,5 @@
 /stat02_64
 /stat03
 /stat03_64
+/stat04
+/stat04_64
testcases/kernel/syscalls/stat/stat04.c new file +11 -0
new file mode 100644
index 000000000..ee635dbd9
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner, Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato <[email protected]>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test checks that stat() executed on file provide the same

information
+ * of symlink linking to it.
+ */

testcases/kernel/syscalls/stat/stat04.c new file +60 -0
+
+#include <stdlib.h>
+#include "tst_test.h"
+
+#define FILENAME "file.txt"
+#define MNTPOINT "mntpoint"
+#define SYMBNAME MNTPOINT"/file_symlink"
+
+static struct stat *file_stat;
+static struct stat *symb_stat;
+static char *tmpdir;
+
+static void run(void)
+{
+       TST_EXP_EQ_LI(file_stat->st_dev, symb_stat->st_dev);
+       TST_EXP_EQ_LI(file_stat->st_mode, symb_stat->st_mode);
+       TST_EXP_EQ_LI(file_stat->st_nlink, symb_stat->st_nlink);
+       TST_EXP_EQ_LI(file_stat->st_uid, symb_stat->st_uid);
+       TST_EXP_EQ_LI(file_stat->st_gid, symb_stat->st_gid);
+       TST_EXP_EQ_LI(file_stat->st_size, symb_stat->st_size);
+       TST_EXP_EQ_LI(file_stat->st_atime, symb_stat->st_atime);
+       TST_EXP_EQ_LI(file_stat->st_mtime, symb_stat->st_mtime);
+       TST_EXP_EQ_LI(file_stat->st_ctime, symb_stat->st_ctime);
+}
+
+static void setup(void)
+{
+       char opt_bsize[32];
+       char symb_path[PATH_MAX];
+       char file_path[PATH_MAX];
+       const char *const fs_opts[] = {opt_bsize, NULL};
+       struct stat sb;
+       int pagesize;
+       int fd;
+
+       tmpdir = tst_get_tmpdir();
+
+       if (strlen(tmpdir) >= (PATH_MAX - strlen(FILENAME))) {
+               tst_brk(TCONF, "Temporary folder name is too long. "
+                       "Can't create file");
+       }
+
+       if (strlen(tmpdir) >= (PATH_MAX - strlen(SYMBNAME))) {
+               tst_brk(TCONF, "Temporary folder name is too long. "
+                       "Can't create symbolic link");
+       }
+
+       /* change st_blksize / st_dev */
+       SAFE_STAT(".", &sb);
+       pagesize = sb.st_blksize == 4096 ? 1024 : 4096;
+
+       snprintf(opt_bsize, sizeof(opt_bsize), "-b %i", pagesize);
+       SAFE_MKFS(tst_device->dev, tst_device->fs_type, fs_opts, NULL);
+       SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, 0);
+
+       SAFE_TOUCH(FILENAME, 0777, NULL);
+
+       /* change st_nlink */
+       SAFE_LINK(FILENAME, "linked_file");
+

testcases/kernel/syscalls/stat/stat04.c line 83

Quoted 10 lines
testcases/kernel/syscalls/stat/stat04.c new file +10 -0
+       /* change st_uid and st_gid */
+       SAFE_CHOWN(FILENAME, 1000, 1000);
+
+       /* change st_size */
+       fd = SAFE_OPEN(FILENAME, O_WRONLY, 0777);
+       tst_fill_fd(fd, 'a', TST_KB, 500);
+       SAFE_CLOSE(fd);
+
+       /* change st_atime / st_mtime / st_ctime */
+       sleep(1);

Does this 1sec sleep make real sense to the test? Can we remove it?

Quoted 47 lines
testcases/kernel/syscalls/stat/stat04.c new file +38 -1
+
+       memset(file_path, 0, PATH_MAX);
+       snprintf(file_path, PATH_MAX, "%s/%s", tmpdir, FILENAME);
+
+       memset(symb_path, 0, PATH_MAX);
+       snprintf(symb_path, PATH_MAX, "%s/%s", tmpdir, SYMBNAME);
+
+       SAFE_SYMLINK(file_path, symb_path);
+
+       SAFE_STAT(file_path, file_stat);
+       SAFE_STAT(symb_path, symb_stat);
+}
+
+static void cleanup(void)
+{
+       free(tmpdir);
+
+       SAFE_UNLINK(SYMBNAME);
+
+       if (tst_is_mounted(MNTPOINT))
+               SAFE_UMOUNT(MNTPOINT);
+}
+
+static struct tst_test test = {
+       .setup = setup,
+       .cleanup = cleanup,
+       .test_all = run,
+       .needs_root = 1,
+       .needs_tmpdir = 1,
+       .needs_device = 1,
+       .mntpoint = MNTPOINT,
+       .dev_fs_type = "ext2",
+       .bufs = (struct tst_buffers []) {
+               {&file_stat, .size = sizeof(struct stat)},
+               {&symb_stat, .size = sizeof(struct stat)},
+               {}
+       }
+};
 
--

2.43.0

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Hi!

Quoted 5 lines

testcases/kernel/syscalls/stat/stat04.c line 83

Quoted 3 lines
testcases/kernel/syscalls/stat/stat04.c new file +2 -0
+       /* change st_atime / st_mtime / st_ctime */
+       sleep(1);

Does this 1sec sleep make real sense to the test? Can we remove it?

With utimensat we can easily change access time and modification time but you can't change status change time. So we either sleep here or set the system clock back, change the file and then reset the system clock back.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Hi!

Quoted 10 lines
Quoted 5 lines

testcases/kernel/syscalls/stat/stat04.c line 83

Quoted 3 lines
testcases/kernel/syscalls/stat/stat04.c new file +2 -0
+       /* change st_atime / st_mtime / st_ctime */
+       sleep(1);

Does this 1sec sleep make real sense to the test? Can we remove it?

With utimensat we can easily change access time and modification time but you can't change status change time. So we either sleep here or set the system clock back, change the file and then reset the system clock back.

And if you are asking if the test will run fine without the sleep, it will run and it will pass, but the timestamps will be same for the link and the file, so if kernel picks up wrong timestamp we will not find out.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Quoted 12 lines · Cyril Hrubis

Hi!

Quoted 10 lines
Quoted 5 lines

testcases/kernel/syscalls/stat/stat04.c line 83

Quoted 3 lines
testcases/kernel/syscalls/stat/stat04.c new file +2 -0
+       /* change st_atime / st_mtime / st_ctime */
+       sleep(1);

Does this 1sec sleep make real sense to the test? Can we remove it?

With utimensat we can easily change access time and modification time but you can't change status change time. So we either sleep here or set the system clock back, change the file and then reset the system clock back.

Quoted 5 lines

And if you are asking if the test will run fine without the sleep, it will run and it will pass, but the timestamps will be same for the link and the file, so if kernel picks up wrong timestamp we will not find out.

I'm confused, do you mean if the kernel sets a wrong timestamp it could report TFAIL?

From what I can tell, the stat(sym_path,) also retrieves information of the target file,
shouldn't that always equal the stat(file_path,) timestamp? As long as the stat()
works correctly, with sleep(1) or not won't impact anything.

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#6 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Hi!

Quoted 6 lines
Quoted 5 lines

And if you are asking if the test will run fine without the sleep, it will run and it will pass, but the timestamps will be same for the link and the file, so if kernel picks up wrong timestamp we will not find out.

Quoted 8 lines

I'm confused, do you mean if the kernel sets a wrong timestamp it could report TFAIL?

From what I can tell, the stat(sym_path,) also retrieves information of the target file,
shouldn't that always equal the stat(file_path,) timestamp? As long as the stat()
works correctly, with sleep(1) or not won't impact anything.

The test tries to assert that stat() follows the symlink and this test is a unit test for this assertion. However if we do not spend some effort on making the link and target attributes actually diffferent the test would pass even if kernel returned the attributes for the symlink instead.

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by
#7 lore raw

Re: [LTP] [PATCH 1/5] Add stat04 test

Quoted 14 lines · Cyril Hrubis

Hi!

Quoted 6 lines
Quoted 5 lines

And if you are asking if the test will run fine without the sleep, it will run and it will pass, but the timestamps will be same for the link and the file, so if kernel picks up wrong timestamp we will not find out.

Quoted 6 lines

I'm confused, do you mean if the kernel sets a wrong timestamp it could report TFAIL?

From what I can tell, the stat(sym_path,) also retrieves information of the target file,
shouldn't that always equal the stat(file_path,) timestamp? As long as

the

Quoted 9 lines
Quoted 2 lines

stat()
works correctly, with sleep(1) or not won't impact anything.

The test tries to assert that stat() follows the symlink and this test is a unit test for this assertion. However if we do not spend some effort on making the link and target attributes actually diffferent the test would pass even if kernel returned the attributes for the symlink instead.

Oh yes, I see. That wait a moment is quite necessary, thanks!

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#8 lore raw

PATCH 2/5 Fix TST_EXP_EXTR() stringification

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

Follow the TST_* macros standards when it comes to stringification of the expressions.

---
 include/tst_test_macros.h               | 5 +++--
 testcases/kernel/syscalls/fork/fork04.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
include/tst_test_macros.h +3 -2
index 22b39fb14..7a443c803 100644
@@ -340,8 +340,9 @@ const char *tst_errno_names(char *buf, const int *exp_errs, int exp_errs_cnt);
 			&tst_exp_err__, 1, ##__VA_ARGS__);                     \
 	} while (0)
 
-#define TST_EXP_EXPR(EXPR, FMT, ...)						\
-	tst_res_(__FILE__, __LINE__, (EXPR) ? TPASS : TFAIL, "Expect: " FMT, ##__VA_ARGS__);
+#define TST_EXP_EXPR(EXPR, ...)                                              \
+       tst_res_(__FILE__, __LINE__, (EXPR) ? TPASS : TFAIL, "Expect: "       \
+                TST_FMT_(TST_2_(dummy, ##__VA_ARGS__, #EXPR), __VA_ARGS__));
 
 #define TST_EXP_EQ_(VAL_A, SVAL_A, VAL_B, SVAL_B, TYPE, PFS) do {\
 	TYPE tst_tmp_a__ = VAL_A; \
testcases/kernel/syscalls/fork/fork04.c +3 -3
index b0c6bebe0..413cd5eb4 100644
@@ -29,7 +29,7 @@ static void run_child(void)
 
 	TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
 		"%s environ variable has been inherited by the child",
-		ENV_KEY)
+		ENV_KEY);
 
 	tst_res(TINFO, "Unset %s environ variable inside child", ENV_KEY);
 
@@ -72,7 +72,7 @@ static void run(void)
 	} else {
 		TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
 			"%s environ variable is still present inside parent",
-			ENV_KEY)
+			ENV_KEY);
 	}
 
 	TST_CHECKPOINT_WAKE_AND_WAIT(0);
@@ -85,7 +85,7 @@ static void run(void)
 	else {
 		TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
 			"%s environ variable didn't change inside parent",
-			ENV_KEY)
+			ENV_KEY);
 	}
 }
 
Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v1 2/5
#9 lore raw

Re: [LTP] [PATCH 2/5] Fix TST_EXP_EXTR() stringification

Quoted 7 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

Follow the TST_* macros standards when it comes to stringification of the expressions.

---

Quoted 69 lines
 include/tst_test_macros.h               | 5 +++--
 testcases/kernel/syscalls/fork/fork04.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
include/tst_test_macros.h +0 -2
index 22b39fb14..7a443c803 100644
@@ -340,8 +340,9 @@ const char *tst_errno_names(char *buf, const int
 *exp_errs, int exp_errs_cnt);
                        &tst_exp_err__, 1, ##__VA_ARGS__);
     \
        } while (0)
 
-#define TST_EXP_EXPR(EXPR, FMT, ...)
     \
-       tst_res_(__FILE__, __LINE__, (EXPR) ? TPASS : TFAIL, "Expect: "

FMT, ##__VA_ARGS__);

include/tst_test_macros.h +3 -0
+#define TST_EXP_EXPR(EXPR, ...)
    \
+       tst_res_(__FILE__, __LINE__, (EXPR) ? TPASS : TFAIL, "Expect: "
   \
+                TST_FMT_(TST_2_(dummy, ##__VA_ARGS__, #EXPR),

__VA_ARGS__));

 #define TST_EXP_EQ_(VAL_A, SVAL_A, VAL_B, SVAL_B, TYPE, PFS) do {\
        TYPE tst_tmp_a__ = VAL_A; \
testcases/kernel/syscalls/fork/fork04.c +2 -2
index b0c6bebe0..413cd5eb4 100644
@@ -29,7 +29,7 @@ static void run_child(void)
 
        TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
                "%s environ variable has been inherited by the child",
-               ENV_KEY)
+               ENV_KEY);
 
        tst_res(TINFO, "Unset %s environ variable inside child", ENV_KEY);
 
@@ -72,7 +72,7 @@ static void run(void)
        } else {
                TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
                        "%s environ variable is still present inside
 parent",
-                       ENV_KEY)
+                       ENV_KEY);
        }
 
        TST_CHECKPOINT_WAKE_AND_WAIT(0);
testcases/kernel/syscalls/fork/fork04.c +1 -2
@@ -85,7 +85,7 @@ static void run(void)
        else {
                TST_EXP_EXPR(strcmp(ENV_VAL0, val) == 0,
                        "%s environ variable didn't change inside parent",
-                       ENV_KEY)
+                       ENV_KEY);
        }
 }
 
 
--

2.43.0

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#11 lore raw

PATCH 3/5 Add lstat03 test

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 test and it checks that lstat() provides the right information, according with device, access time, block size, ownership, etc.

---
 runtest/syscalls                           |   4 +-
 testcases/kernel/syscalls/lstat/.gitignore |   2 +
 testcases/kernel/syscalls/lstat/lstat03.c  | 102 +++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)
runtest/syscalls +2 -2
index 3e7a5ca1b..d78b6822b 100644
@@ -725,12 +725,12 @@ lseek02 lseek02
 lseek07 lseek07
 lseek11 lseek11
 
-lstat01A symlink01 -T lstat01
-lstat01A_64 symlink01 -T lstat01_64
 lstat01 lstat01
 lstat01_64 lstat01_64
 lstat02 lstat02
 lstat02_64 lstat02_64
+lstat03 lstat03
+lstat03_64 lstat03_64
 
 mallinfo02 mallinfo02
 
testcases/kernel/syscalls/lstat/.gitignore +2 -0
index a497a445f..72cba871f 100644
@@ -2,3 +2,5 @@
 /lstat01_64
 /lstat02
 /lstat02_64
+/lstat03
+/lstat03_64
testcases/kernel/syscalls/lstat/lstat03.c new file +102 -0

102 lines not on this page · raw message

Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#12 lore raw

Re: [LTP] [PATCH 3/5] Add lstat03 test

Quoted 124 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 test and it checks that lstat() provides the right information, according with device, access time, block size, ownership, etc.

---
 runtest/syscalls                           |   4 +-
 testcases/kernel/syscalls/lstat/.gitignore |   2 +
 testcases/kernel/syscalls/lstat/lstat03.c  | 102
+++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)
runtest/syscalls +2 -2
index 3e7a5ca1b..d78b6822b 100644
@@ -725,12 +725,12 @@ lseek02 lseek02
 lseek07 lseek07
 lseek11 lseek11
 
-lstat01A symlink01 -T lstat01
-lstat01A_64 symlink01 -T lstat01_64
 lstat01 lstat01
 lstat01_64 lstat01_64
 lstat02 lstat02
 lstat02_64 lstat02_64
+lstat03 lstat03
+lstat03_64 lstat03_64
 
 mallinfo02 mallinfo02
 
testcases/kernel/syscalls/lstat/.gitignore +2 -0
index a497a445f..72cba871f 100644
@@ -2,3 +2,5 @@
 /lstat01_64
 /lstat02
 /lstat02_64
+/lstat03
+/lstat03_64
testcases/kernel/syscalls/lstat/lstat03.c new file +13 -0
new file mode 100644
index 000000000..b52ba0c35
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner, Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato [email protected]
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that lstat() provides correct information according
+ * with device, access time, block size, ownership, etc.
+ * The implementation provides a set of tests which are specific for each

one
+ * of the struct stat used to read file and symlink information.
+ */

testcases/kernel/syscalls/lstat/lstat03.c new file +56 -0
+
+#include "tst_test.h"
+
+#define FILENAME "file.txt"
+#define MNTPOINT "mntpoint"
+#define SYMBNAME MNTPOINT"/file_symlink"
+
+static struct stat *file_stat;
+static struct stat *symb_stat;
+
+static void run(void)
+{
+       TST_EXP_EXPR(file_stat->st_dev != symb_stat->st_dev);
+       TST_EXP_EXPR(file_stat->st_mode != symb_stat->st_mode);
+       TST_EXP_EXPR(file_stat->st_nlink != symb_stat->st_nlink);
+       TST_EXP_EXPR(file_stat->st_ino != symb_stat->st_ino);
+       TST_EXP_EXPR(file_stat->st_uid != symb_stat->st_uid);
+       TST_EXP_EXPR(file_stat->st_gid != symb_stat->st_gid);
+       TST_EXP_EXPR(file_stat->st_size != symb_stat->st_size);
+       TST_EXP_EXPR(file_stat->st_blocks != symb_stat->st_blocks);
+       TST_EXP_EXPR(file_stat->st_blksize != symb_stat->st_blksize);
+       TST_EXP_EXPR(file_stat->st_atime != symb_stat->st_atime);
+       TST_EXP_EXPR(file_stat->st_mtime != symb_stat->st_mtime);
+       TST_EXP_EXPR(file_stat->st_ctime != symb_stat->st_ctime);
+}
+
+static void setup(void)
+{
+       char opt_bsize[32];
+       const char *const fs_opts[] = {opt_bsize, NULL};
+       struct stat sb;
+       int pagesize;
+       int fd;
+
+       /* change st_blksize / st_dev */
+       SAFE_STAT(".", &sb);
+       pagesize = sb.st_blksize == 4096 ? 1024 : 4096;
+
+       snprintf(opt_bsize, sizeof(opt_bsize), "-b %i", pagesize);
+       SAFE_MKFS(tst_device->dev, tst_device->fs_type, fs_opts, NULL);
+       SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, 0);
+
+       SAFE_TOUCH(FILENAME, 0777, NULL);
+
+       /* change st_nlink */
+       SAFE_LINK(FILENAME, "linked_file");
+
+       /* change st_uid and st_gid */
+       SAFE_CHOWN(FILENAME, 1000, 1000);
+
+       /* change st_size */
+       fd = SAFE_OPEN(FILENAME, O_WRONLY, 0777);
+       tst_fill_fd(fd, 'a', TST_KB, 500);
+       SAFE_CLOSE(fd);
+
+       /* change st_atime / st_mtime / st_ctime */

testcases/kernel/syscalls/lstat/lstat03.c line 77

Quoted 10 lines
testcases/kernel/syscalls/lstat/lstat03.c new file +6 -0
+       sleep(1);
+
+       SAFE_SYMLINK(FILENAME, SYMBNAME);
+
 
 
 
 
+       SAFE_LSTAT(FILENAME, file_stat);
+       SAFE_LSTAT(SYMBNAME, symb_stat);

Maybe it would be better to move those two lines into run() function. It makes the test real performed again when using '-i 2' parameter.

Quoted 34 lines
testcases/kernel/syscalls/lstat/lstat03.c new file +25 -1
+}
+
+static void cleanup(void)
+{
+       SAFE_UNLINK(SYMBNAME);
+
+       if (tst_is_mounted(MNTPOINT))
+               SAFE_UMOUNT(MNTPOINT);
+}
+
+static struct tst_test test = {
+       .setup = setup,
+       .cleanup = cleanup,
+       .test_all = run,
+       .needs_root = 1,
+       .needs_tmpdir = 1,
+       .needs_device = 1,
+       .mntpoint = MNTPOINT,
+       .dev_fs_type = "ext2",
+       .bufs = (struct tst_buffers []) {
+               {&file_stat, .size = sizeof(struct stat)},
+               {&symb_stat, .size = sizeof(struct stat)},
+               {}
+       }
+};
 
--

2.43.0

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#13 lore raw

Re: [LTP] [PATCH 3/5] Add lstat03 test

Quoted 122 lines · Li Wang
Quoted 117 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 test and it checks that lstat() provides the right information, according with device, access time, block size, ownership, etc.

---
 runtest/syscalls                           |   4 +-
 testcases/kernel/syscalls/lstat/.gitignore |   2 +
 testcases/kernel/syscalls/lstat/lstat03.c  | 102
+++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)
runtest/syscalls +2 -2
index 3e7a5ca1b..d78b6822b 100644
@@ -725,12 +725,12 @@ lseek02 lseek02
 lseek07 lseek07
 lseek11 lseek11
 
-lstat01A symlink01 -T lstat01
-lstat01A_64 symlink01 -T lstat01_64
 lstat01 lstat01
 lstat01_64 lstat01_64
 lstat02 lstat02
 lstat02_64 lstat02_64
+lstat03 lstat03
+lstat03_64 lstat03_64
 
 mallinfo02 mallinfo02
 
testcases/kernel/syscalls/lstat/.gitignore +2 -0
index a497a445f..72cba871f 100644
@@ -2,3 +2,5 @@
 /lstat01_64
 /lstat02
 /lstat02_64
+/lstat03
+/lstat03_64
testcases/kernel/syscalls/lstat/lstat03.c new file +13 -0
new file mode 100644
index 000000000..b52ba0c35
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner, Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato [email protected]
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that lstat() provides correct information according
+ * with device, access time, block size, ownership, etc.
+ * The implementation provides a set of tests which are specific for

each one
+ * of the struct stat used to read file and symlink information.
+ */

testcases/kernel/syscalls/lstat/lstat03.c new file +50 -0
+
+#include "tst_test.h"
+
+#define FILENAME "file.txt"
+#define MNTPOINT "mntpoint"
+#define SYMBNAME MNTPOINT"/file_symlink"
+
+static struct stat *file_stat;
+static struct stat *symb_stat;
+
+static void run(void)
+{
+       TST_EXP_EXPR(file_stat->st_dev != symb_stat->st_dev);
+       TST_EXP_EXPR(file_stat->st_mode != symb_stat->st_mode);
+       TST_EXP_EXPR(file_stat->st_nlink != symb_stat->st_nlink);
+       TST_EXP_EXPR(file_stat->st_ino != symb_stat->st_ino);
+       TST_EXP_EXPR(file_stat->st_uid != symb_stat->st_uid);
+       TST_EXP_EXPR(file_stat->st_gid != symb_stat->st_gid);
+       TST_EXP_EXPR(file_stat->st_size != symb_stat->st_size);
+       TST_EXP_EXPR(file_stat->st_blocks != symb_stat->st_blocks);
+       TST_EXP_EXPR(file_stat->st_blksize != symb_stat->st_blksize);
+       TST_EXP_EXPR(file_stat->st_atime != symb_stat->st_atime);
+       TST_EXP_EXPR(file_stat->st_mtime != symb_stat->st_mtime);
+       TST_EXP_EXPR(file_stat->st_ctime != symb_stat->st_ctime);
+}
+
+static void setup(void)
+{
+       char opt_bsize[32];
+       const char *const fs_opts[] = {opt_bsize, NULL};
+       struct stat sb;
+       int pagesize;
+       int fd;
+
+       /* change st_blksize / st_dev */
+       SAFE_STAT(".", &sb);
+       pagesize = sb.st_blksize == 4096 ? 1024 : 4096;
+
+       snprintf(opt_bsize, sizeof(opt_bsize), "-b %i", pagesize);
+       SAFE_MKFS(tst_device->dev, tst_device->fs_type, fs_opts, NULL);
+       SAFE_MOUNT(tst_device->dev, MNTPOINT, tst_device->fs_type, 0, 0);
+
+       SAFE_TOUCH(FILENAME, 0777, NULL);
+
+       /* change st_nlink */
+       SAFE_LINK(FILENAME, "linked_file");
+
+       /* change st_uid and st_gid */
+       SAFE_CHOWN(FILENAME, 1000, 1000);
+
Quoted 9 lines

testcases/kernel/syscalls/lstat/lstat03.c line 72

Quoted 8 lines
testcases/kernel/syscalls/lstat/lstat03.c new file +7 -0
+       /* change st_size */
+       fd = SAFE_OPEN(FILENAME, O_WRONLY, 0777);
+       tst_fill_fd(fd, 'a', TST_KB, 500);
+       SAFE_CLOSE(fd);
+
+       /* change st_atime / st_mtime / st_ctime */
+       sleep(1);

And, I would suggest using usleep(1001000) instead of 1sec especial for such atime checking test.

To avoid problem like:
https://github.com/linux-test-project/ltp/commit/ff60156bc02f255fa08934b95223e29a6637eb6a

Quoted 55 lines

+

testcases/kernel/syscalls/lstat/lstat03.c line 77

Quoted 9 lines
testcases/kernel/syscalls/lstat/lstat03.c new file +4 -0
+       SAFE_SYMLINK(FILENAME, SYMBNAME);
+
 
 
 
 
+       SAFE_LSTAT(FILENAME, file_stat);
+       SAFE_LSTAT(SYMBNAME, symb_stat);

Maybe it would be better to move those two lines into run() function. It makes the test real performed again when using '-i 2' parameter.

Quoted 30 lines
testcases/kernel/syscalls/lstat/lstat03.c new file +25 -1
+}
+
+static void cleanup(void)
+{
+       SAFE_UNLINK(SYMBNAME);
+
+       if (tst_is_mounted(MNTPOINT))
+               SAFE_UMOUNT(MNTPOINT);
+}
+
+static struct tst_test test = {
+       .setup = setup,
+       .cleanup = cleanup,
+       .test_all = run,
+       .needs_root = 1,
+       .needs_tmpdir = 1,
+       .needs_device = 1,
+       .mntpoint = MNTPOINT,
+       .dev_fs_type = "ext2",
+       .bufs = (struct tst_buffers []) {
+               {&file_stat, .size = sizeof(struct stat)},
+               {&symb_stat, .size = sizeof(struct stat)},
+               {}
+       }
+};
 
--

2.43.0

Quoted 4 lines

--
Mailing list info: https://lists.linux.it/listinfo/ltp

--
Regards,
Li Wang

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#14 lore raw

PATCH 4/5 Add chmod08 test

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 and it verifies that chmod() is working correctly on symlink() generated files.

---
 runtest/syscalls                           |  1 +
 testcases/kernel/syscalls/chmod/.gitignore |  1 +
 testcases/kernel/syscalls/chmod/chmod08.c  | 45 ++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
runtest/syscalls +1 -0
index d78b6822b..928e75f9b 100644
@@ -72,6 +72,7 @@ chmod03 chmod03
 chmod05 chmod05
 chmod06 chmod06
 chmod07 chmod07
+chmod08 chmod08
 
 chown01 chown01
 chown01_16 chown01_16
testcases/kernel/syscalls/chmod/.gitignore +1 -0
index 27ddfce16..f295f4dcb 100644
@@ -3,3 +3,4 @@
 /chmod05
 /chmod06
 /chmod07
+/chmod08
testcases/kernel/syscalls/chmod/chmod08.c new file +45 -0

45 lines not on this page · raw message

Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v1 4/5
#15 lore raw

Re: [LTP] [PATCH 4/5] Add chmod08 test

Quoted 7 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 and it verifies that chmod() is working correctly on symlink() generated files.

---

Quoted 89 lines
 runtest/syscalls                           |  1 +
 testcases/kernel/syscalls/chmod/.gitignore |  1 +
 testcases/kernel/syscalls/chmod/chmod08.c  | 45
++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
runtest/syscalls +1 -0
index d78b6822b..928e75f9b 100644
@@ -72,6 +72,7 @@ chmod03 chmod03
 chmod05 chmod05
 chmod06 chmod06
 chmod07 chmod07
+chmod08 chmod08
 
 chown01 chown01
 chown01_16 chown01_16
testcases/kernel/syscalls/chmod/.gitignore +1 -0
index 27ddfce16..f295f4dcb 100644
@@ -3,3 +3,4 @@
 /chmod05
 /chmod06
 /chmod07
+/chmod08
testcases/kernel/syscalls/chmod/chmod08.c new file +45 -1
new file mode 100644
index 000000000..7ef396348
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner
+ *    Copilot: Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato [email protected]
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that chmod() is working correctly on symlink()
+ * generated files.
+ */
+
+#include "tst_test.h"
+
+#define PERMS 01777
+#define TESTFILE "myobject"
+
+static void run(void)
+{
+       char *symname = "my_symlink0";
+       struct stat oldsym_stat;
+       struct stat newsym_stat;
+
+       SAFE_TOUCH(TESTFILE, 0644, NULL);
+       SAFE_SYMLINK(TESTFILE, symname);
+       SAFE_STAT(symname, &oldsym_stat);
+
+       TST_EXP_PASS(chmod(symname, PERMS));
+       SAFE_STAT(symname, &newsym_stat);
+
+       TST_EXP_EQ_LI(newsym_stat.st_mode & PERMS, PERMS);
+       TST_EXP_EXPR(oldsym_stat.st_mode != newsym_stat.st_mode,
+               "file mode has changed");
+
+       SAFE_UNLINK(symname);
+       SAFE_UNLINK(TESTFILE);
+}
+
+static struct tst_test test = {
+       .test_all = run,
+       .needs_tmpdir = 1,
+};
 
--

2.43.0

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#16 lore raw

PATCH 5/5 Add open15 test

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 and it verifies that open() is working correctly on symlink() generated files.

---
 runtest/syscalls                          |  2 +-
 testcases/kernel/syscalls/open/.gitignore |  1 +
 testcases/kernel/syscalls/open/open15.c   | 86 +++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)
runtest/syscalls +1 -1
index 928e75f9b..47efac158 100644
@@ -923,7 +923,6 @@ nice04 nice04
 nice05 nice05
 
 open01 open01
-open01A symlink01 -T open01
 open02 open02
 open03 open03
 open04 open04
@@ -936,6 +935,7 @@ open11 open11
 open12 open12
 open13 open13
 open14 open14
+open15 open15
 
 openat01 openat01
 openat02 openat02
testcases/kernel/syscalls/open/.gitignore +1 -0
index 001d874d6..af5997572 100644
@@ -12,3 +12,4 @@
 /open12_child
 /open13
 /open14
+/open15
testcases/kernel/syscalls/open/open15.c new file +86 -0

86 lines not on this page · raw message

Signature · 5 lines
2.43.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#17 lore raw

Re: [LTP] [PATCH 5/5] Add open15 test

Quoted 85 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 and it verifies that open() is working correctly on symlink() generated files.

---
 runtest/syscalls                          |  2 +-
 testcases/kernel/syscalls/open/.gitignore |  1 +
 testcases/kernel/syscalls/open/open15.c   | 86
+++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)
runtest/syscalls +1 -1
index 928e75f9b..47efac158 100644
@@ -923,7 +923,6 @@ nice04 nice04
 nice05 nice05
 
 open01 open01
-open01A symlink01 -T open01
 open02 open02
 open03 open03
 open04 open04
@@ -936,6 +935,7 @@ open11 open11
 open12 open12
 open13 open13
 open14 open14
+open15 open15
 
 openat01 openat01
 openat02 openat02
testcases/kernel/syscalls/open/.gitignore +1 -0
index 001d874d6..af5997572 100644
@@ -12,3 +12,4 @@
 /open12_child
 /open13
 /open14
+/open15
testcases/kernel/syscalls/open/open15.c new file +35 -0
new file mode 100644
index 000000000..cbe2d62a4
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner
+ *    Copilot: Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato [email protected]
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that open() is working correctly on symlink()
+ * generated files.
+ */
+
+#include "tst_test.h"
+
+#define FILENAME "myfile.txt"
+#define BIG_STRING "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
+
+static void test_open_symlink(void)
+{
+       int fd;
+       int str_size;
+       char buff[128];
+       char *symname = "my_symlink0";
+
+       str_size = strlen(BIG_STRING);
+
+       SAFE_SYMLINK(FILENAME, symname);
+
+       fd = SAFE_OPEN(symname, O_CREAT | O_RDWR, 0777);
+       SAFE_WRITE(SAFE_WRITE_ALL, fd, BIG_STRING, str_size);
+       SAFE_LSEEK(fd, 0, 0);
+       SAFE_READ(1, fd, buff, str_size);

testcases/kernel/syscalls/open/open15.c line 45

Quoted 10 lines
testcases/kernel/syscalls/open/open15.c new file +10 -0
+       SAFE_CLOSE(fd);
+
+       TST_EXP_EXPR(!strncmp(buff, BIG_STRING, str_size),
+               "symlink generated file can be opened to write data");
+
+       SAFE_UNLINK(symname);
+       SAFE_UNLINK(FILENAME);
+}
+
+static void test_open_compare(void)

+{

Quoted 10 lines
testcases/kernel/syscalls/open/open15.c new file +9 -0
+       int fd_file, fd_symlink;
+       int str_size;
+       char buff_file[128];
+       char buff_symlink[128];
+       char *symname = "my_symlink1";
+
+       str_size = strlen(BIG_STRING);
+
+       fd_file = SAFE_OPEN(FILENAME, O_CREAT | O_RDWR, 0777);

testcases/kernel/syscalls/open/open15.c line 65

Quoted 10 lines
testcases/kernel/syscalls/open/open15.c new file +10 -0
+       SAFE_WRITE(SAFE_WRITE_ALL, fd_file, BIG_STRING, str_size);
+
+       SAFE_SYMLINK(FILENAME, symname);
+
+       SAFE_LSEEK(fd_file, 0, 0);
+       SAFE_READ(1, fd_file, buff_file, str_size);
+
+       fd_symlink = SAFE_OPEN(symname, O_RDWR, 0777);
+       SAFE_LSEEK(fd_symlink, 0, 0);
+       SAFE_READ(1, fd_symlink, buff_symlink, str_size);

Isn't this tst_open_compare already cover the open symlink test? Maybe we could remove the test_open_symlink?

Quoted 31 lines
testcases/kernel/syscalls/open/open15.c new file +3 -0
+
+       TST_EXP_EXPR(!strncmp(buff_file, buff_symlink, str_size),
+               "file data is the equivalent to symlink generated file

data");

testcases/kernel/syscalls/open/open15.c new file +18 -1
+
+       SAFE_CLOSE(fd_file);
+       SAFE_CLOSE(fd_symlink);
+
+       SAFE_UNLINK(symname);
+       SAFE_UNLINK(FILENAME);
+}
+
+static void run(void)
+{
+       test_open_symlink();
+       test_open_compare();
+}
+
+static struct tst_test test = {
+       .test_all = run,
+       .needs_tmpdir = 1,
+};
 
--

2.43.0

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#18 lore raw

Re: [LTP] [PATCH 5/5] Add open15 test

Quoted 117 lines · Li Wang
Quoted 85 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

This test has been extracted from symlink01 and it verifies that open() is working correctly on symlink() generated files.

---
 runtest/syscalls                          |  2 +-
 testcases/kernel/syscalls/open/.gitignore |  1 +
 testcases/kernel/syscalls/open/open15.c   | 86
+++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)
runtest/syscalls +1 -1
index 928e75f9b..47efac158 100644
@@ -923,7 +923,6 @@ nice04 nice04
 nice05 nice05
 
 open01 open01
-open01A symlink01 -T open01
 open02 open02
 open03 open03
 open04 open04
@@ -936,6 +935,7 @@ open11 open11
 open12 open12
 open13 open13
 open14 open14
+open15 open15
 
 openat01 openat01
 openat02 openat02
testcases/kernel/syscalls/open/.gitignore +1 -0
index 001d874d6..af5997572 100644
@@ -12,3 +12,4 @@
 /open12_child
 /open13
 /open14
+/open15
testcases/kernel/syscalls/open/open15.c new file +35 -0
new file mode 100644
index 000000000..cbe2d62a4
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
+ *    Author: David Fenner
+ *    Copilot: Jon Hendrickson
+ * Copyright (C) 2024 Andrea Cervesato [email protected]
+ */
+
+/*\
+ * [Description]
+ *
+ * This test verifies that open() is working correctly on symlink()
+ * generated files.
+ */
+
+#include "tst_test.h"
+
+#define FILENAME "myfile.txt"
+#define BIG_STRING "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
+
+static void test_open_symlink(void)
+{
+       int fd;
+       int str_size;
+       char buff[128];
+       char *symname = "my_symlink0";
+
+       str_size = strlen(BIG_STRING);
+
+       SAFE_SYMLINK(FILENAME, symname);
+
+       fd = SAFE_OPEN(symname, O_CREAT | O_RDWR, 0777);
+       SAFE_WRITE(SAFE_WRITE_ALL, fd, BIG_STRING, str_size);
+       SAFE_LSEEK(fd, 0, 0);
+       SAFE_READ(1, fd, buff, str_size);

testcases/kernel/syscalls/open/open15.c line 45

Quoted 10 lines
testcases/kernel/syscalls/open/open15.c new file +10 -0
+       SAFE_CLOSE(fd);
+
+       TST_EXP_EXPR(!strncmp(buff, BIG_STRING, str_size),
+               "symlink generated file can be opened to write data");
+
+       SAFE_UNLINK(symname);
+       SAFE_UNLINK(FILENAME);
+}
+
+static void test_open_compare(void)

+{

Quoted 15 lines
testcases/kernel/syscalls/open/open15.c new file +15 -0
+       int fd_file, fd_symlink;
+       int str_size;
+       char buff_file[128];
+       char buff_symlink[128];
+       char *symname = "my_symlink1";
+
+       str_size = strlen(BIG_STRING);
+
+       fd_file = SAFE_OPEN(FILENAME, O_CREAT | O_RDWR, 0777);
+       SAFE_WRITE(SAFE_WRITE_ALL, fd_file, BIG_STRING, str_size);
+
+       SAFE_SYMLINK(FILENAME, symname);
+
+       SAFE_LSEEK(fd_file, 0, 0);
+       SAFE_READ(1, fd_file, buff_file, str_size);
Quoted 9 lines

testcases/kernel/syscalls/open/open15.c line 65

Quoted 5 lines
testcases/kernel/syscalls/open/open15.c new file +4 -0
+
+       fd_symlink = SAFE_OPEN(symname, O_RDWR, 0777);
+       SAFE_LSEEK(fd_symlink, 0, 0);
+       SAFE_READ(1, fd_symlink, buff_symlink, str_size);

Isn't this tst_open_compare already cover the open symlink test? Maybe we could remove the test_open_symlink?

But if we want to check that open() working correctly on symlink() create file,
so just reversing the order of some code inside tst_open_compare should be fine?

static void test_open_compare(void)

{
    ...

    str_size = strlen(BIG_STRING);

    SAFE_SYMLINK(FILENAME, symname);

    fd_symlink = SAFE_OPEN(symname, O_CREAT | O_RDWR, 0777);
    SAFE_WRITE(SAFE_WRITE_ALL, fd_symlink, BIG_STRING, str_size);
    SAFE_LSEEK(fd_symlink, 0, 0);
    SAFE_READ(1, fd_symlink, buff_symlink, str_size);

    fd_file = SAFE_OPEN(FILENAME, O_RDWR, 0777);
    SAFE_LSEEK(fd_file, 0, 0);
    SAFE_READ(1, fd_file, buff_file, str_size);

    TST_EXP_EXPR(!strncmp(buff_file, buff_symlink, str_size),
    "file data is the equivalent to symlink generated file data");

    ...
}
Quoted 38 lines
Quoted 29 lines
testcases/kernel/syscalls/open/open15.c new file +3 -0
+
+       TST_EXP_EXPR(!strncmp(buff_file, buff_symlink, str_size),
+               "file data is the equivalent to symlink generated file

data");

testcases/kernel/syscalls/open/open15.c new file +18 -1
+
+       SAFE_CLOSE(fd_file);
+       SAFE_CLOSE(fd_symlink);
+
+       SAFE_UNLINK(symname);
+       SAFE_UNLINK(FILENAME);
+}
+
+static void run(void)
+{
+       test_open_symlink();
+       test_open_compare();
+}
+
+static struct tst_test test = {
+       .test_all = run,
+       .needs_tmpdir = 1,
+};
 
--

2.43.0

Quoted 4 lines

--
Mailing list info: https://lists.linux.it/listinfo/ltp

--
Regards,
Li Wang

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#19 lore raw

Re: [LTP] [PATCH 5/5] Add open15 test

Hi!

Quoted 155 lines · Li Wang

On Thu, Jul 4, 2024 at 3:18 PM Li Wang <[email protected]> wrote:

    On Tue, Jul 2, 2024 at 10:15 PM Andrea Cervesato
    <[email protected]> wrote:

        From: Andrea Cervesato <[email protected]>

        This test has been extracted from symlink01 and it verifies that
        open() is working correctly on symlink() generated files.

        Signed-off-by: Andrea Cervesato <[email protected]>
        ---
         runtest/syscalls                          |  2 +-
         testcases/kernel/syscalls/open/.gitignore |  1 +
         testcases/kernel/syscalls/open/open15.c   | 86
        +++++++++++++++++++++++++++++++
         3 files changed, 88 insertions(+), 1 deletion(-)

        diff --git a/runtest/syscalls b/runtest/syscalls
        index 928e75f9b..47efac158 100644
        --- a/runtest/syscalls
        +++ b/runtest/syscalls
        @@ -923,7 +923,6 @@ nice04 nice04
         nice05 nice05

         open01 open01
        -open01A symlink01 -T open01
         open02 open02
         open03 open03
         open04 open04
        @@ -936,6 +935,7 @@ open11 open11
         open12 open12
         open13 open13
         open14 open14
        +open15 open15

         openat01 openat01
         openat02 openat02
        diff --git a/testcases/kernel/syscalls/open/.gitignore
        b/testcases/kernel/syscalls/open/.gitignore
        index 001d874d6..af5997572 100644
        --- a/testcases/kernel/syscalls/open/.gitignore
        +++ b/testcases/kernel/syscalls/open/.gitignore
        @@ -12,3 +12,4 @@
         /open12_child
         /open13
         /open14
        +/open15
        diff --git a/testcases/kernel/syscalls/open/open15.c
        b/testcases/kernel/syscalls/open/open15.c
        new file mode 100644
        index 000000000..cbe2d62a4
        --- /dev/null
        +++ b/testcases/kernel/syscalls/open/open15.c
        @@ -0,0 +1,86 @@
        +// SPDX-License-Identifier: GPL-2.0-or-later
        +/*
        + * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights
        Reserved.
        + *    Author: David Fenner
        + *    Copilot: Jon Hendrickson
        + * Copyright (C) 2024 Andrea Cervesato [email protected]
        + */
        +
        +/*\
        + * [Description]
        + *
        + * This test verifies that open() is working correctly on
        symlink()
        + * generated files.
        + */
        +
        +#include "tst_test.h"
        +
        +#define FILENAME "myfile.txt"
        +#define BIG_STRING
        "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
        +
        +static void test_open_symlink(void)
        +{
        +       int fd;
        +       int str_size;
        +       char buff[128];
        +       char *symname = "my_symlink0";
        +
        +       str_size = strlen(BIG_STRING);
        +
        +       SAFE_SYMLINK(FILENAME, symname);
        +
        +       fd = SAFE_OPEN(symname, O_CREAT | O_RDWR, 0777);
        +       SAFE_WRITE(SAFE_WRITE_ALL, fd, BIG_STRING, str_size);
        +       SAFE_LSEEK(fd, 0, 0);
        +       SAFE_READ(1, fd, buff, str_size);
        +       SAFE_CLOSE(fd);
        +
        +       TST_EXP_EXPR(!strncmp(buff, BIG_STRING, str_size),
        +               "symlink generated file can be opened to write
        data");
        +
        +       SAFE_UNLINK(symname);
        +       SAFE_UNLINK(FILENAME);
        +}
        +
        +static void test_open_compare(void)

        +{
        +       int fd_file, fd_symlink;
        +       int str_size;
        +       char buff_file[128];
        +       char buff_symlink[128];
        +       char *symname = "my_symlink1";
        +
        +       str_size = strlen(BIG_STRING);
        +
        +       fd_file = SAFE_OPEN(FILENAME, O_CREAT | O_RDWR, 0777);
        +       SAFE_WRITE(SAFE_WRITE_ALL, fd_file, BIG_STRING, str_size);
        +
        +       SAFE_SYMLINK(FILENAME, symname);
        +
        +       SAFE_LSEEK(fd_file, 0, 0);
        +       SAFE_READ(1, fd_file, buff_file, str_size);
        +
        +       fd_symlink = SAFE_OPEN(symname, O_RDWR, 0777);
        +       SAFE_LSEEK(fd_symlink, 0, 0);
        +       SAFE_READ(1, fd_symlink, buff_symlink, str_size);


    Isn't this tst_open_compare already cover the open symlink test?
    Maybe we could remove the test_open_symlink?

But if we want to check that open() working correctly on symlink() create file, so just reversing the order of some code inside tst_open_compare should be fine?

static void test_open_compare(void)
{
    ...

    str_size = strlen(BIG_STRING);

    SAFE_SYMLINK(FILENAME, symname);

    fd_symlink = SAFE_OPEN(symname, O_CREAT | O_RDWR, 0777); SAFE_WRITE(SAFE_WRITE_ALL, fd_symlink, BIG_STRING, str_size); SAFE_LSEEK(fd_symlink, 0, 0);
    SAFE_READ(1, fd_symlink, buff_symlink, str_size);

    fd_file = SAFE_OPEN(FILENAME, O_RDWR, 0777);
    SAFE_LSEEK(fd_file, 0, 0);
    SAFE_READ(1, fd_file, buff_file, str_size);

Quoted 7 lines

    TST_EXP_EXPR(!strncmp(buff_file, buff_symlink, str_size), "file data is the equivalent to symlink generated file data");

    ...
}

That's a good idea, i will apply it. Thanks

Quoted 28 lines
        +
        +       TST_EXP_EXPR(!strncmp(buff_file, buff_symlink, str_size),
        +               "file data is the equivalent to symlink
        generated file data");
        +
        +       SAFE_CLOSE(fd_file);
        +       SAFE_CLOSE(fd_symlink);
        +
        +       SAFE_UNLINK(symname);
        +       SAFE_UNLINK(FILENAME);
        +}
        +
        +static void run(void)
        +{
        +       test_open_symlink();
        +       test_open_compare();
        +}
        +
        +static struct tst_test test = {
        +       .test_all = run,
        +       .needs_tmpdir = 1,
        +};

        -- 
        2.43.0
Quoted 14 lines
        -- 
        Mailing list info: https://lists.linux.it/listinfo/ltp



    -- 
    Regards,
    Li Wang
Signature · 2 lines
Regards,
Li Wang

Andrea

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp