From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F457CD4F30 for ; Fri, 22 Sep 2023 08:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=az8EfOH+3SR7U3KiSdzeFYxegFMxkyMVvqJEKgXBHx0=; b=I6JeyxfpZZpORC/pvdGgIagH05 R5dKcixsWU7K235J6l/VBZ2EJh4+TsIcvFSxXQ+IJSRhzZXe6NbVIkmC8U/kBxN5E/A0//wa5ZS+g cRuHPGaMwF6WrUFOu/JIaAWaT4+9yOeC3GjphY+HvRf7/IyfLx1MNDfwX8LdPHr0S+TPz7at+nSnK gNZD5kYoAcHh+NeWPId0dVQ0zJjg6JM3zRA6YnbiTxZN2zVgVfzoBcfxrVx2tYcUavy4pRC1ngKTL WTZlJpjmSWU6FXpjUaUUHbtnHdDuEabwMw1FC2jhqIRJZnyE87puaGdeJ28xVleVmPhsT7ooQD9ys YF0G9ibA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjbDl-008Lfx-0F; Fri, 22 Sep 2023 08:09:05 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qjbDf-008LdP-2A for linux-arm-kernel@lists.infradead.org; Fri, 22 Sep 2023 08:09:01 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59ee66806d7so24598527b3.0 for ; Fri, 22 Sep 2023 01:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695370137; x=1695974937; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=E6HfQ9ajoFejClPit+nbh4c2FH86MesGxxER+WNLYXg=; b=FmRYikm/UtS0CknLO4/o1ggJMKhKCupvlx0Dc647DPpjn3uqlIma9km7BMNFMfcsC1 eBCP0k8r84emyUI3Uf+9UgUAaCxdP+HYQFmNExLxvqXqJSesfKbh7HT2dbuRlSaPSdAG WVcQwcYUJhB7XRQXlme+iwyv57i3jchDybJw5ilTwLA16gjUD2KaMmnNCAk5V0trWjsV pbFtDUpOFNdikOqgXzlWm6AOo9Th3E6edIjoBmxnKCWMQdYEQtZhI1IOdF//nE9Ck3Rp 3+xhGHR4Iyc/8TXAXauVuOZK4zzrVGrGszwlPvojTnDgxbWLMg663j/7wjLGPTTcDtPn Mkrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695370137; x=1695974937; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=E6HfQ9ajoFejClPit+nbh4c2FH86MesGxxER+WNLYXg=; b=BfQ1+qaM733VvK/07W2TEKWjzzOk69zZ5IY/ppV/tfRAIuqnqNL3qO1ctkWXHnzqJG 3iT/n7I4ZsvdDC/i3snGkSCu1PE43ppW1MahUB67P1IRYq7GfOOeWeQYU/Ag+nnEOk18 nqlSEs3q7K/bio3JxMT/TR3g+yj3IxzR/pEPniRH0MhBFvJxQ2B3S0FdMjluSHVrVkCb pTkxnzE1uVx26KohV+2jf9WhtN9EH2PYlDzI1XG67rlAvQq7g9dQCrXe6GdP6M9Ws4bv Eubxfe3twZ6qnN4EaqrctI0uPcsSzwyVI0ojNiMCgv6M47VIqrgvYASfunWYp7PIMqE/ hNhA== X-Gm-Message-State: AOJu0Ywkhzc3PnKJWeli3cdRQhD0NEmieWS/Z+YI1YrLLaay9g6grnbO hFXMJ9J+hEp2mO4LWhhQ+OhfXma8Dwg= X-Google-Smtp-Source: AGHT+IEdiD//2jsP7Hipwjz6LYsrL0lV7yx6GCLEvY13BgHGKc4ggEzfLi5fB/Luw3/AsSlbbzCaIuJUQOY= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:4da0:80d4:9480:7d5c]) (user=glider job=sendgmr) by 2002:a81:af1c:0:b0:59b:db15:498c with SMTP id n28-20020a81af1c000000b0059bdb15498cmr119630ywh.10.1695370137358; Fri, 22 Sep 2023 01:08:57 -0700 (PDT) Date: Fri, 22 Sep 2023 10:08:44 +0200 In-Reply-To: <20230922080848.1261487-1-glider@google.com> Mime-Version: 1.0 References: <20230922080848.1261487-1-glider@google.com> X-Mailer: git-send-email 2.42.0.515.g380fc7ccd1-goog Message-ID: <20230922080848.1261487-3-glider@google.com> Subject: [PATCH v5 2/5] lib/test_bitmap: add tests for bitmap_{read,write}() From: Alexander Potapenko To: glider@google.com, catalin.marinas@arm.com, will@kernel.org, pcc@google.com, andreyknvl@gmail.com, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, yury.norov@gmail.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, eugenis@google.com, syednwaris@gmail.com, william.gray@linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230922_010859_711961_31324A32 X-CRM114-Status: GOOD ( 19.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add basic tests ensuring that values can be added at arbitrary positions of the bitmap, including those spanning into the adjacent unsigned longs. Signed-off-by: Alexander Potapenko Reviewed-by: Andy Shevchenko --- This patch was previously called "lib/test_bitmap: add tests for bitmap_{set,get}_value()" (https://lore.kernel.org/lkml/20230720173956.3674987-3-glider@google.com/) and "lib/test_bitmap: add tests for bitmap_{set,get}_value_unaligned" (https://lore.kernel.org/lkml/20230713125706.2884502-3-glider@google.com/) v5: - update patch title - address Yury Norov's comments: - rename the test cases - factor out test_bitmap_write_helper() to test writing over different background patterns; - add a test case copying a nontrivial value bit-by-bit; - drop volatile v4: - Address comments by Andy Shevchenko: added Reviewed-by: and a link to the previous discussion - Address comments by Yury Norov: - expand the bitmap to catch more corner cases - add code testing that bitmap_set_value() does not touch adjacent bits - add code testing the nbits==0 case - rename bitmap_{get,set}_value() to bitmap_{read,write}() v3: - switch to using bitmap_{set,get}_value() - change the expected bit pattern in test_set_get_value(), as the test was incorrectly assuming 0 is the LSB. --- lib/test_bitmap.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 187f5b2db4cf1..ea66e39b29a4e 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -71,6 +71,17 @@ __check_eq_uint(const char *srcfile, unsigned int line, return true; } +static bool __init +__check_eq_ulong(const char *srcfile, unsigned int line, + const unsigned long exp_ulong, unsigned long x) +{ + if (exp_ulong != x) { + pr_err("[%s:%u] expected %lu, got %lu\n", + srcfile, line, exp_ulong, x); + return false; + } + return true; +} static bool __init __check_eq_bitmap(const char *srcfile, unsigned int line, @@ -186,6 +197,7 @@ __check_eq_str(const char *srcfile, unsigned int line, }) #define expect_eq_uint(...) __expect_eq(uint, ##__VA_ARGS__) +#define expect_eq_ulong(...) __expect_eq(ulong, ##__VA_ARGS__) #define expect_eq_bitmap(...) __expect_eq(bitmap, ##__VA_ARGS__) #define expect_eq_pbl(...) __expect_eq(pbl, ##__VA_ARGS__) #define expect_eq_u32_array(...) __expect_eq(u32_array, ##__VA_ARGS__) @@ -1222,6 +1234,108 @@ static void __init test_bitmap_const_eval(void) BUILD_BUG_ON(~var != ~BIT(25)); } +/* + * Test bitmap should be big enough to include the cases when start is not in + * the first word, and start+nbits lands in the following word. + */ +#define TEST_BIT_LEN (1000) +#define TEST_BYTE_LEN (BITS_TO_BYTES(TEST_BIT_LEN)) + +/* + * Helper function to test bitmap_write() overwriting the chosen byte pattern. + */ +static void __init test_bitmap_write_helper(unsigned char pattern) +{ + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + DECLARE_BITMAP(exp_bitmap, TEST_BIT_LEN); + unsigned long w, r, bit; + int i, n, nbits; + + /* + * Check that setting a single bit does not accidentally touch the + * adjacent bits. + */ + for (i = 0; i < TEST_BIT_LEN; i++) { + /* + * A 0b10101010 pattern to catch both 0s replaced to 1s + * and vice versa. + */ + memset(bitmap, pattern, TEST_BYTE_LEN); + memset(exp_bitmap, pattern, TEST_BYTE_LEN); + for (bit = 0; bit <= 1; bit++) { + bitmap_write(bitmap, bit, i, 1); + __assign_bit(i, exp_bitmap, bit); + expect_eq_bitmap(exp_bitmap, bitmap, + TEST_BIT_LEN); + } + } + + /* Ensure setting 0 bits does not change anything. */ + memset(bitmap, pattern, TEST_BYTE_LEN); + memset(exp_bitmap, pattern, TEST_BYTE_LEN); + for (i = 0; i < TEST_BIT_LEN; i++) { + bitmap_write(bitmap, ~0UL, i, 0); + expect_eq_bitmap(exp_bitmap, bitmap, TEST_BIT_LEN); + } + + for (nbits = BITS_PER_LONG; nbits >= 1; nbits--) { + w = 0xdeadbeefdeadbeefUL >> (BITS_PER_LONG - nbits); + for (i = 0; i <= TEST_BIT_LEN - nbits; i++) { + memset(bitmap, pattern, TEST_BYTE_LEN); + memset(exp_bitmap, pattern, TEST_BYTE_LEN); + for (n = 0; n < nbits; n++) + __assign_bit(i + n, exp_bitmap, w & BIT(n)); + bitmap_write(bitmap, w, i, nbits); + expect_eq_bitmap(exp_bitmap, bitmap, TEST_BIT_LEN); + r = bitmap_read(bitmap, i, nbits); + expect_eq_ulong(r, w); + } + } +} + +static void __init test_bitmap_read_write(void) +{ + unsigned char pattern[3] = {0x00, 0xaa, 0xff}; + DECLARE_BITMAP(bitmap, TEST_BIT_LEN); + unsigned long zero_bits = 0; + unsigned long val; + int i, pi; + + /* + * Setting/getting zero bytes should not crash the kernel. + * READ_ONCE() prevents constant folding. + */ + bitmap_write(NULL, 0, 0, READ_ONCE(zero_bits)); + val = bitmap_read(NULL, 0, READ_ONCE(zero_bits)); + expect_eq_ulong(0, val); + + /* + * Ensure that bitmap_read() reads the same value that was previously + * written, and two consequent values are correctly merged. + * The resulting bit pattern is asymmetric to rule out possible issues + * with bit numeration order. + */ + for (i = 0; i < TEST_BIT_LEN - 7; i++) { + bitmap_zero(bitmap, TEST_BIT_LEN); + + bitmap_write(bitmap, 0b10101UL, i, 5); + val = bitmap_read(bitmap, i, 5); + expect_eq_ulong(0b10101UL, val); + + bitmap_write(bitmap, 0b101UL, i + 5, 3); + val = bitmap_read(bitmap, i + 5, 3); + expect_eq_ulong(0b101UL, val); + + val = bitmap_read(bitmap, i, 8); + expect_eq_ulong(0b10110101UL, val); + } + + for (pi = 0; pi < sizeof(pattern); pi++) + test_bitmap_write_helper(pattern[pi]); +} +#undef TEST_BYTE_LEN +#undef TEST_BIT_LEN + static void __init selftest(void) { test_zero_clear(); @@ -1237,6 +1351,7 @@ static void __init selftest(void) test_bitmap_cut(); test_bitmap_print_buf(); test_bitmap_const_eval(); + test_bitmap_read_write(); test_find_nth_bit(); test_for_each_set_bit(); -- 2.42.0.515.g380fc7ccd1-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel