| Message ID | c0830858f19c852f6d124395a32410bc645ecd15.1570374078.git.vilhelm.gray@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce the for_each_set_clump8 macro | expand |
On Sun, Oct 06, 2019 at 11:10:58AM -0400, William Breathitt Gray wrote: > This macro iterates for each 8-bit 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_value8 and bitmap_set_value8 functions are introduced to > respectively get and set an 8-bit value in a bitmap memory region. Very much thank you for an update! I have comments below. > +/** > + * bitmap_get_value8 - get an 8-bit value within a memory region Since it's in find.h I would not collide with bitmap namespace. How about find_and_get_value8() > + * @addr: address to the bitmap memory region > + * @start: bit offset of the 8-bit value; must be a multiple of 8 > + * > + * Returns the 8-bit value located at the @start bit offset within the @addr > + * memory region. > + */ > +static inline unsigned long bitmap_get_value8(const unsigned long *addr, > + unsigned long start) > +{ > + const size_t index = BIT_WORD(start); > + const unsigned long offset = start % BITS_PER_LONG; > + > + return (addr[index] >> offset) & 0xFF; > +} > + > +/** > + * bitmap_set_value8 - set an 8-bit value within a memory region find_and_set_value8() ? > + * @addr: address to the bitmap memory region > + * @value: the 8-bit value; values wider than 8 bits may clobber bitmap > + * @start: bit offset of the 8-bit value; must be a multiple of 8 > + */ > +static inline void bitmap_set_value8(unsigned long *addr, unsigned long value, > + unsigned long start) > +{ > + const size_t index = BIT_WORD(start); > + const unsigned long offset = start % BITS_PER_LONG; > + > + addr[index] &= ~(0xFF << offset); > + addr[index] |= value << offset; > +}
On Mon, Oct 07, 2019 at 11:21:56AM +0300, Andy Shevchenko wrote: > On Sun, Oct 06, 2019 at 11:10:58AM -0400, William Breathitt Gray wrote: > > This macro iterates for each 8-bit 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_value8 and bitmap_set_value8 functions are introduced to > > respectively get and set an 8-bit value in a bitmap memory region. > > Very much thank you for an update! > I have comments below. > > > +/** > > + * bitmap_get_value8 - get an 8-bit value within a memory region > > Since it's in find.h I would not collide with bitmap namespace. > How about > > find_and_get_value8() We modeled the interface for these on the existing bitmap functions, so perhaps it would be better to move bitmap_get_value8 and bitmap_set_value8 to include/linux/bitmap.h so that they are with the rest of the bitmap functions -- afterall, they are operating on bitmaps. > > + * @addr: address to the bitmap memory region > > + * @start: bit offset of the 8-bit value; must be a multiple of 8 > > + * > > + * Returns the 8-bit value located at the @start bit offset within the @addr > > + * memory region. > > + */ > > +static inline unsigned long bitmap_get_value8(const unsigned long *addr, > > + unsigned long start) > > +{ > > + const size_t index = BIT_WORD(start); > > + const unsigned long offset = start % BITS_PER_LONG; > > + > > + return (addr[index] >> offset) & 0xFF; > > +} > > + > > +/** > > + * bitmap_set_value8 - set an 8-bit value within a memory region > > find_and_set_value8() > > ? > > > + * @addr: address to the bitmap memory region > > + * @value: the 8-bit value; values wider than 8 bits may clobber bitmap > > + * @start: bit offset of the 8-bit value; must be a multiple of 8 > > + */ > > +static inline void bitmap_set_value8(unsigned long *addr, unsigned long value, > > + unsigned long start) > > +{ > > + const size_t index = BIT_WORD(start); > > + const unsigned long offset = start % BITS_PER_LONG; > > + > > + addr[index] &= ~(0xFF << offset); > > + addr[index] |= value << offset; > > +} > > -- > With Best Regards, > Andy Shevchenko The find_next_clump8 function can remain exposed via include/linux/find.h since it fits in with the rest of the functions there. The reason I moved the definition to lib/find_bit.c is due to the circular dependency that arose from the round_down macro. Should I try to move the definition back to include/linux/find.h and reimplement it without the round_down macro; or is it best to keep this simpler implementation here in lib/find_bit.c? William Breathitt Gray
diff --git a/include/asm-generic/bitops/find.h b/include/asm-generic/bitops/find.h index 8a1ee10014de..5277e72882ff 100644 --- a/include/asm-generic/bitops/find.h +++ b/include/asm-generic/bitops/find.h @@ -80,4 +80,54 @@ extern unsigned long find_first_zero_bit(const unsigned long *addr, #endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ +/** + * bitmap_get_value8 - get an 8-bit value within a memory region + * @addr: address to the bitmap memory region + * @start: bit offset of the 8-bit value; must be a multiple of 8 + * + * Returns the 8-bit value located at the @start bit offset within the @addr + * memory region. + */ +static inline unsigned long bitmap_get_value8(const unsigned long *addr, + unsigned long start) +{ + const size_t index = BIT_WORD(start); + const unsigned long offset = start % BITS_PER_LONG; + + return (addr[index] >> offset) & 0xFF; +} + +/** + * bitmap_set_value8 - set an 8-bit value within a memory region + * @addr: address to the bitmap memory region + * @value: the 8-bit value; values wider than 8 bits may clobber bitmap + * @start: bit offset of the 8-bit value; must be a multiple of 8 + */ +static inline void bitmap_set_value8(unsigned long *addr, unsigned long value, + unsigned long start) +{ + const size_t index = BIT_WORD(start); + const unsigned long offset = start % BITS_PER_LONG; + + addr[index] &= ~(0xFF << offset); + addr[index] |= value << offset; +} + +/** + * find_next_clump8 - find next 8-bit 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 + * + * 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_clump8(unsigned long *clump, + const unsigned long *addr, + unsigned long size, unsigned long offset); + +#define find_first_clump8(clump, bits, size) \ + find_next_clump8((clump), (bits), (size), 0) + #endif /*_ASM_GENERIC_BITOPS_FIND_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index cf074bce3eb3..fb94a10f7853 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -40,6 +40,11 @@ extern unsigned long __sw_hweight64(__u64 w); (bit) < (size); \ (bit) = find_next_zero_bit((addr), (size), (bit) + 1)) +#define for_each_set_clump8(start, clump, bits, size) \ + for ((start) = find_first_clump8(&(clump), (bits), (size)); \ + (start) < (size); \ + (start) = find_next_clump8(&(clump), (bits), (size), (start) + 8)) + static inline int get_bitmask_order(unsigned int count) { int order; diff --git a/lib/find_bit.c b/lib/find_bit.c index 5c51eb45178a..e35a76b291e6 100644 --- a/lib/find_bit.c +++ b/lib/find_bit.c @@ -214,3 +214,17 @@ EXPORT_SYMBOL(find_next_bit_le); #endif #endif /* __BIG_ENDIAN */ + +unsigned long find_next_clump8(unsigned long *clump, const unsigned long *addr, + unsigned long size, unsigned long offset) +{ + offset = find_next_bit(addr, size, offset); + if (offset == size) + return size; + + offset = round_down(offset, 8); + *clump = bitmap_get_value8(addr, offset); + + return offset; +} +EXPORT_SYMBOL(find_next_clump8);
This macro iterates for each 8-bit 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_value8 and bitmap_set_value8 functions are introduced to respectively get and set an 8-bit value in a bitmap memory region. Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Suggested-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Suggested-by: Lukas Wunner <lukas@wunner.de> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- include/asm-generic/bitops/find.h | 50 +++++++++++++++++++++++++++++++ include/linux/bitops.h | 5 ++++ lib/find_bit.c | 14 +++++++++ 3 files changed, 69 insertions(+)