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>, <linux-doc@vger.kernel.org>,
<linux-arch@vger.kernel.org>, <libc-alpha@sourceware.org>
Cc: <schwidefsky@de.ibm.com>, <heiko.carstens@de.ibm.com>,
<ynorov@caviumnetworks.com>, <pinskia@gmail.com>,
<broonie@kernel.org>, <joseph@codesourcery.com>,
<christoph.muellner@theobroma-systems.com>,
<bamvor.zhangjian@huawei.com>, <szabolcs.nagy@arm.com>,
<klimov.linux@gmail.com>, <Nathan_Lynch@mentor.com>,
<agraf@suse.de>, <Prasun.Kapoor@caviumnetworks.com>,
<kilobyte@angband.pl>, <geert@linux-m68k.org>,
<philipp.tomsich@theobroma-systems.com>,
<manuel.montezelo@gmail.com>, <linyongting@huawei.com>,
<maxim.kuvyrkov@linaro.org>, <davem@davemloft.net>
Subject: [PATCH 10/19] arm64: introduce binfmt_elf32.c
Date: Sat, 18 Jun 2016 02:54:19 +0300 [thread overview]
Message-ID: <1466207668-10549-11-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1466207668-10549-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/hwcap.h | 2 --
arch/arm64/kernel/Makefile | 2 +-
arch/arm64/kernel/binfmt_elf32.c | 31 +++++++++++++++++++++++++++++++
4 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 arch/arm64/kernel/binfmt_elf32.c
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index aea8e61..f5735ec 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -979,7 +979,6 @@ config AARCH32_EL0
def_bool y
depends on ARM64_4K_PAGES || EXPERT
select COMPAT
- select COMPAT_BINFMT_ELF
select HAVE_UID16
select OLD_SIGSUSPEND3
select COMPAT_OLD_SIGACTION
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 631a118..60d59cb 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..aec1c8a
--- /dev/null
+++ b/arch/arm64/kernel/binfmt_elf32.c
@@ -0,0 +1,31 @@
+/*
+ * Support for AArch32 Linux ELF binaries.
+ */
+
+/* AArch32 EABI. */
+#define EF_ARM_EABI_MASK 0xff000000
+
+#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.7.4
next prev parent reply other threads:[~2016-06-17 23:55 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 23:54 [RFC nowrap: PATCH v7 00/19] ILP32 for ARM64 Yury Norov
2016-06-17 23:54 ` [PATCH 01/19] compat ABI: use non-compat openat and open_by_handle_at variants Yury Norov
2016-06-27 7:47 ` Andreas Schwab
2016-08-15 14:30 ` Yury Norov
2016-08-25 15:52 ` Arnd Bergmann
2016-08-29 8:43 ` Yury Norov
2016-06-17 23:54 ` [PATCH 02/19] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Yury Norov
2016-06-17 23:54 ` [PATCH 03/19] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Yury Norov
2016-06-17 23:54 ` [PATCH 04/19] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-06-17 23:54 ` [PATCH 05/19] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-08-11 7:35 ` Zhangjian (Bamvor)
2016-08-11 8:53 ` Arnd Bergmann
2016-08-11 14:50 ` Catalin Marinas
2016-08-11 15:16 ` Arnd Bergmann
2016-08-11 16:30 ` Catalin Marinas
2016-08-11 20:29 ` Arnd Bergmann
2016-08-12 14:36 ` Catalin Marinas
2016-08-13 15:17 ` Yury Norov
2016-08-15 9:38 ` Catalin Marinas
2016-06-17 23:54 ` [PATCH 06/19] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-06-17 23:54 ` [PATCH 07/19] thread: move thread bits accessors to separated file Yury Norov
2016-06-17 23:54 ` [PATCH 08/19] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-06-21 10:23 ` Zhangjian (Bamvor)
2016-06-21 11:34 ` Andreas Schwab
2016-06-21 15:47 ` Arnd Bergmann
2016-06-17 23:54 ` [PATCH 09/19] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-06-17 23:54 ` Yury Norov [this message]
2016-06-17 23:54 ` [PATCH 11/19] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-06-17 23:54 ` [PATCH 12/19] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-06-27 4:47 ` zhouchengming
2016-06-27 4:49 ` [PATCH] ilp32: fix {GET,SET}SIGMASK request for ptrace zhouchengming
2016-06-27 5:39 ` Yury Norov
2016-06-27 10:30 ` zhouchengming
2016-08-13 14:52 ` Yury Norov
2016-06-17 23:54 ` [PATCH 13/19] arm64: ilp32: share aarch32 syscall handlers Yury Norov
2016-06-17 23:54 ` [PATCH 14/19] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-06-20 12:48 ` Yury Norov
2016-06-17 23:54 ` [PATCH 15/19] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-06-17 23:54 ` [PATCH 16/19] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-06-17 23:54 ` [PATCH 17/19] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Yury Norov
2016-06-17 23:54 ` [PATCH 18/19] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-06-20 14:54 ` Andreas Schwab
2016-08-13 14:54 ` Yury Norov
2016-06-17 23:54 ` [PATCH 19/19] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
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=1466207668-10549-11-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=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=heiko.carstens@de.ibm.com \
--cc=joseph@codesourcery.com \
--cc=kilobyte@angband.pl \
--cc=klimov.linux@gmail.com \
--cc=libc-alpha@sourceware.org \
--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=linyongting@huawei.com \
--cc=manuel.montezelo@gmail.com \
--cc=maxim.kuvyrkov@linaro.org \
--cc=philipp.tomsich@theobroma-systems.com \
--cc=pinskia@gmail.com \
--cc=schwidefsky@de.ibm.com \
--cc=szabolcs.nagy@arm.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).