Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1255951 > unrolled thread
| Started by | Vitaly Kuznetsov <vkuznets@redhat.com> |
|---|---|
| First post | 2015-10-26 15:00 +0100 |
| Last post | 2015-10-27 10:00 +0100 |
| Articles | 7 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-10-26 15:00 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-10-26 16:20 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-10-26 16:20 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-10-26 16:30 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-10-26 17:00 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Rasmus Villemoes <linux@rasmusvillemoes.dk> - 2015-10-26 23:00 +0100
Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests Vitaly Kuznetsov <vkuznets@redhat.com> - 2015-10-27 10:00 +0100
| From | Vitaly Kuznetsov <vkuznets@redhat.com> |
|---|---|
| Date | 2015-10-26 15:00 +0100 |
| Subject | [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests |
| Message-ID | <qnQtA-ue-13@gated-at.bofh.it> |
Add a couple of simple tests for string_get_size().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
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);
--
2.4.3
--
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/
[toc] | [next] | [standalone]
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Date | 2015-10-26 16:20 +0100 |
| Subject | Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests |
| Message-ID | <qnRIZ-1pQ-5@gated-at.bofh.it> |
| In reply to | #1255951 |
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.
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> 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 <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/
[toc] | [prev] | [next] | [standalone]
| From | Vitaly Kuznetsov <vkuznets@redhat.com> |
|---|---|
| Date | 2015-10-26 16:20 +0100 |
| Message-ID | <qnRJ0-1pQ-9@gated-at.bofh.it> |
| In reply to | #1256102 |
Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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 I'll just add a
couple of additional tests here.
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> ---
>> 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);
--
Vitaly
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Date | 2015-10-26 16:30 +0100 |
| Subject | Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests |
| Message-ID | <qnRSH-1tC-45@gated-at.bofh.it> |
| In reply to | #1256103 |
On Mon, 2015-10-26 at 16:18 +0100, Vitaly Kuznetsov wrote:
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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 <vkuznets@redhat.com>
> > > ---
> > > 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 <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/
[toc] | [prev] | [next] | [standalone]
| From | Vitaly Kuznetsov <vkuznets@redhat.com> |
|---|---|
| Date | 2015-10-26 17:00 +0100 |
| Message-ID | <qnSlJ-1Dx-15@gated-at.bofh.it> |
| In reply to | #1256108 |
Andy Shevchenko <andriy.shevchenko@linux.intel.com> writes: > On Mon, 2015-10-26 at 16:18 +0100, Vitaly Kuznetsov wrote: >> Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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? > Oh, actually 29f3d140 (linux-next commit id) is some old version of my patch, there were later submissions (I think 'v5' was the last one: https://lkml.org/lkml/2015/9/17/172 and that's where Rasmus found the issue I'm fixing here). So I think it would be the best to throw away 29f3d140 from Andrew's tree and take this one instead. [skip] -- Vitaly -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Rasmus Villemoes <linux@rasmusvillemoes.dk> |
|---|---|
| Date | 2015-10-26 23:00 +0100 |
| Message-ID | <qnXY7-55x-15@gated-at.bofh.it> |
| In reply to | #1255951 |
On Mon, Oct 26 2015, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
> Add a couple of simple tests for string_get_size().
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> 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");
Since we're changing this anyway, can't we test every pair of
(size,blk_size) with both units? That'll be twice the number of tests
for less horizontal real estate. E.g.
test_string_get_size_one(8192, 4096, "32.0 MiB", "33.5 MB");
Do we really care how and if string_get_size works for a non-power-of-2
blk_size? I certainly assume that we're passed a non-zero value.
Rasmus
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Vitaly Kuznetsov <vkuznets@redhat.com> |
|---|---|
| Date | 2015-10-27 10:00 +0100 |
| Message-ID | <qo8gO-33R-5@gated-at.bofh.it> |
| In reply to | #1256311 |
Rasmus Villemoes <linux@rasmusvillemoes.dk> writes:
> On Mon, Oct 26 2015, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>
>> Add a couple of simple tests for string_get_size().
>>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> ---
>> 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");
>
> Since we're changing this anyway, can't we test every pair of
> (size,blk_size) with both units? That'll be twice the number of tests
> for less horizontal real estate. E.g.
>
> test_string_get_size_one(8192, 4096, "32.0 MiB", "33.5 MB");
>
Nice idea, will do.
> Do we really care how and if string_get_size works for a non-power-of-2
> blk_size?
Probably not but there is nothing in current algorithm which prevents it
from working correctly with a non-power-of-2 blk_sizes. The issue you
found is even more visible on (3000, 1900) test.
> I certainly assume that we're passed a non-zero value.
Oh crap, we don't have a check for blk_size = 0 and this leads to an
infinite loop now... will do something in v2.
>
> Rasmus
--
Vitaly
--
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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web