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
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,
zhouchengming1@huawei.com, cmetcalf@ezchip.com,
Andrew Pinski <Andrew.Pinski@caviumnetworks.com>
Subject: [PATCH 08/18] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64
Date: Fri, 21 Oct 2016 23:33:07 +0300 [thread overview]
Message-ID: <1477081997-4770-9-git-send-email-ynorov@caviumnetworks.com> (raw)
Message-ID: <20161021203307.w8Cz6anO4vcai7xOF4S8cp1S-TElzMT8q_WVs3RahcE@z> (raw)
In-Reply-To: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com>
ILP32 tasks are needed to be distinguished from lp64 and aarch32.
This patch adds helper functions is_ilp32_compat_{task,thread} and
thread flag TIF_32BIT_AARCH64 to address it. This is a preparation
for following patches in ilp32 patchset.
For consistency, SET_PERSONALITY is changed here accordingly.
Signed-off-by: Andrew Pinski <Andrew.Pinski@caviumnetworks.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Reviewed-by: David Daney <ddaney@caviumnetworks.com>
---
arch/arm64/include/asm/elf.h | 13 +++++++++++--
arch/arm64/include/asm/is_compat.h | 30 ++++++++++++++++++++++++++++--
arch/arm64/include/asm/thread_info.h | 2 ++
3 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 6a9049b..f259fe8 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -142,7 +142,11 @@ typedef struct user_fpsimd_state elf_fpregset_t;
*/
#define ELF_PLAT_INIT(_r, load_addr) (_r)->regs[0] = 0
-#define SET_PERSONALITY(ex) clear_thread_flag(TIF_32BIT);
+#define SET_PERSONALITY(ex) \
+do { \
+ clear_thread_flag(TIF_32BIT_AARCH64); \
+ clear_thread_flag(TIF_32BIT); \
+} while (0)
/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */
#define ARCH_DLINFO \
@@ -183,7 +187,12 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG];
((x)->e_flags & EF_ARM_EABI_MASK))
#define compat_start_thread compat_start_thread
-#define COMPAT_SET_PERSONALITY(ex) set_thread_flag(TIF_32BIT);
+#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);
diff --git a/arch/arm64/include/asm/is_compat.h b/arch/arm64/include/asm/is_compat.h
index 8dba5ca..7726beb 100644
--- a/arch/arm64/include/asm/is_compat.h
+++ b/arch/arm64/include/asm/is_compat.h
@@ -45,18 +45,44 @@ static inline int is_a32_compat_thread(struct thread_info *thread)
#endif /* CONFIG_AARCH32_EL0 */
+#ifdef CONFIG_ARM64_ILP32
+
+static inline int is_ilp32_compat_task(void)
+{
+ return test_thread_flag(TIF_32BIT_AARCH64);
+}
+
+static inline int is_ilp32_compat_thread(struct thread_info *thread)
+{
+ return test_ti_thread_flag(thread, TIF_32BIT_AARCH64);
+}
+
+#else
+
+static inline int is_ilp32_compat_task(void)
+{
+ return 0;
+}
+
+static inline int is_ilp32_compat_thread(struct thread_info *thread)
+{
+ return 0;
+}
+
+#endif /* CONFIG_ARM64_ILP32 */
+
#ifdef CONFIG_COMPAT
static inline int is_compat_task(void)
{
- return is_a32_compat_task();
+ return is_a32_compat_task() || is_ilp32_compat_task();
}
#endif /* CONFIG_COMPAT */
static inline int is_compat_thread(struct thread_info *thread)
{
- return is_a32_compat_thread(thread);
+ return is_a32_compat_thread(thread) || is_ilp32_compat_thread(thread);
}
diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
index e12411f..680aca5 100644
--- a/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@ -122,6 +122,7 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_RESTORE_SIGMASK 20
#define TIF_SINGLESTEP 21
#define TIF_32BIT 22 /* AARCH32 process */
+#define TIF_32BIT_AARCH64 23 /* 32 bit process on AArch64(ILP32) */
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
@@ -133,6 +134,7 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_32BIT (1 << TIF_32BIT)
+#define _TIF_32BIT_AARCH64 (1 << TIF_32BIT_AARCH64)
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
_TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
--
2.7.4
next prev parent reply other threads:[~2016-10-21 20:49 UTC|newest]
Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 20:32 [RFC3 nowrap: PATCH v7 00/18] ILP32 for ARM64 Yury Norov
2016-10-21 20:32 ` Yury Norov
2016-10-21 20:33 ` [PATCH 01/18] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-24 16:30 ` Chris Metcalf
2016-10-24 16:30 ` Chris Metcalf
2016-10-24 22:22 ` Arnd Bergmann
2016-10-27 9:29 ` Yury Norov
2016-10-27 9:29 ` Yury Norov
2016-10-21 20:33 ` [PATCH 02/18] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-24 16:36 ` Chris Metcalf
2016-10-24 16:36 ` Chris Metcalf
2016-10-27 9:40 ` Yury Norov
2016-10-27 9:40 ` Yury Norov
2016-10-21 20:33 ` [PATCH 03/18] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 04/18] arm64: ensure the kernel is compiled for LP64 Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 05/18] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 06/18] thread: move thread bits accessors to separated file Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 07/18] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` Yury Norov [this message]
2016-10-21 20:33 ` [PATCH 08/18] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-10-21 20:33 ` [PATCH 09/18] arm64: introduce binfmt_elf32.c Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-12-05 15:10 ` Catalin Marinas
2016-12-14 9:39 ` Yury Norov
2016-12-14 9:39 ` Yury Norov
2016-10-21 20:33 ` [PATCH 10/18] arm64: ilp32: introduce binfmt_ilp32.c Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-12-05 15:38 ` Catalin Marinas
2016-12-05 15:38 ` Catalin Marinas
2016-12-21 18:56 ` Yury Norov
2016-12-21 18:56 ` Yury Norov
2017-01-06 14:48 ` Catalin Marinas
2017-01-06 14:48 ` Catalin Marinas
2016-10-21 20:33 ` [PATCH 11/18] arm64: ilp32: share aarch32 syscall handlers Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-12-05 17:12 ` Catalin Marinas
2016-12-06 7:32 ` Yury Norov
2016-12-06 7:32 ` Yury Norov
2016-10-21 20:33 ` [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 13/18] arm64: signal: share lp64 signal routines to ilp32 Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 14/18] arm64: signal32: move ilp32 and aarch32 common code to separated file Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-12-05 16:18 ` Catalin Marinas
2016-12-05 16:18 ` Catalin Marinas
2016-12-06 9:36 ` Yury Norov
2016-12-06 9:36 ` Yury Norov
2016-10-21 20:33 ` [PATCH 15/18] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 16/18] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-12-05 16:34 ` Catalin Marinas
2016-12-06 6:25 ` Yury Norov
2016-12-06 6:30 ` Yury Norov
2016-12-06 6:30 ` Yury Norov
2016-12-07 16:59 ` Catalin Marinas
2016-12-07 16:59 ` Catalin Marinas
2016-12-07 20:40 ` Arnd Bergmann
2016-12-07 20:40 ` Arnd Bergmann
2016-12-08 13:12 ` Catalin Marinas
2017-01-05 20:40 ` Yury Norov
2017-01-05 20:40 ` Yury Norov
2017-01-06 14:36 ` Catalin Marinas
2017-01-06 14:36 ` Catalin Marinas
2016-10-21 20:33 ` [PATCH 17/18] arm64:ilp32: add vdso-ilp32 and use for signal return Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-21 20:33 ` [PATCH 18/18] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2016-10-21 20:33 ` Yury Norov
2016-10-28 12:46 ` ILP32 for ARM64 - testing with lmbench Yury Norov
2016-11-17 3:28 ` Zhangjian (Bamvor)
2016-11-17 3:28 ` Zhangjian (Bamvor)
2016-11-17 5:02 ` Maxim Kuvyrkov
2016-11-17 5:02 ` Maxim Kuvyrkov
2016-11-17 7:48 ` Zhangjian (Bamvor)
2016-11-17 7:48 ` Zhangjian (Bamvor)
2016-12-05 10:16 ` Zhangjian (Bamvor)
2016-12-05 10:16 ` Zhangjian (Bamvor)
2016-12-05 14:13 ` Catalin Marinas
2016-12-05 14:13 ` Catalin Marinas
2016-12-11 12:08 ` Yury Norov
2016-12-11 12:08 ` Yury Norov
2016-11-07 8:23 ` ILP32 for ARM64: testing with glibc testsuite Yury Norov
2016-11-07 8:23 ` Yury Norov
2016-11-09 9:56 ` Yury Norov
2016-11-09 9:56 ` Yury Norov
2016-11-16 11:22 ` Maxim Kuvyrkov
2016-11-16 11:22 ` Maxim Kuvyrkov
2016-11-17 15:50 ` Catalin Marinas
2016-11-17 15:50 ` Catalin Marinas
2016-11-17 21:45 ` Steve Ellcey
2016-11-17 21:45 ` Steve Ellcey
2016-12-05 9:58 ` Zhangjian (Bamvor)
2016-12-05 9:58 ` Zhangjian (Bamvor)
2016-12-05 10:07 ` Andreas Schwab
2016-12-05 10:07 ` Andreas Schwab
2016-12-05 10:24 ` Zhangjian (Bamvor)
2016-12-05 10:24 ` Zhangjian (Bamvor)
2016-12-06 5:29 ` Yury Norov
2016-12-06 5:29 ` Yury Norov
2016-12-05 19:33 ` Steve Ellcey
2016-12-05 19:33 ` Steve Ellcey
2016-12-06 8:31 ` Andreas Schwab
2016-12-06 8:31 ` Andreas Schwab
2016-11-30 5:02 ` [RFC3 nowrap: PATCH v7 00/18] ILP32 for ARM64 Yury Norov
2016-11-30 5:02 ` Yury Norov
2016-11-30 6:52 ` Adam Borowski
2016-11-30 6:52 ` Adam Borowski
-- strict thread matches above, loose matches on Subject: below --
2016-08-17 11:46 [RFC2 " Yury Norov
2016-08-17 11:46 ` [PATCH 08/18] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2016-08-17 11:46 ` 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=1477081997-4770-9-git-send-email-ynorov@caviumnetworks.com \
--to=ynorov@caviumnetworks.com \
--cc=Andrew.Pinski@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=cmetcalf@ezchip.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=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 \
--cc=zhouchengming1@huawei.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).