Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp126000pxu; Tue, 6 Oct 2020 02:27:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnVjn1CYwWLNwOuaXx1n1N64tCJaqiA/ysK/FeHwmVNSDwJG4mmW5LpQDHFFPfOFY6CWw4 X-Received: by 2002:a05:6402:31b3:: with SMTP id dj19mr2347829edb.210.1601976458491; Tue, 06 Oct 2020 02:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601976458; cv=none; d=google.com; s=arc-20160816; b=gx0JtCJId19e3vZ2esBxREaLVgN0DIK0p42Ic/k7xFcR15VKXbjQygCwV5I6dShPVv 9kXq1OeozKD+/6//DpwatMM9ZZ6s6f8emAqMdE8khpgDICS/QoYe3xu0JvqRy0b2Sf8U s5HjkeRdjElN+pED0vObSTqZ4MYkUuUYC3/nonekjoummIjhJfGdCcQutGfrgIhCfln3 Ov2Dt9fI03QRokmD1WupViGslICG/kZhQpMoqlIawcVJ9Tjpq7d/C/on9vNTlsuCjOjC vjlzwre+MAdVwMeGFoFWZWYkFit7V9CtLCbTE4nFfsycZIkqClVYQc+XzNjyjSTJsY47 Ezfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=gdhFLsfSb7JmxQyIrw0z//eGxxz8abX11p+y8lQbvwc=; b=UhuaFPYxfoHyiVUK9e2LKlZ9z8jrwmddvoaX9iOcGfAmJjJ1bLtd02ZYR6T6aiN/Xj q8r+Zc33GJslgIxQkWA3WIlGBfNObCtGv8jUiQponXWj1AMBxSBFa5KyM8gdSh50ZWgl 5qaobxx7A/yvhLwErLO3AXujN2855BQ0Qz39hMdQyamQLS1+QG7wyzZWsK/DD5xknJ1N e5W92prBcvtPBsQQfAejc2+lFv81QpI8gkbuGtpdQzHIQ0lImT6LYajodqVO3iKly0x7 Gmf7LgCBtAK8NQDOcXly55Y7J8uIx8wEIJ0Ov3YYnlPU/XisW0WFpx6ka2MRpVbSe2fg zqcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=exCaIUhT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dh21si1907402edb.255.2020.10.06.02.27.15; Tue, 06 Oct 2020 02:27:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=exCaIUhT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725946AbgJFJYG (ORCPT + 99 others); Tue, 6 Oct 2020 05:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725891AbgJFJYG (ORCPT ); Tue, 6 Oct 2020 05:24:06 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B57C061755 for ; Tue, 6 Oct 2020 02:24:06 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id bb1so927274plb.2 for ; Tue, 06 Oct 2020 02:24:05 -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=gdhFLsfSb7JmxQyIrw0z//eGxxz8abX11p+y8lQbvwc=; b=exCaIUhTsOkIZ62+JehAvJP4gl1N1zPmkdOYECnu0SWmTnmUrwydh3fagPiAj2xeX0 wU4W4EeQ7yvnVYkUQKOsIrX1mJdTUXNvKCmb7wz9pc5g8rJe8t4aXWyEVptz3VhTP/1F SN0mjNUWtLVQtzjinrbsYroEVq8G4F5gjoFFtIeOf80GqrZLwxIcc4bA4HpzScQIpHZH Dj2S4G0nDT08b+1ssQ+ZhcdzCuonGmFgFIe7p096OkmpUBxqUiuhvSkqUpqRAnA5c620 UQ7NF+4OYeyLbMzTzY4c5A4AbyfwUnFZEBMssBsR4AI4rrwMlb4f1NJ8UvHG0oavxSZl tyWg== 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=gdhFLsfSb7JmxQyIrw0z//eGxxz8abX11p+y8lQbvwc=; b=SJEE6hScOWQrKOdsauqi6EY6Y77OnvzB0mNCEydgvb+eH8FlOYRg0SY2MGXfT/LOFe MFJirliWgSeaDTgxTAdIO8o08Qp2wLcKwf67xbReENMFmEQTif9C8eDmGCbeIlta9ARS ZRmcRqJefjMejsLIqy436NL3qlIpF1OZImabMrGmb/JjnzN+rCu9RiclaQ2eTDfrq+G9 8ToLW7+TVCxkYj8JDn8fdH+X/RwNaMLp7Bcm+t28gqaqfUl1NkijaeU2fJfNCfJy67S3 fc10BZY8nT3cRKogL8f52vEHo+rMAS59QdgnHOFFsdlaPb/EufdVrk0M27WCByifregy jcxQ== X-Gm-Message-State: AOAM533EjHcG02/KykYOcSULQtxvnbduv9lg12Gv7IglXxo/1gySFpp9 jBWBUh04bxXISniUycgEjf8= X-Received: by 2002:a17:90a:1189:: with SMTP id e9mr3503328pja.124.1601976245541; Tue, 06 Oct 2020 02:24:05 -0700 (PDT) Received: from syed ([117.97.226.113]) by smtp.gmail.com with ESMTPSA id v1sm2953702pfi.122.2020.10.06.02.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2020 02:24:05 -0700 (PDT) Date: Tue, 6 Oct 2020 14:53:45 +0530 From: Syed Nayyar Waris To: linus.walleij@linaro.org, akpm@linux-foundation.org Cc: andriy.shevchenko@linux.intel.com, vilhelm.gray@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH v11 2/4] lib/test_bitmap.c: Add for_each_set_clump test cases Message-ID: <5a5ec584ab8ea0ca32e94c55d518edcb737667ea.1601974764.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) 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. Signed-off-by: Syed Nayyar Waris Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- Changes in v11: - No change. Changes in v10: - No change. Changes in v9: - No change. Changes in v8: - [Patch 2/4]: Minor change: Use '__initdata' for correct section mismatch in 'clump_test_data' array. Changes in v7: - Minor changes: Use macro 'DECLARE_BITMAP()' and split 'struct' definition and test data. Changes in v6: - Make 'for loop' inside 'test_for_each_set_clump' more succinct. Changes in v5: - No change. 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 | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index df903c53952b..cb2cf3858f93 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -155,6 +155,37 @@ 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 +203,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) { @@ -577,6 +609,28 @@ static void noinline __init test_mem_optimisations(void) } } +static const unsigned long clump_bitmap_data[] __initconst = { + 0x38000201, + 0x05ff0f38, + 0xeffedcba, + 0xbbbbabcd, + 0x000000aa, + 0x000000aa, + 0x00ff0000, + 0xaaaaaa00, + 0xff000000, + 0x00aa0000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x0f000000, + 0x00ff0000, + 0xaaaaaa00, + 0xff000000, + 0x00aa0000, + 0x00000ac0, +}; + static const unsigned char clump_exp[] __initconst = { 0x01, /* 1 bit set */ 0x02, /* non-edge 1 bit set */ @@ -588,6 +642,95 @@ static const unsigned char clump_exp[] __initconst = { 0x05, /* non-adjacent 2 bits set */ }; +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, +}; + +struct clump_test_data_params { + DECLARE_BITMAP(data, 256); + unsigned long count; + unsigned long offset; + unsigned long limit; + unsigned long clump_size; + unsigned long const *exp; +}; + +static struct clump_test_data_params clump_test_data[] __initdata = + { {{0}, 2, 0, 64, 8, clump_exp1}, + {{0}, 8, 2, 240, 24, clump_exp2}, + {{0}, 8, 10, 240, 30, clump_exp3}, + {{0}, 1, 18, 18, 6, clump_exp4} }; + +static void __init prepare_test_data(unsigned int index) +{ + int i; + unsigned long width = 0; + + for(i = 0; i < clump_test_data[index].count; i++) + { + bitmap_set_value(clump_test_data[index].data, + clump_bitmap_data[(clump_test_data[index].offset)++], width, 32); + width += 32; + } +} + +static void __init execute_for_each_set_clump_test(unsigned int index) +{ + unsigned long start, clump; + + for_each_set_clump(start, clump, clump_test_data[index].data, + clump_test_data[index].limit, + clump_test_data[index].clump_size) + expect_eq_clump(start, clump_test_data[index].limit, clump_test_data[index].exp, + &clump, clump_test_data[index].clump_size); +} + +static void __init test_for_each_set_clump(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(clump_test_data); i++) { + prepare_test_data(i); + execute_for_each_set_clump_test(i); + } +} + static void __init test_for_each_set_clump8(void) { #define CLUMP_EXP_NUMBITS 64 @@ -680,6 +823,7 @@ static void __init selftest(void) test_bitmap_parselist_user(); test_mem_optimisations(); test_for_each_set_clump8(); + test_for_each_set_clump(); test_bitmap_cut(); } -- 2.26.2