Skip to content

Commit acfab97

Browse files
committed
openrisc: 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 OpenRISC'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=openrisc defconfig with GCC or1k-linux 15.1.0. Link: KSPP#364 [1] Acked-by: Stafford Horne <shorne@gmail.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20250804164417.1612371-10-kees@kernel.org Signed-off-by: Kees Cook <kees@kernel.org>
1 parent c51c26e commit acfab97

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/openrisc/include/asm/bitops/__ffs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef CONFIG_OPENRISC_HAVE_INST_FF1
1313

14-
static inline unsigned long __ffs(unsigned long x)
14+
static inline __attribute_const__ unsigned long __ffs(unsigned long x)
1515
{
1616
int ret;
1717

arch/openrisc/include/asm/bitops/__fls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef CONFIG_OPENRISC_HAVE_INST_FL1
1313

14-
static inline unsigned long __fls(unsigned long x)
14+
static inline __attribute_const__ unsigned long __fls(unsigned long x)
1515
{
1616
int ret;
1717

arch/openrisc/include/asm/bitops/ffs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#ifdef CONFIG_OPENRISC_HAVE_INST_FF1
1212

13-
static inline int ffs(int x)
13+
static inline __attribute_const__ int ffs(int x)
1414
{
1515
int ret;
1616

arch/openrisc/include/asm/bitops/fls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifdef CONFIG_OPENRISC_HAVE_INST_FL1
1313

14-
static inline int fls(unsigned int x)
14+
static inline __attribute_const__ int fls(unsigned int x)
1515
{
1616
int ret;
1717

0 commit comments

Comments
 (0)