lib/test_bitmap: correct test data offsets for 32-bit (69334ca5) · Commits · 戴 / test

On 32-bit platform the size of long is only 32 bits which makes wrong offset in the array of 64 bit size. Calculate offset based on BITS_PER_LONG. Link: http://lkml.kernel.org/r/20200109103601.45929-1-andriy.shevchenko@linux.intel.com Fixes: ("lib/bitmap: introduce bitmap_replace() helper") Signed-off-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reported-by:

Guenter Roeck <linux@roeck-us.net> Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Yury Norov <yury.norov@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

lib/test_bitmap.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -275,22 +275,23 @@ static void __init test_copy(void)
		static void __init test_replace(void)
		{
		unsigned int nbits = 64;
		unsigned int nlongs = DIV_ROUND_UP(nbits, BITS_PER_LONG);
		DECLARE_BITMAP(bmap, 1024);

		bitmap_zero(bmap, 1024);
		bitmap_replace(bmap, &exp2[0], &exp2[1], exp2_to_exp3_mask, nbits);
		bitmap_replace(bmap, &exp2[0 * nlongs], &exp2[1 * nlongs], exp2_to_exp3_mask, nbits);
		expect_eq_bitmap(bmap, exp3_0_1, nbits);

		bitmap_zero(bmap, 1024);
		bitmap_replace(bmap, &exp2[1], &exp2[0], exp2_to_exp3_mask, nbits);
		bitmap_replace(bmap, &exp2[1 * nlongs], &exp2[0 * nlongs], exp2_to_exp3_mask, nbits);
		expect_eq_bitmap(bmap, exp3_1_0, nbits);

		bitmap_fill(bmap, 1024);
		bitmap_replace(bmap, &exp2[0], &exp2[1], exp2_to_exp3_mask, nbits);
		bitmap_replace(bmap, &exp2[0 * nlongs], &exp2[1 * nlongs], exp2_to_exp3_mask, nbits);
		expect_eq_bitmap(bmap, exp3_0_1, nbits);

		bitmap_fill(bmap, 1024);
		bitmap_replace(bmap, &exp2[1], &exp2[0], exp2_to_exp3_mask, nbits);
		bitmap_replace(bmap, &exp2[1 * nlongs], &exp2[0 * nlongs], exp2_to_exp3_mask, nbits);
		expect_eq_bitmap(bmap, exp3_1_0, nbits);
		}

Admin message