From: Yury Norov <ynorov@caviumnetworks.com>
To: <arnd@arndb.de>, <catalin.marinas@arm.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <schwidefsky@de.ibm.com>, <heiko.carstens@de.ibm.com>,
<ynorov@caviumnetworks.com>, <pinskia@gmail.com>,
<Prasun.Kapoor@caviumnetworks.com>, <schwab@suse.de>,
<Nathan_Lynch@mentor.com>, <agraf@suse.de>,
<klimov.linux@gmail.com>, <broonie@kernel.org>,
<joseph@codesourcery.com>,
<christoph.muellner@theobroma-systems.com>,
<bamvor.zhangjian@huawei.com>, <linux-doc@vger.kernel.org>,
<linux-arch@vger.kernel.org>, <linux-s390@vger.kernel.org>
Subject: [PATCH 17/25] arm64: introduce binfmt_elf32.c
Date: Wed, 6 Apr 2016 01:08:39 +0300 [thread overview]
Message-ID: <1459894127-17698-18-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1459894127-17698-1-git-send-email-ynorov@caviumnetworks.com>
As we support more than one compat formats, it looks more reasonable
to not use fs/compat_binfmt.c. Custom binfmt_elf32.c allows to move aarch32
specific definitions there and make code more maintainable and readable.
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
---
arch/arm64/Kconfig | 1 -
arch/arm64/include/asm/elf.h | 24 ------------------------
arch/arm64/include/asm/hwcap.h | 2 --
arch/arm64/kernel/Makefile | 2 +-
arch/arm64/kernel/binfmt_elf32.c | 33 +++++++++++++++++++++++++++++++++
5 files changed, 34 insertions(+), 28 deletions(-)
create mode 100644 arch/arm64/kernel/binfmt_elf32.c
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ebaf38a..46fc295 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -931,7 +931,6 @@ config COMPAT
config AARCH32_EL0
bool "Kernel support for 32-bit EL0"
depends on ARM64_4K_PAGES || EXPERT
- select COMPAT_BINFMT_ELF
select HAVE_UID16
select OLD_SIGSUSPEND3
select COMPAT_OLD_SIGACTION
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index e18bb8a..7a39683 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -166,12 +166,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
#ifdef CONFIG_COMPAT
-#ifdef __AARCH64EB__
-#define COMPAT_ELF_PLATFORM ("v8b")
-#else
-#define COMPAT_ELF_PLATFORM ("v8l")
-#endif
-
#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3)
/* AArch32 registers. */
@@ -179,24 +173,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
typedef unsigned int compat_elf_greg_t;
typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
-/* AArch32 EABI. */
-#define EF_ARM_EABI_MASK 0xff000000
-#define compat_elf_check_arch(x) (((x)->e_machine == EM_ARM) && \
- ((x)->e_flags & EF_ARM_EABI_MASK))
-
-#define compat_start_thread compat_start_thread
-#define COMPAT_SET_PERSONALITY(ex) \
-do { \
- clear_thread_flag(TIF_32BIT_AARCH64); \
- set_thread_flag(TIF_32BIT); \
-} while (0)
-
-#define COMPAT_ARCH_DLINFO
-extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,
- int uses_interp);
-#define compat_arch_setup_additional_pages \
- aarch32_setup_vectors_page
-
#endif /* CONFIG_COMPAT */
#endif /* !__ASSEMBLY__ */
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 2c7fc5d..99dfd92 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -47,8 +47,6 @@
#define ELF_HWCAP (elf_hwcap)
#ifdef CONFIG_AARCH32_EL0
-#define COMPAT_ELF_HWCAP (compat_elf_hwcap)
-#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2)
extern unsigned int compat_elf_hwcap, compat_elf_hwcap2;
#endif
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 75dd250..6bc9738 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -27,7 +27,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \
sys_compat.o entry32.o \
- ../../arm/kernel/opcodes.o
+ ../../arm/kernel/opcodes.o binfmt_elf32.o
arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o
arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o
arm64-obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o
diff --git a/arch/arm64/kernel/binfmt_elf32.c b/arch/arm64/kernel/binfmt_elf32.c
new file mode 100644
index 0000000..5487872
--- /dev/null
+++ b/arch/arm64/kernel/binfmt_elf32.c
@@ -0,0 +1,33 @@
+/*
+ * Support for AArch32 Linux ELF binaries.
+ */
+
+/* AArch32 EABI. */
+#define EF_ARM_EABI_MASK 0xff000000
+#define compat_elf_check_arch(x) (((x)->e_machine == EM_ARM) && \
+ ((x)->e_flags & EF_ARM_EABI_MASK))
+
+#define compat_start_thread compat_start_thread
+#define COMPAT_SET_PERSONALITY(ex) \
+do { \
+ clear_thread_flag(TIF_32BIT_AARCH64); \
+ set_thread_flag(TIF_32BIT); \
+} while (0)
+
+#define COMPAT_ARCH_DLINFO
+#define COMPAT_ELF_HWCAP (compat_elf_hwcap)
+#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2)
+
+#ifdef __AARCH64EB__
+#define COMPAT_ELF_PLATFORM ("v8b")
+#else
+#define COMPAT_ELF_PLATFORM ("v8l")
+#endif
+
+#define compat_arch_setup_additional_pages \
+ aarch32_setup_vectors_page
+struct linux_binprm;
+extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,
+ int uses_interp);
+
+#include "../../../fs/compat_binfmt_elf.c"
--
2.5.0
next prev parent reply other threads:[~2016-04-05 22:12 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 22:08 [RFC6 PATCH v6 00/21] ILP32 for ARM64 Yury Norov
2016-04-05 22:08 ` [PATCH 01/25] all: syscall wrappers: add documentation Yury Norov
2016-04-05 22:08 ` [PATCH 02/25] all: introduce COMPAT_WRAPPER option and enable it for s390 Yury Norov
2016-04-05 22:08 ` [PATCH 03/25] all: s390: move wrapper infrastructure to generic headers Yury Norov
2016-04-05 22:08 ` [PATCH 04/25] all: s390: move compat_wrappers.c from arch/s390/kernel to kernel/ Yury Norov
2016-04-05 22:08 ` [PATCH 05/25] all: wrap needed syscalls in generic unistd Yury Norov
2016-04-05 22:08 ` [PATCH 06/25] compat ABI: use non-compat openat and open_by_handle_at variants Yury Norov
2016-04-05 22:08 ` [PATCH 07/25] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Yury Norov
2016-04-05 22:08 ` [PATCH 08/25] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Yury Norov
2016-04-05 22:08 ` [PATCH 09/25] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-04-05 22:08 ` [PATCH 10/25] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-04-14 3:20 ` Zhangjian (Bamvor)
2016-04-22 15:28 ` Catalin Marinas
2016-04-05 22:08 ` [PATCH 11/25] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Yury Norov
2016-04-05 22:08 ` [PATCH 12/25] arm64: compat: change config dependences to aarch32 Yury Norov
2016-04-22 15:58 ` Catalin Marinas
2016-04-22 21:59 ` Yury Norov
2016-04-23 2:33 ` Zhangjian (Bamvor)
2016-04-05 22:08 ` [PATCH 13/25] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-04-05 22:08 ` [PATCH 14/25] thread: move thread bits accessors to separated file Yury Norov
2016-04-05 22:08 ` [PATCH 15/25] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-05-06 12:02 ` Zhangjian (Bamvor)
2016-04-05 22:08 ` [PATCH 16/25] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-04-05 22:08 ` Yury Norov [this message]
2016-04-05 22:08 ` [PATCH 18/25] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-04-22 16:51 ` Catalin Marinas
2016-04-22 17:41 ` Arnd Bergmann
2016-04-05 22:08 ` [PATCH 19/25] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-04-22 17:10 ` Catalin Marinas
2016-04-22 21:40 ` Yury Norov
2016-04-25 16:57 ` Catalin Marinas
2016-04-05 22:08 ` [PATCH 20/25] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-04-25 17:26 ` Catalin Marinas
2016-04-25 18:19 ` Yury Norov
2016-04-25 18:47 ` Yury Norov
2016-04-26 10:08 ` Catalin Marinas
2016-04-26 16:57 ` Catalin Marinas
2016-04-28 19:19 ` Yury Norov
2016-04-28 20:43 ` Arnd Bergmann
2016-04-28 22:21 ` Yury Norov
2016-04-28 22:43 ` Arnd Bergmann
2016-04-29 13:13 ` Yury Norov
2016-04-29 15:45 ` Arnd Bergmann
2016-05-06 12:16 ` Zhangjian (Bamvor)
2016-05-06 12:37 ` Yury Norov
2016-05-10 7:42 ` Zhangjian (Bamvor)
2016-05-10 7:55 ` Zhangjian (Bamvor)
2016-05-10 8:36 ` Arnd Bergmann
2016-05-10 9:47 ` Zhangjian (Bamvor)
2016-05-10 11:48 ` Arnd Bergmann
2016-05-10 12:39 ` Zhangjian (Bamvor)
2016-05-10 12:50 ` Arnd Bergmann
2016-05-11 2:04 ` Zhangjian (Bamvor)
2016-05-11 8:04 ` Yury Norov
2016-05-11 10:55 ` Arnd Bergmann
2016-05-11 16:59 ` Catalin Marinas
2016-05-11 19:30 ` Arnd Bergmann
2016-05-12 9:17 ` Catalin Marinas
2016-05-12 9:21 ` Arnd Bergmann
2016-05-12 12:49 ` Zhangjian (Bamvor)
2016-05-12 13:06 ` Arnd Bergmann
2016-05-12 13:19 ` Yury Norov
2016-05-14 12:49 ` Yury Norov
2016-05-11 8:09 ` Arnd Bergmann
2016-05-11 10:12 ` Zhangjian (Bamvor)
2016-05-11 11:16 ` Zhangjian (Bamvor)
2016-05-11 14:50 ` Arnd Bergmann
2016-05-12 3:45 ` Zhangjian (Bamvor)
2016-05-12 8:24 ` Yury Norov
2016-05-12 12:52 ` Zhangjian (Bamvor)
2016-05-12 12:59 ` Yury Norov
2016-05-14 15:03 ` Yury Norov
2016-05-16 17:06 ` Catalin Marinas
2016-05-17 19:05 ` Yury Norov
2016-05-18 11:21 ` Catalin Marinas
2016-05-18 17:58 ` Yury Norov
2016-04-05 22:08 ` [PATCH 21/25] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-04-05 22:08 ` [PATCH 22/25] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-04-05 22:08 ` [PATCH 23/25] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Yury Norov
2016-04-05 22:08 ` [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-04-13 9:19 ` Zhangjian (Bamvor)
2016-04-13 15:55 ` Yury Norov
2016-05-03 12:49 ` Zhangjian (Bamvor)
2016-04-29 16:01 ` Catalin Marinas
2016-04-29 17:30 ` Arnd Bergmann
2016-05-03 9:00 ` Catalin Marinas
2016-05-03 9:05 ` Arnd Bergmann
2016-05-03 11:07 ` Zhangjian (Bamvor)
2016-05-03 12:41 ` Zhangjian (Bamvor)
2016-05-04 21:49 ` Yury Norov
2016-05-04 23:23 ` Andrew Pinski
2016-05-05 2:24 ` Zhangjian (Bamvor)
2016-05-05 6:40 ` Andrew Pinski
2016-05-06 14:00 ` Yury Norov
2016-05-09 10:07 ` Zhangjian (Bamvor)
2016-05-05 8:22 ` Yury Norov
2016-04-05 22:08 ` [PATCH 25/25] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2016-04-29 16:03 ` Catalin Marinas
2016-04-29 16:08 ` Yury Norov
2016-04-29 16:14 ` Catalin Marinas
2016-04-29 16:26 ` Yury Norov
2016-04-05 22:44 ` [RFC6 PATCH v6 00/21] ILP32 for ARM64 - LTP results Yury Norov
2016-04-23 3:37 ` Zhangjian (Bamvor)
2016-04-27 7:30 ` Andrew Pinski
2016-04-27 21:15 ` Andrew Pinski
2016-04-28 12:16 ` Zhangjian (Bamvor)
2016-04-06 6:51 ` [RFC6 PATCH v6 00/21] ILP32 for ARM64 Geert Uytterhoeven
2016-04-06 12:29 ` Yury Norov
2016-04-07 12:28 ` Geert Uytterhoeven
2016-05-12 0:20 ` Yury Norov
2016-05-12 9:19 ` Arnd Bergmann
2016-05-12 10:30 ` Yury Norov
2016-05-12 13:35 ` Catalin Marinas
2016-05-12 13:44 ` Yury Norov
2016-05-12 14:07 ` Catalin Marinas
2016-05-12 14:20 ` Catalin Marinas
2016-05-12 14:34 ` Yury Norov
2016-05-12 14:54 ` Catalin Marinas
2016-05-12 15:27 ` Yury Norov
2016-05-12 14:24 ` Yury Norov
2016-05-12 15:28 ` Catalin Marinas
2016-05-13 8:11 ` Zhangjian (Bamvor)
2016-05-13 9:28 ` Catalin Marinas
2016-05-13 10:51 ` Yury Norov
2016-05-13 11:03 ` Catalin Marinas
2016-05-13 13:32 ` Catalin Marinas
2016-05-17 12:10 ` Szabolcs Nagy
2016-05-17 15:37 ` Arnd Bergmann
2016-05-17 15:45 ` Joseph Myers
2016-05-17 16:02 ` Andreas Schwab
2016-05-17 22:45 ` Arnd Bergmann
2016-05-17 15:40 ` Joseph Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459894127-17698-18-git-send-email-ynorov@caviumnetworks.com \
--to=ynorov@caviumnetworks.com \
--cc=Nathan_Lynch@mentor.com \
--cc=Prasun.Kapoor@caviumnetworks.com \
--cc=agraf@suse.de \
--cc=arnd@arndb.de \
--cc=bamvor.zhangjian@huawei.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christoph.muellner@theobroma-systems.com \
--cc=heiko.carstens@de.ibm.com \
--cc=joseph@codesourcery.com \
--cc=klimov.linux@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pinskia@gmail.com \
--cc=schwab@suse.de \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).