From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753109AbbIOPVB (ORCPT ); Tue, 15 Sep 2015 11:21:01 -0400 Received: from mga03.intel.com ([134.134.136.65]:65445 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752131AbbIOPU7 (ORCPT ); Tue, 15 Sep 2015 11:20:59 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,536,1437462000"; d="scan'208";a="562162997" Message-ID: <1442330454.8361.47.camel@linux.intel.com> Subject: Re: [PATCH v4 2/2] lib/test-string_helpers.c: add string_get_size() tests From: Andy Shevchenko To: Vitaly Kuznetsov , Andrew Morton Cc: Rasmus Villemoes , James Bottomley , linux-kernel@vger.kernel.org, "K. Y. Srinivasan" Date: Tue, 15 Sep 2015 18:20:54 +0300 In-Reply-To: <1442325322-23366-3-git-send-email-vkuznets@redhat.com> References: <1442325322-23366-1-git-send-email-vkuznets@redhat.com> <1442325322-23366-3-git-send-email-vkuznets@redhat.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Vitaly Kuznetsov > --- > 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 Intel Finland Oy