Skip to contentSkip to conversation

kselftest: tmpfs: Add ksft macros and skip if no root

PATCH Superseded Shivam Chaudhary 2 participants 4 messages Dec 19, 2024 – Dec 20, 2024 Kselftest

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v6 cover kselftest: tmpfs: Add ksft macros and skip if no root

This version 5 patch series replace direct error handling methods with ksft macros, which provide better reporting.Currently, when the tmpfs test runs, it does not display any output if it passes,and if it fails (particularly when not run as root),it simply exits without any warning or message.

This series of patch adds:

1. Add 'ksft_print_header()' and 'ksft_set_plan()' to structure test outputs more effectively.

2. skip if not run as root.

3. Replace direct error handling with 'ksft_test_result_*', macros for better reporting.

v5->v6:
- Skip if not run as root.
v5 v1: https://lore.kernel.org/all/[email protected]/
v5 v2: https://lore.kernel.org/all/[email protected]/

v4->v5:
- Remove unnecessary pass messages.
- Remove unnecessary use of KSFT_SKIP.
- Add appropriate use of ksft_exit_fail_msg.
v4 v1: https://lore.kernel.org/all/[email protected]/
v4 v2: https://lore.kernel.org/all/[email protected]/

v3->v4:
- Start a patchset
- Split patch into smaller patches to make it easy to review.
Patch1 Replace 'ksft_test_result_skip' with 'KSFT_SKIP' during root run check. Patch2 Replace 'ksft_test_result_fail' with 'KSFT_SKIP' where fail does not make sense,
or failure could be due to not unsupported APIs with appropriate warnings.

v3: https://lore.kernel.org/all/[email protected]/

v2->v3:
- Remove extra ksft_set_plan()
- Remove function for unshare()
- Fix the comment style
v2: https://lore.kernel.org/all/[email protected]/

v1->v2:
- Make the commit message more clear.
v1: https://lore.kernel.org/all/[email protected]/T/#u

thanks
Shivam

Shivam Chaudhary (2):
selftests: tmpfs: Add Test-skip if not run as root
selftests: tmpfs: Add kselftest support to tmpfs

 .../selftests/tmpfs/bug-link-o-tmpfile.c      | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v6 1/2 selftests: tmpfs: Add Test-skip if not run as root

Add 'ksft_exit_skip()', if not run as root, with an appropriate Warning.

Add 'ksft_print_header()' and 'ksft_set_plan()' to structure test outputs more effectively.

Test logs:

Before Change:
- Without root
error: unshare, errno 1

- With root
No, output

After change:

- Without root
TAP version 13
1..1
ok 2 # SKIP This test needs root to run!
Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0

- With root
TAP version 13
1..1

---
 tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c +12 -0
