From: Greg Kroah-Hartman Date: Wed, 15 Mar 2023 08:32:08 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v4.14.310~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=858bbedd6a148397ae1f7ab7156045750398a55a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: arch-fix-broken-buildid-for-arm64-and-riscv.patch powerpc-vmlinux.lds-define-runtime_discard_exit.patch powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch sh-define-runtime_discard_exit.patch --- diff --git a/queue-5.15/arch-fix-broken-buildid-for-arm64-and-riscv.patch b/queue-5.15/arch-fix-broken-buildid-for-arm64-and-riscv.patch new file mode 100644 index 00000000000..e03f1eca4f0 --- /dev/null +++ b/queue-5.15/arch-fix-broken-buildid-for-arm64-and-riscv.patch @@ -0,0 +1,89 @@ +From stable-owner@vger.kernel.org Thu Mar 2 03:04:22 2023 +From: Tom Saeger +Date: Wed, 1 Mar 2023 19:03:48 -0700 +Subject: arch: fix broken BuildID for arm64 and riscv +To: Greg Kroah-Hartman +Cc: Sasha Levin , Tom Saeger , stable@vger.kernel.org, Masahiro Yamada , Dennis Gilmore , Ard Biesheuvel , Palmer Dabbelt +Message-ID: <20230210-tsaeger-upstream-linux-stable-5-15-v3-1-3431a425f0c7@oracle.com> + +From: Masahiro Yamada + +commit 99cb0d917ffa1ab628bb67364ca9b162c07699b1 upstream. + +Dennis Gilmore reports that the BuildID is missing in the arm64 vmlinux +since commit 994b7ac1697b ("arm64: remove special treatment for the +link order of head.o"). + +The issue is that the type of .notes section, which contains the BuildID, +changed from NOTES to PROGBITS. + +Ard Biesheuvel figured out that whichever object gets linked first gets +to decide the type of a section. The PROGBITS type is the result of the +compiler emitting .note.GNU-stack as PROGBITS rather than NOTE. + +While Ard provided a fix for arm64, I want to fix this globally because +the same issue is happening on riscv since commit 2348e6bf4421 ("riscv: +remove special treatment for the link order of head.o"). This problem +will happen in general for other architectures if they start to drop +unneeded entries from scripts/head-object-list.txt. + +Discard .note.GNU-stack in include/asm-generic/vmlinux.lds.h. + +Link: https://lore.kernel.org/lkml/CAABkxwuQoz1CTbyb57n0ZX65eSYiTonFCU8-LCQc=74D=xE=rA@mail.gmail.com/ +Fixes: 994b7ac1697b ("arm64: remove special treatment for the link order of head.o") +Fixes: 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o") +Reported-by: Dennis Gilmore +Suggested-by: Ard Biesheuvel +Signed-off-by: Masahiro Yamada +Acked-by: Palmer Dabbelt +[Tom: stable backport 5.15.y, 5.10.y, 5.4.y] + +Though the above "Fixes:" commits are not in this kernel, the conditions +which lead to a missing Build ID in arm64 vmlinux are similar. + +Evidence points to these conditions: +1. ld version > 2.36 (exact binutils commit documented in a494398bde27) +2. first object which gets linked (head.o) has a PROGBITS .note.GNU-stack segment + +These conditions can be observed when: +- 5.15.60+ OR 5.10.136+ OR 5.4.210+ +- AND ld version > 2.36 +- AND arch=arm64 +- AND CONFIG_MODVERSIONS=y + +There are notable differences in the vmlinux elf files produced +before(bad) and after(good) applying this series. + +Good: p_type:PT_NOTE segment exists. + Bad: p_type:PT_NOTE segment is missing. + +Good: sh_name_str:.notes section has sh_type:SHT_NOTE + Bad: sh_name_str:.notes section has sh_type:SHT_PROGBITS + +`readelf -n` (as of v2.40) searches for Build Id +by processing only the very first note in sh_type:SHT_NOTE sections. + +This was previously bisected to the stable backport of 0d362be5b142. +Follow-up experiments were discussed here: https://lore.kernel.org/all/20221221235413.xaisboqmr7dkqwn6@oracle.com/ +which strongly hints at condition 2. +Signed-off-by: Tom Saeger +Signed-off-by: Greg Kroah-Hartman +--- + include/asm-generic/vmlinux.lds.h | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h +@@ -903,7 +903,12 @@ + #define PRINTK_INDEX + #endif + ++/* ++ * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler. ++ * Otherwise, the type of .notes section would become PROGBITS instead of NOTES. ++ */ + #define NOTES \ ++ /DISCARD/ : { *(.note.GNU-stack) } \ + .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ + __start_notes = .; \ + KEEP(*(.note.*)) \ diff --git a/queue-5.15/powerpc-vmlinux.lds-define-runtime_discard_exit.patch b/queue-5.15/powerpc-vmlinux.lds-define-runtime_discard_exit.patch new file mode 100644 index 00000000000..43027b5ca0f --- /dev/null +++ b/queue-5.15/powerpc-vmlinux.lds-define-runtime_discard_exit.patch @@ -0,0 +1,58 @@ +From stable-owner@vger.kernel.org Thu Mar 2 03:04:27 2023 +From: Tom Saeger +Date: Wed, 1 Mar 2023 19:03:49 -0700 +Subject: powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT +To: Greg Kroah-Hartman +Cc: Sasha Levin , Tom Saeger , stable@vger.kernel.org, Michael Ellerman +Message-ID: <20230210-tsaeger-upstream-linux-stable-5-15-v3-2-3431a425f0c7@oracle.com> + +From: Michael Ellerman + +commit 4b9880dbf3bdba3a7c56445137c3d0e30aaa0a40 upstream. + +The powerpc linker script explicitly includes .exit.text, because +otherwise the link fails due to references from __bug_table and +__ex_table. The code is freed (discarded) at runtime along with +.init.text and data. + +That has worked in the past despite powerpc not defining +RUNTIME_DISCARD_EXIT because DISCARDS appears late in the powerpc linker +script (line 410), and the explicit inclusion of .exit.text +earlier (line 280) supersedes the discard. + +However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and +riscv") introduced an earlier use of DISCARD as part of the RO_DATA +macro (line 136). With binutils < 2.36 that causes the DISCARD +directives later in the script to be applied earlier [1], causing +.exit.text to actually be discarded at link time, leading to build +errors: + + '.exit.text' referenced in section '__bug_table' of crypto/algboss.o: defined in + discarded section '.exit.text' of crypto/algboss.o + '.exit.text' referenced in section '__ex_table' of drivers/nvdimm/core.o: defined in + discarded section '.exit.text' of drivers/nvdimm/core.o + +Fix it by defining RUNTIME_DISCARD_EXIT, which causes the generic +DISCARDS macro to not include .exit.text at all. + +1: https://lore.kernel.org/lkml/87fscp2v7k.fsf@igel.home/ + +Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20230105132349.384666-1-mpe@ellerman.id.au +Signed-off-by: Tom Saeger +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/kernel/vmlinux.lds.S ++++ b/arch/powerpc/kernel/vmlinux.lds.S +@@ -8,6 +8,7 @@ + #define BSS_FIRST_SECTIONS *(.bss.prominit) + #define EMITS_PT_NOTE + #define RO_EXCEPTION_TABLE_ALIGN 0 ++#define RUNTIME_DISCARD_EXIT + + #define SOFT_MASK_TABLE(align) \ + . = ALIGN(align); \ diff --git a/queue-5.15/powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch b/queue-5.15/powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch new file mode 100644 index 00000000000..8dcdb6c4d7e --- /dev/null +++ b/queue-5.15/powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch @@ -0,0 +1,58 @@ +From stable-owner@vger.kernel.org Thu Mar 2 03:04:28 2023 +From: Tom Saeger +Date: Wed, 1 Mar 2023 19:03:50 -0700 +Subject: powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds +To: Greg Kroah-Hartman +Cc: Sasha Levin , Tom Saeger , stable@vger.kernel.org, Michael Ellerman +Message-ID: <20230210-tsaeger-upstream-linux-stable-5-15-v3-3-3431a425f0c7@oracle.com> + +From: Michael Ellerman + +commit 07b050f9290ee012a407a0f64151db902a1520f5 upstream. + +Relocatable kernels must not discard relocations, they need to be +processed at runtime. As such they are included for CONFIG_RELOCATABLE +builds in the powerpc linker script (line 340). + +However they are also unconditionally discarded later in the +script (line 414). Previously that worked because the earlier inclusion +superseded the discard. + +However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and +riscv") introduced an earlier use of DISCARD as part of the RO_DATA +macro (line 137). With binutils < 2.36 that causes the DISCARD +directives later in the script to be applied earlier, causing .rela* to +actually be discarded at link time, leading to build warnings and a +kernel that doesn't boot: + + ld: warning: discarding dynamic section .rela.init.rodata + +Fix it by conditionally discarding .rela* only when CONFIG_RELOCATABLE +is disabled. + +Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") +Signed-off-by: Michael Ellerman + +Link: https://lore.kernel.org/r/20230105132349.384666-2-mpe@ellerman.id.au +Signed-off-by: Tom Saeger +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/vmlinux.lds.S | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/kernel/vmlinux.lds.S ++++ b/arch/powerpc/kernel/vmlinux.lds.S +@@ -408,9 +408,12 @@ SECTIONS + DISCARDS + /DISCARD/ : { + *(*.EMB.apuinfo) +- *(.glink .iplt .plt .rela* .comment) ++ *(.glink .iplt .plt .comment) + *(.gnu.version*) + *(.gnu.attributes) + *(.eh_frame) ++#ifndef CONFIG_RELOCATABLE ++ *(.rela*) ++#endif + } + } diff --git a/queue-5.15/s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch b/queue-5.15/s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch new file mode 100644 index 00000000000..df8c3121624 --- /dev/null +++ b/queue-5.15/s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch @@ -0,0 +1,73 @@ +From stable-owner@vger.kernel.org Thu Mar 2 03:04:32 2023 +From: Tom Saeger +Date: Wed, 1 Mar 2023 19:03:51 -0700 +Subject: s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 +To: Greg Kroah-Hartman +Cc: Sasha Levin , Tom Saeger , stable@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Heiko Carstens +Message-ID: <20230210-tsaeger-upstream-linux-stable-5-15-v3-4-3431a425f0c7@oracle.com> + +From: Masahiro Yamada + +commit a494398bde273143c2352dd373cad8211f7d94b2 upstream. + +Nathan Chancellor reports that the s390 vmlinux fails to link with +GNU ld < 2.36 since commit 99cb0d917ffa ("arch: fix broken BuildID +for arm64 and riscv"). + +It happens for defconfig, or more specifically for CONFIG_EXPOLINE=y. + + $ s390x-linux-gnu-ld --version | head -n1 + GNU ld (GNU Binutils for Debian) 2.35.2 + $ make -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- allnoconfig + $ ./scripts/config -e CONFIG_EXPOLINE + $ make -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- olddefconfig + $ make -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- + `.exit.text' referenced in section `.s390_return_reg' of drivers/base/dd.o: defined in discarded section `.exit.text' of drivers/base/dd.o + make[1]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1 + make: *** [Makefile:1252: vmlinux] Error 2 + +arch/s390/kernel/vmlinux.lds.S wants to keep EXIT_TEXT: + + .exit.text : { + EXIT_TEXT + } + +But, at the same time, EXIT_TEXT is thrown away by DISCARD because +s390 does not define RUNTIME_DISCARD_EXIT. + +I still do not understand why the latter wins after 99cb0d917ffa, +but defining RUNTIME_DISCARD_EXIT seems correct because the comment +line in arch/s390/kernel/vmlinux.lds.S says: + + /* + * .exit.text is discarded at runtime, not link time, + * to deal with references from __bug_table + */ + +Nathan also found that binutils commit 21401fc7bf67 ("Duplicate output +sections in scripts") cured this issue, so we cannot reproduce it with +binutils 2.36+, but it is better to not rely on it. + +Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") +Link: https://lore.kernel.org/all/Y7Jal56f6UBh1abE@dev-arch.thelio-3990X/ +Reported-by: Nathan Chancellor +Signed-off-by: Masahiro Yamada +Link: https://lore.kernel.org/r/20230105031306.1455409-1-masahiroy@kernel.org +Signed-off-by: Heiko Carstens +Signed-off-by: Tom Saeger +Signed-off-by: Greg Kroah-Hartman +--- + arch/s390/kernel/vmlinux.lds.S | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/s390/kernel/vmlinux.lds.S ++++ b/arch/s390/kernel/vmlinux.lds.S +@@ -17,6 +17,8 @@ + /* Handle ro_after_init data on our own. */ + #define RO_AFTER_INIT_DATA + ++#define RUNTIME_DISCARD_EXIT ++ + #define EMITS_PT_NOTE + + #include diff --git a/queue-5.15/series b/queue-5.15/series index 2f092bbcdfc..b36944b7738 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -126,3 +126,8 @@ ext4-refactor-ext4_free_blocks-to-pull-out-ext4_mb_clear_bb.patch ext4-add-ext4_sb_block_valid-refactored-out-of-ext4_inode_block_valid.patch ext4-add-strict-range-checks-while-freeing-blocks.patch ext4-block-range-must-be-validated-before-use-in-ext4_mb_clear_bb.patch +arch-fix-broken-buildid-for-arm64-and-riscv.patch +powerpc-vmlinux.lds-define-runtime_discard_exit.patch +powerpc-vmlinux.lds-don-t-discard-.rela-for-relocatable-builds.patch +s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2.36.patch +sh-define-runtime_discard_exit.patch diff --git a/queue-5.15/sh-define-runtime_discard_exit.patch b/queue-5.15/sh-define-runtime_discard_exit.patch new file mode 100644 index 00000000000..3e425d69a60 --- /dev/null +++ b/queue-5.15/sh-define-runtime_discard_exit.patch @@ -0,0 +1,87 @@ +From tom.saeger@oracle.com Thu Mar 2 03:04:34 2023 +From: Tom Saeger +Date: Wed, 1 Mar 2023 19:03:52 -0700 +Subject: sh: define RUNTIME_DISCARD_EXIT +To: Greg Kroah-Hartman +Cc: Sasha Levin , Tom Saeger , stable@vger.kernel.org, John Paul Adrian Glaubitz , Ard Biesheuvel , Arnd Bergmann , Christoph Hellwig , Dennis Gilmore , Masahiro Yamada , Naresh Kamboju , Nathan Chancellor , Palmer Dabbelt , Rich Felker , Yoshinori Sato , Andrew Morton +Message-ID: <20230210-tsaeger-upstream-linux-stable-5-15-v3-5-3431a425f0c7@oracle.com> + +From: Tom Saeger + +commit c1c551bebf928889e7a8fef7415b44f9a64975f4 upstream. + +sh vmlinux fails to link with GNU ld < 2.40 (likely < 2.36) since +commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv"). + +This is similar to fixes for powerpc and s390: +commit 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT"). +commit a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error +with GNU ld < 2.36"). + + $ sh4-linux-gnu-ld --version | head -n1 + GNU ld (GNU Binutils for Debian) 2.35.2 + + $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu- microdev_defconfig + $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu- + + `.exit.text' referenced in section `__bug_table' of crypto/algboss.o: + defined in discarded section `.exit.text' of crypto/algboss.o + `.exit.text' referenced in section `__bug_table' of + drivers/char/hw_random/core.o: defined in discarded section + `.exit.text' of drivers/char/hw_random/core.o + make[2]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1 + make[1]: *** [Makefile:1252: vmlinux] Error 2 + +arch/sh/kernel/vmlinux.lds.S keeps EXIT_TEXT: + + /* + * .exit.text is discarded at runtime, not link time, to deal with + * references from __bug_table + */ + .exit.text : AT(ADDR(.exit.text)) { EXIT_TEXT } + +However, EXIT_TEXT is thrown away by +DISCARD(include/asm-generic/vmlinux.lds.h) because +sh does not define RUNTIME_DISCARD_EXIT. + +GNU ld 2.40 does not have this issue and builds fine. +This corresponds with Masahiro's comments in a494398bde27: +"Nathan [Chancellor] also found that binutils +commit 21401fc7bf67 ("Duplicate output sections in scripts") cured this +issue, so we cannot reproduce it with binutils 2.36+, but it is better +to not rely on it." + +Link: https://lkml.kernel.org/r/9166a8abdc0f979e50377e61780a4bba1dfa2f52.1674518464.git.tom.saeger@oracle.com +Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") +Link: https://lore.kernel.org/all/Y7Jal56f6UBh1abE@dev-arch.thelio-3990X/ +Link: https://lore.kernel.org/all/20230123194218.47ssfzhrpnv3xfez@oracle.com/ +Signed-off-by: Tom Saeger +Tested-by: John Paul Adrian Glaubitz +Cc: Ard Biesheuvel +Cc: Arnd Bergmann +Cc: Christoph Hellwig +Cc: Dennis Gilmore +Cc: Greg Kroah-Hartman +Cc: Masahiro Yamada +Cc: Naresh Kamboju +Cc: Nathan Chancellor +Cc: Palmer Dabbelt +Cc: Rich Felker +Cc: Yoshinori Sato +Signed-off-by: Andrew Morton +Signed-off-by: Tom Saeger +Signed-off-by: Greg Kroah-Hartman +--- + arch/sh/kernel/vmlinux.lds.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/sh/kernel/vmlinux.lds.S ++++ b/arch/sh/kernel/vmlinux.lds.S +@@ -4,6 +4,7 @@ + * Written by Niibe Yutaka and Paul Mundt + */ + OUTPUT_ARCH(sh) ++#define RUNTIME_DISCARD_EXIT + #include + #include + #include