Skip to contentSkip to conversation

fixup! kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS

PATCH In review Masahiro Yamada 3 participants 3 messages May 22, 2022 – May 23, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fixup! kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS

I will squash this into

https://patchwork.kernel.org/project/linux-kbuild/patch/[email protected]/

Sedat Reported an error:

https://lore.kernel.org/linux-kbuild/CA+icZUWttwjhDNPO1VuVyiMoReH5e83nsYDd0rEoY8-Uwv6pHw@mail.gmail.com/T/#md82f561e348b7959b7270c33ac86fa3edb0d773a

__used is needed to make the combination of
CONFIG_MODVERSIONS and CONFIG_LTO_CLANG working.

---

 include/linux/export-internal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/export-internal.h +2 -1
index 77175d561058..c2b1d4fd5987 100644
@@ -10,7 +10,8 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+/* __used is needed to keep __crc_* for LTO */
 #define SYMBOL_CRC(sym, crc, sec)   \
-	u32 __section("___kcrctab" sec "+" #sym) __crc_##sym = crc
+	u32 __section("___kcrctab" sec "+" #sym) __used __crc_##sym = crc
 
 #endif /* __LINUX_EXPORT_INTERNAL_H__ */
Signature · 1 line
2.32.0
Tested-by on v1 1/1
#1 lore raw
Quoted 5 lines · Masahiro Yamada

I will squash this into

https://patchwork.kernel.org/project/linux-kbuild/patch/[email protected]/

Quoted 8 lines

Sedat Reported an error:

https://lore.kernel.org/linux-kbuild/CA+icZUWttwjhDNPO1VuVyiMoReH5e83nsYDd0rEoY8-Uwv6pHw@mail.gmail.com/T/#md82f561e348b7959b7270c33ac86fa3edb0d773a

__used is needed to make the combination of
CONFIG_MODVERSIONS and CONFIG_LTO_CLANG working.

I was able to build and boot on bare metal.

Feel free to add my...

-Sedat-

Quoted 22 lines

---

 include/linux/export-internal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/export-internal.h +2 -2
index 77175d561058..c2b1d4fd5987 100644
@@ -10,7 +10,8 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+/* __used is needed to keep __crc_* for LTO */
 #define SYMBOL_CRC(sym, crc, sec)   \
-       u32 __section("___kcrctab" sec "+" #sym) __crc_##sym = crc
+       u32 __section("___kcrctab" sec "+" #sym) __used __crc_##sym = crc
 
 #endif /* __LINUX_EXPORT_INTERNAL_H__ */
--

2.32.0

Acked-by on v1 1/1
#2 lore raw
In reply to Masahiro Yamada
Quoted 11 lines · Masahiro Yamada

I will squash this into

https://patchwork.kernel.org/project/linux-kbuild/patch/[email protected]/

Sedat Reported an error:

https://lore.kernel.org/linux-kbuild/CA+icZUWttwjhDNPO1VuVyiMoReH5e83nsYDd0rEoY8-Uwv6pHw@mail.gmail.com/T/#md82f561e348b7959b7270c33ac86fa3edb0d773a

__used is needed to make the combination of
CONFIG_MODVERSIONS and CONFIG_LTO_CLANG working.

Yep, vaguely reminiscent of
commit f3751ad0116f ("tracepoint: Mark __tracepoint_string's __used")

Quoted 24 lines

---

 include/linux/export-internal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/export-internal.h +2 -2
index 77175d561058..c2b1d4fd5987 100644
@@ -10,7 +10,8 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+/* __used is needed to keep __crc_* for LTO */
 #define SYMBOL_CRC(sym, crc, sec)   \
-       u32 __section("___kcrctab" sec "+" #sym) __crc_##sym = crc
+       u32 __section("___kcrctab" sec "+" #sym) __used __crc_##sym = crc
 
 #endif /* __LINUX_EXPORT_INTERNAL_H__ */
--

2.32.0

Signature · 2 lines
Thanks,
~Nick Desaulniers