RISC-V: Fix a few kexec_file_load(2) failures
Subsystems (3)
cover RISC-V: Fix a few kexec_file_load(2) failures
From: Petr Tesarik <[email protected]>
The kexec_file_load(2) syscall does not work at least in some kernel builds. For details see the relevant section in this blog post:
https://sigillatum.tesarici.cz/2023-07-21-state-of-riscv64-kdump.html
This patch series handles additional relocation types and removes the need to implement a Global Offset Table (GOT) for the purgatory.
Petr Tesarik (2):
riscv/kexec: handle R_RISCV_ADD16 and R_RISCV_SUB16 relocation types riscv/purgatory: do not link with string.o
Torsten Duwe (1):
riscv/kexec: handle R_RISCV_CALL_PLT relocation type
arch/riscv/kernel/elf_kexec.c | 7 +++++++ arch/riscv/purgatory/Makefile | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-)
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 1/3 riscv/kexec: handle R_RISCV_CALL_PLT relocation type
From: Torsten Duwe <[email protected]>
R_RISCV_CALL has been deprecated and replaced by R_RISCV_CALL_PLT. See Enum 18-19 in Table 3. Relocation types here:
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc
It was deprecated in ("Deprecated R_RISCV_CALL, prefer R_RISCV_CALL_PLT"):
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a0dced85018d7a0ec17023c9389cbd70b1dbc1b0
Recent tools (at least GNU binutils-2.40) already use R_RISCV_CALL_PLT. Kernels built with such binutils fail kexec_load_file(2) with:
kexec_image: Unknown rela relocation: 19
kexec_image: Error loading purgatory ret=-8
The binary code at the call site remains the same, so tell arch_kexec_apply_relocations_add() to handle _PLT alike.
--- arch/riscv/kernel/elf_kexec.c | 1 + 1 file changed, 1 insertion(+)
arch/riscv/kernel/elf_kexec.c +1 -0
@@ -425,6 +425,7 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,* sym, instead of searching the whole relsec. */ case R_RISCV_PCREL_HI20 : +case R_RISCV_CALL_PLT :case R_RISCV_CALL : *(u64 *)loc =CLEAN_IMM (UITYPE , *(u64 *)loc) |ENCODE_UJTYPE_IMM (val - addr);
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v1 1/3] riscv/kexec: handle R_RISCV_CALL_PLT relocation type
+Cc Torsten (somehow missed from the original Cc list).
Petr T
Quoted 34 lines · On Tue, 25 Jul 2023 10:44:25 +0200 Petr Tesarik <[email protected]>…
From: Torsten Duwe <[email protected]>
R_RISCV_CALLhas been deprecated and replaced byR_RISCV_CALL_PLT. See Enum 18-19 in Table 3. Relocation types here:https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc
It was deprecated in ("Deprecated
R_RISCV_CALL, preferR_RISCV_CALL_PLT"):https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a0dced85018d7a0ec17023c9389cbd70b1dbc1b0
Recent tools (at least GNU binutils-2.40) already use
R_RISCV_CALL_PLT. Kernels built with such binutils failkexec_load_file(2)with:
kexec_image: Unknown rela relocation: 19
kexec_image: Error loading purgatory ret=-8The binary code at the call site remains the same, so tell
arch_kexec_apply_relocations_add()to handle_PLTalike.Fixes 838b3e28488f ("RISC-V: Load purgatory in kexec_file")Signed-off-by Torsten Duwe <[email protected]>Signed-off-by Petr Tesarik <[email protected]>Cc Li Zhengyu <[email protected]>--- arch/riscv/kernel/elf_kexec.c | 1 + 1 file changed, 1 insertion(+)arch/riscv/kernel/elf_kexec.c +0
-0
arch/riscv/kernel/elf_kexec.c int arch_kexec_apply_relocations_add(struct purgatory_info *pi, · line 431
Quoted 7 lines
arch/riscv/kernel/elf_kexec.c +1
-0@@ -425,6 +425,7 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,* sym, instead of searching the whole relsec. */ case R_RISCV_PCREL_HI20 : +case R_RISCV_CALL_PLT :case R_RISCV_CALL : *(u64 *)loc =CLEAN_IMM (UITYPE , *(u64 *)loc) |ENCODE_UJTYPE_IMM (val - addr);
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 2/3 riscv/kexec: handle R_RISCV_ADD16 and R_RISCV_SUB16 relocation types
In reply to Petr TesarikFrom: Petr Tesarik <[email protected]>
16-bit add and subtract relocation types are used by the purgatory code when the kernel is built with CONFIG_RISCV_ALTERNATIVES. If they are not handled, kexec_file_load(2) fails with:
Unknown rela relocation: 34
kexec_image: Error loading purgatory ret=-8
or later with:
Unknown rela relocation: 38
kexec_image: Error loading purgatory ret=-8
Note that alternatives are not yet handled in purgatory code; this patch merely allows to load it.
--- arch/riscv/kernel/elf_kexec.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/kernel/elf_kexec.c +6 -0
@@ -444,6 +444,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,case R_RISCV_SUB32 : *(u32 *)loc -= val;break ; +case R_RISCV_ADD16 : + *(u16 *)loc += val; +break ; +case R_RISCV_SUB16 : + *(u16 *)loc -= val; +break ;/* It has been applied by R_RISCV_PCREL_HI20 sym */ case R_RISCV_PCREL_LO12_I :case R_RISCV_ALIGN :
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 3/3 riscv/purgatory: do not link with string.o
In reply to Petr TesarikFrom: Petr Tesarik <[email protected]>
Linking with this object file it makes kexec_file_load(2) fail with:
kexec_image: Unknown rela relocation: 20
kexec_image: Error loading purgatory ret=-8
This is R_RISCV_GOT_HI20, generated by the linker to handle references to the global variable _ctype from strcasecmp() and strncasecmp().
Rather than implementing GOT for the purgatory, remove the object file, because it is not needed by the purgatory code.
--- arch/riscv/purgatory/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/riscv/purgatory/Makefile +1 -8
@@ -1,15 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 OBJECT_FILES_NON_STANDARD := y -purgatory-y := purgatory.o sha256.o entry.o string.o ctype.o memcpy.o memset.o +purgatory-y := purgatory.o sha256.o entry.o ctype.o memcpy.o memset.o purgatory-y += strcmp.o strlen.o strncmp.o targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) -$(obj)/string.o: $(srctree)/lib/string.c FORCE - $(call if_changed_rule,cc_o_c) - $(obj)/ctype.o: $(srctree)/lib/ctype.c FORCE $(call if_changed_rule,cc_o_c)
@@ -32,7 +29,6 @@ $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE $(call if_changed_rule,cc_o_c) CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY -CFLAGS_string.o := -D__DISABLE_EXPORTS CFLAGS_ctype.o := -D__DISABLE_EXPORTS # When profile-guided optimization is enabled, llvm emits two different
@@ -83,9 +79,6 @@ CFLAGS_purgatory.o += $(PURGATORY_CFLAGS) CFLAGS_REMOVE_sha256.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_sha256.o += $(PURGATORY_CFLAGS) -CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) -CFLAGS_string.o += $(PURGATORY_CFLAGS) - CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_ctype.o += $(PURGATORY_CFLAGS)
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
kernel test robot
build botRe: [PATCH v1 3/3] riscv/purgatory: do not link with string.o
kernel test robot noticed the following build errors:
Hi Petr,
kernel test robot noticed the following build errors:
[auto build test ERROR on kees/for-next/pstore]
[also build test ERROR on kees/for-next/kspp linus/master v6.5-rc3 next-20230725] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Petr-Tesarik/riscv-kexec-handle-R_RISCV_CALL_PLT-relocation-type/20230725-165116 base: https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore patch link: https://lore.kernel.org/r/a083f38c7c3acd6ac9542228e36947be30b58188.1690274483.git.petr.tesarik.ext%40huawei.com patch subject: [PATCH v1 3/3] riscv/purgatory: do not link with string.o config: riscv-randconfig-r001-20230725 (https://download.01.org/0day-ci/archive/20230726/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230726/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> ld.lld: error: undefined symbol: memcmp >>> referenced by ctype.c >>> arch/riscv/purgatory/purgatory.ro:(purgatory)
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v1 3/3] riscv/purgatory: do not link with string.o
Quoted 18 lines · On Wed, 26 Jul 2023 03:36:39 +0800 kernel test robot <[email protected]> wrote:
Hi Petr,
kernel test robot noticed the following build errors:
[auto build test ERROR on kees/for-next/pstore]
[also build test ERROR on kees/for-next/kspp linus/master v6.5-rc3 next-20230725] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/Petr-Tesarik/riscv-kexec-handle-R_RISCV_CALL_PLT-relocation-type/20230725-165116 base: https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore patch link: https://lore.kernel.org/r/a083f38c7c3acd6ac9542228e36947be30b58188.1690274483.git.petr.tesarik.ext%40huawei.com patch subject: [PATCH v1 3/3] riscv/purgatory: do not link with string.o config: riscv-randconfig-r001-20230725 (https://download.01.org/0day-ci/archive/20230726/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230726/[email protected]/reproduce)
Quoted 10 lines
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
Quoted 3 lines
Quoted 3 lines
ld.lld: error: undefined symbol: memcmp
Quoted 2 lines
referenced by
ctype.c
arch/riscv/purgatory/purgatory.ro:(purgatory)
Ah, I see... In my build, it was inlined by gcc (GCC-13), but I cannot rely on that. Too bad...
OTOH I don't think it's worth implementing full support for GOT, especially for functions that are not needed. I would rather either write a RISC-V implementation of memcmp(), or split memcmp() from lib/string.c.
Stay tuned for v2.
Petr T
Hi,
oops. I wanted to _add_ the kexec ML to all other recipients, but I somehow screwed up, so this version is sent _only_ to the kexec ML. If you reply here, the other recipients will not see your reply. The real thread is here:
https://lore.kernel.org/lkml/[email protected]/
I'm sorry
Petr T
Quoted 14 lines · On Tue, 25 Jul 2023 12:01:07 +0200 Petr Tesarik <[email protected]>…
From: Petr Tesarik <[email protected]>
The
kexec_file_load(2)syscall does not work at least in some kernel builds. For details see the relevant section in this blog post:https://sigillatum.tesarici.cz/2023-07-21-state-of-riscv64-kdump.html
This patch series handles additional relocation types and removes the need to implement a Global Offset Table (GOT) for the purgatory.
Petr Tesarik (2):
riscv/kexec: handleR_RISCV_ADD16andR_RISCV_SUB16relocation types riscv/purgatory: do not link with string.o
Quoted 7 lines
Torsten Duwe (1):
riscv/kexec: handleR_RISCV_CALL_PLTrelocation typearch/riscv/kernel/elf_kexec.c | 7 +++++++ arch/riscv/purgatory/Makefile | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-)
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec