Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp772117imm; Tue, 15 May 2018 08:59:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrPGN2panCLu3gGvF9Z5osNHmRw6xIaIG6HV9xNZ3BCG4nY0zEV2+xSU82+6lH5kVi+6j/2 X-Received: by 2002:a17:902:8647:: with SMTP id y7-v6mr14898168plt.86.1526399945637; Tue, 15 May 2018 08:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526399945; cv=none; d=google.com; s=arc-20160816; b=H5BCx0Sz1bJpWr6bMdONxOiJt/MEuS1V7jXRcQtZKc/YNRcRi6BzEVNpzhxQkAb0Mk 0fxJmkmxhnXP5sYA8ZH8eiiX1M5cz8EcndNfLVjEQ0aQfnS/V48PPwKGzBu5vW+dw3Ew boCvyGRQiTY/aMfyebmOIsbo/8Ya1qzJS79mUOJBiUS81V4MvIrEhWHMVwYSkskKGgPJ lITEtWCb1Q45fOPurFeZ1SzRGrZd6UkrUsX8QkL7UIzb0PJI/vVoEKl5uvdfyjApnqTq YeQ/pkZxY67y15T/2ORvAiN2n8BA9f4N8zFeag+SP83xOsXGjwP/fU5UMs8WRQ4Uessa huGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=+sr29fQyfWY2HRDh3nP0cRl0Asr8Qz+juv1orUOFG6g=; b=LBnLUNhlx+BZiwcnHcGXh8QDKplHcHQB9p3dzJGfQmstYMawwEp1P/7sZwvtxS9rMH 2AOZ1r+3c0obMNl5F3lPjupK/vicQu6+BcWqKj0UtI2W2izljK65gdl42mTRUrCtr6U+ lacnebv6mAxLQdiFiDEusjrFKPBDxxys+b3R7qxEltBRbHtx13HGr0nm5y9AC3JzuMc4 f4sfnEpldxnjMMuayWO0Z4byk0I7whdwNFUItC+JRuS+Uslz41+jIMuCfiaI65xQgdkM 62l6ZOs9jhsBIr+ORYDwHQ9MPu4oIUQVz7kDK5Wk6F7XYCfqcfSjmpBkL43lVEdOO3X6 mvTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jdCTXsRJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id e124-v6si320583pfe.80.2018.05.15.08.58.51; Tue, 15 May 2018 08:59:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jdCTXsRJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1753704AbeEOPuV (ORCPT + 99 others); Tue, 15 May 2018 11:50:21 -0400 Received: from mail-yb0-f193.google.com ([209.85.213.193]:37083 "EHLO mail-yb0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbeEOPuT (ORCPT ); Tue, 15 May 2018 11:50:19 -0400 Received: by mail-yb0-f193.google.com with SMTP id i13-v6so217626ybl.4; Tue, 15 May 2018 08:50:18 -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; bh=+sr29fQyfWY2HRDh3nP0cRl0Asr8Qz+juv1orUOFG6g=; b=jdCTXsRJBT15Iot8q7a20yUX5KpdOpUs9r66nDgLfl+e9IipRHtagrqXgtD5HZmbQz LemHibajIYoOraWwtk1FHL1bK+XQiOXEDY7nKMCPzWNl9mQqVDF41t7MW4lufo3pYCEr 8CCjcTZeEbXkdMhWpGewL+fCbm0kUz3WaYcArYNf81U8X2pHuqve9yFGh+xHe4XAyvaX whViY2Kt4QY4bcEdhaWiBOwYdwkaBws2Tq34Wm0cPqoMP3UzFd7eB0C/EZ/uvp3OdCW/ EglG0qbE7RCLHhcpmI9t6EfEPvLPhmn3SHLwb7qXZJGtWnhRvadmP/12kWHXYdOJIn0Z sEAA== 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; bh=+sr29fQyfWY2HRDh3nP0cRl0Asr8Qz+juv1orUOFG6g=; b=o4MUY51T5FumAgskmUd9HNZTnJw9T4BmoLRtXxEgcYiISfUX6PpTUwGrrxeeP9OXKS 0M3OPpVHhLcJi7tGgDoK6WkZLZmZ7VskaoLZtCQS6aKIb82SYzDPO84lpcJip4IzsRW8 JDGQ+h/DcAbdlx//orrGVsTCIx/B6s7hplPb8azOOXQEU3zU6ersq/hIs1h81UQqitMY ZxnrmKbHmVrwMZuTMmV77ee6f37EOppYkVabsIF6TjXoev/+vMabSvum4OrMOqssw5L8 BbPZW4ie0byO5f39FOGvZscxmdpQ/q8WfZTWAF2sc1y//5q29GMkiYAdjpjsGJ/Ow21f fsQg== X-Gm-Message-State: ALKqPwctBz4ndG7aBmauU4QcszShIGyRJLYKYfRPxQgH9HBKzQy7AZdh CGJOEIOHg/T55acQB7f8d2Y4YA== X-Received: by 2002:a25:818c:: with SMTP id p12-v6mr2954380ybk.397.1526399418070; Tue, 15 May 2018 08:50:18 -0700 (PDT) Received: from localhost ([72.188.97.40]) by smtp.gmail.com with ESMTPSA id z67-v6sm124520ywd.50.2018.05.15.08.50.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 08:50:17 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org Cc: linux-gpio@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray , Andy Shevchenko Subject: [PATCH v3 2/8] lib/test_bitmap.c: Add for_each_set_clump test cases Date: Tue, 15 May 2018 11:50:12 -0400 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The introduction of the for_each_set_clump 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. A 4-bit clump size is chosen in order to verify non-8-bit iteration. Cc: Andy Shevchenko Signed-off-by: William Breathitt Gray --- lib/test_bitmap.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index de16f7869fb1..395e4f4fe43d 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -88,6 +88,39 @@ __check_eq_u32_array(const char *srcfile, unsigned int line, return true; } +static bool __init __check_eq_clump(const char *srcfile, unsigned int line, + const size_t clump_index, const size_t size, + const unsigned char *const clump_exp, + const unsigned long *const bits, + const size_t index, + const unsigned int offset) +{ + unsigned long clump; + unsigned long exp; + + if (clump_index >= size) { + pr_warn("[%s:%u] clump index out-of-bounds: expected less than %zu, got %zu\n", + srcfile, line, size, clump_index); + return false; + } + + exp = clump_exp[clump_index]; + if (!exp) { + pr_warn("[%s:%u] clump index for zero clump: expected nonzero clump, got clump index %zu with clump value 0", + srcfile, line, clump_index); + return false; + } + + clump = (bits[index] >> offset) & 0xF; + if (clump != exp) { + pr_warn("[%s:%u] expected 0x%lX, got 0x%lX", + srcfile, line, exp, clump); + return false; + } + + return true; +} + #define __expect_eq(suffix, ...) \ ({ \ int result = 0; \ @@ -104,6 +137,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_clump(...) __expect_eq(clump, ##__VA_ARGS__) static void __init test_zero_clear(void) { @@ -352,6 +386,42 @@ static void noinline __init test_mem_optimisations(void) } } +static const unsigned char clump_exp[] __initconst = { + 0x1, /* 1 bit set */ + 0x2, /* non-edge 1 bit set */ + 0x0, /* zero bits set */ + 0xE, /* 3 bits set */ + 0xE, /* Repeated clump */ + 0xF, /* 4 bits set */ + 0x3, /* 2 bits set */ + 0x5, /* non-adjacent 2 bits set */ +}; + +static void __init test_for_each_set_clump(void) +{ + size_t clump; + size_t index; + unsigned int offset; +#define CLUMP_BITMAP_NUMBITS 32 + DECLARE_BITMAP(bits, CLUMP_BITMAP_NUMBITS); +#define CLUMP_SIZE 4 + const size_t size = DIV_ROUND_UP(CLUMP_BITMAP_NUMBITS, CLUMP_SIZE); + + /* set bitmap to test case */ + bitmap_zero(bits, CLUMP_BITMAP_NUMBITS); + bitmap_set(bits, 0, 1); /* 0x1 */ + bitmap_set(bits, 5, 6); /* 0x2 */ + bitmap_set(bits, 13, 16); /* 0xE */ + bitmap_set(bits, 17, 20); /* 0xE */ + bitmap_set(bits, 20, 24); /* 0xF */ + bitmap_set(bits, 24, 26); /* 0x3 */ + bitmap_set(bits, 28, 29); /* 0x5 - part 1 */ + bitmap_set(bits, 30, 31); /* 0x5 - part 2 */ + + for_each_set_clump(clump, index, offset, bits, size, CLUMP_SIZE) + expect_eq_clump(clump, size, clump_exp, bits, index, offset); +} + static int __init test_bitmap_init(void) { test_zero_clear(); @@ -360,6 +430,7 @@ static int __init test_bitmap_init(void) test_bitmap_arr32(); test_bitmap_parselist(); test_mem_optimisations(); + test_for_each_set_clump(); if (failed_tests == 0) pr_info("all %u tests passed\n", total_tests); -- 2.17.0