index b5c3ddb90942..657b64857e82 100644
@@ -23,10 +23,22 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
+#include "../kselftest.h"
+
 int main(void)
 {
 	int fd;
 
+	// Setting up kselftest framework
+	ksft_print_header();
+	ksft_set_plan(1);
+
+	// Check if test is run as root
+	if (geteuid()) {
+		ksft_exit_skip("This test needs root to run!\n");
+		return 1;
+	}
+
 	if (unshare(CLONE_NEWNS) == -1) {
 		if (errno == ENOSYS || errno == EPERM) {
 			fprintf(stderr, "error: unshare, errno %d\n", errno);
Signature · 1 line
2.34.1
#2 lore raw

PATCH v6 2/2 selftests: tmpfs: Add kselftest support to tmpfs

In reply to Shivam Chaudhary

Replace direct error handling with 'ksft_test_result_*' macros for better reporting.

Test logs:

Before change:
- Without root
error: unshare, errno 1

- With root
No, output

After change:
- Without root
TAP version 13
1..1
ok 2 # SKIP This test needs root to run!
Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0

- With root
TAP version 13
1..1
ok 1 Test : Success
Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0

---
 .../selftests/tmpfs/bug-link-o-tmpfile.c      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c +15 -14
index 657b64857e82..91b30a0ca365 100644
@@ -41,39 +41,40 @@ int main(void)
 
 	if (unshare(CLONE_NEWNS) == -1) {
 		if (errno == ENOSYS || errno == EPERM) {
-			fprintf(stderr, "error: unshare, errno %d\n", errno);
-			return 4;
+			ksft_test_result_skip("unshare() error: unshare, errno %d\n", errno);
+		}
+		else {
+			ksft_exit_fail_msg("unshare() error: unshare, errno %d\n", errno);
 		}
-		fprintf(stderr, "error: unshare, errno %d\n", errno);
-		return 1;
 	}
+
 	if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) == -1) {
-		fprintf(stderr, "error: mount '/', errno %d\n", errno);
-		return 1;
+		ksft_exit_fail_msg("mount() error: Root filesystem private mount: Fail %d\n", errno);
 	}
 
 	/* Our heroes: 1 root inode, 1 O_TMPFILE inode, 1 permanent inode. */
 	if (mount(NULL, "/tmp", "tmpfs", 0, "nr_inodes=3") == -1) {
-		fprintf(stderr, "error: mount tmpfs, errno %d\n", errno);
-		return 1;
+		ksft_exit_fail_msg("mount() error: Mounting tmpfs on /tmp: Fail %d\n", errno);
 	}
 
 	fd = openat(AT_FDCWD, "/tmp", O_WRONLY|O_TMPFILE, 0600);
 	if (fd == -1) {
-		fprintf(stderr, "error: open 1, errno %d\n", errno);
-		return 1;
+		ksft_exit_fail_msg("openat() error: Open first temporary file: Fail %d\n", errno);
 	}
+
 	if (linkat(fd, "", AT_FDCWD, "/tmp/1", AT_EMPTY_PATH) == -1) {
-		fprintf(stderr, "error: linkat, errno %d\n", errno);
-		return 1;
+		ksft_exit_fail_msg("linkat() error: Linking the temporary file: Fail %d\n", errno);
+		/* Ensure fd is closed on failure */
+		close(fd);
 	}
 	close(fd);
 
 	fd = openat(AT_FDCWD, "/tmp", O_WRONLY|O_TMPFILE, 0600);
 	if (fd == -1) {
-		fprintf(stderr, "error: open 2, errno %d\n", errno);
-		return 1;
+		ksft_exit_fail_msg("openat() error: Opening the second temporary file: Fail %d\n", errno);
 	}
 
+	ksft_test_result_pass("Test : Success\n");
+	ksft_exit_pass();
 	return 0;
 }
Signature · 1 line
2.34.1
maintainer
#3 lore raw

Re: [PATCH v6 2/2] selftests: tmpfs: Add kselftest support to tmpfs

Quoted 35 lines · Shivam Chaudhary

Replace direct error handling with 'ksft_test_result_*' macros for better reporting.

Test logs:

Before change:
- Without root
error: unshare, errno 1

- With root
No, output

After change:
- Without root
TAP version 13
1..1
ok 2 # SKIP This test needs root to run!
Totals: pass:0 fail:0 xfail:0 xpass:0 skip:1 error:0

- With root
TAP version 13
1..1
ok 1 Test : Success
Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0

---
  .../selftests/tmpfs/bug-link-o-tmpfile.c      | 29 ++++++++++---------
  1 file changed, 15 insertions(+), 14 deletions(-)
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c +0 -0
index 657b64857e82..91b30a0ca365 100644

tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c int main(void) · line 44

Quoted 6 lines
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c +1 -2
@@ -41,39 +41,40 @@ int main(void)
 
  	if (unshare(CLONE_NEWNS) == -1) {
  		if (errno == ENOSYS || errno == EPERM) {
-			fprintf(stderr, "error: unshare, errno %d\n", errno);
-			return 4;
+			ksft_test_result_skip("unshare() error: unshare, errno %d\n", errno);

ksft_exit_skip_msg() is a better choice here.
The rest looks good.

thanks,
-- Shuah