selftests/landlock: fix fs_tests when overlayfs
Subsystems (3)
v8 cover selftests/landlock: fix fs_tests when overlayfs
From: Jeff Xu <[email protected]>
Overlayfs can be disabled in kernel config, causing related tests to fail. Adding a check for overlayfs’s supportability at runtime, so we can call SKIP() when needed.
Note:
Below comments are raised during V7 discussion:
Currently SKIP() is applied to FIXTURE_SETUP, FIXTURE_TEARDOWN, TEST_F_FORK, this is because SKIP() apply within the function scope, not the testcase.
We would like test infra to have a dedicated environment check hook (FIXTURE_ENV_CHECK) in test infra, called before FIXTURE_SETUP(). If the environment check fails, the remaining of the test will be skipped. The benefit of these are two:
1> if env check pass, in theory, the test should pass. 2> if env check fail, no need to call setup, so no need to cleanup resource.
v8:
style change, no logic change.
v7:
https://lore.kernel.org/all/[email protected]/
Fix bug in supports_overlayfs().
Manual test with kernel with and without overlayfs.
v6: https://lore.kernel.org/all/[email protected]/
In v4, the SKIP() was applied at FIXTURE_SETUP() after mount() fail, however, FIXTURE_TEARDOWN() will fail. It might be complicated for test infra or testcase itself to have cleanup code handing the success/failure of steps in SETUP().
This patch changes the approach, it calls supports_overlay() and SKIP() at the beginning of FIXTURE_SETUP(), FIX_TEARDOWN(), TEST_F_FORK(). Because no modification of system is done by the test, cleanup is not needed.
v4:
https://lore.kernel.org/all/[email protected]/
Jeff Xu (1):
selftests/landlock: skip overlayfs test when not support
tools/testing/selftests/landlock/fs_test.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)
base-commit: 963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
PATCH v8 1/1 selftests/landlock: skip overlayfs test when not support
From: Jeff Xu <[email protected]>
Overlayfs can be disabled in kernel config, causing related tests to fail. Add check for overlayfs’s supportability at runtime, so we can call SKIP() when needed.
--- tools/testing/selftests/landlock/fs_test.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)
tools/testing/selftests/landlock/fs_test.c +48 -0
@@ -11,6 +11,7 @@#include <fcntl.h> #include <linux/landlock.h> #include <sched.h> +#include <stdio.h> #include <string.h> #include <sys/capability.h> #include <sys/mount.h>
@@ -87,6 +88,41 @@ static const char dir_s3d3[] = TMP_DIR "/s3d1/s3d2/s3d3";* └── s3d3 */ +static bool fgrep (FILE *inf,const char *str) +{ +char line[32 ]; +int slen =strlen (str); + +while (!feof (inf)) { +if (!fgets (line,sizeof (line), inf)) +break ; +if (strncmp (line, str, slen)) +continue ; + +return true; + } + +return false; +} + +static bool supports_overlayfs (void ) +{ +bool res; +FILE *inf =fopen ("/proc/filesystems" ,"r" ); + +/* +* If fopen failed, return supported. +* This help detect missing file (shall not happen). +*/ +if (!inf) +return true; + + res =fgrep (inf,"nodev\toverlay\n" ); +fclose (inf); + +return res; +} +static void mkdir_parents (struct __test_metadata *const _metadata,const char *const path) {
@@ -3404,6 +3440,9 @@ FIXTURE(layout2_overlay) {};FIXTURE_SETUP (layout2_overlay) { +if (!supports_overlayfs ()) +SKIP (return,"overlayfs is not supported" ); +prepare_layout (_metadata);create_directory (_metadata,LOWER_BASE );
@@ -3440,6 +3479,9 @@ FIXTURE_SETUP(layout2_overlay)FIXTURE_TEARDOWN (layout2_overlay) { +if (!supports_overlayfs ()) +SKIP (return,"overlayfs is not supported" ); +EXPECT_EQ (0 ,remove_path (lower_do1_fl3));EXPECT_EQ (0 ,remove_path (lower_dl1_fl2));EXPECT_EQ (0 ,remove_path (lower_fl1));
@@ -3471,6 +3513,9 @@ FIXTURE_TEARDOWN(layout2_overlay) TEST_F_FORK(layout2_overlay, no_restriction) { +if (!supports_overlayfs ()) +SKIP (return,"overlayfs is not supported" ); +ASSERT_EQ (0 ,test_open (lower_fl1,O_RDONLY ));ASSERT_EQ (0 ,test_open (lower_dl1,O_RDONLY ));ASSERT_EQ (0 ,test_open (lower_dl1_fl2,O_RDONLY ));
@@ -3634,6 +3679,9 @@ TEST_F_FORK(layout2_overlay, same_content_different_file)size_t i;const char *path_entry; +if (!supports_overlayfs ()) +SKIP (return,"overlayfs is not supported" ); +/* Sets rules on base directories (i.e. outside overlay scope). */ ruleset_fd =create_ruleset (_metadata,ACCESS_RW , layer1_base);ASSERT_LE (0 , ruleset_fd);
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
Mickaël Salaün
maintainerThanks Jeff! I pushed this patch in -next: https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/log/?h=next
Quoted 52 lines · On 13/01/2023 06:32, [email protected] wrote:
From: Jeff Xu <[email protected]>
Overlayfs can be disabled in kernel config, causing related tests to fail. Adding a check for overlayfs’s supportability at runtime, so we can call
SKIP()when needed.Note:
Below comments are raised during V7 discussion:Currently
SKIP()is applied toFIXTURE_SETUP,FIXTURE_TEARDOWN,TEST_F_FORK, this is becauseSKIP()apply within the function scope, not the testcase.We would like test infra to have a dedicated environment check hook (
FIXTURE_ENV_CHECK) in test infra, called beforeFIXTURE_SETUP(). If the environment check fails, the remaining of the test will be skipped. The benefit of these are two:
1> if env check pass, in theory, the test should pass. 2> if env check fail, no need to call setup, so no need to cleanup resource.v8:
style change, no logic change.v7:
https://lore.kernel.org/all/[email protected]/
Fix bug insupports_overlayfs().
Manual test with kernel with and without overlayfs.v6: https://lore.kernel.org/all/[email protected]/
In v4, theSKIP()was applied atFIXTURE_SETUP()aftermount()fail, however,FIXTURE_TEARDOWN()will fail. It might be complicated for test infra or testcase itself to have cleanup code handing the success/failure of steps inSETUP().This patch changes the approach, it calls
supports_overlay()andSKIP()at the beginning ofFIXTURE_SETUP(),FIX_TEARDOWN(),TEST_F_FORK(). Because no modification of system is done by the test, cleanup is not needed.v4:
https://lore.kernel.org/all/[email protected]/Jeff Xu (1):
selftests/landlock: skip overlayfs test when not supporttools/testing/selftests/landlock/fs_test.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)base-commit:
963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a
Awesome, thanks!
Quoted 58 lines · Mickaël Salaün
Thanks Jeff! I pushed this patch in -next:
https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/log/?h=nextQuoted 52 lines · On 13/01/2023 06:32, [email protected] wrote:
From: Jeff Xu <[email protected]>
Overlayfs can be disabled in kernel config, causing related tests to fail. Adding a check for overlayfs’s supportability at runtime, so we can call
SKIP()when needed.Note:
Below comments are raised during V7 discussion:Currently
SKIP()is applied toFIXTURE_SETUP,FIXTURE_TEARDOWN,TEST_F_FORK, this is becauseSKIP()apply within the function scope, not the testcase.We would like test infra to have a dedicated environment check hook (
FIXTURE_ENV_CHECK) in test infra, called beforeFIXTURE_SETUP(). If the environment check fails, the remaining of the test will be skipped. The benefit of these are two:
1> if env check pass, in theory, the test should pass. 2> if env check fail, no need to call setup, so no need to cleanup resource.v8:
style change, no logic change.v7:
https://lore.kernel.org/all/[email protected]/
Fix bug insupports_overlayfs().
Manual test with kernel with and without overlayfs.v6: https://lore.kernel.org/all/[email protected]/
In v4, theSKIP()was applied atFIXTURE_SETUP()aftermount()fail, however,FIXTURE_TEARDOWN()will fail. It might be complicated for test infra or testcase itself to have cleanup code handing the success/failure of steps inSETUP().This patch changes the approach, it calls
supports_overlay()andSKIP()at the beginning ofFIXTURE_SETUP(),FIX_TEARDOWN(),TEST_F_FORK(). Because no modification of system is done by the test, cleanup is not needed.v4:
https://lore.kernel.org/all/[email protected]/Jeff Xu (1):
selftests/landlock: skip overlayfs test when not supporttools/testing/selftests/landlock/fs_test.c | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+)base-commit:
963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a