Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools: sync lib/find_bit implementation

Add fast paths to find_*_bit() functions as per kernel implementation.

Link: https://lkml.kernel.org/r/20210401003153.97325-12-yury.norov@gmail.com
Signed-off-by: Yury Norov <yury.norov@gmail.com>
Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Alexey Klimov <aklimov@redhat.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Sterba <dsterba@suse.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jianpeng Ma <jianpeng.ma@intel.com>
Cc: Joe Perches <joe@perches.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Stefano Brivio <sbrivio@redhat.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Yury Norov and committed by
Linus Torvalds
eaae7841 2cc7b6a4

+57 -5
+55 -3
tools/include/asm-generic/bitops/find.h
··· 5 5 extern unsigned long _find_next_bit(const unsigned long *addr1, 6 6 const unsigned long *addr2, unsigned long nbits, 7 7 unsigned long start, unsigned long invert, unsigned long le); 8 + extern unsigned long _find_first_bit(const unsigned long *addr, unsigned long size); 9 + extern unsigned long _find_first_zero_bit(const unsigned long *addr, unsigned long size); 10 + extern unsigned long _find_last_bit(const unsigned long *addr, unsigned long size); 8 11 9 12 #ifndef find_next_bit 10 13 /** ··· 23 20 unsigned long find_next_bit(const unsigned long *addr, unsigned long size, 24 21 unsigned long offset) 25 22 { 23 + if (small_const_nbits(size)) { 24 + unsigned long val; 25 + 26 + if (unlikely(offset >= size)) 27 + return size; 28 + 29 + val = *addr & GENMASK(size - 1, offset); 30 + return val ? __ffs(val) : size; 31 + } 32 + 26 33 return _find_next_bit(addr, NULL, size, offset, 0UL, 0); 27 34 } 28 35 #endif ··· 53 40 const unsigned long *addr2, unsigned long size, 54 41 unsigned long offset) 55 42 { 43 + if (small_const_nbits(size)) { 44 + unsigned long val; 45 + 46 + if (unlikely(offset >= size)) 47 + return size; 48 + 49 + val = *addr1 & *addr2 & GENMASK(size - 1, offset); 50 + return val ? __ffs(val) : size; 51 + } 52 + 56 53 return _find_next_bit(addr1, addr2, size, offset, 0UL, 0); 57 54 } 58 55 #endif ··· 81 58 unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, 82 59 unsigned long offset) 83 60 { 61 + if (small_const_nbits(size)) { 62 + unsigned long val; 63 + 64 + if (unlikely(offset >= size)) 65 + return size; 66 + 67 + val = *addr | ~GENMASK(size - 1, offset); 68 + return val == ~0UL ? size : ffz(val); 69 + } 70 + 84 71 return _find_next_bit(addr, NULL, size, offset, ~0UL, 0); 85 72 } 86 73 #endif ··· 105 72 * Returns the bit number of the first set bit. 106 73 * If no bits are set, returns @size. 107 74 */ 108 - extern unsigned long find_first_bit(const unsigned long *addr, 109 - unsigned long size); 75 + static inline 76 + unsigned long find_first_bit(const unsigned long *addr, unsigned long size) 77 + { 78 + if (small_const_nbits(size)) { 79 + unsigned long val = *addr & GENMASK(size - 1, 0); 80 + 81 + return val ? __ffs(val) : size; 82 + } 83 + 84 + return _find_first_bit(addr, size); 85 + } 110 86 111 87 #endif /* find_first_bit */ 112 88 ··· 129 87 * Returns the bit number of the first cleared bit. 130 88 * If no bits are zero, returns @size. 131 89 */ 132 - unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size); 90 + static inline 91 + unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size) 92 + { 93 + if (small_const_nbits(size)) { 94 + unsigned long val = *addr | ~GENMASK(size - 1, 0); 95 + 96 + return val == ~0UL ? size : ffz(val); 97 + } 98 + 99 + return _find_first_zero_bit(addr, size); 100 + } 133 101 #endif 134 102 135 103 #endif /*_TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_ */
+2 -2
tools/lib/find_bit.c
··· 83 83 /* 84 84 * Find the first set bit in a memory region. 85 85 */ 86 - unsigned long find_first_bit(const unsigned long *addr, unsigned long size) 86 + unsigned long _find_first_bit(const unsigned long *addr, unsigned long size) 87 87 { 88 88 unsigned long idx; 89 89 ··· 100 100 /* 101 101 * Find the first cleared bit in a memory region. 102 102 */ 103 - unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size) 103 + unsigned long _find_first_zero_bit(const unsigned long *addr, unsigned long size) 104 104 { 105 105 unsigned long idx; 106 106