From 606b1c3b33d478485bcdcfe1edae0142986d7ea9 Mon Sep 17 00:00:00 2001 From: Zhou Kang Date: Wed, 5 Jul 2023 02:43:43 +0000 Subject: [PATCH] rename EF_AARCH64_AOT to EF_AARCH64_SYMBOLIC_LINK --- Makefile | 5 ++++- src/binfmt_rto/binfmt_rto.c | 8 ++++---- src/elf_hugepage.c | 12 ++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 6c9c72f..aa5252e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SYSBOOST=../build/sysboost/sysboost SYSBOOSTD_INSTALL_PATH=/usr/bin/sysboostd SYSBOOST_INSTALL_PATH=/usr/bin/sysboost -all: sysboostd sysboost +all: sysboostd sysboost binfmt_rto sysboostd: clear @@ -14,6 +14,9 @@ sysboostd: sysboost: ninja -C build -v +binfmt_rto: + make -C src/binfmt_rto + release: rm -rf build meson build diff --git a/src/binfmt_rto/binfmt_rto.c b/src/binfmt_rto/binfmt_rto.c index 2f9ceba..9ca1d12 100644 --- a/src/binfmt_rto/binfmt_rto.c +++ b/src/binfmt_rto/binfmt_rto.c @@ -65,8 +65,8 @@ static int debug = 0; module_param(debug, int, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "debug mode"); -#ifndef EF_AARCH64_AOT -#define EF_AARCH64_AOT (0x00010000U) +#ifndef EF_AARCH64_SYMBOLIC_LINK +#define EF_AARCH64_SYMBOLIC_LINK (0x00010000U) #endif #ifndef EF_AARCH64_HUGEPAGE @@ -1167,7 +1167,7 @@ static int load_elf_binary(struct linux_binprm *bprm) struct pt_regs *regs; #ifdef CONFIG_ELF_SYSBOOST - bool is_rto_format = elf_ex->e_flags & EF_AARCH64_AOT; + bool is_rto_format = elf_ex->e_flags & EF_AARCH64_SYMBOLIC_LINK; load_rto: retval = -ENOEXEC; @@ -1197,7 +1197,7 @@ load_rto: #ifdef CONFIG_ELF_SYSBOOST /* e_flags will change */ - if (elf_ex->e_flags & EF_AARCH64_AOT) { + if (elf_ex->e_flags & EF_AARCH64_SYMBOLIC_LINK) { if (!try_replace_file(bprm)) goto load_rto; } else if (debug) { diff --git a/src/elf_hugepage.c b/src/elf_hugepage.c index 0fa87ed..8bfd141 100644 --- a/src/elf_hugepage.c +++ b/src/elf_hugepage.c @@ -18,8 +18,8 @@ #define PF_HUGEPAGE (0x01000000) #endif -#ifndef EF_AARCH64_AOT -#define EF_AARCH64_AOT (0x00010000U) +#ifndef EF_AARCH64_SYMBOLIC_LINK +#define EF_AARCH64_SYMBOLIC_LINK (0x00010000U) #endif #ifndef EF_AARCH64_HUGEPAGE @@ -27,19 +27,19 @@ #endif #ifdef __aarch64__ -#define OS_SPECIFIC_FLAG_AOT EF_AARCH64_AOT +#define OS_SPECIFIC_FLAG_SYMBOLIC_LINK EF_AARCH64_SYMBOLIC_LINK #define OS_SPECIFIC_FLAG_HUGEPAGE EF_AARCH64_HUGEPAGE #else // TODO: feature, for x86 -#define OS_SPECIFIC_FLAG_AOT EF_AARCH64_AOT +#define OS_SPECIFIC_FLAG_SYMBOLIC_LINK EF_AARCH64_SYMBOLIC_LINK #define OS_SPECIFIC_FLAG_HUGEPAGE EF_AARCH64_HUGEPAGE #endif -#define OS_SPECIFIC_MASK (0xffffffffU ^ OS_SPECIFIC_FLAG_AOT ^ OS_SPECIFIC_FLAG_HUGEPAGE) +#define OS_SPECIFIC_MASK (0xffffffffU ^ OS_SPECIFIC_FLAG_SYMBOLIC_LINK ^ OS_SPECIFIC_FLAG_HUGEPAGE) void _elf_set_aot(elf_file_t *ef, bool state) { if (state) { - ef->hdr->e_flags |= OS_SPECIFIC_FLAG_AOT; + ef->hdr->e_flags |= OS_SPECIFIC_FLAG_SYMBOLIC_LINK; ef->hdr->e_flags |= OS_SPECIFIC_FLAG_HUGEPAGE; } else { ef->hdr->e_flags &= OS_SPECIFIC_MASK; -- Gitee