[PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[Michael Ellerman]

From: Matthew Wilcox <mawilcox@microsoft.com>

I had neglected to increment the error counter when the tests failed,
which made the tests noisy when they fail, but not actually return an
error code.

Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Fixes: 3cc78125a081 ("lib/test_bitmap.c: add optimisation tests")
Cc: stable@vger.kernel.org # v4.13+
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
---
 lib/test_bitmap.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

We noticed this a while back but the patch got lost.

Andrew are you happy to take it?

cheers


diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index de16f7869fb1..6cd7d0740005 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -331,23 +331,32 @@ static void noinline __init test_mem_optimisations(void)
 	unsigned int start, nbits;
 
 	for (start = 0; start < 1024; start += 8) {
-		memset(bmap1, 0x5a, sizeof(bmap1));
-		memset(bmap2, 0x5a, sizeof(bmap2));
 		for (nbits = 0; nbits < 1024 - start; nbits += 8) {
+			memset(bmap1, 0x5a, sizeof(bmap1));
+			memset(bmap2, 0x5a, sizeof(bmap2));
+
 			bitmap_set(bmap1, start, nbits);
 			__bitmap_set(bmap2, start, nbits);
-			if (!bitmap_equal(bmap1, bmap2, 1024))
+			if (!bitmap_equal(bmap1, bmap2, 1024)) {
 				printk("set not equal %d %d\n", start, nbits);
-			if (!__bitmap_equal(bmap1, bmap2, 1024))
+				failed_tests++;
+			}
+			if (!__bitmap_equal(bmap1, bmap2, 1024)) {
 				printk("set not __equal %d %d\n", start, nbits);
+				failed_tests++;
+			}
 
 			bitmap_clear(bmap1, start, nbits);
 			__bitmap_clear(bmap2, start, nbits);
-			if (!bitmap_equal(bmap1, bmap2, 1024))
+			if (!bitmap_equal(bmap1, bmap2, 1024)) {
 				printk("clear not equal %d %d\n", start, nbits);
-			if (!__bitmap_equal(bmap1, bmap2, 1024))
+				failed_tests++;
+			}
+			if (!__bitmap_equal(bmap1, bmap2, 1024)) {
 				printk("clear not __equal %d %d\n", start,
 									nbits);
+				failed_tests++;
+			}
 		}
 	}
 }
-- 
2.14.1

Re: [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[Kees Cook]

On Wed, May 9, 2018 at 4:43 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
> From: Matthew Wilcox <mawilcox@microsoft.com>
>
> I had neglected to increment the error counter when the tests failed,
> which made the tests noisy when they fail, but not actually return an
> error code.
>
> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
> Fixes: 3cc78125a081 ("lib/test_bitmap.c: add optimisation tests")
> Cc: stable@vger.kernel.org # v4.13+
> Tested-by: Michael Ellerman <mpe@ellerman.id.au>

FWIW:

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  lib/test_bitmap.c | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
>
> We noticed this a while back but the patch got lost.
>
> Andrew are you happy to take it?
>
> cheers
>
>
> diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
> index de16f7869fb1..6cd7d0740005 100644
> --- a/lib/test_bitmap.c
> +++ b/lib/test_bitmap.c
> @@ -331,23 +331,32 @@ static void noinline __init test_mem_optimisations(void)
>         unsigned int start, nbits;
>
>         for (start = 0; start < 1024; start += 8) {
> -               memset(bmap1, 0x5a, sizeof(bmap1));
> -               memset(bmap2, 0x5a, sizeof(bmap2));
>                 for (nbits = 0; nbits < 1024 - start; nbits += 8) {
> +                       memset(bmap1, 0x5a, sizeof(bmap1));
> +                       memset(bmap2, 0x5a, sizeof(bmap2));
> +
>                         bitmap_set(bmap1, start, nbits);
>                         __bitmap_set(bmap2, start, nbits);
> -                       if (!bitmap_equal(bmap1, bmap2, 1024))
> +                       if (!bitmap_equal(bmap1, bmap2, 1024)) {
>                                 printk("set not equal %d %d\n", start, nbits);
> -                       if (!__bitmap_equal(bmap1, bmap2, 1024))
> +                               failed_tests++;
> +                       }
> +                       if (!__bitmap_equal(bmap1, bmap2, 1024)) {
>                                 printk("set not __equal %d %d\n", start, nbits);
> +                               failed_tests++;
> +                       }
>
>                         bitmap_clear(bmap1, start, nbits);
>                         __bitmap_clear(bmap2, start, nbits);
> -                       if (!bitmap_equal(bmap1, bmap2, 1024))
> +                       if (!bitmap_equal(bmap1, bmap2, 1024)) {
>                                 printk("clear not equal %d %d\n", start, nbits);
> -                       if (!__bitmap_equal(bmap1, bmap2, 1024))
> +                               failed_tests++;
> +                       }
> +                       if (!__bitmap_equal(bmap1, bmap2, 1024)) {
>                                 printk("clear not __equal %d %d\n", start,
>                                                                         nbits);
> +                               failed_tests++;
> +                       }
>                 }
>         }
>  }
> --
> 2.14.1
>



-- 
Kees Cook
Pixel Security

Re: [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[Andrew Morton]

On Wed,  9 May 2018 21:43:28 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:

> From: Matthew Wilcox <mawilcox@microsoft.com>
> 
> I had neglected to increment the error counter when the tests failed,
> which made the tests noisy when they fail, but not actually return an
> error code.
> 
> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
> Fixes: 3cc78125a081 ("lib/test_bitmap.c: add optimisation tests")
> Cc: stable@vger.kernel.org # v4.13+
> Tested-by: Michael Ellerman <mpe@ellerman.id.au>

I'll add your SOB to my copy of this, as you were on the patch delivery path.

Re: [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[Michael Ellerman]

Kees Cook <keescook@chromium.org> writes:

> On Wed, May 9, 2018 at 4:43 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>> From: Matthew Wilcox <mawilcox@microsoft.com>
>>
>> I had neglected to increment the error counter when the tests failed,
>> which made the tests noisy when they fail, but not actually return an
>> error code.
>>
>> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
>> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
>> Fixes: 3cc78125a081 ("lib/test_bitmap.c: add optimisation tests")
>> Cc: stable@vger.kernel.org # v4.13+
>> Tested-by: Michael Ellerman <mpe@ellerman.id.au>
>
> FWIW:
>
> Reviewed-by: Kees Cook <keescook@chromium.org>

Thanks.

cheers

Re: [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly

[Michael Ellerman]

Andrew Morton <akpm@linux-foundation.org> writes:
> On Wed,  9 May 2018 21:43:28 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>> From: Matthew Wilcox <mawilcox@microsoft.com>
>> 
>> I had neglected to increment the error counter when the tests failed,
>> which made the tests noisy when they fail, but not actually return an
>> error code.
>> 
>> Reported-by: Michael Ellerman <mpe@ellerman.id.au>
>> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
>> Fixes: 3cc78125a081 ("lib/test_bitmap.c: add optimisation tests")
>> Cc: stable@vger.kernel.org # v4.13+
>> Tested-by: Michael Ellerman <mpe@ellerman.id.au>
>
> I'll add your SOB to my copy of this, as you were on the patch delivery path.

Ah yep, I wasn't on the original delivery path, but you're right I am now.

Thanks for fixing it up.

cheers