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

Configure Feed

Select the types of activity you want to include in your feed.

lib: count_zeros: fix 32/64-bit inconsistency in count_trailing_zeros()

Based on 'sizeof(x) == 4' condition, in 32-bit case the function is wired
to ffs(), while in 64-bit case to __ffs(). The difference is substantial:
ffs(x) == __ffs(x) + 1. Also, ffs(0) == 0, while __ffs(0) is undefined.

The 32-bit behaviour is inconsistent with the function description, so it
needs to get fixed.

There are 9 individual users for the function in 6 different subsystems.
Some arches and drivers are 64-bit only:
- arch/loongarch/kvm/intc/eiointc.c;
- drivers/hv/mshv_vtl_main.c;
- kernel/liveupdate/kexec_handover.c;

The others are:
- ib_umem_find_best_pgsz(): as per comment, __ffs() should be correct;
- rzv2m_csi_reg_write_bit(): ARCH_RENESAS only, unclear;
- lz77_match_len(): CIFS_COMPRESSION only, unclear, experimental;

IB and CIFS are explicitly OK with the change.

The attached patch gets rid of 32-bit explicit support, so that both
32- and 64-bit versions rely on __ffs().

CC: K. Y. Srinivasan <kys@microsoft.com>
CC: Haiyang Zhang <haiyangz@microsoft.com>
CC: Mark Brown <broonie@kernel.org>
CC: Steve French <sfrench@samba.org>
CC: Alexander Graf <graf@amazon.com>
CC: Mike Rapoport <rppt@kernel.org>
CC: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Yury Norov <ynorov@nvidia.com>

+3 -6
+3 -6
include/linux/count_zeros.h
··· 10 10 11 11 #include <asm/bitops.h> 12 12 13 + #define COUNT_TRAILING_ZEROS_0 (-1) 14 + 13 15 /** 14 16 * count_leading_zeros - Count the number of zeros from the MSB back 15 17 * @x: The value ··· 42 40 */ 43 41 static inline int count_trailing_zeros(unsigned long x) 44 42 { 45 - #define COUNT_TRAILING_ZEROS_0 (-1) 46 - 47 - if (sizeof(x) == 4) 48 - return ffs(x); 49 - else 50 - return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0; 43 + return (x != 0) ? __ffs(x) : COUNT_TRAILING_ZEROS_0; 51 44 } 52 45 53 46 #endif /* _LINUX_BITOPS_COUNT_ZEROS_H_ */