From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751921AbbJZPVT (ORCPT ); Mon, 26 Oct 2015 11:21:19 -0400 Received: from mga14.intel.com ([192.55.52.115]:9581 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563AbbJZPVR (ORCPT ); Mon, 26 Oct 2015 11:21:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,201,1444719600"; d="scan'208";a="588246983" Message-ID: <1445872873.22669.72.camel@linux.intel.com> Subject: Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests From: Andy Shevchenko To: Vitaly Kuznetsov Cc: Andrew Morton , Rasmus Villemoes , Ulf Hansson , James Bottomley , Kees Cook , linux-kernel@vger.kernel.org Date: Mon, 26 Oct 2015 17:21:13 +0200 In-Reply-To: <87vb9ty7xg.fsf@vitty.brq.redhat.com> References: <1445867720-25473-1-git-send-email-vkuznets@redhat.com> <1445867720-25473-4-git-send-email-vkuznets@redhat.com> <1445872421.22669.69.camel@linux.intel.com> <87vb9ty7xg.fsf@vitty.brq.redhat.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.0-2+b1 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 Mon, 2015-10-26 at 16:18 +0100, Vitaly Kuznetsov wrote: > Andy Shevchenko writes: > > > On Mon, 2015-10-26 at 14:55 +0100, Vitaly Kuznetsov wrote: > > > Add a couple of simple tests for string_get_size(). > > > > > > > In linux-next this one (or similar?) is commit 29f3d140. > > I don't think you need it in the series since it's in Andrew's > > patch > > set already. > > > > Ah, sorry, missed that. In case it was already merged It's not yet in upstream afaiuc. > I'll just add a > couple of additional tests here. Then perhaps send it as a separate patch first? > > > > Signed-off-by: Vitaly Kuznetsov > > > --- > > >  lib/test-string_helpers.c | 44 > > > ++++++++++++++++++++++++++++++++++++++++++++ > > >  1 file changed, 44 insertions(+) > > > > > > diff --git a/lib/test-string_helpers.c b/lib/test- > > > string_helpers.c > > > index 8e376ef..a158cb3 100644 > > > --- a/lib/test-string_helpers.c > > > +++ b/lib/test-string_helpers.c > > > @@ -326,6 +326,47 @@ out: > > >   kfree(out_test); > > >  } > > >   > > > +#define string_get_size_maxbuf 16 > > > +#define test_string_get_size_one(size, blk_size, units, > > > exp_result)            \ > > > + do > > > {                                                                 > > >    \ > > > + BUILD_BUG_ON(sizeof(exp_result) >= > > > string_get_size_maxbuf);    \ > > > + __test_string_get_size((size), (blk_size), > > > (units),            \ > > > +        (exp_result));            > > >      > > >            \ > > > + } while (0) > > > + > > > + > > > +static __init void __test_string_get_size(const u64 size, const > > > u32 > > > blk_size, > > > +   const enum > > > string_size_units units, > > > +   const char > > > *exp_result) > > > +{ > > > + char buf[string_get_size_maxbuf]; > > > + > > > + string_get_size(size, blk_size, units, buf, > > > sizeof(buf)); > > > + if (!memcmp(buf, exp_result, strlen(exp_result) + 1)) > > > + return; > > > + > > > + buf[sizeof(buf) - 1] = '\0'; > > > + pr_warn("Test 'test_string_get_size_one' failed!\n"); > > > + pr_warn("string_get_size(size = %llu, blk_size = %u, > > > 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(500118192, 512, STRING_UNITS_2, > > > "238 GiB"); > > > + test_string_get_size_one(8192, 4096, STRING_UNITS_10, > > > "33.5 > > > MB"); > > > + test_string_get_size_one(1100, 1, STRING_UNITS_10, "1.10 > > > kB"); > > > + test_string_get_size_one(3000, 1900, STRING_UNITS_10, > > > "5.70 > > > MB"); > > > + test_string_get_size_one(151234561234657, 3456789, > > > STRING_UNITS_10, > > > +  "522 EB"); > > > + test_string_get_size_one(1999, U32_MAX - 1, > > > STRING_UNITS_10, > > > +  "8.58 TB"); > > > + test_string_get_size_one(1, 512, STRING_UNITS_10, "512 > > > B"); > > > + test_string_get_size_one(0, 512, STRING_UNITS_10, "0 > > > B"); > > > +} > > > + > > >  static int __init test_string_helpers_init(void) > > >  { > > >   unsigned int i; > > > @@ -344,6 +385,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