Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1205201ybt; Sat, 27 Jun 2020 01:11:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjz20w0DWMA/ARlqIZcYmiQBvUFIGB6HOndloPaPl1KteKiYbbxPjw61vCJPdmR2WbxloB X-Received: by 2002:a17:906:ca4c:: with SMTP id jx12mr5378628ejb.231.1593245508629; Sat, 27 Jun 2020 01:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593245508; cv=none; d=google.com; s=arc-20160816; b=qWUwoE/mzRyvC2yFeQLKG9hbclq1NeKx57JJiaXiBmXPT7hLFNW3WoR2smHAHVNM/C tg6Tdsnnb03QcVorntm7Pfg6GxTGQgaivyD3p2SSRLzCGWTPWy8f0PiXcAnKlRTgMYsT WEQQhKm4udhyZrn8l6O40NpyuLrUimAwJ9BYAh4CXoaOD+waQ1PYWTKJJrADj9qaf3aB Q++wANPy5GmUI+7P3Vu0nSf8K2chA6u7pfxLA+Vk8D3FG+QjlKMfXCXsLV8bOnrGvYon bJNKG6ifX9fVL5lNwUQYIq0rjTxIxMU1EuMSLVXkjpHJ8HzNi/we7JV+yvZpOcdzF/LD Tg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=QTCFY0OvhLByi4lFkZj1DNq5Znrp9JZLegOWJW6QWCw=; b=X/ws346//0tuMOiLbMCIRCdUYfpvg+5mQo7kxVcQqItgCutQkj3csE8xwqQuXYYrpN VIsogGUzxyYw/nx+VcK/GkwbQkIeFGMnluJcOojqBmOD+Yz83J6qo75qPcj/5NAKKpoT nDiHcpko/4DGxgiluuNd6pI7P8VFiygSCVaRRGxaDmLc2VfT7OSRnSyeglcj/vQjAdVe DuzcWN5pP4Jp99yvzf7qDSz3Y1oKXadzCiKVAw+EmDeBwu8+c8QZ6jv8HG+3vhALfXm3 Fws+1Z+fVfDhgvMgXFh3kcoOUtba+0oVRKX3Yx7pa+ern37Ae70PvjLIk+mSa/UixCZs rhww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=KZkWexmx; 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 b4si1772469edk.454.2020.06.27.01.11.25; Sat, 27 Jun 2020 01:11:48 -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=KZkWexmx; 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 S1726361AbgF0ILD (ORCPT + 99 others); Sat, 27 Jun 2020 04:11:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbgF0ILC (ORCPT ); Sat, 27 Jun 2020 04:11:02 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86F58C03E979; Sat, 27 Jun 2020 01:11:02 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id q17so5675908pfu.8; Sat, 27 Jun 2020 01:11:02 -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=QTCFY0OvhLByi4lFkZj1DNq5Znrp9JZLegOWJW6QWCw=; b=KZkWexmxoDLGiSaiULcP4busgdUukO7L74OZCNxdLU5UKgxNhQbwxUxgM3CGhTKT4m su5tMvVzJOog78TnPrRKcelfxUmJaL3P0cGhOVKXGzbxwA1HAcgWcG00rTAIRbL5wb5r YCPMLARJ4WbZN5wH8wC/dGKqLXb86qlaf2+ZeZTV8GzeIgtZ+Z1yQWJfyXPnyT9wkStg 7hv+evJ3V/UvcP0MNqpanbCKVMzeqxQBD4SEXqdS37IXQTxuO5WIfwdyRMH6gIJBtDkI h5S9g1+Ij49U6QzgAuJGJyRDb5o51iC+NzjYfTYs8lElqQg45URqqyWPASCaR5LDoEn1 6VfQ== 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=QTCFY0OvhLByi4lFkZj1DNq5Znrp9JZLegOWJW6QWCw=; b=dVDSlt4DJro5+YUJxQHJ0jNUbArdXkyPhLIatFizCIKaIr8VcXi4jIEj3SSz/hL8es //l1OouKO175XFwPjeAltj2sBPWDLWhsVsAR+0JQ+fh4P0dLu7Ox0Y8P7YdVY7SJ0ruM MmUiGwZaw7+T5xQTh7Nz/JeovJGRNkt0NcTK8bW1YYY75uoXnpj8Ym5cWIi+B9Z/npdf /CNIZKOuY6bD6/vgu9dxuAYlZw3ztVd8J9rYGUW1AtLt+emb4LBbbVQUnjqfMmer33tU VljxuSqd56vETgPjbY3ypvOOcZMo9vatntVII2YNowlx1KZ4T3om+nSb0QOapSES4jCm sHsQ== X-Gm-Message-State: AOAM530Womo9krG61DmLHO2cGofy8ISdN9Na/ZDJ5Dha/Jxpw3Kkrnre a1ryIdyZMa9nGRtDfTenoSM= X-Received: by 2002:a63:d317:: with SMTP id b23mr2387080pgg.132.1593245462088; Sat, 27 Jun 2020 01:11:02 -0700 (PDT) Received: from syed ([106.198.160.82]) by smtp.gmail.com with ESMTPSA id 63sm28056245pfd.65.2020.06.27.01.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Jun 2020 01:11:01 -0700 (PDT) Date: Sat, 27 Jun 2020 13:40:42 +0530 From: Syed Nayyar Waris To: linus.walleij@linaro.org Cc: andriy.shevchenko@linux.intel.com, vilhelm.gray@gmail.com, arnd@arndb.de, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 1/4] bitops: Introduce the for_each_set_clump macro Message-ID: <95d928e24b6ed5d4537fcbf92363893ad5e19f88.1593243081.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 This macro iterates for each group of bits (clump) with set bits, within a bitmap memory region. For each iteration, "start" is set to the bit offset of the found clump, while the respective clump value is stored to the location pointed by "clump". Additionally, the bitmap_get_value and bitmap_set_value functions are introduced to respectively get and set a value of n-bits in a bitmap memory region. The n-bits can have any size less than or equal to BITS_PER_LONG. Moreover, during setting value of n-bit in bitmap, if a situation arise that the width of next n-bit is exceeding the word boundary, then it will divide itself such that some portion of it is stored in that word, while the remaining portion is stored in the next higher word. Similar situation occurs while retrieving value of n-bits from bitmap. Cc: Arnd Bergmann Signed-off-by: Syed Nayyar Waris Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- Changes in v9: - No change. Changes in v8: - No change. Changes in v7: - No change. Changes in v6: - No change. Changes in v5: - No change. Changes in v4: - No change. Changes in v3: - No change. Changes in v2: - No change. include/asm-generic/bitops/find.h | 19 ++++++++++ include/linux/bitmap.h | 61 +++++++++++++++++++++++++++++++ include/linux/bitops.h | 13 +++++++ lib/find_bit.c | 14 +++++++ 4 files changed, 107 insertions(+) diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h index 9fdf21302fdf..4e6600759455 100644 --- a/include/asm-generic/bitops/find.h +++ b/include/asm-generic/bitops/find.h @@ -97,4 +97,23 @@ extern unsigned long find_next_clump8(unsigned long *clump, #define find_first_clump8(clump, bits, size) \ find_next_clump8((clump), (bits), (size), 0) +/** + * find_next_clump - find next clump with set bits in a memory region + * @clump: location to store copy of found clump + * @addr: address to base the search on + * @size: bitmap size in number of bits + * @offset: bit offset at which to start searching + * @clump_size: clump size in bits + * + * Returns the bit offset for the next set clump; the found clump value is + * copied to the location pointed by @clump. If no bits are set, returns @size. + */ +extern unsigned long find_next_clump(unsigned long *clump, + const unsigned long *addr, + unsigned long size, unsigned long offset, + unsigned long clump_size); + +#define find_first_clump(clump, bits, size, clump_size) \ + find_next_clump((clump), (bits), (size), 0, (clump_size)) + #endif /*_ASM_GENERIC_BITOPS_FIND_H_ */ diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 99058eb81042..7ab2c65fc964 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -75,7 +75,11 @@ * bitmap_from_arr32(dst, buf, nbits) Copy nbits from u32[] buf to dst * bitmap_to_arr32(buf, src, nbits) Copy nbits from buf to u32[] dst * bitmap_get_value8(map, start) Get 8bit value from map at start + * bitmap_get_value(map, start, nbits) Get bit value of size + * 'nbits' from map at start * bitmap_set_value8(map, value, start) Set 8bit value to map at start + * bitmap_set_value(map, value, start, nbits) Set bit value of size 'nbits' + * of map at start * * Note, bitmap_zero() and bitmap_fill() operate over the region of * unsigned longs, that is, bits behind bitmap till the unsigned long @@ -563,6 +567,34 @@ static inline unsigned long bitmap_get_value8(const unsigned long *map, return (map[index] >> offset) & 0xFF; } +/** + * bitmap_get_value - get a value of n-bits from the memory region + * @map: address to the bitmap memory region + * @start: bit offset of the n-bit value + * @nbits: size of value in bits + * + * Returns value of nbits located at the @start bit offset within the @map + * memory region. + */ +static inline unsigned long bitmap_get_value(const unsigned long *map, + unsigned long start, + unsigned long nbits) +{ + const size_t index = BIT_WORD(start); + const unsigned long offset = start % BITS_PER_LONG; + const unsigned long ceiling = roundup(start + 1, BITS_PER_LONG); + const unsigned long space = ceiling - start; + unsigned long value_low, value_high; + + if (space >= nbits) + return (map[index] >> offset) & GENMASK(nbits - 1, 0); + else { + value_low = map[index] & BITMAP_FIRST_WORD_MASK(start); + value_high = map[index + 1] & BITMAP_LAST_WORD_MASK(start + nbits); + return (value_low >> offset) | (value_high << space); + } +} + /** * bitmap_set_value8 - set an 8-bit value within a memory region * @map: address to the bitmap memory region @@ -579,6 +611,35 @@ static inline void bitmap_set_value8(unsigned long *map, unsigned long value, map[index] |= value << offset; } +/** + * bitmap_set_value - set n-bit value within a memory region + * @map: address to the bitmap memory region + * @value: value of nbits + * @start: bit offset of the n-bit value + * @nbits: size of value in bits + */ +static inline void bitmap_set_value(unsigned long *map, + unsigned long value, + unsigned long start, unsigned long nbits) +{ + const size_t index = BIT_WORD(start); + const unsigned long offset = start % BITS_PER_LONG; + const unsigned long ceiling = roundup(start + 1, BITS_PER_LONG); + const unsigned long space = ceiling - start; + + value &= GENMASK(nbits - 1, 0); + + if (space >= nbits) { + map[index] &= ~(GENMASK(nbits + offset - 1, offset)); + map[index] |= value << offset; + } else { + map[index] &= ~BITMAP_FIRST_WORD_MASK(start); + map[index] |= value << offset; + map[index + 1] &= ~BITMAP_LAST_WORD_MASK(start + nbits); + map[index + 1] |= (value >> space); + } +} + #endif /* __ASSEMBLY__ */ #endif /* __LINUX_BITMAP_H */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 99f2ac30b1d9..36a445e4a7cc 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -62,6 +62,19 @@ extern unsigned long __sw_hweight64(__u64 w); (start) < (size); \ (start) = find_next_clump8(&(clump), (bits), (size), (start) + 8)) +/** + * for_each_set_clump - iterate over bitmap for each clump with set bits + * @start: bit offset to start search and to store the current iteration offset + * @clump: location to store copy of current 8-bit clump + * @bits: bitmap address to base the search on + * @size: bitmap size in number of bits + * @clump_size: clump size in bits + */ +#define for_each_set_clump(start, clump, bits, size, clump_size) \ + for ((start) = find_first_clump(&(clump), (bits), (size), (clump_size)); \ + (start) < (size); \ + (start) = find_next_clump(&(clump), (bits), (size), (start) + (clump_size), (clump_size))) + static inline int get_bitmask_order(unsigned int count) { int order; diff --git a/lib/find_bit.c b/lib/find_bit.c index 49f875f1baf7..1341bd39b32a 100644 --- a/lib/find_bit.c +++ b/lib/find_bit.c @@ -190,3 +190,17 @@ unsigned long find_next_clump8(unsigned long *clump, const unsigned long *addr, return offset; } EXPORT_SYMBOL(find_next_clump8); + +unsigned long find_next_clump(unsigned long *clump, const unsigned long *addr, + unsigned long size, unsigned long offset, + unsigned long clump_size) +{ + offset = find_next_bit(addr, size, offset); + if (offset == size) + return size; + + offset = rounddown(offset, clump_size); + *clump = bitmap_get_value(addr, offset, clump_size); + return offset; +} +EXPORT_SYMBOL(find_next_clump); -- 2.26.2