linux-parisc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kees Cook <kees@kernel.org>
To: linux-arch@vger.kernel.org
Cc: Kees Cook <kees@kernel.org>,
	linux-kernel@vger.kernel.org, x86@kernel.org,
	linux-alpha@vger.kernel.org, linux-csky@vger.kernel.org,
	linux-hexagon@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
	linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org,
	linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
	linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
	llvm@lists.linux.dev, linux-hardening@vger.kernel.org
Subject: [PATCH 09/17] riscv: Add __attribute_const__ to ffs()-family implementations
Date: Mon,  4 Aug 2025 09:44:05 -0700	[thread overview]
Message-ID: <20250804164417.1612371-9-kees@kernel.org> (raw)
In-Reply-To: <20250804163910.work.929-kees@kernel.org>

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 RISC-V's implementations of
variable__ffs(), variable__fls(), and variable_ffs() 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=riscv defconfig with GCC riscv64-linux-gnu 14.2.0.

Link: https://github.com/KSPP/linux/issues/364 [1]
Signed-off-by: Kees Cook <kees@kernel.org>
---
 arch/riscv/include/asm/bitops.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/include/asm/bitops.h b/arch/riscv/include/asm/bitops.h
index d59310f74c2b..77880677b06e 100644
--- a/arch/riscv/include/asm/bitops.h
+++ b/arch/riscv/include/asm/bitops.h
@@ -45,7 +45,7 @@
 #error "Unexpected BITS_PER_LONG"
 #endif
 
-static __always_inline unsigned long variable__ffs(unsigned long word)
+static __always_inline __attribute_const__ unsigned long variable__ffs(unsigned long word)
 {
 	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 				      RISCV_ISA_EXT_ZBB, 1)
@@ -74,7 +74,7 @@ static __always_inline unsigned long variable__ffs(unsigned long word)
 	 (unsigned long)__builtin_ctzl(word) :	\
 	 variable__ffs(word))
 
-static __always_inline unsigned long variable__fls(unsigned long word)
+static __always_inline __attribute_const__ unsigned long variable__fls(unsigned long word)
 {
 	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 				      RISCV_ISA_EXT_ZBB, 1)
@@ -103,7 +103,7 @@ static __always_inline unsigned long variable__fls(unsigned long word)
 	 (unsigned long)(BITS_PER_LONG - 1 - __builtin_clzl(word)) :	\
 	 variable__fls(word))
 
-static __always_inline int variable_ffs(int x)
+static __always_inline __attribute_const__ int variable_ffs(int x)
 {
 	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 				      RISCV_ISA_EXT_ZBB, 1)
-- 
2.34.1


  parent reply	other threads:[~2025-08-04 16:44 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-04 16:43 [PATCH 00/17] Add __attribute_const__ to ffs()-family implementations Kees Cook
2025-08-04 16:43 ` [PATCH 01/17] KUnit: Introduce ffs()-family tests Kees Cook
2025-08-04 16:43 ` [PATCH 02/17] bitops: Add __attribute_const__ to generic ffs()-family implementations Kees Cook
2025-08-04 16:43 ` [PATCH 03/17] csky: Add __attribute_const__ to " Kees Cook
2025-08-04 16:44 ` [PATCH 04/17] x86: " Kees Cook
2025-08-04 16:44 ` [PATCH 05/17] powerpc: " Kees Cook
2025-08-07  9:46   ` Madhavan Srinivasan
2025-08-15 16:34     ` Segher Boessenkool
2025-08-15 16:41       ` Segher Boessenkool
2025-08-04 16:44 ` [PATCH 06/17] sh: " Kees Cook
2025-08-04 16:44 ` [PATCH 07/17] alpha: " Kees Cook
2025-08-04 16:44 ` [PATCH 08/17] hexagon: " Kees Cook
2025-08-04 16:44 ` Kees Cook [this message]
2025-08-07 14:43   ` [PATCH 09/17] riscv: " Alexandre Ghiti
2025-08-04 16:44 ` [PATCH 10/17] openrisc: " Kees Cook
2025-08-04 17:15   ` Stafford Horne
2025-08-04 16:44 ` [PATCH 11/17] m68k: " Kees Cook
2025-08-05  8:12   ` Geert Uytterhoeven
2025-08-04 16:44 ` [PATCH 12/17] mips: " Kees Cook
2025-08-04 16:44 ` [PATCH 13/17] parisc: " Kees Cook
2025-08-08  9:01   ` Helge Deller
2025-08-04 16:44 ` [PATCH 14/17] s390: " Kees Cook
2025-08-06 10:33   ` Heiko Carstens
2025-08-04 16:44 ` [PATCH 15/17] xtensa: " Kees Cook
2025-08-04 16:44 ` [PATCH 16/17] sparc: " Kees Cook
2025-08-04 16:44 ` [PATCH 17/17] KUnit: ffs: Validate all the __attribute_const__ annotations Kees Cook
2025-08-15 14:16 ` [PATCH 00/17] Add __attribute_const__ to ffs()-family implementations Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250804164417.1612371-9-kees@kernel.org \
    --to=kees@kernel.org \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-csky@vger.kernel.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-hexagon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-openrisc@vger.kernel.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=llvm@lists.linux.dev \
    --cc=sparclinux@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).