summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWANG Rui <wangrui@loongson.cn>2023-11-24 16:54:10 +0800
committerSimon Horman <horms@kernel.org>2023-12-02 12:42:17 +0000
commitba0ac0efe29927d135d073176bba559a25733b43 (patch)
treea4a6f67fb39aa91708b6552fb7cb9b2cd20e5138
parent74dfaefd631694d771a38ede308da2083eae3a3b (diff)
downloadkexec-tools-ba0ac0efe29927d135d073176bba559a25733b43.tar.gz
LoongArch: Fix an issue with relocatable vmlinux
Normally vmlinux for LoongArch is of ET_EXEC type, while if built with CONFIG_RELOCATABLE (this is PIE) and Clang, it will be of ET_DYN type. Meanwhile, physical address field of segments in vmlinux has actually the same value as virtual address field. Similar to arm64, this patch allows to unconditionally skip the check on LoongArch. Link: https://github.com/ClangBuiltLinux/linux/issues/1963 Signed-off-by: WANG Rui <wangrui@loongson.cn> Reviewed-by: Huacai Chen <chenhuacai@loongson.cn> Signed-off-by: Simon Horman <horms@kernel.org>
-rw-r--r--kexec/kexec-elf-exec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kexec/kexec-elf-exec.c b/kexec/kexec-elf-exec.c
index bea7b3e3..b3376427 100644
--- a/kexec/kexec-elf-exec.c
+++ b/kexec/kexec-elf-exec.c
@@ -39,12 +39,13 @@ static int get_elf_exec_load_base(struct mem_ehdr *ehdr, struct kexec_info *info
unsigned long first, last;
size_t i;
- /* Note on arm64:
+ /* Note on arm64 and loongarch64:
* arm64's vmlinux has virtual address in physical address
* field of PT_LOAD segments. So the following validity check
* and relocation makes no sense on arm64.
+ * This is also applies to LoongArch.
*/
- if (ehdr->e_machine == EM_AARCH64)
+ if (ehdr->e_machine == EM_AARCH64 || ehdr->e_machine == EM_LOONGARCH)
return 0;
first = ULONG_MAX;