From: Kees Cook <keescook@chromium.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
Matthew Wilcox <mawilcox@microsoft.com>,
Yury Norov <ynorov@caviumnetworks.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly
Date: Wed, 9 May 2018 10:16:24 -0700 [thread overview]
Message-ID: <CAGXu5jJSDFid-w3kdhCYH_9d_n1AOnJkDaFg70OaWvjpsJ2sgQ@mail.gmail.com> (raw)
In-Reply-To: <20180509114328.9887-1-mpe@ellerman.id.au>
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
next prev parent reply other threads:[~2018-05-09 17:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 11:43 [PATCH] lib/test_bitmap.c: Fix bitmap optimisation tests to report errors correctly Michael Ellerman
2018-05-09 17:16 ` Kees Cook [this message]
2018-05-11 13:47 ` Michael Ellerman
2018-05-09 22:59 ` Andrew Morton
2018-05-11 13:48 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGXu5jJSDFid-w3kdhCYH_9d_n1AOnJkDaFg70OaWvjpsJ2sgQ@mail.gmail.com \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mawilcox@microsoft.com \
--cc=mpe@ellerman.id.au \
--cc=torvalds@linux-foundation.org \
--cc=ynorov@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).