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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D5D0C3A5A9 for ; Sat, 2 May 2020 18:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05DBD206CD for ; Sat, 2 May 2020 18:49:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XrDZyUUR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728484AbgEBStl (ORCPT ); Sat, 2 May 2020 14:49:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728426AbgEBStk (ORCPT ); Sat, 2 May 2020 14:49:40 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B960CC061A0C for ; Sat, 2 May 2020 11:49:40 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id v2so5008831plp.9 for ; Sat, 02 May 2020 11:49:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=2rZHb0gLCOUzwtwIusEMK1vjTRbWVNQVBZAQphFrTIg=; b=XrDZyUURmIGaCLcMHT1aW+6kRxVjIwRrgCjgv6/3ixuiAKbWGT629SyAZxjVk0m011 6LmEvmefqL2uWPgmL14xK+5+1HVP3zQyT6uLv//iwqNUNBtsmRkZ1izf/tTb/pUUjTgn 167uRaRmubPkv5r5UIDKDsPdq4Blacs+9spsPyogPqzDY1cxDxpr+W+XVlNYV95IbNZu yjoOiLfOlNiZ1avOf7af1Cxy1H/VFw8ZIs5NkniFFkNeWQYrewgzX0Euv7GdHbsxjC/4 ZOpGfq7JN/NjBPOq+M/AysTFSVfx1FSimZf3kk6QtRe2DBytEid0nXQxTf0DObHcSuT3 FP/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=2rZHb0gLCOUzwtwIusEMK1vjTRbWVNQVBZAQphFrTIg=; b=hIYJ8vhS7DnruFgglET00azJA4PTNYFdhWObs7eNvZKMRz7UFZmKRrGYvcvnGS2HZq DMHTlRUzDZDUaNlTeHm24wdhiYXBwZ29Iw97Gq8VkSRKhC6it693nLSt/VwNK1G/Rbul pfXHAXgtmmlqA5tdU0sI0AmlF12uKMpfZb3kkjcEQVat/hl6AMqv4vhO0AtpRq1gFsmZ IU1uvnHxxfNnsWUnfNW8Q6p2hZYn0yjTWGrPDfLw2kQXNYLOnBY6NSon/aNBSggF6sFV MvW1e3rG1RtVEqgBXxfIEHeN3Is4n7fDYEsVo/FEVqF0jdYKtoirfa141Z6XKqram+FO 1Gow== X-Gm-Message-State: AGi0Puajl6qLXfYca4EnRQawMqJLw1+SLbaKmqecON+sZ388lIBnKgHh Zf7ROFKU5Rg7s0fvvVa8WFM= X-Google-Smtp-Source: APiQypIHMPwkJs3+5gh8Y5Jq95GiAfY0QuTT347JADz+2rMfMWR2BEcg+PG4eQDLj4+IyfnL/nhnpg== X-Received: by 2002:a17:90a:8c85:: with SMTP id b5mr6956016pjo.187.1588445380204; Sat, 02 May 2020 11:49:40 -0700 (PDT) Received: from syed ([106.210.101.167]) by smtp.gmail.com with ESMTPSA id s136sm5068660pfc.29.2020.05.02.11.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 May 2020 11:49:39 -0700 (PDT) Date: Sun, 3 May 2020 00:19:19 +0530 From: Syed Nayyar Waris To: akpm@linux-foundation.org Cc: andriy.shevchenko@linux.intel.com, vilhelm.gray@gmail.com, linus.walleij@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/4] lib/test_bitmap.c: Add for_each_set_clump test cases Message-ID: <3eeb13d101db69be8eca739522bbf303527339bd.1588443578.git.syednwaris@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The introduction of the generic for_each_set_clump macro need test cases to verify the implementation. This patch adds test cases for scenarios in which clump sizes are 8 bits, 24 bits, 30 bits and 6 bits. The cases contain situations where clump is getting split at the word boundary and also when zeroes are present in the start and middle of bitmap. Cc: Andy Shevchenko Cc: Linus Walleij Signed-off-by: Syed Nayyar Waris Signed-off-by: William Breathitt Gray --- Changes in v4: - Use 'for' loop in test function of 'for_each_set_clump'. Changes in v3: - No Change. Changes in v2: - Unify different tests for 'for_each_set_clump'. Pass test data as function parameters. - Remove unnecessary bitmap_zero calls. lib/test_bitmap.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 6b13150667f5..a2a1c411dd62 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -155,6 +155,38 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line, return true; } +static bool __init __check_eq_clump(const char *srcfile, unsigned int line, + const unsigned int offset, + const unsigned int size, + const unsigned long *const clump_exp, + const unsigned long *const clump, + const unsigned long clump_size) +{ + unsigned long exp; + + if (offset >= size) { + pr_warn("[%s:%u] bit offset for clump out-of-bounds: expected less than %u, got %u\n", + srcfile, line, size, offset); + return false; + } + + exp = clump_exp[offset / clump_size]; + if (!exp) { + pr_warn("[%s:%u] bit offset for zero clump: expected nonzero clump, got bit offset %u with clump value 0", + srcfile, line, offset); + return false; + } + + if (*clump != exp) { + pr_warn("[%s:%u] expected clump value of 0x%lX, got clump value of 0x%lX", + srcfile, line, exp, *clump); + return false; + } + + return true; +} + + #define __expect_eq(suffix, ...) \ ({ \ int result = 0; \ @@ -172,6 +204,7 @@ static bool __init __check_eq_clump8(const char *srcfile, unsigned int line, #define expect_eq_pbl(...) __expect_eq(pbl, ##__VA_ARGS__) #define expect_eq_u32_array(...) __expect_eq(u32_array, ##__VA_ARGS__) #define expect_eq_clump8(...) __expect_eq(clump8, ##__VA_ARGS__) +#define expect_eq_clump(...) __expect_eq(clump, ##__VA_ARGS__) static void __init test_zero_clear(void) { @@ -588,6 +621,71 @@ static const unsigned char clump_exp[] __initconst = { 0x05, /* non-adjacent 2 bits set */ }; +static const unsigned long bitmap_test_data[] __initconst = { + 0x38000201, + 0x05ff0f38, + 0xeffedcba, + 0xbbbbabcd, + 0x000000aa, + 0x000000aa, + 0x00ff0000, + 0xaaaaaa00, + 0xff000000, + 0x00aa0000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x0f000000, + 0x00000ac0, +}; + +static const unsigned long clump_exp1[] __initconst = { + 0x01, /* 1 bit set */ + 0x02, /* non-edge 1 bit set */ + 0x00, /* zero bits set */ + 0x38, /* 3 bits set across 4-bit boundary */ + 0x38, /* Repeated clump */ + 0x0F, /* 4 bits set */ + 0xFF, /* all bits set */ + 0x05, /* non-adjacent 2 bits set */ +}; + +static const unsigned long clump_exp2[] __initconst = { + 0xfedcba, /* 24 bits */ + 0xabcdef, + 0xaabbbb, /* Clump split between 2 words */ + 0x000000, /* zeroes in between */ + 0x0000aa, + 0x000000, + 0x0000ff, + 0xaaaaaa, + 0x000000, + 0x0000ff, +}; + +static const unsigned long clump_exp3[] __initconst = { + 0x00000000, /* starting with 0s*/ + 0x00000000, /* All 0s */ + 0x00000000, + 0x00000000, + 0x3f00000f, /* Non zero set */ + 0x2aa80003, + 0x00000aaa, + 0x00003fc0, +}; + +static const unsigned long clump_exp4[] __initconst = { + 0x00, + 0x2b, +}; + +static const unsigned long * const clump_data[] __initconst = { + clump_exp1, + clump_exp2, + clump_exp3, + clump_exp4, +}; + static void __init test_for_each_set_clump8(void) { #define CLUMP_EXP_NUMBITS 64 @@ -610,6 +708,48 @@ static void __init test_for_each_set_clump8(void) expect_eq_clump8(start, CLUMP_EXP_NUMBITS, clump_exp, &clump); } +static void __init execute_for_each_set_clump_test(unsigned long *bits, + unsigned long size, + unsigned long clump_size, + const unsigned long *clump_exp) +{ + unsigned long start, clump; + + for_each_set_clump(start, clump, bits, size, clump_size) + expect_eq_clump(start, size, clump_exp, &clump, clump_size); +} + +static void __init prepare_test_data(unsigned long * bits, + const unsigned long * test_data, + int start, int count) +{ + int i; + unsigned long position = 0; + + for(i = 0; i < count; i++) + { + bitmap_set_value(bits, test_data[start++], position, 32); + position += 32; + } +} + +static void __init test_for_each_set_clump(void) +{ + int i; + int count[] = {2, 8, 4, 1}; + int offset[] = {0, 2, 10, 14}; + unsigned long limit[] = {64, 240, 240, 18}; + unsigned long clump_size[] = {8, 24, 30, 6}; + DECLARE_BITMAP(bits, 256); + + for(i = 0; i < 4; i++) + { + prepare_test_data(bits, bitmap_test_data, offset[i], count[i]); + execute_for_each_set_clump_test(bits, limit[i], + clump_size[i], clump_data[i]); + } +} + static void __init selftest(void) { test_zero_clear(); @@ -623,6 +763,7 @@ static void __init selftest(void) test_bitmap_parselist_user(); test_mem_optimisations(); test_for_each_set_clump8(); + test_for_each_set_clump(); } KSTM_MODULE_LOADERS(test_bitmap); -- 2.26.2