From patchwork Thu Mar 14 12:30:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 10852711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2EEE41515 for ; Thu, 14 Mar 2019 12:29:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14C1F2A37B for ; Thu, 14 Mar 2019 12:29:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 084552A3AF; Thu, 14 Mar 2019 12:29:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 842432A37B for ; Thu, 14 Mar 2019 12:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NGjO61jJ+ZtHjMj7PjKydAZFMhP3fiH/iEzwOEbSN9s=; b=ZlwQNKyOt5TYQ8 JMgzraUt2EZNEf3oLz5j8oXBdIJ8b9TfDsN85NHV6YN1bzqoUoKU2uQf8iAcIu6s1FC0KPKDnPOVc 4E/V9/z0E9qRf7lEsKxvrKjgL9LEcm4bI5lZAfUf2K564TeR0OgiVlcWEKRJNkfun+RcgiWg22xqE XvuBYYMG3RqCWWpCEQGyLFBxxVhYQxsGjWMj3gGxEUJLlzN6hPvjCPyAoSLPI3oFAFd9fcgaGnEjS hZuWTcxpdPJwtUV+VsA5WQzx94VtZC4VGOlNNw7kENMatjrFqRHuIb+/BRNxiZcKQLEqKPQrhJI96 HzmRWdAAP4SjXbb0O1cQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4PUP-0005pB-Bz; Thu, 14 Mar 2019 12:29:37 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4PUK-0005kJ-BB for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2019 12:29:35 +0000 Received: by mail-pf1-x444.google.com with SMTP id d25so3718066pfn.8 for ; Thu, 14 Mar 2019 05:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=voPjJIpaEIENDSX5D22rQL6GtMzeJ5e93HyvmN9lrck=; b=pTqUtj30cxrD+gvouv7l3w0sFX0bU95MZfqL2IhBnTFd3ZXuG/F5ODVBg9kgA9QzHs r3mDBmiOdL+UC7yLlhKjBcQ36z0WatAFhJT2WDUW9Ync2XxWNO3qNODGTvVMlbhOOXpj lefjWJGy+IWcFMkn6iVeqNNz5N+0ijmh/LpNpFp97+yrMMq7gZ+OwYHQJNm3lzvfByRj Mh0Fjho/B5rZRA/iSHmM5FyRH+snx0QBJjNfgzqxiv5mjFlQj3tnpez3VKh0d6z3rzE8 RNt/AhoyDOsoSHal0yMP+L9rQ2hK6bRHJ38L63OkIDRR9fgMUXTT+9kbS3Ezmq7LFXrw hecA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=voPjJIpaEIENDSX5D22rQL6GtMzeJ5e93HyvmN9lrck=; b=oslDVWTjeso6uD8lVgdsS7KTlrQiXRc6n5rue9t1soqk+oFWKq48CvDuA85GldHfYg /Mtj+Vm/K1qvg3X7JFbdA2/GLEaeQBwH0yL8V/Y4eK2cRA7JYXqdKENA+VtAues2xPrz sKkqc3s5pfNSACrz06WLWP9MVPf6a2s7AAyYIsXKqn8SgkihfGk41vsaqrdqT6alOYyH YTfGZEgfu77U3MRC4IAOViFTYSEj3mI6pg9xCNVc8QSJalWGopo2ouaDQhZ3TWwZ/Ps+ C/T6IrzWroIIGx3miqS3T68ZILdEZtJL4ZtrmXJenqymbpVV5nBZjACKsTZ2x21riSZL P4Mw== X-Gm-Message-State: APjAAAXRbP+3SmdJ/Jln8yCYSbxZDjHYxRA33LlKYDTizxPHguoi5wd2 By4azziwy6/B9HEw/B2Gx+X4Gw8R X-Google-Smtp-Source: APXvYqy5UvtD/Kf3+GFJlYe8rHPF7gTdnvCaAjrNRw0ivGvgRMuD2mN3+AT9okFrXWaVOTJwEpNVnQ== X-Received: by 2002:a63:da58:: with SMTP id l24mr9806796pgj.167.1552566571813; Thu, 14 Mar 2019 05:29:31 -0700 (PDT) Received: from localhost.localdomain ([2001:268:c0a4:3974:c70:4af9:86e2:2]) by smtp.gmail.com with ESMTPSA id k189sm13888301pgk.21.2019.03.14.05.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 05:29:31 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org Subject: [PATCH v10 02/10] lib/test_bitmap.c: Add for_each_set_clump8 test cases Date: Thu, 14 Mar 2019 21:30:24 +0900 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190314_052932_407414_93E7DDA4 X-CRM114-Status: GOOD ( 14.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, yamada.masahiro@socionext.com, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, William Breathitt Gray , linux-gpio@vger.kernel.org, Andy Shevchenko , bgolaszewski@baylibre.com, akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The introduction of the for_each_set_clump8 macro warrants test cases to verify the implementation. This patch adds test case checks for whether an out-of-bounds clump index is returned, a zero clump is returned, or the returned clump value differs from the expected clump value. Cc: Rasmus Villemoes Acked-by: Andrew Morton Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij Signed-off-by: William Breathitt Gray --- lib/test_bitmap.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 6cd7d0740005..8d1f268069c1 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -88,6 +88,36 @@ __check_eq_u32_array(const char *srcfile, unsigned int line, return true; } +static bool __init __check_eq_clump8(const char *srcfile, unsigned int line, + const unsigned int offset, + const unsigned int size, + const unsigned char *const clump_exp, + const unsigned long *const clump) +{ + 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 / 8]; + 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; \ @@ -104,6 +134,7 @@ __check_eq_u32_array(const char *srcfile, unsigned int line, #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__) +#define expect_eq_clump8(...) __expect_eq(clump8, ##__VA_ARGS__) static void __init test_zero_clear(void) { @@ -361,6 +392,39 @@ static void noinline __init test_mem_optimisations(void) } } +static const unsigned char clump_exp[] __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 void __init test_for_each_set_clump8(void) +{ +#define CLUMP_EXP_NUMBITS 64 + DECLARE_BITMAP(bits, CLUMP_EXP_NUMBITS); + unsigned int start; + unsigned long clump; + + /* set bitmap to test case */ + bitmap_zero(bits, CLUMP_EXP_NUMBITS); + bitmap_set(bits, 0, 1); /* 0x01 */ + bitmap_set(bits, 9, 1); /* 0x02 */ + bitmap_set(bits, 27, 3); /* 0x28 */ + bitmap_set(bits, 35, 3); /* 0x28 */ + bitmap_set(bits, 40, 4); /* 0x0F */ + bitmap_set(bits, 48, 8); /* 0xFF */ + bitmap_set(bits, 56, 1); /* 0x05 - part 1 */ + bitmap_set(bits, 58, 1); /* 0x05 - part 2 */ + + for_each_set_clump8(start, clump, bits, CLUMP_EXP_NUMBITS) + expect_eq_clump8(start, CLUMP_EXP_NUMBITS, clump_exp, &clump); +} + static int __init test_bitmap_init(void) { test_zero_clear(); @@ -369,6 +433,7 @@ static int __init test_bitmap_init(void) test_bitmap_arr32(); test_bitmap_parselist(); test_mem_optimisations(); + test_for_each_set_clump8(); if (failed_tests == 0) pr_info("all %u tests passed\n", total_tests);