Re: [PATCH 05/11] test_bitmap: skip user bitmap tests for !CONFIG_SET_FS
From: Christophe Leroy <hidden>
Date: 2020-08-17 07:50:13
Also in:
linux-arch, linux-fsdevel, lkml
Le 17/08/2020 à 09:32, Christoph Hellwig a écrit :
quoted hunk ↗ jump to hunk
We can't run the tests for userspace bitmap parsing if set_fs() doesn't exist. Signed-off-by: Christoph Hellwig <hch@lst.de> --- lib/test_bitmap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index df903c53952bb9..49b1d25fbaf546 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c@@ -365,6 +365,7 @@ static void __init __test_bitmap_parselist(int is_user) for (i = 0; i < ARRAY_SIZE(parselist_tests); i++) { #define ptest parselist_tests[i] +#ifdef CONFIG_SET_FS
get_fs() and set_fs() have stubs for when an arch doesn't define them, so I this it would be cleaner if you were using 'if (IS_ENABLED(CONFIG_SET_FS) && is_user)`instead of an ifdefery in the middle of the if/else. Christophe
quoted hunk ↗ jump to hunk
if (is_user) { mm_segment_t orig_fs = get_fs(); size_t len = strlen(ptest.in);@@ -375,7 +376,9 @@ static void __init __test_bitmap_parselist(int is_user) bmap, ptest.nbits); time = ktime_get() - time; set_fs(orig_fs); - } else { + } else +#endif /* CONFIG_SET_FS */ + { time = ktime_get(); err = bitmap_parselist(ptest.in, bmap, ptest.nbits); time = ktime_get() - time;@@ -454,6 +457,7 @@ static void __init __test_bitmap_parse(int is_user) for (i = 0; i < ARRAY_SIZE(parse_tests); i++) { struct test_bitmap_parselist test = parse_tests[i]; +#ifdef CONFIG_SET_FS if (is_user) { size_t len = strlen(test.in); mm_segment_t orig_fs = get_fs();@@ -464,7 +468,9 @@ static void __init __test_bitmap_parse(int is_user) bmap, test.nbits); time = ktime_get() - time; set_fs(orig_fs); - } else { + } else +#endif /* CONFIG_SET_FS */ + { size_t len = test.flags & NO_LEN ? UINT_MAX : strlen(test.in); time = ktime_get();