* [Regression] s390x build broken with 5.10-rc1 (bisected)
@ 2020-10-26 10:48 Michal Kubecek
2020-10-26 12:49 ` Vasily Gorbik
0 siblings, 1 reply; 6+ messages in thread
From: Michal Kubecek @ 2020-10-26 10:48 UTC (permalink / raw)
To: linux-s390, Joe Perches; +Cc: linux-kernel, Jiri Slaby
Hello,
5.10-rc1 builds on s390x fail with
make -f ./scripts/Makefile.build obj=arch/s390/boot arch/s390/boot/bzImage
make -f ./scripts/Makefile.modpost
make -f ./scripts/Makefile.modfinal
make -f ./scripts/Makefile.build obj=arch/s390/boot/compressed arch/s390/boot/compressed/vmlinux
s1=`s390x-suse-linux-objdump -t -j ".boot.data" "vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.data\s\+//p" | sha256sum`; s2=`s390x-suse-linux-objdump -t -j ".boot.data" "arch/s390/boot/compressed/vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.data\s\+//p" | sha256sum`; if [ "$s1" != "$s2" ]; then echo "error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux" >&2; exit 1; fi; touch arch/s390/boot/section_cmp.boot.data
s1=`s390x-suse-linux-objdump -t -j ".boot.preserved.data" "vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.preserved.data\s\+//p" | sha256sum`; s2=`s390x-suse-linux-objdump -t -j ".boot.preserved.data" "arch/s390/boot/compressed/vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.preserved.data\s\+//p" | sha256sum`; if [ "$s1" != "$s2" ]; then echo "error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux" >&2; exit 1; fi; touch arch/s390/boot/section_cmp.boot.preserved.data
error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
make[1]: *** [arch/s390/boot/Makefile:65: arch/s390/boot/section_cmp.boot.data] Error 1
make[1]: *** Waiting for unfinished jobs....
error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
make[1]: *** [arch/s390/boot/Makefile:65: arch/s390/boot/section_cmp.boot.preserved.data] Error 1
make: *** [arch/s390/Makefile:153: bzImage] Error 2
make: *** Waiting for unfinished jobs....
Bisect identified commit 33def8498fdd ("treewide: Convert macro and uses
of __section(foo) to __section("foo")"), i.e. the very last commit
before tagging v5.10-rc1.
I can reproduce this with e.g. defconfig and both native s390x build and
build on x86_64 using cross compiler. I used gcc 10.2.1 and binutils 2.34.
Michal
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Regression] s390x build broken with 5.10-rc1 (bisected)
2020-10-26 10:48 [Regression] s390x build broken with 5.10-rc1 (bisected) Michal Kubecek
@ 2020-10-26 12:49 ` Vasily Gorbik
2020-10-26 12:49 ` [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros Vasily Gorbik
0 siblings, 1 reply; 6+ messages in thread
From: Vasily Gorbik @ 2020-10-26 12:49 UTC (permalink / raw)
To: Michal Kubecek; +Cc: linux-s390, Joe Perches, linux-kernel, Jiri Slaby
On Mon, Oct 26, 2020 at 11:48:11AM +0100, Michal Kubecek wrote:
> Hello,
>
> 5.10-rc1 builds on s390x fail with
>
> make -f ./scripts/Makefile.build obj=arch/s390/boot arch/s390/boot/bzImage
> make -f ./scripts/Makefile.modpost
> make -f ./scripts/Makefile.modfinal
> make -f ./scripts/Makefile.build obj=arch/s390/boot/compressed arch/s390/boot/compressed/vmlinux
> s1=`s390x-suse-linux-objdump -t -j ".boot.data" "vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.data\s\+//p" | sha256sum`; s2=`s390x-suse-linux-objdump -t -j ".boot.data" "arch/s390/boot/compressed/vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.data\s\+//p" | sha256sum`; if [ "$s1" != "$s2" ]; then echo "error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux" >&2; exit 1; fi; touch arch/s390/boot/section_cmp.boot.data
> s1=`s390x-suse-linux-objdump -t -j ".boot.preserved.data" "vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.preserved.data\s\+//p" | sha256sum`; s2=`s390x-suse-linux-objdump -t -j ".boot.preserved.data" "arch/s390/boot/compressed/vmlinux" | sort | sed -n "/0000000000000000/! s/.*\s.boot.preserved.data\s\+//p" | sha256sum`; if [ "$s1" != "$s2" ]; then echo "error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux" >&2; exit 1; fi; touch arch/s390/boot/section_cmp.boot.preserved.data
> error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[1]: *** [arch/s390/boot/Makefile:65: arch/s390/boot/section_cmp.boot.data] Error 1
> make[1]: *** Waiting for unfinished jobs....
> error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[1]: *** [arch/s390/boot/Makefile:65: arch/s390/boot/section_cmp.boot.preserved.data] Error 1
> make: *** [arch/s390/Makefile:153: bzImage] Error 2
> make: *** Waiting for unfinished jobs....
>
> Bisect identified commit 33def8498fdd ("treewide: Convert macro and uses
> of __section(foo) to __section("foo")"), i.e. the very last commit
> before tagging v5.10-rc1.
>
> I can reproduce this with e.g. defconfig and both native s390x build and
> build on x86_64 using cross compiler. I used gcc 10.2.1 and binutils 2.34.
>
> Michal
Hello Michal,
I've already fixed that. The fix will appear shortly on s390/fixes
Thank you for reporting!
Vasily Gorbik (1):
s390: correct __bootdata / __bootdata_preserved macros
arch/s390/include/asm/sections.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
2.25.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros
2020-10-26 12:49 ` Vasily Gorbik
@ 2020-10-26 12:49 ` Vasily Gorbik
2020-10-26 13:31 ` Joe Perches
2020-10-26 23:57 ` Michal Kubecek
0 siblings, 2 replies; 6+ messages in thread
From: Vasily Gorbik @ 2020-10-26 12:49 UTC (permalink / raw)
To: Michal Kubecek; +Cc: linux-s390, Joe Perches, linux-kernel, Jiri Slaby
Currently s390 build is broken.
SECTCMP .boot.data
error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1
SECTCMP .boot.preserved.data
error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1
make[1]: *** [bzImage] Error 2
Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
to __section("foo")") converted all __section(foo) to __section("foo").
This is wrong for __bootdata / __bootdata_preserved macros which want
variable names to be a part of intermediate section names .boot.data.<var
name> and .boot.preserved.data.<var name>. Those sections are later
sorted by alignment + name and merged together into final .boot.data
/ .boot.preserved.data sections. Those sections must be identical in
the decompressor and the decompressed kernel (that is checked during
the build).
Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")")
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---
arch/s390/include/asm/sections.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sections.h
index a996d3990a02..0c2151451ba5 100644
--- a/arch/s390/include/asm/sections.h
+++ b/arch/s390/include/asm/sections.h
@@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsigned long addr)
* final .boot.data section, which should be identical in the decompressor and
* the decompressed kernel (that is checked during the build).
*/
-#define __bootdata(var) __section(".boot.data.var") var
+#define __bootdata(var) __section(".boot.data." #var) var
/*
* .boot.preserved.data is similar to .boot.data, but it is not part of the
* .init section and thus will be preserved for later use in the decompressed
* kernel.
*/
-#define __bootdata_preserved(var) __section(".boot.preserved.data.var") var
+#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var
extern unsigned long __sdma, __edma;
extern unsigned long __stext_dma, __etext_dma;
--
2.25.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros
2020-10-26 12:49 ` [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros Vasily Gorbik
@ 2020-10-26 13:31 ` Joe Perches
2020-10-26 23:57 ` Michal Kubecek
1 sibling, 0 replies; 6+ messages in thread
From: Joe Perches @ 2020-10-26 13:31 UTC (permalink / raw)
To: Vasily Gorbik, Michal Kubecek; +Cc: linux-s390, linux-kernel, Jiri Slaby
On Mon, 2020-10-26 at 13:49 +0100, Vasily Gorbik wrote:
> Currently s390 build is broken.
>
> SECTCMP .boot.data
> error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1
> SECTCMP .boot.preserved.data
> error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1
> make[1]: *** [bzImage] Error 2
>
> Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
> to __section("foo")") converted all __section(foo) to __section("foo").
> This is wrong for __bootdata / __bootdata_preserved macros which want
> variable names to be a part of intermediate section names .boot.data.<var
> name> and .boot.preserved.data.<var name>. Those sections are later
> sorted by alignment + name and merged together into final .boot.data
> / .boot.preserved.data sections. Those sections must be identical in
> the decompressor and the decompressed kernel (that is checked during
> the build).
>
> Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")")
> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Apologies and thank you.
I believed the robot had done these compilation tests.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros
@ 2020-10-26 13:31 ` Joe Perches
0 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2020-10-26 13:31 UTC (permalink / raw)
To: Vasily Gorbik, Michal Kubecek; +Cc: linux-s390, linux-kernel, Jiri Slaby
On Mon, 2020-10-26 at 13:49 +0100, Vasily Gorbik wrote:
> Currently s390 build is broken.
>
> ��SECTCMP .boot.data
> error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1
> ��SECTCMP .boot.preserved.data
> error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1
> make[1]: *** [bzImage] Error 2
>
> Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
> to __section("foo")") converted all __section(foo) to __section("foo").
> This is wrong for __bootdata / __bootdata_preserved macros which want
> variable names to be a part of intermediate section names .boot.data.<var
> name> and .boot.preserved.data.<var name>. Those sections are later
> sorted by alignment + name and merged together into final .boot.data
> / .boot.preserved.data sections. Those sections must be identical in
> the decompressor and the decompressed kernel (that is checked during
> the build).
>
> Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")")
> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Apologies and thank you.
I believed the robot had done these compilation tests.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros
2020-10-26 12:49 ` [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros Vasily Gorbik
2020-10-26 13:31 ` Joe Perches
@ 2020-10-26 23:57 ` Michal Kubecek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Kubecek @ 2020-10-26 23:57 UTC (permalink / raw)
To: Vasily Gorbik; +Cc: linux-s390, Joe Perches, linux-kernel, Jiri Slaby
[-- Attachment #1: Type: text/plain, Size: 2519 bytes --]
On Mon, Oct 26, 2020 at 01:49:08PM +0100, Vasily Gorbik wrote:
> Currently s390 build is broken.
>
> SECTCMP .boot.data
> error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1
> SECTCMP .boot.preserved.data
> error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux
> make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1
> make[1]: *** [bzImage] Error 2
>
> Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
> to __section("foo")") converted all __section(foo) to __section("foo").
> This is wrong for __bootdata / __bootdata_preserved macros which want
> variable names to be a part of intermediate section names .boot.data.<var
> name> and .boot.preserved.data.<var name>. Those sections are later
> sorted by alignment + name and merged together into final .boot.data
> / .boot.preserved.data sections. Those sections must be identical in
> the decompressor and the decompressed kernel (that is checked during
> the build).
>
> Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")")
> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Tested-by: Michal Kubecek <mkubecek@suse.cz>
Thank you,
Michal
> ---
> arch/s390/include/asm/sections.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sections.h
> index a996d3990a02..0c2151451ba5 100644
> --- a/arch/s390/include/asm/sections.h
> +++ b/arch/s390/include/asm/sections.h
> @@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsigned long addr)
> * final .boot.data section, which should be identical in the decompressor and
> * the decompressed kernel (that is checked during the build).
> */
> -#define __bootdata(var) __section(".boot.data.var") var
> +#define __bootdata(var) __section(".boot.data." #var) var
>
> /*
> * .boot.preserved.data is similar to .boot.data, but it is not part of the
> * .init section and thus will be preserved for later use in the decompressed
> * kernel.
> */
> -#define __bootdata_preserved(var) __section(".boot.preserved.data.var") var
> +#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var
>
> extern unsigned long __sdma, __edma;
> extern unsigned long __stext_dma, __etext_dma;
> --
> 2.25.4
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-26 23:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-26 10:48 [Regression] s390x build broken with 5.10-rc1 (bisected) Michal Kubecek
2020-10-26 12:49 ` Vasily Gorbik
2020-10-26 12:49 ` [PATCH 1/1] s390: correct __bootdata / __bootdata_preserved macros Vasily Gorbik
2020-10-26 13:31 ` Joe Perches
2020-10-26 13:31 ` Joe Perches
2020-10-26 23:57 ` Michal Kubecek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.