Skip to content

Commit b77fee8

Browse files
committed
s390: Add __attribute_const__ to ffs()-family implementations
While tracking down a problem where constant expressions used by BUILD_BUG_ON() suddenly stopped working[1], we found that an added static initializer was convincing the compiler that it couldn't track the state of the prior statically initialized value. Tracing this down found that ffs() was used in the initializer macro, but since it wasn't marked with __attribute__const__, the compiler had to assume the function might change variable states as a side-effect (which is not true for ffs(), which provides deterministic math results). Add missing __attribute_const__ annotations to S390's implementations of ffs(), __ffs(), fls(), and __fls() functions. These are pure mathematical functions that always return the same result for the same input with no side effects, making them eligible for compiler optimization. Build tested ARCH=s390 defconfig with GCC s390x-linux-gnu 14.2.0. Link: KSPP#364 [1] Acked-by: Heiko Carstens <hca@linux.ibm.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20250804164417.1612371-14-kees@kernel.org Signed-off-by: Kees Cook <kees@kernel.org>
1 parent 28fc097 commit b77fee8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

arch/s390/include/asm/bitops.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static inline unsigned char __flogr(unsigned long word)
179179
*
180180
* Undefined if no bit exists, so code should check against 0 first.
181181
*/
182-
static inline unsigned long __ffs(unsigned long word)
182+
static inline __attribute_const__ unsigned long __ffs(unsigned long word)
183183
{
184184
return __flogr(-word & word) ^ (BITS_PER_LONG - 1);
185185
}
@@ -191,7 +191,7 @@ static inline unsigned long __ffs(unsigned long word)
191191
* This is defined the same way as the libc and
192192
* compiler builtin ffs routines (man ffs).
193193
*/
194-
static inline int ffs(int word)
194+
static inline __attribute_const__ int ffs(int word)
195195
{
196196
unsigned long mask = 2 * BITS_PER_LONG - 1;
197197
unsigned int val = (unsigned int)word;
@@ -205,7 +205,7 @@ static inline int ffs(int word)
205205
*
206206
* Undefined if no set bit exists, so code should check against 0 first.
207207
*/
208-
static inline unsigned long __fls(unsigned long word)
208+
static inline __attribute_const__ unsigned long __fls(unsigned long word)
209209
{
210210
return __flogr(word) ^ (BITS_PER_LONG - 1);
211211
}
@@ -221,7 +221,7 @@ static inline unsigned long __fls(unsigned long word)
221221
* set bit if value is nonzero. The last (most significant) bit is
222222
* at position 64.
223223
*/
224-
static inline int fls64(unsigned long word)
224+
static inline __attribute_const__ int fls64(unsigned long word)
225225
{
226226
unsigned long mask = 2 * BITS_PER_LONG - 1;
227227

@@ -235,7 +235,7 @@ static inline int fls64(unsigned long word)
235235
* This is defined the same way as ffs.
236236
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
237237
*/
238-
static inline int fls(unsigned int word)
238+
static inline __attribute_const__ int fls(unsigned int word)
239239
{
240240
return fls64(word);
241241
}

0 commit comments

Comments
 (0)