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.

Rename .data.unlikely to .data..unlikely

Commit 7ccaba5314ca ("consolidate WARN_...ONCE() static variables")
was intended to collect all .data.unlikely sections into one chunk.
However, this has not worked when CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
or CONFIG_LTO_CLANG is enabled, because .data.unlikely matches the
.data.[0-9a-zA-Z_]* pattern in the DATA_MAIN macro.

Commit cb87481ee89d ("kbuild: linker script do not match C names unless
LD_DEAD_CODE_DATA_ELIMINATION is configured") was introduced to suppress
the issue for the default CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=n case,
providing a minimal fix for stable backporting. We were aware this did
not address the issue for CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y. The
plan was to apply correct fixes and then revert cb87481ee89d. [1]

Seven years have passed since then, yet the #ifdef workaround remains in
place.

Using a ".." separator in the section name fixes the issue for
CONFIG_LD_DEAD_CODE_DATA_ELIMINATION and CONFIG_LTO_CLANG.

[1]: https://lore.kernel.org/linux-kbuild/CAK7LNASck6BfdLnESxXUeECYL26yUDm0cwRZuM4gmaWUkxjL5g@mail.gmail.com/

Fixes: cb87481ee89d ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

+2 -2
+1 -1
include/asm-generic/vmlinux.lds.h
··· 357 357 *(.data..decrypted) \ 358 358 *(.ref.data) \ 359 359 *(.data..shared_aligned) /* percpu related */ \ 360 - *(.data.unlikely) \ 360 + *(.data..unlikely) \ 361 361 __start_once = .; \ 362 362 *(.data.once) \ 363 363 __end_once = .; \
+1 -1
include/linux/rcupdate.h
··· 401 401 */ 402 402 #define RCU_LOCKDEP_WARN(c, s) \ 403 403 do { \ 404 - static bool __section(".data.unlikely") __warned; \ 404 + static bool __section(".data..unlikely") __warned; \ 405 405 if (debug_lockdep_rcu_enabled() && (c) && \ 406 406 debug_lockdep_rcu_enabled() && !__warned) { \ 407 407 __warned = true; \