Messages in this thread Patch in this message | | | Subject | Re: linux-next: Tree for May 31 (riscv: arch/riscv/kernel/elf_kexec.c) | From | "lizhengyu (E)" <> | Date | Wed, 1 Jun 2022 11:54:23 +0800 |
| |
On Tue, 31 May 2022 12:52:28 -0700, Randy Dunlap <rdunlap@infradead.org> wrote: > 838b3e28488f7: RISC-V: Load purgatory in kexec_file > > > On 5/30/22 21:54, Stephen Rothwell wrote: >> Hi all, >> >> Note: please do not add any v5.20 material to your linux-next included >> branches until after v5.19-rc1 has been related. >> >> Changes since 20220527: >> > When CONFIG_MODULES is not set/enabled: > (oh, also CONFIG_MMU is not set) > > > ../arch/riscv/kernel/elf_kexec.c:346:5: error: redefinition of 'arch_kexec_apply_relocations_add' > 346 | int arch_kexec_apply_relocations_add(struct purgatory_info *pi, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from ../arch/riscv/kernel/elf_kexec.c:17: > ../include/linux/kexec.h:236:1: note: previous definition of 'arch_kexec_apply_relocations_add' with type 'int(struct purgatory_info *, Elf64_Shdr *, const Elf64_Shdr *, const Elf64_Shdr *)' {aka 'int(struct purgatory_info *, struct elf64_shdr *, const struct elf64_shdr *, const struct elf64_shdr *)'} > 236 | arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../arch/riscv/kernel/elf_kexec.c: In function 'arch_kexec_apply_relocations_add': This problem has already solved by Uwe Kleine-König, see https://lore.kernel.org/all/20220530074202.pydmbbgvbtaugw5j@pengutronix.de/ . > ../arch/riscv/kernel/elf_kexec.c:353:9: error: unknown type name 'Elf_Rela'; did you mean 'Elf64_Rela'? > 353 | Elf_Rela *relas; > | ^~~~~~~~ > | Elf64_Rela
Replace Elf_Rela by Elf64_Rela, get
kernel/kexec_core.o: In function `kimage_free': kexec_core.c:(.text+0xa0c): undefined reference to `machine_kexec_cleanup' kernel/kexec_core.o: In function `.L0 ': kexec_core.c:(.text+0xde8): undefined reference to `machine_crash_shutdown' kexec_core.c:(.text+0xdf4): undefined reference to `machine_kexec' kernel/kexec_core.o: In function `.L231': kexec_core.c:(.text+0xe1c): undefined reference to `riscv_crash_save_regs' kernel/kexec_core.o: In function `.L0 ': kexec_core.c:(.text+0x119e): undefined reference to `machine_shutdown' kernel/kexec_core.o: In function `.L312': kexec_core.c:(.text+0x11b2): undefined reference to `machine_kexec' kernel/kexec_file.o: In function `.L0 ': kexec_file.c:(.text+0xb84): undefined reference to `machine_kexec_prepare' kernel/kexec_file.o: In function `.L177': kexec_file.c:(.text+0xc5a): undefined reference to `machine_kexec_prepare'
When config KEXEC_FILE=y but config KEXEC is not set. Fix it by
--- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -78,7 +78,7 @@ obj-$(CONFIG_SMP) += cpu_ops_sbi.o endif obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o obj-$(CONFIG_KGDB) += kgdb.o -obj-$(CONFIG_KEXEC) += kexec_relocate.o crash_save_regs.o machine_kexec.o +obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
I will send these patches soon.
> In file included from ../arch/riscv/include/asm/elf.h:11, > from ../include/linux/elf.h:6, > from ../include/linux/module.h:19, > from ../arch/riscv/kernel/elf_kexec.c:15: > ../arch/riscv/kernel/elf_kexec.c:371:44: error: request for member 'r_info' in something not a structure or union > 371 | sym += ELF64_R_SYM(relas[i].r_info); > | ^ > ../include/uapi/linux/elf.h:163:43: note: in definition of macro 'ELF64_R_SYM' > 163 | #define ELF64_R_SYM(i) ((i) >> 32) > | ^ > ../arch/riscv/kernel/elf_kexec.c:380:32: error: request for member 'r_offset' in something not a structure or union > 380 | loc += relas[i].r_offset; > | ^ > ../arch/riscv/kernel/elf_kexec.c:393:32: error: request for member 'r_addend' in something not a structure or union > 393 | val += relas[i].r_addend; > | ^ > ../arch/riscv/kernel/elf_kexec.c:395:51: error: request for member 'r_offset' in something not a structure or union > 395 | addr = section->sh_addr + relas[i].r_offset; > | ^ > In file included from ../arch/riscv/include/asm/elf.h:11, > from ../include/linux/elf.h:6, > from ../include/linux/module.h:19, > from ../arch/riscv/kernel/elf_kexec.c:15: > ../arch/riscv/kernel/elf_kexec.c:397:47: error: request for member 'r_info' in something not a structure or union > 397 | r_type = ELF64_R_TYPE(relas[i].r_info); > | ^ > ../include/uapi/linux/elf.h:164:43: note: in definition of macro 'ELF64_R_TYPE' > 164 | #define ELF64_R_TYPE(i) ((i) & 0xffffffff) > | ^ > > > Full randconfig file is attached. >
| |