libltp: add support for .needs_rofs for EROFS check

lib/tst_test.c +1 -0

index 4c30edab5..828eae49d 100644
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/time.h>

lib/tst_test.c +0 -0

 struct results {
 	int passed;

@@ -701,7 +702,32 @@ static void do_setup(int argc, char *argv[])
 	if (needs_tmpdir() && !tst_tmpdir_created())
 		tst_tmpdir();

lib/tst_test.c +13 -3

+					"setting up a device instead\n",
+					tst_test->mntpoint);
+			tst_test->mount_device = 1;
+			tst_test->needs_device = 1;
+			tst_test->format_device = 1;
+			tst_test->mnt_flags = MS_RDONLY;
+		} else {
+			mntpoint_active = 1;
+		}
+	}
+
+	if (tst_test->needs_device && !mntpoint_active) {
 		tdev.dev = tst_acquire_device_(NULL, tst_test->dev_min_size);
 
 		if (!tdev.dev)

@@ -721,16 +747,14 @@ static void do_setup(int argc, char *argv[])
 		}
 
 		if (tst_test->mount_device) {
-
 			if (!tst_test->mntpoint) {
 				tst_brk(TBROK,
 					"tst_test->mntpoint must be set!");
 			}
 
-			SAFE_MKDIR(tst_test->mntpoint, 0777);
 			SAFE_MOUNT(tdev.dev, tst_test->mntpoint, tdev.fs_type,
 				   tst_test->mnt_flags, tst_test->mnt_data);
-			device_mounted = 1;
+			mntpoint_active = 1;
 		}
 	}
 

Hi!

Quoted 13 lines

lib/tst_test.c +1 -0

index 4c30edab5..828eae49d 100644
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/time.h>

lib/tst_test.c struct tst_test *tst_test; · line 45

Quoted 5 lines

lib/tst_test.c +1 -1

@@ -41,7 +42,7 @@ struct tst_test *tst_test;
 static int iterations = 1;
 static float duration = -1;
 static pid_t main_pid, lib_pid;
-static int device_mounted;
+static int mntpoint_active;

A bit better name would be 'mntpoint_mounted' but that is very minor.

Quoted 5 lines

lib/tst_test.c +0 -0

 struct results {
 	int passed;

@@ -701,7 +702,32 @@ static void do_setup(int argc, char *argv[])
 	if (needs_tmpdir() && !tst_tmpdir_created())
 		tst_tmpdir();

lib/tst_test.c static void do_setup(int argc, char *argv[]) · line 712

Quoted 10 lines

lib/tst_test.c +8 -1

 
-	if (tst_test->needs_device) {
+	if (tst_test->mntpoint)
+		SAFE_MKDIR(tst_test->mntpoint, 0777);
+
+	if (tst_test->needs_rofs) {
+		if (!tst_test->mntpoint) {
+			tst_brk(TBROK,
+				"tst_test->mntpoint must be set!");
+		}

We may as well move this check from both branches to the top to avoid duplication, i.e. add:

	if ((tst_test->needs_rofs || tst_test->mount_device) &&
	    !tst_test->mntpoint) {
		tst_brk(TBROK, "tst_test->mntpoint must be set!");
	}

lib/tst_test.c static void do_setup(int argc, char *argv[]) · line 718

Quoted 5 lines

lib/tst_test.c +5 -0

+		/* If we failed to do read-only bind mount for '/'. Fallback to
+		 * using a device with empty read-only filesystem.
+		 */
+		if (mount(NULL, tst_test->mntpoint, "tmpfs", MS_RDONLY, NULL)) {
+			tst_res(TINFO, "Cannot mount tmpfs read-only at %s, "

^
Maybe we should add | TERRNO here as well so that user gets a hint why this mount() had failed.

Quoted 41 lines

lib/tst_test.c +14 -4

+					"setting up a device instead\n",
+					tst_test->mntpoint);
+			tst_test->mount_device = 1;
+			tst_test->needs_device = 1;
+			tst_test->format_device = 1;
+			tst_test->mnt_flags = MS_RDONLY;
+		} else {
+			mntpoint_active = 1;
+		}
+	}
+
+	if (tst_test->needs_device && !mntpoint_active) {
 		tdev.dev = tst_acquire_device_(NULL, tst_test->dev_min_size);
 
 		if (!tdev.dev)

@@ -721,16 +747,14 @@ static void do_setup(int argc, char *argv[])
 		}
 
 		if (tst_test->mount_device) {
-
 			if (!tst_test->mntpoint) {
 				tst_brk(TBROK,
 					"tst_test->mntpoint must be set!");
 			}
 
-			SAFE_MKDIR(tst_test->mntpoint, 0777);
 			SAFE_MOUNT(tdev.dev, tst_test->mntpoint, tdev.fs_type,
 				   tst_test->mnt_flags, tst_test->mnt_data);
-			device_mounted = 1;
+			mntpoint_active = 1;
 		}
 	}
 

@@ -751,7 +775,7 @@ static void do_test_setup(void)
 
 static void do_cleanup(void)
 {
-	if (device_mounted)
+	if (mntpoint_active)
 		tst_umount(tst_test->mntpoint);
 

lib/tst_test.c static void do_test_setup(void) · line 781

Quoted 1 line

lib/tst_test.c +0 -0

 	if (tst_test->needs_device && tdev.dev)

Other than the minor nits it looks good to me.

Prefer to use the read-only bind mount of '/' over create, format and mount a filesystem image for testing 'EROFS' return value from access()

Signed-off-by Sandeep Patil <[email protected]>

---
 testcases/kernel/syscalls/access/access04.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

testcases/kernel/syscalls/access/access04.c +0 -0

index dbb6d271a..626e6df2c 100644

Hi!

Quoted 18 lines

Prefer to use the read-only bind mount of '/' over create, format and mount a filesystem image for testing 'EROFS' return value from access()

Signed-off-by Sandeep Patil <[email protected]>

---
 testcases/kernel/syscalls/access/access04.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

testcases/kernel/syscalls/access/access04.c +0 -1

index dbb6d271a..626e6df2c 100644
@@ -125,9 +125,8 @@ static struct tst_test test = {
 	.needs_tmpdir = 1,
 	.needs_root = 1,
 	.forks_child = 1,
-	.mount_device = 1,

testcases/kernel/syscalls/access/access04.c static struct tst_test test = { · line 132

Quoted 6 lines

testcases/kernel/syscalls/access/access04.c +1 -1

+	.needs_rofs = 1,
 	.mntpoint = MNT_POINT,
-	.mnt_flags = MS_RDONLY,
 	.setup = setup,
 	.test = verify_access,
 };

This is obviously correct, how many testcases can use this interface?

Lookint into the git tree, there is at least creat06 that could be converted in the very same way, then there is a quite a bit of testcases that will need to be converted to the new test library first.

Signature · 3 lines

-- 
Cyril Hrubis
[email protected]