* [LTP] [PATCH v2 0/4] Add proper filesystem skiplist
@ 2021-03-11 10:55 Cyril Hrubis
2021-03-11 10:55 ` [LTP] [PATCH v2 1/4] lib: " Cyril Hrubis
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Cyril Hrubis @ 2021-03-11 10:55 UTC (permalink / raw)
To: ltp
This adds a proper .skip_filesystems array to the tst_test structure and
implements support for both test with .all_filesystems enabled and
disabled.
As a bonus point we get the list of filesystems that the test does not
support exported to the metadata as well.
Changes in v2:
* Add docs (as Jan requested)
* Move the skiplist detection from the is_supported_by_kernel()
to tst_fs_is_supported()
(as requested by Martin and Li)
(which also fixed the double message reported by Peter)
* Fixed typos in tst_fs.h header (as requested by Peter)
Cyril Hrubis (4):
lib: Add proper filesystem skiplist
lib: tst_fs_type change fs names to lowercase
lib: Apply the skip_filesystems to rest of test as well
doc: Update docs on filesystem detection
doc/test-writing-guidelines.txt | 47 +++++++++++++------
include/tst_fs.h | 23 ++++++---
include/tst_test.h | 9 +++-
lib/tst_fs_type.c | 36 +++++++-------
lib/tst_supported_fs_types.c | 37 ++++++++++++---
lib/tst_test.c | 14 +++++-
testcases/kernel/syscalls/fcntl/fcntl33.c | 19 +++-----
.../kernel/syscalls/fsconfig/fsconfig01.c | 2 +-
testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +-
testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +-
testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +-
testcases/kernel/syscalls/fspick/fspick01.c | 2 +-
testcases/kernel/syscalls/fspick/fspick02.c | 2 +-
.../kernel/syscalls/ioctl/ioctl_loop05.c | 11 ++---
.../kernel/syscalls/move_mount/move_mount01.c | 2 +-
.../kernel/syscalls/move_mount/move_mount02.c | 2 +-
.../kernel/syscalls/open_tree/open_tree01.c | 2 +-
.../kernel/syscalls/open_tree/open_tree02.c | 2 +-
.../sync_file_range/sync_file_range02.c | 2 +-
.../kernel/syscalls/vmsplice/vmsplice01.c | 9 ++--
.../kernel/syscalls/vmsplice/vmsplice02.c | 9 ++--
testcases/lib/tst_supported_fs.c | 4 +-
22 files changed, 152 insertions(+), 88 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 10+ messages in thread* [LTP] [PATCH v2 1/4] lib: Add proper filesystem skiplist 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis @ 2021-03-11 10:55 ` Cyril Hrubis 2021-03-12 11:06 ` [LTP] [PATCH v3] " Martin Doucha 2021-03-11 10:55 ` [LTP] [PATCH v2 2/4] lib: tst_fs_type change fs names to lowercase Cyril Hrubis ` (3 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Cyril Hrubis @ 2021-03-11 10:55 UTC (permalink / raw) To: ltp The approach with flags we added for FUSE does not scale at all, we need a proper skiplist so that we can skip individual filesystems. The motivation here is the addition of tmpfs to the supported filesystems check. One of the problems there is that sync() is no-op on tmpfs and hence the syncfs test fails. After this patchset we can simply skip syncfs test on tmpfs by setting the right skiplist. As a bonus point the list of unsupported filesystem gets nicely propagated to the metadata as well. Signed-off-by: Cyril Hrubis <chrubis@suse.cz> --- include/tst_fs.h | 23 +++++++++--- include/tst_test.h | 9 ++++- lib/tst_supported_fs_types.c | 37 ++++++++++++++++--- lib/tst_test.c | 2 +- .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- testcases/kernel/syscalls/fspick/fspick01.c | 2 +- testcases/kernel/syscalls/fspick/fspick02.c | 2 +- .../kernel/syscalls/move_mount/move_mount01.c | 2 +- .../kernel/syscalls/move_mount/move_mount02.c | 2 +- .../kernel/syscalls/open_tree/open_tree01.c | 2 +- .../kernel/syscalls/open_tree/open_tree02.c | 2 +- .../sync_file_range/sync_file_range02.c | 2 +- testcases/lib/tst_supported_fs.c | 4 +- 16 files changed, 69 insertions(+), 28 deletions(-) diff --git a/include/tst_fs.h b/include/tst_fs.h index 4f7dd68d2..9145a4917 100644 --- a/include/tst_fs.h +++ b/include/tst_fs.h @@ -167,18 +167,29 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount); */ int tst_prealloc_file(const char *path, size_t bs, size_t bcount); -#define TST_FS_SKIP_FUSE 0x01 - /* - * Return 1 if a specified fiilsystem is supported - * Return 0 if a specified fiilsystem isn't supported + * Return 1 if a specified filesystem is supported + * Return 0 if a specified filesystem isn't supported + * + * @fs_type A filesystem type to check the support for. + * @skiplist A NULL terminated array of filesystems to skip. */ -int tst_fs_is_supported(const char *fs_type, int flags); +int tst_fs_is_supported(const char *fs_type, const char *const *skiplist); /* * Returns NULL-terminated array of kernel-supported filesystems. + * + * @skiplist A NULL terminated array of filesystems to skip. + */ +const char **tst_get_supported_fs_types(const char *const *skiplist); + +/* + * Returns 1 if filesystem is in skiplist 0 otherwise. + * + * @fs_type A filesystem type to lookup. + * @skiplist A NULL terminated array of fileystemsytems to skip. */ -const char **tst_get_supported_fs_types(int flags); +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist); /* * Creates and writes to files on given path until write fails with ENOSPC diff --git a/include/tst_test.h b/include/tst_test.h index 1fbebe752..4eee6f897 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -159,6 +159,13 @@ struct tst_test { */ int all_filesystems:1; + /* + * The skip_filesystem is a NULL terminated list of filesystems the + * test does not support. It can also be used to disable whole class of + * filesystems with a special keyworks such as "fuse". + */ + const char *const *skip_filesystems; + /* Minimum number of online CPU required by the test */ unsigned long min_cpus; @@ -197,8 +204,6 @@ struct tst_test { /* Device filesystem type override NULL == default */ const char *dev_fs_type; - /* Flags to be passed to tst_get_supported_fs_types() */ - int dev_fs_flags; /* Options passed to SAFE_MKFS() when format_device is set */ const char *const *dev_fs_opts; diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c index 00ede549d..fe2a8f7ec 100644 --- a/lib/tst_supported_fs_types.c +++ b/lib/tst_supported_fs_types.c @@ -45,7 +45,22 @@ static int has_mkfs(const char *fs_type) return 1; } -static int has_kernel_support(const char *fs_type, int flags) +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist) +{ + unsigned int i; + + if (!skiplist) + return 0; + + for (i = 0; skiplist[i]; i++) { + if (!strcmp(fs_type, skiplist[i])) + return 1; + } + + return 0; +} + +static int has_kernel_support(const char *fs_type, int skip_fuse) { static int fuse_supported = -1; const char *tmpdir = getenv("TMPDIR"); @@ -84,7 +99,7 @@ static int has_kernel_support(const char *fs_type, int flags) return 0; } - if (flags & TST_FS_SKIP_FUSE) { + if (skip_fuse) { tst_res(TINFO, "Skipping FUSE as requested by the test"); return 0; } @@ -93,17 +108,27 @@ static int has_kernel_support(const char *fs_type, int flags) return 1; } -int tst_fs_is_supported(const char *fs_type, int flags) +int tst_fs_is_supported(const char *fs_type, const char *const *skiplist) { - return has_kernel_support(fs_type, flags) && has_mkfs(fs_type); + int skip_fuse; + + if (tst_fs_in_skiplist(fs_type, skiplist)) { + tst_res(TINFO, + "Skipping %s as requested by the test", fs_type); + return 0; + } + + skip_fuse = tst_fs_in_skiplist("fuse", skiplist); + + return has_kernel_support(fs_type, skip_fuse) && has_mkfs(fs_type); } -const char **tst_get_supported_fs_types(int flags) +const char **tst_get_supported_fs_types(const char *const *skiplist) { unsigned int i, j = 0; for (i = 0; fs_type_whitelist[i]; i++) { - if (tst_fs_is_supported(fs_type_whitelist[i], flags)) + if (tst_fs_is_supported(fs_type_whitelist[i], skiplist)) fs_types[j++] = fs_type_whitelist[i]; } diff --git a/lib/tst_test.c b/lib/tst_test.c index 45753d1ca..639e21727 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -1347,7 +1347,7 @@ static int run_tcases_per_fs(void) { int ret = 0; unsigned int i; - const char *const *filesystems = tst_get_supported_fs_types(tst_test->dev_fs_flags); + const char *const *filesystems = tst_get_supported_fs_types(tst_test->skip_filesystems); if (!filesystems[0]) tst_brk(TCONF, "There are no supported filesystems"); diff --git a/testcases/kernel/syscalls/fsconfig/fsconfig01.c b/testcases/kernel/syscalls/fsconfig/fsconfig01.c index 47941136d..a585daa6d 100644 --- a/testcases/kernel/syscalls/fsconfig/fsconfig01.c +++ b/testcases/kernel/syscalls/fsconfig/fsconfig01.c @@ -89,5 +89,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsmount/fsmount01.c b/testcases/kernel/syscalls/fsmount/fsmount01.c index e81981871..5f755863f 100644 --- a/testcases/kernel/syscalls/fsmount/fsmount01.c +++ b/testcases/kernel/syscalls/fsmount/fsmount01.c @@ -95,5 +95,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsmount/fsmount02.c b/testcases/kernel/syscalls/fsmount/fsmount02.c index effc86351..a4f42dc18 100644 --- a/testcases/kernel/syscalls/fsmount/fsmount02.c +++ b/testcases/kernel/syscalls/fsmount/fsmount02.c @@ -76,5 +76,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsopen/fsopen01.c b/testcases/kernel/syscalls/fsopen/fsopen01.c index 8dabd6814..c2c719c96 100644 --- a/testcases/kernel/syscalls/fsopen/fsopen01.c +++ b/testcases/kernel/syscalls/fsopen/fsopen01.c @@ -76,5 +76,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fspick/fspick01.c b/testcases/kernel/syscalls/fspick/fspick01.c index 2f372f7f1..d3309a912 100644 --- a/testcases/kernel/syscalls/fspick/fspick01.c +++ b/testcases/kernel/syscalls/fspick/fspick01.c @@ -63,5 +63,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fspick/fspick02.c b/testcases/kernel/syscalls/fspick/fspick02.c index b9d020226..f9a3697c1 100644 --- a/testcases/kernel/syscalls/fspick/fspick02.c +++ b/testcases/kernel/syscalls/fspick/fspick02.c @@ -50,5 +50,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/move_mount/move_mount01.c b/testcases/kernel/syscalls/move_mount/move_mount01.c index fd785da02..445e6197e 100644 --- a/testcases/kernel/syscalls/move_mount/move_mount01.c +++ b/testcases/kernel/syscalls/move_mount/move_mount01.c @@ -79,5 +79,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/move_mount/move_mount02.c b/testcases/kernel/syscalls/move_mount/move_mount02.c index f75991a3f..45b1db4be 100644 --- a/testcases/kernel/syscalls/move_mount/move_mount02.c +++ b/testcases/kernel/syscalls/move_mount/move_mount02.c @@ -88,5 +88,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/open_tree/open_tree01.c b/testcases/kernel/syscalls/open_tree/open_tree01.c index f217866bb..808d25665 100644 --- a/testcases/kernel/syscalls/open_tree/open_tree01.c +++ b/testcases/kernel/syscalls/open_tree/open_tree01.c @@ -70,5 +70,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/open_tree/open_tree02.c b/testcases/kernel/syscalls/open_tree/open_tree02.c index 32ad1aefe..ddaa204f2 100644 --- a/testcases/kernel/syscalls/open_tree/open_tree02.c +++ b/testcases/kernel/syscalls/open_tree/open_tree02.c @@ -51,5 +51,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c index 64d069e93..f68f46233 100644 --- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c +++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c @@ -121,7 +121,7 @@ static struct tst_test test = { .needs_root = 1, .mount_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, .mntpoint = MNTPOINT, .setup = setup, .test = run, diff --git a/testcases/lib/tst_supported_fs.c b/testcases/lib/tst_supported_fs.c index 022a61508..c7f0afe41 100644 --- a/testcases/lib/tst_supported_fs.c +++ b/testcases/lib/tst_supported_fs.c @@ -37,9 +37,9 @@ int main(int argc, char *argv[]) } if (argv[1]) - return !tst_fs_is_supported(argv[1], 0); + return !tst_fs_is_supported(argv[1], NULL); - filesystems = tst_get_supported_fs_types(0); + filesystems = tst_get_supported_fs_types(NULL); for (i = 0; filesystems[i]; i++) printf("%s\n", filesystems[i]); -- 2.26.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [LTP] [PATCH v3] lib: Add proper filesystem skiplist 2021-03-11 10:55 ` [LTP] [PATCH v2 1/4] lib: " Cyril Hrubis @ 2021-03-12 11:06 ` Martin Doucha 2021-03-12 14:05 ` Cyril Hrubis 0 siblings, 1 reply; 10+ messages in thread From: Martin Doucha @ 2021-03-12 11:06 UTC (permalink / raw) To: ltp The approach with flags we added for FUSE does not scale at all, we need a proper skiplist so that we can skip individual filesystems. The motivation here is the addition of tmpfs to the supported filesystems check. One of the problems there is that sync() is no-op on tmpfs and hence the syncfs test fails. After this patchset we can simply skip syncfs test on tmpfs by setting the right skiplist. As a bonus point the list of unsupported filesystem gets nicely propagated to the metadata as well. Signed-off-by: Cyril Hrubis <chrubis@suse.cz> Co-authored-by: Martin Doucha <mdoucha@suse.cz> --- Moving the skiplist logic from has_kernel_support() to tst_fs_is_supported() misses the point of my objection. This is the code I had in mind when I was commenting on the patchset. include/tst_fs.h | 26 +++++++--- include/tst_test.h | 9 +++- lib/tst_supported_fs_types.c | 51 ++++++++++++++----- lib/tst_test.c | 2 +- .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- testcases/kernel/syscalls/fspick/fspick01.c | 2 +- testcases/kernel/syscalls/fspick/fspick02.c | 2 +- .../kernel/syscalls/move_mount/move_mount01.c | 2 +- .../kernel/syscalls/move_mount/move_mount02.c | 2 +- .../kernel/syscalls/open_tree/open_tree01.c | 2 +- .../kernel/syscalls/open_tree/open_tree02.c | 2 +- .../sync_file_range/sync_file_range02.c | 2 +- testcases/lib/tst_supported_fs.c | 4 +- 16 files changed, 79 insertions(+), 35 deletions(-) diff --git a/include/tst_fs.h b/include/tst_fs.h index 4f7dd68d2..ae58a9647 100644 --- a/include/tst_fs.h +++ b/include/tst_fs.h @@ -44,6 +44,9 @@ enum { #define OVL_WORK OVL_BASE_MNTPOINT"/work" #define OVL_MNT OVL_BASE_MNTPOINT"/ovl" +#define TST_FS_NATIVE 1 +#define TST_FS_FUSE 2 + /* * @path: path is the pathname of any file within the mounted file system * @mult: mult should be TST_KB, TST_MB or TST_GB @@ -167,18 +170,29 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount); */ int tst_prealloc_file(const char *path, size_t bs, size_t bcount); -#define TST_FS_SKIP_FUSE 0x01 - /* - * Return 1 if a specified fiilsystem is supported - * Return 0 if a specified fiilsystem isn't supported + * Return TST_FS_NATIVE if a specified filesystem is supported by kernel + * Return TST_FS_FUSE if a specified filesystem is supported through FUSE + * Return 0 if a specified filesystem isn't supported + * + * @fs_type A filesystem type to check the support for. */ -int tst_fs_is_supported(const char *fs_type, int flags); +int tst_fs_is_supported(const char *fs_type); /* * Returns NULL-terminated array of kernel-supported filesystems. + * + * @skiplist A NULL terminated array of filesystems to skip. + */ +const char **tst_get_supported_fs_types(const char *const *skiplist); + +/* + * Returns 1 if filesystem is in skiplist 0 otherwise. + * + * @fs_type A filesystem type to lookup. + * @skiplist A NULL terminated array of fileystemsytems to skip. */ -const char **tst_get_supported_fs_types(int flags); +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist); /* * Creates and writes to files on given path until write fails with ENOSPC diff --git a/include/tst_test.h b/include/tst_test.h index 1fbebe752..4eee6f897 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -159,6 +159,13 @@ struct tst_test { */ int all_filesystems:1; + /* + * The skip_filesystem is a NULL terminated list of filesystems the + * test does not support. It can also be used to disable whole class of + * filesystems with a special keyworks such as "fuse". + */ + const char *const *skip_filesystems; + /* Minimum number of online CPU required by the test */ unsigned long min_cpus; @@ -197,8 +204,6 @@ struct tst_test { /* Device filesystem type override NULL == default */ const char *dev_fs_type; - /* Flags to be passed to tst_get_supported_fs_types() */ - int dev_fs_flags; /* Options passed to SAFE_MKFS() when format_device is set */ const char *const *dev_fs_opts; diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c index 00ede549d..7a420f481 100644 --- a/lib/tst_supported_fs_types.c +++ b/lib/tst_supported_fs_types.c @@ -45,7 +45,22 @@ static int has_mkfs(const char *fs_type) return 1; } -static int has_kernel_support(const char *fs_type, int flags) +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist) +{ + unsigned int i; + + if (!skiplist) + return 0; + + for (i = 0; skiplist[i]; i++) { + if (!strcmp(fs_type, skiplist[i])) + return 1; + } + + return 0; +} + +static int has_kernel_support(const char *fs_type) { static int fuse_supported = -1; const char *tmpdir = getenv("TMPDIR"); @@ -58,7 +73,7 @@ static int has_kernel_support(const char *fs_type, int flags) mount("/dev/zero", tmpdir, fs_type, 0, NULL); if (errno != ENODEV) { tst_res(TINFO, "Kernel supports %s", fs_type); - return 1; + return TST_FS_NATIVE; } /* Is FUSE supported by kernel? */ @@ -84,26 +99,36 @@ static int has_kernel_support(const char *fs_type, int flags) return 0; } - if (flags & TST_FS_SKIP_FUSE) { - tst_res(TINFO, "Skipping FUSE as requested by the test"); - return 0; - } - tst_res(TINFO, "FUSE does support %s", fs_type); - return 1; + return TST_FS_FUSE; } -int tst_fs_is_supported(const char *fs_type, int flags) +int tst_fs_is_supported(const char *fs_type) { - return has_kernel_support(fs_type, flags) && has_mkfs(fs_type); + if (has_mkfs(fs_type)) + return has_kernel_support(fs_type); + + return 0; } -const char **tst_get_supported_fs_types(int flags) +const char **tst_get_supported_fs_types(const char *const *skiplist) { - unsigned int i, j = 0; + unsigned int ret, skip_fuse, i, j = 0; + + skip_fuse = tst_fs_in_skiplist("fuse", skiplist); for (i = 0; fs_type_whitelist[i]; i++) { - if (tst_fs_is_supported(fs_type_whitelist[i], flags)) + if (tst_fs_in_skiplist(fs_type_whitelist[i], skiplist)) + continue; + + ret = tst_fs_is_supported(fs_type_whitelist[i]); + + if (ret == TST_FS_FUSE && skip_fuse) { + tst_res(TINFO, "Skipping FUSE as requested by test"); + continue; + } + + if (ret) fs_types[j++] = fs_type_whitelist[i]; } diff --git a/lib/tst_test.c b/lib/tst_test.c index 45753d1ca..639e21727 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -1347,7 +1347,7 @@ static int run_tcases_per_fs(void) { int ret = 0; unsigned int i; - const char *const *filesystems = tst_get_supported_fs_types(tst_test->dev_fs_flags); + const char *const *filesystems = tst_get_supported_fs_types(tst_test->skip_filesystems); if (!filesystems[0]) tst_brk(TCONF, "There are no supported filesystems"); diff --git a/testcases/kernel/syscalls/fsconfig/fsconfig01.c b/testcases/kernel/syscalls/fsconfig/fsconfig01.c index 47941136d..a585daa6d 100644 --- a/testcases/kernel/syscalls/fsconfig/fsconfig01.c +++ b/testcases/kernel/syscalls/fsconfig/fsconfig01.c @@ -89,5 +89,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsmount/fsmount01.c b/testcases/kernel/syscalls/fsmount/fsmount01.c index e81981871..5f755863f 100644 --- a/testcases/kernel/syscalls/fsmount/fsmount01.c +++ b/testcases/kernel/syscalls/fsmount/fsmount01.c @@ -95,5 +95,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsmount/fsmount02.c b/testcases/kernel/syscalls/fsmount/fsmount02.c index effc86351..a4f42dc18 100644 --- a/testcases/kernel/syscalls/fsmount/fsmount02.c +++ b/testcases/kernel/syscalls/fsmount/fsmount02.c @@ -76,5 +76,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fsopen/fsopen01.c b/testcases/kernel/syscalls/fsopen/fsopen01.c index 8dabd6814..c2c719c96 100644 --- a/testcases/kernel/syscalls/fsopen/fsopen01.c +++ b/testcases/kernel/syscalls/fsopen/fsopen01.c @@ -76,5 +76,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fspick/fspick01.c b/testcases/kernel/syscalls/fspick/fspick01.c index 2f372f7f1..d3309a912 100644 --- a/testcases/kernel/syscalls/fspick/fspick01.c +++ b/testcases/kernel/syscalls/fspick/fspick01.c @@ -63,5 +63,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/fspick/fspick02.c b/testcases/kernel/syscalls/fspick/fspick02.c index b9d020226..f9a3697c1 100644 --- a/testcases/kernel/syscalls/fspick/fspick02.c +++ b/testcases/kernel/syscalls/fspick/fspick02.c @@ -50,5 +50,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/move_mount/move_mount01.c b/testcases/kernel/syscalls/move_mount/move_mount01.c index fd785da02..445e6197e 100644 --- a/testcases/kernel/syscalls/move_mount/move_mount01.c +++ b/testcases/kernel/syscalls/move_mount/move_mount01.c @@ -79,5 +79,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/move_mount/move_mount02.c b/testcases/kernel/syscalls/move_mount/move_mount02.c index f75991a3f..45b1db4be 100644 --- a/testcases/kernel/syscalls/move_mount/move_mount02.c +++ b/testcases/kernel/syscalls/move_mount/move_mount02.c @@ -88,5 +88,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/open_tree/open_tree01.c b/testcases/kernel/syscalls/open_tree/open_tree01.c index f217866bb..808d25665 100644 --- a/testcases/kernel/syscalls/open_tree/open_tree01.c +++ b/testcases/kernel/syscalls/open_tree/open_tree01.c @@ -70,5 +70,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/open_tree/open_tree02.c b/testcases/kernel/syscalls/open_tree/open_tree02.c index 32ad1aefe..ddaa204f2 100644 --- a/testcases/kernel/syscalls/open_tree/open_tree02.c +++ b/testcases/kernel/syscalls/open_tree/open_tree02.c @@ -51,5 +51,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, }; diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c index 64d069e93..f68f46233 100644 --- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c +++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c @@ -121,7 +121,7 @@ static struct tst_test test = { .needs_root = 1, .mount_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, .mntpoint = MNTPOINT, .setup = setup, .test = run, diff --git a/testcases/lib/tst_supported_fs.c b/testcases/lib/tst_supported_fs.c index 022a61508..154b12ece 100644 --- a/testcases/lib/tst_supported_fs.c +++ b/testcases/lib/tst_supported_fs.c @@ -37,9 +37,9 @@ int main(int argc, char *argv[]) } if (argv[1]) - return !tst_fs_is_supported(argv[1], 0); + return !tst_fs_is_supported(argv[1]); - filesystems = tst_get_supported_fs_types(0); + filesystems = tst_get_supported_fs_types(NULL); for (i = 0; filesystems[i]; i++) printf("%s\n", filesystems[i]); -- 2.30.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [LTP] [PATCH v3] lib: Add proper filesystem skiplist 2021-03-12 11:06 ` [LTP] [PATCH v3] " Martin Doucha @ 2021-03-12 14:05 ` Cyril Hrubis 2021-03-12 17:00 ` Martin Doucha 0 siblings, 1 reply; 10+ messages in thread From: Cyril Hrubis @ 2021-03-12 14:05 UTC (permalink / raw) To: ltp Hi! > The approach with flags we added for FUSE does not scale at all, we need > a proper skiplist so that we can skip individual filesystems. > > The motivation here is the addition of tmpfs to the supported > filesystems check. One of the problems there is that sync() is no-op on > tmpfs and hence the syncfs test fails. After this patchset we can simply > skip syncfs test on tmpfs by setting the right skiplist. > > As a bonus point the list of unsupported filesystem gets nicely > propagated to the metadata as well. > > Signed-off-by: Cyril Hrubis <chrubis@suse.cz> > Co-authored-by: Martin Doucha <mdoucha@suse.cz> This would be just Signed-off-by: > --- > > Moving the skiplist logic from has_kernel_support() to tst_fs_is_supported() > misses the point of my objection. This is the code I had in mind when I was > commenting on the patchset. > > include/tst_fs.h | 26 +++++++--- > include/tst_test.h | 9 +++- > lib/tst_supported_fs_types.c | 51 ++++++++++++++----- > lib/tst_test.c | 2 +- > .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- > testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- > testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- > testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- > testcases/kernel/syscalls/fspick/fspick01.c | 2 +- > testcases/kernel/syscalls/fspick/fspick02.c | 2 +- > .../kernel/syscalls/move_mount/move_mount01.c | 2 +- > .../kernel/syscalls/move_mount/move_mount02.c | 2 +- > .../kernel/syscalls/open_tree/open_tree01.c | 2 +- > .../kernel/syscalls/open_tree/open_tree02.c | 2 +- > .../sync_file_range/sync_file_range02.c | 2 +- > testcases/lib/tst_supported_fs.c | 4 +- > 16 files changed, 79 insertions(+), 35 deletions(-) > > diff --git a/include/tst_fs.h b/include/tst_fs.h > index 4f7dd68d2..ae58a9647 100644 > --- a/include/tst_fs.h > +++ b/include/tst_fs.h > @@ -44,6 +44,9 @@ enum { > #define OVL_WORK OVL_BASE_MNTPOINT"/work" > #define OVL_MNT OVL_BASE_MNTPOINT"/ovl" > > +#define TST_FS_NATIVE 1 > +#define TST_FS_FUSE 2 > + > /* > * @path: path is the pathname of any file within the mounted file system > * @mult: mult should be TST_KB, TST_MB or TST_GB > @@ -167,18 +170,29 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount); > */ > int tst_prealloc_file(const char *path, size_t bs, size_t bcount); > > -#define TST_FS_SKIP_FUSE 0x01 > - > /* > - * Return 1 if a specified fiilsystem is supported > - * Return 0 if a specified fiilsystem isn't supported > + * Return TST_FS_NATIVE if a specified filesystem is supported by kernel > + * Return TST_FS_FUSE if a specified filesystem is supported through FUSE > + * Return 0 if a specified filesystem isn't supported > + * > + * @fs_type A filesystem type to check the support for. > */ > -int tst_fs_is_supported(const char *fs_type, int flags); > +int tst_fs_is_supported(const char *fs_type); > > /* > * Returns NULL-terminated array of kernel-supported filesystems. > + * > + * @skiplist A NULL terminated array of filesystems to skip. > + */ > +const char **tst_get_supported_fs_types(const char *const *skiplist); > + > +/* > + * Returns 1 if filesystem is in skiplist 0 otherwise. > + * > + * @fs_type A filesystem type to lookup. > + * @skiplist A NULL terminated array of fileystemsytems to skip. > */ > -const char **tst_get_supported_fs_types(int flags); > +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist); > > /* > * Creates and writes to files on given path until write fails with ENOSPC > diff --git a/include/tst_test.h b/include/tst_test.h > index 1fbebe752..4eee6f897 100644 > --- a/include/tst_test.h > +++ b/include/tst_test.h > @@ -159,6 +159,13 @@ struct tst_test { > */ > int all_filesystems:1; > > + /* > + * The skip_filesystem is a NULL terminated list of filesystems the > + * test does not support. It can also be used to disable whole class of > + * filesystems with a special keyworks such as "fuse". > + */ > + const char *const *skip_filesystems; > + > /* Minimum number of online CPU required by the test */ > unsigned long min_cpus; > > @@ -197,8 +204,6 @@ struct tst_test { > > /* Device filesystem type override NULL == default */ > const char *dev_fs_type; > - /* Flags to be passed to tst_get_supported_fs_types() */ > - int dev_fs_flags; > > /* Options passed to SAFE_MKFS() when format_device is set */ > const char *const *dev_fs_opts; > diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c > index 00ede549d..7a420f481 100644 > --- a/lib/tst_supported_fs_types.c > +++ b/lib/tst_supported_fs_types.c > @@ -45,7 +45,22 @@ static int has_mkfs(const char *fs_type) > return 1; > } > > -static int has_kernel_support(const char *fs_type, int flags) > +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist) > +{ > + unsigned int i; > + > + if (!skiplist) > + return 0; > + > + for (i = 0; skiplist[i]; i++) { > + if (!strcmp(fs_type, skiplist[i])) > + return 1; > + } > + > + return 0; > +} > + > +static int has_kernel_support(const char *fs_type) > { > static int fuse_supported = -1; > const char *tmpdir = getenv("TMPDIR"); > @@ -58,7 +73,7 @@ static int has_kernel_support(const char *fs_type, int flags) > mount("/dev/zero", tmpdir, fs_type, 0, NULL); > if (errno != ENODEV) { > tst_res(TINFO, "Kernel supports %s", fs_type); > - return 1; > + return TST_FS_NATIVE; > } > > /* Is FUSE supported by kernel? */ > @@ -84,26 +99,36 @@ static int has_kernel_support(const char *fs_type, int flags) > return 0; > } > > - if (flags & TST_FS_SKIP_FUSE) { > - tst_res(TINFO, "Skipping FUSE as requested by the test"); > - return 0; > - } > - > tst_res(TINFO, "FUSE does support %s", fs_type); > - return 1; > + return TST_FS_FUSE; > } > > -int tst_fs_is_supported(const char *fs_type, int flags) > +int tst_fs_is_supported(const char *fs_type) > { > - return has_kernel_support(fs_type, flags) && has_mkfs(fs_type); > + if (has_mkfs(fs_type)) > + return has_kernel_support(fs_type); > + > + return 0; > } > > -const char **tst_get_supported_fs_types(int flags) > +const char **tst_get_supported_fs_types(const char *const *skiplist) > { > - unsigned int i, j = 0; > + unsigned int ret, skip_fuse, i, j = 0; > + > + skip_fuse = tst_fs_in_skiplist("fuse", skiplist); > > for (i = 0; fs_type_whitelist[i]; i++) { > - if (tst_fs_is_supported(fs_type_whitelist[i], flags)) > + if (tst_fs_in_skiplist(fs_type_whitelist[i], skiplist)) I guess that we should print here that the filesystem is skipped otherwise there will be no information why it was skipped in the test output. > + continue; > + > + ret = tst_fs_is_supported(fs_type_whitelist[i]); > + > + if (ret == TST_FS_FUSE && skip_fuse) { > + tst_res(TINFO, "Skipping FUSE as requested by test"); > + continue; And here we produce two messages for FUSE based filesystems, one that it's supported and second that it's skipped in a case that it's supported. It would probably be more consistent if we called the tst_fs_is_supported() unconditionally and filtered out skipped filesystems only if we get positive return value from tst_fs_is_supported(). -- Cyril Hrubis chrubis@suse.cz ^ permalink raw reply [flat|nested] 10+ messages in thread
* [LTP] [PATCH v3] lib: Add proper filesystem skiplist 2021-03-12 14:05 ` Cyril Hrubis @ 2021-03-12 17:00 ` Martin Doucha 0 siblings, 0 replies; 10+ messages in thread From: Martin Doucha @ 2021-03-12 17:00 UTC (permalink / raw) To: ltp On 12. 03. 21 15:05, Cyril Hrubis wrote: > Hi! >> The approach with flags we added for FUSE does not scale at all, we need >> a proper skiplist so that we can skip individual filesystems. >> >> The motivation here is the addition of tmpfs to the supported >> filesystems check. One of the problems there is that sync() is no-op on >> tmpfs and hence the syncfs test fails. After this patchset we can simply >> skip syncfs test on tmpfs by setting the right skiplist. >> >> As a bonus point the list of unsupported filesystem gets nicely >> propagated to the metadata as well. >> >> Signed-off-by: Cyril Hrubis <chrubis@suse.cz> >> Co-authored-by: Martin Doucha <mdoucha@suse.cz> > > This would be just Signed-off-by: > >> --- >> >> Moving the skiplist logic from has_kernel_support() to tst_fs_is_supported() >> misses the point of my objection. This is the code I had in mind when I was >> commenting on the patchset. >> >> include/tst_fs.h | 26 +++++++--- >> include/tst_test.h | 9 +++- >> lib/tst_supported_fs_types.c | 51 ++++++++++++++----- >> lib/tst_test.c | 2 +- >> .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- >> testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- >> testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- >> testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- >> testcases/kernel/syscalls/fspick/fspick01.c | 2 +- >> testcases/kernel/syscalls/fspick/fspick02.c | 2 +- >> .../kernel/syscalls/move_mount/move_mount01.c | 2 +- >> .../kernel/syscalls/move_mount/move_mount02.c | 2 +- >> .../kernel/syscalls/open_tree/open_tree01.c | 2 +- >> .../kernel/syscalls/open_tree/open_tree02.c | 2 +- >> .../sync_file_range/sync_file_range02.c | 2 +- >> testcases/lib/tst_supported_fs.c | 4 +- >> 16 files changed, 79 insertions(+), 35 deletions(-) >> >> diff --git a/include/tst_fs.h b/include/tst_fs.h >> index 4f7dd68d2..ae58a9647 100644 >> --- a/include/tst_fs.h >> +++ b/include/tst_fs.h >> @@ -44,6 +44,9 @@ enum { >> #define OVL_WORK OVL_BASE_MNTPOINT"/work" >> #define OVL_MNT OVL_BASE_MNTPOINT"/ovl" >> >> +#define TST_FS_NATIVE 1 >> +#define TST_FS_FUSE 2 >> + >> /* >> * @path: path is the pathname of any file within the mounted file system >> * @mult: mult should be TST_KB, TST_MB or TST_GB >> @@ -167,18 +170,29 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount); >> */ >> int tst_prealloc_file(const char *path, size_t bs, size_t bcount); >> >> -#define TST_FS_SKIP_FUSE 0x01 >> - >> /* >> - * Return 1 if a specified fiilsystem is supported >> - * Return 0 if a specified fiilsystem isn't supported >> + * Return TST_FS_NATIVE if a specified filesystem is supported by kernel >> + * Return TST_FS_FUSE if a specified filesystem is supported through FUSE >> + * Return 0 if a specified filesystem isn't supported >> + * >> + * @fs_type A filesystem type to check the support for. >> */ >> -int tst_fs_is_supported(const char *fs_type, int flags); >> +int tst_fs_is_supported(const char *fs_type); >> >> /* >> * Returns NULL-terminated array of kernel-supported filesystems. >> + * >> + * @skiplist A NULL terminated array of filesystems to skip. >> + */ >> +const char **tst_get_supported_fs_types(const char *const *skiplist); >> + >> +/* >> + * Returns 1 if filesystem is in skiplist 0 otherwise. >> + * >> + * @fs_type A filesystem type to lookup. >> + * @skiplist A NULL terminated array of fileystemsytems to skip. >> */ >> -const char **tst_get_supported_fs_types(int flags); >> +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist); >> >> /* >> * Creates and writes to files on given path until write fails with ENOSPC >> diff --git a/include/tst_test.h b/include/tst_test.h >> index 1fbebe752..4eee6f897 100644 >> --- a/include/tst_test.h >> +++ b/include/tst_test.h >> @@ -159,6 +159,13 @@ struct tst_test { >> */ >> int all_filesystems:1; >> >> + /* >> + * The skip_filesystem is a NULL terminated list of filesystems the >> + * test does not support. It can also be used to disable whole class of >> + * filesystems with a special keyworks such as "fuse". >> + */ >> + const char *const *skip_filesystems; >> + >> /* Minimum number of online CPU required by the test */ >> unsigned long min_cpus; >> >> @@ -197,8 +204,6 @@ struct tst_test { >> >> /* Device filesystem type override NULL == default */ >> const char *dev_fs_type; >> - /* Flags to be passed to tst_get_supported_fs_types() */ >> - int dev_fs_flags; >> >> /* Options passed to SAFE_MKFS() when format_device is set */ >> const char *const *dev_fs_opts; >> diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c >> index 00ede549d..7a420f481 100644 >> --- a/lib/tst_supported_fs_types.c >> +++ b/lib/tst_supported_fs_types.c >> @@ -45,7 +45,22 @@ static int has_mkfs(const char *fs_type) >> return 1; >> } >> >> -static int has_kernel_support(const char *fs_type, int flags) >> +int tst_fs_in_skiplist(const char *fs_type, const char *const *skiplist) >> +{ >> + unsigned int i; >> + >> + if (!skiplist) >> + return 0; >> + >> + for (i = 0; skiplist[i]; i++) { >> + if (!strcmp(fs_type, skiplist[i])) >> + return 1; >> + } >> + >> + return 0; >> +} >> + >> +static int has_kernel_support(const char *fs_type) >> { >> static int fuse_supported = -1; >> const char *tmpdir = getenv("TMPDIR"); >> @@ -58,7 +73,7 @@ static int has_kernel_support(const char *fs_type, int flags) >> mount("/dev/zero", tmpdir, fs_type, 0, NULL); >> if (errno != ENODEV) { >> tst_res(TINFO, "Kernel supports %s", fs_type); >> - return 1; >> + return TST_FS_NATIVE; >> } >> >> /* Is FUSE supported by kernel? */ >> @@ -84,26 +99,36 @@ static int has_kernel_support(const char *fs_type, int flags) >> return 0; >> } >> >> - if (flags & TST_FS_SKIP_FUSE) { >> - tst_res(TINFO, "Skipping FUSE as requested by the test"); >> - return 0; >> - } >> - >> tst_res(TINFO, "FUSE does support %s", fs_type); >> - return 1; >> + return TST_FS_FUSE; >> } >> >> -int tst_fs_is_supported(const char *fs_type, int flags) >> +int tst_fs_is_supported(const char *fs_type) >> { >> - return has_kernel_support(fs_type, flags) && has_mkfs(fs_type); >> + if (has_mkfs(fs_type)) >> + return has_kernel_support(fs_type); >> + >> + return 0; >> } >> >> -const char **tst_get_supported_fs_types(int flags) >> +const char **tst_get_supported_fs_types(const char *const *skiplist) >> { >> - unsigned int i, j = 0; >> + unsigned int ret, skip_fuse, i, j = 0; >> + >> + skip_fuse = tst_fs_in_skiplist("fuse", skiplist); >> >> for (i = 0; fs_type_whitelist[i]; i++) { >> - if (tst_fs_is_supported(fs_type_whitelist[i], flags)) >> + if (tst_fs_in_skiplist(fs_type_whitelist[i], skiplist)) > > I guess that we should print here that the filesystem is skipped > otherwise there will be no information why it was skipped in the test > output. Yes, that makes sense. >> + continue; >> + >> + ret = tst_fs_is_supported(fs_type_whitelist[i]); >> + >> + if (ret == TST_FS_FUSE && skip_fuse) { >> + tst_res(TINFO, "Skipping FUSE as requested by test"); >> + continue; > > And here we produce two messages for FUSE based filesystems, one that > it's supported and second that it's skipped in a case that it's > supported. > > It would probably be more consistent if we called the > tst_fs_is_supported() unconditionally and filtered out skipped > filesystems only if we get positive return value from > tst_fs_is_supported(). Does it really matter? The main issue here is that the helper function prints too much information in the successful case. It'd be better to remove debug output from has_kernel_support() and instead print only one line per file system in the tst_* functions: - supported - FUSE - missing mkfs.%s - missing mount support - FUSE (skipped) - skipped But that would require redesigning the return value of has_kernel_support() a bit more and moving the (silent) mkfs check there as well. Either way, I'd leave that to a separate patchset. -- Martin Doucha mdoucha@suse.cz QA Engineer for Software Maintenance SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic ^ permalink raw reply [flat|nested] 10+ messages in thread
* [LTP] [PATCH v2 2/4] lib: tst_fs_type change fs names to lowercase 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 1/4] lib: " Cyril Hrubis @ 2021-03-11 10:55 ` Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 3/4] lib: Apply the skip_filesystems to rest of test as well Cyril Hrubis ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Cyril Hrubis @ 2021-03-11 10:55 UTC (permalink / raw) To: ltp To make it consistent with the rest of the library. Signed-off-by: Cyril Hrubis <chrubis@suse.cz> --- lib/tst_fs_type.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/tst_fs_type.c b/lib/tst_fs_type.c index d661d5b2a..8475f4c78 100644 --- a/lib/tst_fs_type.c +++ b/lib/tst_fs_type.c @@ -47,46 +47,46 @@ const char *tst_fs_type_name(long f_type) { switch (f_type) { case TST_TMPFS_MAGIC: - return "TMPFS"; + return "tmpfs"; case TST_NFS_MAGIC: - return "NFS"; + return "nfs"; case TST_V9FS_MAGIC: - return "9P"; + return "9p"; case TST_RAMFS_MAGIC: - return "RAMFS"; + return "ramfs"; case TST_BTRFS_MAGIC: - return "BTRFS"; + return "btrfs"; case TST_XFS_MAGIC: - return "XFS"; + return "xfs"; case TST_EXT2_OLD_MAGIC: - return "EXT2"; + return "ext2"; case TST_EXT234_MAGIC: - return "EXT2/EXT3/EXT4"; + return "ext2/ext3/ext4"; case TST_MINIX_MAGIC: case TST_MINIX_MAGIC2: case TST_MINIX2_MAGIC: case TST_MINIX2_MAGIC2: case TST_MINIX3_MAGIC: - return "MINIX"; + return "minix"; case TST_UDF_MAGIC: - return "UDF"; + return "udf"; case TST_SYSV2_MAGIC: case TST_SYSV4_MAGIC: - return "SYSV"; + return "sysv"; case TST_UFS_MAGIC: case TST_UFS2_MAGIC: - return "UFS"; + return "ufs"; case TST_F2FS_MAGIC: - return "F2FS"; + return "f2fs"; case TST_NILFS_MAGIC: - return "NILFS"; + return "nilfs"; case TST_EXOFS_MAGIC: - return "EXOFS"; + return "exofs"; case TST_OVERLAYFS_MAGIC: - return "OVERLAYFS"; + return "overlayfs"; case TST_FUSE_MAGIC: - return "FUSE"; + return "fuse"; default: - return "Unknown"; + return "unknown"; } } -- 2.26.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [LTP] [PATCH v2 3/4] lib: Apply the skip_filesystems to rest of test as well 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 1/4] lib: " Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 2/4] lib: tst_fs_type change fs names to lowercase Cyril Hrubis @ 2021-03-11 10:55 ` Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection Cyril Hrubis 2021-03-11 12:46 ` [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Li Wang 4 siblings, 0 replies; 10+ messages in thread From: Cyril Hrubis @ 2021-03-11 10:55 UTC (permalink / raw) To: ltp There is no reason to use the newly introduced .skip_filesystems only for .all_filesystems tests. So if .all_filesystems is not enabled and .skip_filesystems is set we check if test temporary directory filesystem type is in the list of supported filesystem types. Signed-off-by: Cyril Hrubis <chrubis@suse.cz> --- lib/tst_test.c | 12 ++++++++++++ testcases/kernel/syscalls/fcntl/fcntl33.c | 19 +++++++------------ .../kernel/syscalls/ioctl/ioctl_loop05.c | 11 +++++------ .../kernel/syscalls/vmsplice/vmsplice01.c | 9 ++++----- .../kernel/syscalls/vmsplice/vmsplice02.c | 9 ++++----- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/lib/tst_test.c b/lib/tst_test.c index 639e21727..2f728de28 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -1051,6 +1051,18 @@ static void do_test_setup(void) { main_pid = getpid(); + if (!tst_test->all_filesystems && tst_test->skip_filesystems) { + long fs_type = tst_fs_type("."); + const char *fs_name = tst_fs_type_name(fs_type); + + if (tst_fs_in_skiplist(fs_name, tst_test->skip_filesystems)) { + tst_brk(TCONF, "Skipping %s as requested by the test", + fs_name); + } else { + tst_res(TINFO, "%s is supported by the test", fs_name); + } + } + if (tst_test->caps) tst_cap_setup(tst_test->caps, TST_CAP_REQ); diff --git a/testcases/kernel/syscalls/fcntl/fcntl33.c b/testcases/kernel/syscalls/fcntl/fcntl33.c index 70d5ec5ff..8d0d1a5a1 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl33.c +++ b/testcases/kernel/syscalls/fcntl/fcntl33.c @@ -81,17 +81,6 @@ static void setup(void) SAFE_FILE_SCANF(PATH_LS_BRK_T, "%d", &ls_brk_t); SAFE_FILE_PRINTF(PATH_LS_BRK_T, "%d", 45); - switch ((type = tst_fs_type("."))) { - case TST_NFS_MAGIC: - case TST_RAMFS_MAGIC: - case TST_TMPFS_MAGIC: - tst_brk(TCONF, - "Cannot do fcntl(F_SETLEASE, F_WRLCK) on %s filesystem", - tst_fs_type_name(type)); - default: - break; - } - SAFE_TOUCH("file", FILE_MODE, NULL); sigemptyset(&newset); @@ -230,5 +219,11 @@ static struct tst_test test = { .tcnt = ARRAY_SIZE(test_cases), .setup = setup, .test = do_test, - .cleanup = cleanup + .cleanup = cleanup, + .skip_filesystems = (const char *const []) { + "tmpfs", + "ramfs", + "nfs", + NULL + }, }; diff --git a/testcases/kernel/syscalls/ioctl/ioctl_loop05.c b/testcases/kernel/syscalls/ioctl/ioctl_loop05.c index f8fa413a9..58aa6f0d8 100644 --- a/testcases/kernel/syscalls/ioctl/ioctl_loop05.c +++ b/testcases/kernel/syscalls/ioctl/ioctl_loop05.c @@ -98,12 +98,6 @@ static void setup(void) { char bd_path[100]; - if (tst_fs_type(".") == TST_TMPFS_MAGIC) - tst_brk(TCONF, "tmpfd doesn't support O_DIRECT flag"); - - if (tst_fs_type(".") == TST_OVERLAYFS_MAGIC) - tst_brk(TCONF, "device isn't properly detected in overlay fs"); - dev_num = tst_find_free_loopdev(dev_path, sizeof(dev_path)); if (dev_num < 0) tst_brk(TBROK, "Failed to find free loop device"); @@ -151,6 +145,11 @@ static struct tst_test test = { .test_all = verify_ioctl_loop, .needs_root = 1, .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { + "tmpfs", + "overlayfs", + NULL + }, .needs_drivers = (const char *const []) { "loop", NULL diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c index 833af239f..1d1b66d12 100644 --- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c +++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c @@ -103,11 +103,6 @@ static void setup(void) { int i; - if (tst_fs_type(".") == TST_NFS_MAGIC) { - tst_brk(TCONF, "Cannot do splice() " - "on a file located on an NFS filesystem"); - } - for (i = 0; i < TEST_BLOCK_SIZE; i++) buffer[i] = i & 0xff; } @@ -123,5 +118,9 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = vmsplice_test, .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { + "nfs", + NULL + }, .min_kver = "2.6.17", }; diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice02.c b/testcases/kernel/syscalls/vmsplice/vmsplice02.c index 978633d31..39c407cb8 100644 --- a/testcases/kernel/syscalls/vmsplice/vmsplice02.c +++ b/testcases/kernel/syscalls/vmsplice/vmsplice02.c @@ -52,11 +52,6 @@ static struct tcase { static void setup(void) { - if (tst_fs_type(".") == TST_NFS_MAGIC) { - tst_brk(TCONF, "Cannot do splice() " - "on a file located on an NFS filesystem"); - } - filefd = SAFE_OPEN(TESTFILE, O_WRONLY | O_CREAT, 0644); SAFE_PIPE(pipes); @@ -106,5 +101,9 @@ static struct tst_test test = { .test = vmsplice_verify, .tcnt = ARRAY_SIZE(tcases), .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { + "nfs", + NULL + }, .min_kver = "2.6.17", }; -- 2.26.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis ` (2 preceding siblings ...) 2021-03-11 10:55 ` [LTP] [PATCH v2 3/4] lib: Apply the skip_filesystems to rest of test as well Cyril Hrubis @ 2021-03-11 10:55 ` Cyril Hrubis 2021-03-11 11:34 ` Petr Vorel 2021-03-11 12:46 ` [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Li Wang 4 siblings, 1 reply; 10+ messages in thread From: Cyril Hrubis @ 2021-03-11 10:55 UTC (permalink / raw) To: ltp Signed-off-by: Cyril Hrubis <chrubis@suse.cz> --- doc/test-writing-guidelines.txt | 47 +++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index dd1911ceb..b6ef7858a 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -978,41 +978,60 @@ LTP_ALIGN(x, a) Aligns the x to be next multiple of a. The a must be power of 2. -2.2.13 Filesystem type detection -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.13 Filesystem type detection and skiplist +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some tests are known to fail on certain filesystems (you cannot swap on TMPFS, there are unimplemented 'fcntl()' etc.). -If your test needs to be skipped on certain filesystems, use the interface -below: +If your test needs to be skipped on certain filesystems use the +'.skip_filesystems' field in the tst_test structure as follows: [source,c] ------------------------------------------------------------------------------- #include "tst_test.h" - /* - * Unsupported only on NFS. - */ - if (tst_fs_type(".") == TST_NFS_MAGIC) - tst_brk(TCONF, "Test not supported on NFS filesystem"); +static struct tst_test test = { + ... + .skip_filesystems = (const char *const []) { + "tmpfs", + "ramfs", + "nfs", + NULL + }, +}; +------------------------------------------------------------------------------- +When the '.all_filesystem' flag is set the '.skip_filesystems' list is passed +to the function that detects supported filesystems any listed filesystem is +not included in the resulting list of supported filesystems. - /* - * Unsupported on NFS, TMPFS and RAMFS - */ - long type; +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +static void run(void) +{ + ... switch ((type = tst_fs_type("."))) { case TST_NFS_MAGIC: case TST_TMPFS_MAGIC: case TST_RAMFS_MAGIC: - tst_brk(TCONF, "Test not supported on %s filesystem", + tst_brk(TCONF, "Subtest not supported on %s", tst_fs_type_name(type)); + return; break; } + + ... +} ------------------------------------------------------------------------------- +If test needs to adjust expectations based on filesystem type it's also +possible to detect filesystem type at the runtime. This is preferably used +when only subset of the test is not applicable for a given filesystem. + 2.2.14 Thread-safety in the LTP library ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- 2.26.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection 2021-03-11 10:55 ` [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection Cyril Hrubis @ 2021-03-11 11:34 ` Petr Vorel 0 siblings, 0 replies; 10+ messages in thread From: Petr Vorel @ 2021-03-11 11:34 UTC (permalink / raw) To: ltp Hi Cyril, > - /* > - * Unsupported on NFS, TMPFS and RAMFS > - */ > - long type; > +[source,c] > +------------------------------------------------------------------------------- > +#include "tst_test.h" > + > +static void run(void) > +{ > + ... > switch ((type = tst_fs_type("."))) { > case TST_NFS_MAGIC: > case TST_TMPFS_MAGIC: > case TST_RAMFS_MAGIC: > - tst_brk(TCONF, "Test not supported on %s filesystem", > + tst_brk(TCONF, "Subtest not supported on %s", > tst_fs_type_name(type)); > + return; > break; > } > + > + ... > +} > ------------------------------------------------------------------------------- > +If test needs to adjust expectations based on filesystem type it's also > +possible to detect filesystem type at the runtime. This is preferably used > +when only subset of the test is not applicable for a given filesystem. Should be this paragraph above the previous code example and not below? As the example illustrates the case of this paragraph. Apart from that whole patchset LGTM, nice changes. Reviewed-by: Petr Vorel <pvorel@suse.cz> Kind regards, Petr ^ permalink raw reply [flat|nested] 10+ messages in thread
* [LTP] [PATCH v2 0/4] Add proper filesystem skiplist 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis ` (3 preceding siblings ...) 2021-03-11 10:55 ` [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection Cyril Hrubis @ 2021-03-11 12:46 ` Li Wang 4 siblings, 0 replies; 10+ messages in thread From: Li Wang @ 2021-03-11 12:46 UTC (permalink / raw) To: ltp On Thu, Mar 11, 2021 at 6:53 PM Cyril Hrubis <chrubis@suse.cz> wrote: > This adds a proper .skip_filesystems array to the tst_test structure and > implements support for both test with .all_filesystems enabled and > disabled. > > As a bonus point we get the list of filesystems that the test does not > support exported to the metadata as well. > > Changes in v2: > > * Add docs (as Jan requested) > > * Move the skiplist detection from the is_supported_by_kernel() > to tst_fs_is_supported() > (as requested by Martin and Li) > (which also fixed the double message reported by Peter) > > * Fixed typos in tst_fs.h header (as requested by Peter) > > Cyril Hrubis (4): > lib: Add proper filesystem skiplist > lib: tst_fs_type change fs names to lowercase > lib: Apply the skip_filesystems to rest of test as well > doc: Update docs on filesystem detection > For series: Reviewed-by: Li Wang <liwang@redhat.com> -- Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210311/2b2fbea7/attachment.htm> ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-03-12 17:00 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-03-11 10:55 [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 1/4] lib: " Cyril Hrubis 2021-03-12 11:06 ` [LTP] [PATCH v3] " Martin Doucha 2021-03-12 14:05 ` Cyril Hrubis 2021-03-12 17:00 ` Martin Doucha 2021-03-11 10:55 ` [LTP] [PATCH v2 2/4] lib: tst_fs_type change fs names to lowercase Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 3/4] lib: Apply the skip_filesystems to rest of test as well Cyril Hrubis 2021-03-11 10:55 ` [LTP] [PATCH v2 4/4] doc: Update docs on filesystem detection Cyril Hrubis 2021-03-11 11:34 ` Petr Vorel 2021-03-11 12:46 ` [LTP] [PATCH v2 0/4] Add proper filesystem skiplist Li Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox