p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/test_bitmap: add tests for bitmap_parselist_user() 

Propagate existing bitmap_parselist() tests to bitmap_parselist_user().

Link: http://lkml.kernel.org/r/20190405173211.11373-6-ynorov@marvell.com
Signed-off-by: Yury Norov <ynorov@marvell.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yury Norov 2019-05-14 15:43:24 -07:00 committed by Linus Torvalds
parent a4ab50509c
commit 6ea86bdfc1
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/test_bitmap.c
View File

@ -11,6 +11,7 @@
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h>
#include "../tools/testing/selftests/kselftest_module.h" #include "../tools/testing/selftests/kselftest_module.h"
@ -280,39 +281,63 @@ static const struct test_bitmap_parselist parselist_tests[] __initconst = {
{-EINVAL, "0-\n", NULL, 8, 0}, {-EINVAL, "0-\n", NULL, 8, 0},
}; };
static void __init test_bitmap_parselist(void) static void __init __test_bitmap_parselist(int is_user)
{ {
int i; int i;
int err; int err;
ktime_t time; ktime_t time;
DECLARE_BITMAP(bmap, 2048); DECLARE_BITMAP(bmap, 2048);
char *mode = is_user ? "_user" : "";
for (i = 0; i < ARRAY_SIZE(parselist_tests); i++) { for (i = 0; i < ARRAY_SIZE(parselist_tests); i++) {
#define ptest parselist_tests[i] #define ptest parselist_tests[i]
time = ktime_get(); if (is_user) {
err = bitmap_parselist(ptest.in, bmap, ptest.nbits); mm_segment_t orig_fs = get_fs();
time = ktime_get() - time; size_t len = strlen(ptest.in);
set_fs(KERNEL_DS);
time = ktime_get();
err = bitmap_parselist_user(ptest.in, len,
bmap, ptest.nbits);
time = ktime_get() - time;
set_fs(orig_fs);
} else {
time = ktime_get();
err = bitmap_parselist(ptest.in, bmap, ptest.nbits);
time = ktime_get() - time;
}
if (err != ptest.errno) { if (err != ptest.errno) {
pr_err("test %d: input is %s, errno is %d, expected %d\n", pr_err("parselist%s: %d: input is %s, errno is %d, expected %d\n",
i, ptest.in, err, ptest.errno); mode, i, ptest.in, err, ptest.errno);
continue; continue;
} }
if (!err && ptest.expected if (!err && ptest.expected
&& !__bitmap_equal(bmap, ptest.expected, ptest.nbits)) { && !__bitmap_equal(bmap, ptest.expected, ptest.nbits)) {
pr_err("test %d: input is %s, result is 0x%lx, expected 0x%lx\n", pr_err("parselist%s: %d: input is %s, result is 0x%lx, expected 0x%lx\n",
i, ptest.in, bmap[0], *ptest.expected); mode, i, ptest.in, bmap[0],
*ptest.expected);
continue; continue;
} }
if (ptest.flags & PARSE_TIME) if (ptest.flags & PARSE_TIME)
pr_err("test %d: input is '%s' OK, Time: %llu\n", pr_err("parselist%s: %d: input is '%s' OK, Time: %llu\n",
i, ptest.in, time); mode, i, ptest.in, time);
} }
} }
static void __init test_bitmap_parselist(void)
{
__test_bitmap_parselist(0);
}
static void __init test_bitmap_parselist_user(void)
{
__test_bitmap_parselist(1);
}
#define EXP_BYTES (sizeof(exp) * 8) #define EXP_BYTES (sizeof(exp) * 8)
static void __init test_bitmap_arr32(void) static void __init test_bitmap_arr32(void)
@ -385,6 +410,7 @@ static void __init selftest(void)
test_copy(); test_copy();
test_bitmap_arr32(); test_bitmap_arr32();
test_bitmap_parselist(); test_bitmap_parselist();
test_bitmap_parselist_user();
test_mem_optimisations(); test_mem_optimisations();
} }