mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v1 1/1] bitmap: Refactor bitmap_read() and bitmap_write() to avoid too big shift
@ 2026-11-19 19:15 Andy Shevchenko
  2026-11-19 20:37 ` Yury Norov
  0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2026-11-19 19:15 UTC (permalink / raw)
  To: Yury Norov, linux-kernel
  Cc: Yury Norov, Rasmus Villemoes, Jonathan Cameron, Andy Shevchenko

While compiling ad4691.c I have noticed the following warnings:

  drivers/iio/adc/ad4691.c: note: in included file:
  include/linux/bitmap.h:854:55: warning: shift too big (64) for type unsigned long
  include/linux/bitmap.h:854:55: warning: shift too big (64) for type unsigned long

Since the bitmap_read() is called with statically define 'start',
the 'space' local variable becomes equal to BITS_PER_LONG, or 64 on
64-bit machines. The 'nbits' parameter is coming from the run-time
defined value. Static analyser doesn't see that the right shift
by 64-bit can't happen — the space >= nbits check guards that.
While Jonathan put it as false positive [1], we still can give a hint
to it without growing in the code (`bloat-o-meter` for above mentioned
driver shows no difference in size). So this is what this change does.

For completeness, bitmap_write() is also refactored in the similar manner.
I have also checked a few users of it and `bloat-o-meter` showed no change.

Link: https://lore.kernel.org/r/20260531111528.32697d1f@jic23-huawei [1]
Fixes: 63c15822b8dd ("lib/bitmap: add bitmap_{read,write}()")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/linux/bitmap.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index adafbcf2016b..f331cf06130d 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -846,7 +846,7 @@ unsigned long bitmap_read(const unsigned long *map, unsigned long start, unsigne
 	if (unlikely(!nbits || nbits > BITS_PER_LONG))
 		return 0;
 
-	if (space >= nbits)
+	if (space >= nbits || offset == 0)
 		return (map[index] >> offset) & BITMAP_LAST_WORD_MASK(nbits);
 
 	value_low = map[index] & BITMAP_FIRST_WORD_MASK(start);
@@ -874,25 +874,23 @@ void bitmap_write(unsigned long *map, unsigned long value,
 		  unsigned long start, unsigned long nbits)
 {
 	size_t index;
-	unsigned long offset;
-	unsigned long space;
-	unsigned long mask;
-	bool fit;
+	unsigned long offset = start % BITS_PER_LONG;
+	unsigned long space = BITS_PER_LONG - offset;
 
 	if (unlikely(!nbits || nbits > BITS_PER_LONG))
 		return;
 
-	mask = BITMAP_LAST_WORD_MASK(nbits);
-	value &= mask;
-	offset = start % BITS_PER_LONG;
-	space = BITS_PER_LONG - offset;
-	fit = space >= nbits;
+	value &= BITMAP_LAST_WORD_MASK(nbits);
 	index = BIT_WORD(start);
 
-	map[index] &= (fit ? (~(mask << offset)) : ~BITMAP_FIRST_WORD_MASK(start));
-	map[index] |= value << offset;
-	if (fit)
+	if (space >= nbits || offset == 0) {
+		map[index] &= ~(BITMAP_LAST_WORD_MASK(nbits) << offset);
+		map[index] |= value << offset;
 		return;
+	}
+
+	map[index] &= ~BITMAP_FIRST_WORD_MASK(start);
+	map[index] |= value << offset;
 
 	map[index + 1] &= BITMAP_FIRST_WORD_MASK(start + nbits);
 	map[index + 1] |= (value >> space);
-- 
2.50.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-11-19 21:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 19:15 [PATCH v1 1/1] bitmap: Refactor bitmap_read() and bitmap_write() to avoid too big shift Andy Shevchenko
2026-11-19 20:37 ` Yury Norov
2026-11-19 21:03   ` Andy Shevchenko
2026-11-19 21:22     ` Yury Norov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®