Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225302

Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size() tests

Show all headers | View raw

On Tue, 2015-09-15 at 15:55 +0200, Vitaly Kuznetsov wrote:
> 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.
> 

Minor comments to address, otherwise

Reviewed-by: 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
>  lib/test-string_helpers.c | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/lib/test-string_helpers.c b/lib/test-string_helpers.c
> index 8e376ef..b00fc0a 100644
> --- a/lib/test-string_helpers.c
> +++ b/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[16];
> +
> +	string_get_size(size, blk_size, units, buf, sizeof(buf));
> +	if (!memcmp(buf, exp_result, strnlen(exp_result, sizeof(buf) 
> - 1) + 1))

Actually you don't need to do this +- 1. Either you will have '\0' or
not, it will be checked by memcmp() anyway.

Thus,
memcmp(buf, exp_result, strnlen(exp_result, sizeof(buf))).

> +		return;
> +

Perhaps one line comment here
/* Make sure that buf will be always NULL-terminated */

> +	buf[sizeof(buf) - 1] = '\0';


> +	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);

Here I recommend to use single quotes (just to see empty strings)

…expected '%s', got '%s'…

> +}
> +
> +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_init(void)
>  	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);

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/2] lib/string_helpers.c: fix infinite loop in string_get_size() Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-09-15 16:00 +0200
  [PATCH v4 1/2] lib/string_helpers.c: fix infinite loop in string_get_size() Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-09-15 16:00 +0200
  [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-09-15 16:00 +0200
    Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size()  tests Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-09-15 17:30 +0200
      Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size() tests Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-09-16 13:30 +0200
        Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size()  tests Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-09-16 13:40 +0200
          Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-09-16 18:40 +0200

csiph-web