s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel()
Subsystems (2)
PATCH 1/1 s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel()
Starting with gcc 11.3, the C compiler will generate PLT-relative function calls even if they are local and do not require it. Later on during linking, the linker will replace all PLT-relative calls to local functions with PC-relative ones. Unfortunately, the purgatory code of kexec/kdump is not being linked as a regular executable or shared library would have been, and therefore, all PLT-relative addresses remain in the generated purgatory object code unresolved. This leads to the situation where the purgatory code is being executed during kdump with all PLT-relative addresses unresolved. And this results in endless loops within the purgatory code.
Furthermore, the clang C compiler has always behaved like described above and this commit should fix the purgatory code built with the latter.
Because the purgatory code is no regular executable or shared library, contains only calls to local functions and has no PLT, all R_390_PLT32DBL relocation entries can be resolved just like a R_390_PC32DBL one.
* https://refspecs.linuxfoundation.org/ELF/zSeries/lzsabi0_zSeries/x1633.html#AEN1699
Relocation entries of purgatory code generated with gcc 11.3
------------------------------------------------------------
$ readelf -r purgatory/purgatory.o
Relocation section '.rela.text' at offset 0x6e8 contains 27 entries:
Offset Info Type Sym. Value Sym. Name + Addend
00000000000c 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000001a 001000000014 R_390_PLT32DBL 0000000000000000 sha256_starts + 2 000000000030 001100000014 R_390_PLT32DBL 0000000000000000 sha256_update + 2 000000000046 001200000014 R_390_PLT32DBL 0000000000000000 sha256_finish + 2 000000000050 000300000013 R_390_PC32DBL 0000000000000000 .data + 102 00000000005a 001300000014 R_390_PLT32DBL 0000000000000000 memcmp + 2 ... 000000000118 001600000014 R_390_PLT32DBL 0000000000000000 setup_arch + 2 00000000011e 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000012c 000f00000014 R_390_PLT32DBL 0000000000000000 verify_sha256_digest + 2 000000000142 001700000014 R_390_PLT32DBL 0000000000000000
post_verification[...] + 2
Relocation entries of purgatory code generated with gcc 11.2
------------------------------------------------------------
$ readelf -r purgatory/purgatory.o
Relocation section '.rela.text' at offset 0x6e8 contains 27 entries:
Offset Info Type Sym. Value Sym. Name + Addend
00000000000e 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000001c 001000000013 R_390_PC32DBL 0000000000000000 sha256_starts + 2 000000000036 001100000013 R_390_PC32DBL 0000000000000000 sha256_update + 2 000000000048 001200000013 R_390_PC32DBL 0000000000000000 sha256_finish + 2 000000000052 000300000013 R_390_PC32DBL 0000000000000000 .data + 102 00000000005c 001300000013 R_390_PC32DBL 0000000000000000 memcmp + 2 ... 00000000011a 001600000013 R_390_PC32DBL 0000000000000000 setup_arch + 2 000000000120 000300000013 R_390_PC32DBL 0000000000000000 .data + 122 000000000130 000f00000013 R_390_PC32DBL 0000000000000000 verify_sha256_digest + 2 000000000146 001700000013 R_390_PC32DBL 0000000000000000 post_verification[...] + 2
Corresponding s390 kernel discussion:
* https://lore.kernel.org/linux-s390/[email protected]/T/#u
--- kexec/arch/s390/kexec-elf-rel-s390.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kexec/arch/s390/kexec-elf-rel-s390.c +2 -1
@@ -56,6 +56,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),case R_390_PC16 :/* PC relative 16 bit. */ case R_390_PC16DBL :/* PC relative 16 bit shifted by 1. */ case R_390_PC32DBL :/* PC relative 32 bit shifted by 1. */ +case R_390_PLT32DBL :/* 32 bit PC rel. PLT shifted by 1. */ case R_390_PC32 :/* PC relative 32 bit. */ case R_390_PC64 :/* PC relative 64 bit. */ val -= address;
@@ -63,7 +64,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), *(unsigned short *) loc = val; else if (r_type == R_390_PC16DBL) *(unsigned short *) loc = val >>1 ; - else if (r_type == R_390_PC32DBL) + else if (r_type == R_390_PC32DBL || r_type == R_390_PLT32DBL) *(unsigned int *) loc = val >>1 ; else if (r_type == R_390_PC32) *(unsigned int *) loc = val;
Signature · 7 lines
2.31.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Hi Alexander,
@Alexander: Thanks for taking care of this.
Quoted 9 lines · On Wed, 8 Dec 2021 13:53:55 +0100 Alexander Egorenkov…
Starting with gcc 11.3, the C compiler will generate PLT-relative function calls even if they are local and do not require it. Later on during linking, the linker will replace all PLT-relative calls to local functions with PC-relative ones. Unfortunately, the purgatory code of kexec/kdump is not being linked as a regular executable or shared library would have been, and therefore, all PLT-relative addresses remain in the generated purgatory object code unresolved. This leads to the situation where the purgatory code is being executed during kdump with all PLT-relative addresses unresolved. And this results in endless loops within the purgatory code.
Tiny nit. The last two sentences describe the situation in the kernel. Luckily the kexec-tools do proper error checking and die with
"Unknown rela relocation: 0x14 0x73c0901c"
when they encounter an unknown relocation type.
Anyway, the code is correct
Quoted 71 lines
Furthermore, the clang C compiler has always behaved like described above and this commit should fix the purgatory code built with the latter.
Because the purgatory code is no regular executable or shared library, contains only calls to local functions and has no PLT, all
R_390_PLT32DBLrelocation entries can be resolved just like aR_390_PC32DBLone.* https://refspecs.linuxfoundation.org/ELF/zSeries/lzsabi0_zSeries/x1633.html#AEN1699
Relocation entries of purgatory code generated with gcc 11.3
------------------------------------------------------------$ readelf -r purgatory/purgatory.oRelocation section '.rela.text' at offset
0x6e8contains 27 entries:
Offset Info Type Sym. Value Sym. Name + Addend00000000000c 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000001a 001000000014 R_390_PLT32DBL 0000000000000000 sha256_starts + 2 000000000030 001100000014 R_390_PLT32DBL 0000000000000000 sha256_update + 2 000000000046 001200000014 R_390_PLT32DBL 0000000000000000 sha256_finish + 2 000000000050 000300000013 R_390_PC32DBL 0000000000000000 .data + 102 00000000005a 001300000014 R_390_PLT32DBL 0000000000000000 memcmp + 2 ... 000000000118 001600000014 R_390_PLT32DBL 0000000000000000 setup_arch + 2 00000000011e 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000012c 000f00000014 R_390_PLT32DBL 0000000000000000 verify_sha256_digest + 2 000000000142 001700000014 R_390_PLT32DBL 0000000000000000post_verification[...] + 2
Relocation entries of purgatory code generated with gcc 11.2
------------------------------------------------------------$ readelf -r purgatory/purgatory.oRelocation section '.rela.text' at offset
0x6e8contains 27 entries:
Offset Info Type Sym. Value Sym. Name + Addend00000000000e 000300000013 R_390_PC32DBL 0000000000000000 .data + 2 00000000001c 001000000013 R_390_PC32DBL 0000000000000000 sha256_starts + 2 000000000036 001100000013 R_390_PC32DBL 0000000000000000 sha256_update + 2 000000000048 001200000013 R_390_PC32DBL 0000000000000000 sha256_finish + 2 000000000052 000300000013 R_390_PC32DBL 0000000000000000 .data + 102 00000000005c 001300000013 R_390_PC32DBL 0000000000000000 memcmp + 2 ... 00000000011a 001600000013 R_390_PC32DBL 0000000000000000 setup_arch + 2 000000000120 000300000013 R_390_PC32DBL 0000000000000000 .data + 122 000000000130 000f00000013 R_390_PC32DBL 0000000000000000 verify_sha256_digest + 2 000000000146 001700000013 R_390_PC32DBL 0000000000000000 post_verification[...] + 2Corresponding s390 kernel discussion:
* https://lore.kernel.org/linux-s390/[email protected]/T/#uSigned-off-by Alexander Egorenkov <[email protected]>Reported-by Tao Liu <[email protected]>Suggested-by Philipp Rudo <[email protected]>--- kexec/arch/s390/kexec-elf-rel-s390.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kexec/arch/s390/kexec-elf-rel-s390.c +1
-0@@ -56,6 +56,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr),case R_390_PC16 :/* PC relative 16 bit. */ case R_390_PC16DBL :/* PC relative 16 bit shifted by 1. */ case R_390_PC32DBL :/* PC relative 32 bit shifted by 1. */ +case R_390_PLT32DBL :/* 32 bit PC rel. PLT shifted by 1. */ case R_390_PC32 :/* PC relative 32 bit. */ case R_390_PC64 :/* PC relative 64 bit. */ val -= address;
kexec/arch/s390/kexec-elf-rel-s390.c void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), · line 70
Quoted 8 lines
kexec/arch/s390/kexec-elf-rel-s390.c +1
-1@@ -63,7 +64,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), *(unsigned short *) loc = val; else if (r_type == R_390_PC16DBL) *(unsigned short *) loc = val >>1 ; - else if (r_type == R_390_PC32DBL) + else if (r_type == R_390_PC32DBL || r_type == R_390_PLT32DBL) *(unsigned int *) loc = val >>1 ; else if (r_type == R_390_PC32) *(unsigned int *) loc = val;
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 20 lines · Philipp Rudo
Hi Alexander,
@Alexander: Thanks for taking care of this.
Quoted 9 lines · On Wed, 8 Dec 2021 13:53:55 +0100 Alexander Egorenkov…
Starting with gcc 11.3, the C compiler will generate PLT-relative function calls even if they are local and do not require it. Later on during linking, the linker will replace all PLT-relative calls to local functions with PC-relative ones. Unfortunately, the purgatory code of kexec/kdump is not being linked as a regular executable or shared library would have been, and therefore, all PLT-relative addresses remain in the generated purgatory object code unresolved. This leads to the situation where the purgatory code is being executed during kdump with all PLT-relative addresses unresolved. And this results in endless loops within the purgatory code.
Tiny nit. The last two sentences describe the situation in the kernel. Luckily the kexec-tools do proper error checking and die with
Quoted 7 lines
"Unknown rela relocation: 0x14 0x73c0901c"when they encounter an unknown relocation type.
Anyway, the code is correct
Reviewed-by Philipp Rudo <[email protected]>
Thanks.
Alexander would you care to post a v2 with an updated patch description?
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 25 lines · Simon Horman
Quoted 24 lines · Philipp Rudo
Hi Alexander,
@Alexander: Thanks for taking care of this.
Quoted 9 lines · On Wed, 8 Dec 2021 13:53:55 +0100 Alexander Egorenkov…
Starting with gcc 11.3, the C compiler will generate PLT-relative function calls even if they are local and do not require it. Later on during linking, the linker will replace all PLT-relative calls to local functions with PC-relative ones. Unfortunately, the purgatory code of kexec/kdump is not being linked as a regular executable or shared library would have been, and therefore, all PLT-relative addresses remain in the generated purgatory object code unresolved. This leads to the situation where the purgatory code is being executed during kdump with all PLT-relative addresses unresolved. And this results in endless loops within the purgatory code.
Tiny nit. The last two sentences describe the situation in the kernel. Luckily the kexec-tools do proper error checking and die with
"Unknown rela relocation: 0x14 0x73c0901c"when they encounter an unknown relocation type.
Quoted 7 lines
Quoted 3 lines
Anyway, the code is correct
Reviewed-by Philipp Rudo <[email protected]>Thanks.
Alexander would you care to post a v2 with an updated patch description?
Given that Alexander is currently not available, I will resend his patch with an updated commit message.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
PATCH 1/1 s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel()
Quoted 3 lines · Heiko Carstens
Given that Alexander is currently not available, I will resend his patch with an updated commit message.
Many thanks for the review and taking care of the review finding.
Regards
Alex
PATCH 1/1 s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel()
Quoted 5 lines · Alexander Egorenkov
Quoted 2 lines · Heiko Carstens
Given that Alexander is currently not available, I will resend his patch with an updated commit message.
Many thanks for the review and taking care of the review finding.
But it looks like this still hasn't been applied to the kexec-tools git tree, unless I'm mistaken(?)
PATCH 1/1 s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel()
Quoted 9 lines · Heiko Carstens
Quoted 5 lines · Alexander Egorenkov
Quoted 2 lines · Heiko Carstens
Given that Alexander is currently not available, I will resend his patch with an updated commit message.
Many thanks for the review and taking care of the review finding.
But it looks like this still hasn't been applied to the kexec-tools git tree, unless I'm mistaken(?)
Sorry for the delay, I have now applied v2.