The patch titled Subject: lib/test-string_helpers.c: add string_get_size() tests has been added to the -mm tree. Its filename is lib-test-string_helpersc-add-string_get_size-tests.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/lib-test-string_helpersc-add-string_get_size-tests.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/lib-test-string_helpersc-add-string_get_size-tests.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx> Subject: lib/test-string_helpers.c: add string_get_size() tests Add a couple of simple tests for string_get_size(). The last one will hang the kernel without the 'lib/string_helpers.c: fix infinite loop in string_get_size()' fix. Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx> Cc: James Bottomley <JBottomley@xxxxxxxx> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: "K. Y. Srinivasan" <kys@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/test-string_helpers.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff -puN lib/test-string_helpers.c~lib-test-string_helpersc-add-string_get_size-tests lib/test-string_helpers.c --- a/lib/test-string_helpers.c~lib-test-string_helpersc-add-string_get_size-tests +++ a/lib/test-string_helpers.c @@ -326,6 +326,30 @@ out: kfree(out_test); } +static __init void test_string_get_size_one(u64 size, u64 blk_size, + const enum string_size_units units, + const char *exp_result) +{ + char buf[256]; + + string_get_size(size, blk_size, units, buf, sizeof(buf)); + if (!strncmp(buf, exp_result, min(sizeof(buf), strlen(exp_result)))) + return; + + pr_warn("Test 'test_string_get_size_one' failed!\n"); + pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %d\n", + size, blk_size, units); + pr_warn("expected: %s, got %s\n", exp_result, buf); + +} + +static __init void test_string_get_size(void) +{ + test_string_get_size_one(16384, 512, STRING_UNITS_2, "8.00 MiB"); + test_string_get_size_one(8192, 4096, STRING_UNITS_10, "32.7 MB"); + test_string_get_size_one(1, 512, STRING_UNITS_10, "512 B"); +} + static int __init test_string_helpers_init(void) { unsigned int i; @@ -344,6 +368,9 @@ static int __init test_string_helpers_in for (i = 0; i < (ESCAPE_ANY_NP | ESCAPE_HEX) + 1; i++) test_string_escape("escape 1", escape1, i, TEST_STRING_2_DICT_1); + /* Test string_get_size() */ + test_string_get_size(); + return -EINVAL; } module_init(test_string_helpers_init); _ Patches currently in -mm which might be from vkuznets@xxxxxxxxxx are lib-string_helpersc-fix-infinite-loop-in-string_get_size.patch lib-string_helpersc-fix-infinite-loop-in-string_get_size-v3.patch lib-test-string_helpersc-add-string_get_size-tests.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html