| Message ID | 20241001-ioctl_ficlone01_fix-v2-2-dd0b021dd31d@suse.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix ioctl_ficlone(range) failures on certain FS | expand |
Hi! > In some cases, a filesystem that is going to be created and mounted > by LTP can't be supported by certain kernel versions. This is the case > of the CoW support: mkfs creates a CoW filesystem, while underlying > kernel can't mount it. > > To cover this scenario, a new flag called .min_kver has been > introduced in the tst_fs structure, giving the user a possibility to > filter out certain kernels not supporting certain FS features. > > Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> > --- > include/tst_test.h | 5 +++++ > lib/tst_test.c | 20 ++++++++++++++------ > testcases/lib/tst_run_shell.c | 5 +++++ > 3 files changed, 24 insertions(+), 6 deletions(-) > > diff --git a/include/tst_test.h b/include/tst_test.h > index 38d24f48c..ac3ee66af 100644 > --- a/include/tst_test.h > +++ b/include/tst_test.h > @@ -270,6 +270,9 @@ struct tst_ulimit_val { > * > * @mnt_data: The data passed to mount(2) when the test library mounts a device > * in the case of 'tst_test.mount_device'. > + * > + * @min_kver: minimum kernel version supporting the filesystem which has been ^ Uppercase here. > + * created with mkfs. ^ Should spaces or tabs be used here? The rest of the comments uses spaces. > */ > struct tst_fs { > const char *type; > @@ -280,6 +283,8 @@ struct tst_fs { > > unsigned int mnt_flags; > const void *mnt_data; > + > + const char *min_kver; > }; > > /** > diff --git a/lib/tst_test.c b/lib/tst_test.c > index 7dfab4677..49a46fc7b 100644 > --- a/lib/tst_test.c > +++ b/lib/tst_test.c > @@ -946,19 +946,24 @@ static void do_exit(int ret) > exit(ret); > } > > -void check_kver(void) > +void check_kver(const char *min_kver, const int skip) ^ Maybe this should be called brk_on_skip in both of the cases. > { > + char *msg; > int v1, v2, v3; > > - if (tst_parse_kver(tst_test->min_kver, &v1, &v2, &v3)) { > + if (tst_parse_kver(min_kver, &v1, &v2, &v3)) { > tst_res(TWARN, > "Invalid kernel version %s, expected %%d.%%d.%%d", > - tst_test->min_kver); > + min_kver); > } > > if (tst_kvercmp(v1, v2, v3) < 0) { > - tst_brk(TCONF, "The test requires kernel %s or newer", > - tst_test->min_kver); > + msg = "The test requires kernel %s or newer"; > + > + if (skip) > + tst_res(TCONF, msg, min_kver); > + else > + tst_brk(TCONF, msg, min_kver); > } > } > > @@ -1150,6 +1155,9 @@ static void prepare_device(struct tst_fs *fs) > char buf[1024]; > struct tst_fs dummy = {}; > > + if (fs->min_kver) > + check_kver(fs->min_kver, 1); And here as we, we print the message but continue with the action. I suppose that we have to hook it up the same way as the mkfs check. > fs = fs ?: &dummy; > > const char *const extra[] = {fs->mkfs_size_opt, NULL}; > @@ -1287,7 +1295,7 @@ static void do_setup(int argc, char *argv[]) > tst_brk(TCONF, "Test needs to be run as root"); > > if (tst_test->min_kver) > - check_kver(); > + check_kver(tst_test->min_kver, 0); > > if (tst_test->supported_archs && !tst_is_on_arch(tst_test->supported_archs)) > tst_brk(TCONF, "This arch '%s' is not supported for test!", tst_arch.name); > diff --git a/testcases/lib/tst_run_shell.c b/testcases/lib/tst_run_shell.c > index fbfbe16a7..dc840782a 100644 > --- a/testcases/lib/tst_run_shell.c > +++ b/testcases/lib/tst_run_shell.c > @@ -155,6 +155,7 @@ enum fs_ids { > MKFS_SIZE_OPT, > MKFS_VER, > MNT_FLAGS, > + FS_MIN_KVER, > TYPE, > }; > > @@ -163,6 +164,7 @@ static ujson_obj_attr fs_attrs[] = { > UJSON_OBJ_ATTR_IDX(MKFS_VER, "mkfs_ver", UJSON_STR), > UJSON_OBJ_ATTR_IDX(MKFS_SIZE_OPT, "mkfs_size_opt", UJSON_STR), > UJSON_OBJ_ATTR_IDX(MNT_FLAGS, "mnt_flags", UJSON_ARR), > + UJSON_OBJ_ATTR_IDX(FS_MIN_KVER, "min_kver", UJSON_STR), Again has to be sorted. > UJSON_OBJ_ATTR_IDX(TYPE, "type", UJSON_STR), > }; > > @@ -229,6 +231,9 @@ static struct tst_fs *parse_filesystems(ujson_reader *reader, ujson_val *val) > case MKFS_VER: > ret[i].mkfs_ver = strdup(val->val_str); > break; > + case FS_MIN_KVER: > + ret[i].min_kver = strdup(val->val_str); > + break; > case MNT_FLAGS: > ret[i].mnt_flags = parse_mnt_flags(reader, val); > break; > > -- > 2.43.0 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
diff --git a/include/tst_test.h b/include/tst_test.h index 38d24f48c..ac3ee66af 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -270,6 +270,9 @@ struct tst_ulimit_val { * * @mnt_data: The data passed to mount(2) when the test library mounts a device * in the case of 'tst_test.mount_device'. + * + * @min_kver: minimum kernel version supporting the filesystem which has been + * created with mkfs. */ struct tst_fs { const char *type; @@ -280,6 +283,8 @@ struct tst_fs { unsigned int mnt_flags; const void *mnt_data; + + const char *min_kver; }; /** diff --git a/lib/tst_test.c b/lib/tst_test.c index 7dfab4677..49a46fc7b 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -946,19 +946,24 @@ static void do_exit(int ret) exit(ret); } -void check_kver(void) +void check_kver(const char *min_kver, const int skip) { + char *msg; int v1, v2, v3; - if (tst_parse_kver(tst_test->min_kver, &v1, &v2, &v3)) { + if (tst_parse_kver(min_kver, &v1, &v2, &v3)) { tst_res(TWARN, "Invalid kernel version %s, expected %%d.%%d.%%d", - tst_test->min_kver); + min_kver); } if (tst_kvercmp(v1, v2, v3) < 0) { - tst_brk(TCONF, "The test requires kernel %s or newer", - tst_test->min_kver); + msg = "The test requires kernel %s or newer"; + + if (skip) + tst_res(TCONF, msg, min_kver); + else + tst_brk(TCONF, msg, min_kver); } } @@ -1150,6 +1155,9 @@ static void prepare_device(struct tst_fs *fs) char buf[1024]; struct tst_fs dummy = {}; + if (fs->min_kver) + check_kver(fs->min_kver, 1); + fs = fs ?: &dummy; const char *const extra[] = {fs->mkfs_size_opt, NULL}; @@ -1287,7 +1295,7 @@ static void do_setup(int argc, char *argv[]) tst_brk(TCONF, "Test needs to be run as root"); if (tst_test->min_kver) - check_kver(); + check_kver(tst_test->min_kver, 0); if (tst_test->supported_archs && !tst_is_on_arch(tst_test->supported_archs)) tst_brk(TCONF, "This arch '%s' is not supported for test!", tst_arch.name); diff --git a/testcases/lib/tst_run_shell.c b/testcases/lib/tst_run_shell.c index fbfbe16a7..dc840782a 100644 --- a/testcases/lib/tst_run_shell.c +++ b/testcases/lib/tst_run_shell.c @@ -155,6 +155,7 @@ enum fs_ids { MKFS_SIZE_OPT, MKFS_VER, MNT_FLAGS, + FS_MIN_KVER, TYPE, }; @@ -163,6 +164,7 @@ static ujson_obj_attr fs_attrs[] = { UJSON_OBJ_ATTR_IDX(MKFS_VER, "mkfs_ver", UJSON_STR), UJSON_OBJ_ATTR_IDX(MKFS_SIZE_OPT, "mkfs_size_opt", UJSON_STR), UJSON_OBJ_ATTR_IDX(MNT_FLAGS, "mnt_flags", UJSON_ARR), + UJSON_OBJ_ATTR_IDX(FS_MIN_KVER, "min_kver", UJSON_STR), UJSON_OBJ_ATTR_IDX(TYPE, "type", UJSON_STR), }; @@ -229,6 +231,9 @@ static struct tst_fs *parse_filesystems(ujson_reader *reader, ujson_val *val) case MKFS_VER: ret[i].mkfs_ver = strdup(val->val_str); break; + case FS_MIN_KVER: + ret[i].min_kver = strdup(val->val_str); + break; case MNT_FLAGS: ret[i].mnt_flags = parse_mnt_flags(reader, val); break;