From: Alexander Lobakin <aleksander.lobakin@intel.com>
To: Yury Norov <yury.norov@gmail.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Alexander Potapenko <glider@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
David Ahern <dsahern@kernel.org>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
Simon Horman <simon.horman@corigine.com>,
netdev@vger.kernel.org, linux-btrfs@vger.kernel.org,
dm-devel@redhat.com, ntfs3@lists.linux.dev,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/14] lib/bitmap: add tests for bitmap_{get,set}_bits()
Date: Mon, 9 Oct 2023 17:10:25 +0200 [thread overview]
Message-ID: <20231009151026.66145-14-aleksander.lobakin@intel.com> (raw)
In-Reply-To: <20231009151026.66145-1-aleksander.lobakin@intel.com>
bitmap_{get,set}_value8() is now bitmap_{get,set}_bits(). The former
didn't have any dedicated tests in the bitmap test suite.
Add a pack of test cases with variable offset, width, and value to set
(for _set_bits()), randomly generated with the only limitation:
``offset % 32 + width <= 32``, to make sure the tests won't fail or
trigger kernel warnings on 32-bit platforms. For _get_bits(), compare
the return values with the expected ones, calculated and saved manually.
For _set_bit(), do several modifications of the source bitmap and then
compare against the expected resulting one, also pre-calculated.
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
---
lib/test_bitmap.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index cbf1b9611616..6037b66fd30a 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -1161,6 +1161,82 @@ static void __init test_bitmap_print_buf(void)
}
}
+struct getset_test {
+ u16 offset;
+ u16 width;
+ union {
+ u32 expect;
+ u32 value;
+ };
+};
+
+#define GETSET_TEST(o, w, v) { \
+ .offset = (o), \
+ .width = (w), \
+ .value = (v), \
+}
+
+static const unsigned long getset_src[] __initconst = {
+ BITMAP_FROM_U64(0x4329c918b472468eULL),
+ BITMAP_FROM_U64(0xb2c20a622474a119ULL),
+ BITMAP_FROM_U64(0x3a08cb5591cea40dULL),
+ BITMAP_FROM_U64(0xc9a7550384e145f8ULL),
+};
+
+static const struct getset_test get_bits_test[] __initconst = {
+ GETSET_TEST(208, 16, 0x84e1),
+ GETSET_TEST(104, 8, 0xa),
+ GETSET_TEST(224, 32, 0xc9a75503),
+ GETSET_TEST(64, 16, 0xa119),
+ GETSET_TEST(169, 1, 0x1),
+ GETSET_TEST(144, 8, 0xce),
+ GETSET_TEST(80, 4, 0x4),
+ GETSET_TEST(24, 4, 0x4),
+};
+
+static const struct getset_test set_bits_test[] __initconst = {
+ GETSET_TEST(56, 4, 0xa),
+ GETSET_TEST(80, 16, 0xb17a),
+ GETSET_TEST(112, 8, 0x1b),
+ GETSET_TEST(0, 32, 0xe8a555f2),
+ GETSET_TEST(16, 2, 0),
+ GETSET_TEST(72, 8, 0x7d),
+ GETSET_TEST(47, 1, 0),
+ GETSET_TEST(160, 16, 0x1622),
+};
+
+static const unsigned long getset_out[] __initconst = {
+ BITMAP_FROM_U64(0x4a294918e8a455f2ULL),
+ BITMAP_FROM_U64(0xb21b0a62b17a7d19ULL),
+ BITMAP_FROM_U64(0x3a08162291cea40dULL),
+ BITMAP_FROM_U64(0xc9a7550384e145f8ULL),
+};
+
+#define GETSET_TEST_BITS BYTES_TO_BITS(sizeof(getset_out))
+
+static void __init test_bitmap_getset_bits(void)
+{
+ DECLARE_BITMAP(out, GETSET_TEST_BITS);
+
+ for (u32 i = 0; i < ARRAY_SIZE(get_bits_test); i++) {
+ const struct getset_test *test = &get_bits_test[i];
+ u32 val;
+
+ val = bitmap_get_bits(getset_src, test->offset, test->width);
+ expect_eq_uint(test->expect, val);
+ }
+
+ bitmap_copy(out, getset_src, GETSET_TEST_BITS);
+
+ for (u32 i = 0; i < ARRAY_SIZE(set_bits_test); i++) {
+ const struct getset_test *test = &set_bits_test[i];
+
+ bitmap_set_bits(out, test->offset, test->value, test->width);
+ }
+
+ expect_eq_bitmap(getset_out, out, GETSET_TEST_BITS);
+}
+
/*
* FIXME: Clang breaks compile-time evaluations when KASAN and GCOV are enabled.
* To workaround it, GCOV is force-disabled in Makefile for this configuration.
@@ -1238,6 +1314,7 @@ static void __init selftest(void)
test_mem_optimisations();
test_bitmap_cut();
test_bitmap_print_buf();
+ test_bitmap_getset_bits();
test_bitmap_const_eval();
test_find_nth_bit();
--
2.41.0
next prev parent reply other threads:[~2023-10-09 15:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 15:10 [PATCH 00/14] ip_tunnel: convert __be16 tunnel flags to bitmaps Alexander Lobakin
2023-10-09 15:10 ` [PATCH 01/14] bitops: add missing prototype check Alexander Lobakin
2023-10-09 15:10 ` [PATCH 02/14] bitops: make BYTES_TO_BITS() treewide-available Alexander Lobakin
2023-10-09 15:10 ` [PATCH 03/14] bitops: let the compiler optimize __assign_bit() Alexander Lobakin
2023-10-09 16:18 ` Yury Norov
2023-10-11 7:25 ` Alexander Lobakin
2023-10-09 15:10 ` [PATCH 04/14] linkmode: convert linkmode_{test,set,clear,mod}_bit() to macros Alexander Lobakin
2023-10-09 15:10 ` [PATCH 05/14] s390/cio: rename bitmap_size() -> idset_bitmap_size() Alexander Lobakin
2023-10-09 16:35 ` Yury Norov
2023-10-11 7:28 ` Alexander Lobakin
2023-10-09 15:10 ` [PATCH 06/14] fs/ntfs3: rename bitmap_size() -> ntfs3_bitmap_size() Alexander Lobakin
2023-10-09 16:50 ` Yury Norov
2023-10-11 7:36 ` Alexander Lobakin
2023-10-09 15:10 ` [PATCH 07/14] btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() Alexander Lobakin
2023-10-09 15:23 ` David Sterba
2023-10-09 15:10 ` [PATCH 08/14] bitmap: introduce generic optimized bitmap_size() Alexander Lobakin
2023-10-09 17:04 ` Yury Norov
2023-10-09 15:10 ` [PATCH 09/14] bitmap: extend bitmap_{get,set}_value8() to bitmap_{get,set}_bits() Alexander Lobakin
2023-10-09 16:31 ` Yury Norov
2023-10-11 9:33 ` Alexander Lobakin
2023-10-11 10:36 ` Andy Shevchenko
2023-10-15 2:20 ` Yury Norov
2023-10-09 15:10 ` [PATCH 10/14] ip_tunnel: use a separate struct to store tunnel params in the kernel Alexander Lobakin
2023-10-09 15:10 ` [PATCH 11/14] ip_tunnel: convert __be16 tunnel flags to bitmaps Alexander Lobakin
2023-10-09 15:10 ` [PATCH 12/14] lib/bitmap: add compile-time test for __assign_bit() optimization Alexander Lobakin
2023-10-09 15:10 ` Alexander Lobakin [this message]
2023-10-09 15:10 ` [PATCH 14/14] lib/bitmap: add tests for IP tunnel flags conversion helpers Alexander Lobakin
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=20231009151026.66145-14-aleksander.lobakin@intel.com \
--to=aleksander.lobakin@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dm-devel@redhat.com \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=kuba@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=netdev@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=przemyslaw.kitszel@intel.com \
--cc=simon.horman@corigine.com \
--cc=yury.norov@gmail.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).