From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754934AbbKQVTi (ORCPT ); Tue, 17 Nov 2015 16:19:38 -0500 Received: from mail-bn1on0091.outbound.protection.outlook.com ([157.56.110.91]:41952 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754833AbbKQVTf (ORCPT ); Tue, 17 Nov 2015 16:19:35 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , CC: , , , , , , , , , , , , , , Yury Norov Subject: [PATCH v6 07/19] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Date: Wed, 18 Nov 2015 00:16:47 +0300 Message-ID: <1447795019-30176-8-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447795019-30176-1-git-send-email-ynorov@caviumnetworks.com> References: <1447795019-30176-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.120] X-ClientProxiedBy: DB5PR04CA0006.eurprd04.prod.outlook.com (25.164.34.144) To BLUPR07MB609.namprd07.prod.outlook.com (10.141.207.12) X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB609;2:DINQkMPM2hUUnsOShLAN5HQxYb3Qp0U7E54Mt2YMA01xKkDMmzkE9I+98bYXLr8xfarriwP3uL6XoTpEzCoxaSlXp/vQt0DDEJjb/5bTyN5ibYp8oM92NQdmAhwmR/l2sylFPkY0/HOypl9L/CmlBYzo0odxRxkCls1ZC7TBJuA=;3:Sd1QXZ1Oya+CedGJSV+rpoIBO7iC83bP1XCmRA7qN6ijhn9dkBpofzVOEdaaIC9uXXGjQKcfhWpWpeMURvT49tBE0XKzKDTvJLUlleIhqU8H0jAid97BPHHx7liRh88N92m8Hs/UOj9I+b6sBBUuFw==;25:E68TAWUFWuqHjci9PtW6lYCtOt32o+FIVkijzjrMTMbrUhauoxDUMTuqgNp0ju8+TIKYL4fJ3vaTecJzG7nvEk6Fh9Je49l7KNvg8QMCPzUwDl94pxtUu7OovegWgKUpiDiXupEHY1l85Rxa4ARh+AD8KnSynQ8bHbmPM1V0nbUx3PQA9VKkcWbPhCpmV5agGNmw/2Rds2I5uo+SFq+dzFeXhEPIeqXLEZ5fx5Nd+Sxk0Ckk3gYjXlk5C+ruGq3H X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR07MB609; X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB609;20:1Ck8c3VJCV5OaszpsOl2WAbTmZNj8EN4YK1/jo64wkWFG/3+DkIv1siiv8KF4tza+4rRNflkVYZakOIckWbnxsAGuU8v/vlcAX9LmibZpgdi7LeK+o0SIZGzaWrI6K5D6FhrLdDjjnP905axezCjCDdkqy9wERYhT70CsZEtVoJlFi6bgMDIKYNb79vK1zlVSMdTYYoMWYE5Tu3GrVJUFhxye/nUx4nSDhbQ42wDJU844TAid07/zne7LA+RVb1B5mpRui2qv3YXyBMsw4yi9ayHI7XoRgpnXbFsUQ7WyQMZdRFX0qJgU7fCbDLF6v/TFdRXC54fKVpWN9/s6ZKRtAmVOI8KRBf9igDkOvF6tmpsVNwB2qRJr2+jCCQhtXvVhFiyNm8tqi01yDLzwLM9FbWxnuHYMnuuIE5LFVTf3wnDawBGW4gU2PFjknwLBDMjYnI/NxOwoGvBntFcH2rIr06cMksKFdZ3f4rOKfJxs6TeFDLDW3cqVADo8xglxNWrqnBW2NAqyNOnd/OQ9hm50ZxTzGCrTrOOiKcO3HWL2NDe3xdqwy9KEO6b9UWcnWjhz3PGSS8fwuhueRVjm3OwxGBXt1ODAOWFhFM4jMgpoGo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(10201501046);SRVR:BLUPR07MB609;BCL:0;PCL:0;RULEID:;SRVR:BLUPR07MB609; X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB609;4:emVxXsxcHE1vE0zNeFrLooCAen9/wubU6IZF3A6JYqcs+FxOZPLrs6sg03nhPTt/fZf0evL/1fCCmUtEBv0juj3X/sS6/ey1+5JP0EqTlilII0wvG5ejIFZUplZIAPXjJdh1v6cV0kEaH1u0830Ys2WowsLD7/iuYkOGskwm8tL2YTo/RYGx7vt+VKLGq67B2ehLMCYvq5PwKAiL/pNEXBq9tU/ibbydnEwHFe4ZSOxDxVZIciACgOxKVJhPXH3cHrNHmQg6T49I+6TA0rbVKGaIKCXbNCUfYrc59yCU6uoTGq9nzwF0aVvLcAb61zvkQY9umlvM8myYG4fBzt3EmRGtZtvV0I7PHe1dDbyHLHthQSUKar3BpmMnvgTZCatA X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(189002)(199003)(47776003)(50466002)(50226001)(42186005)(76506005)(92566002)(5004730100002)(107886002)(5001770100001)(586003)(5001960100002)(105586002)(101416001)(81156007)(36756003)(5008740100001)(5003940100001)(97736004)(189998001)(4001430100002)(5007970100001)(40100003)(77096005)(66066001)(19580395003)(2950100001)(2201001)(122386002)(19580405001)(48376002)(106356001)(87976001)(229853001)(33646002)(50986999)(76176999)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR07MB609;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR07MB609;23:R+TCizq3cyjCk8eNdd8RhVjFX16sQGpVYcHGqLl4ib?= =?us-ascii?Q?KCVciaRXA6Z8QuFTW5Av0I7inJkHkuKxCf5ZsZUbSOl8/mJIutL8T86I+vZZ?= =?us-ascii?Q?Cmb2C8a5O76Gzcsr24EukV3JcWv3wrNZEL5wSyqGasAFG4aUlaVDDhSwBWpa?= =?us-ascii?Q?WM3+qNBVb3Ru05dS0YqUK+9uI1Kc5uRhy93OpYBLAu8MYlJ8mJbjOQNrxD2L?= =?us-ascii?Q?HmQVkuoc8NREbAgJ5OY2eQ7nKJ0nevH6BmtmNNftQ80OHXNjIkrPHn4n2HZX?= =?us-ascii?Q?glY1iRC0rlnH0qzn9RcDFtSFC1kIKteIkxGZN4OhUxeagPbk5Js6O02sLHHI?= =?us-ascii?Q?x3XQcGw/DYIe11jbMvOOv4aJrs1pC6gwudWzXDxoJtcix+m6+y5s6G0WyRJM?= =?us-ascii?Q?E6dW6js6HKcgnWFCcnJBSVI7WFVQYxcjNZqNnJ+1yVmNpD3p64e09IDcvCXq?= =?us-ascii?Q?HsWb8UI3NzoBr+em5NPSsGc7zBnF/Q+JkMG25s7fh1WaV7W1lOs9tr5VnFB7?= =?us-ascii?Q?+MoXqwX4JdxkGrVDXbreuUX0Gv2gmxakdDDhS8yXVDfCDkWdw1PuBUTbWoGN?= =?us-ascii?Q?17m0P+BjbahryxqCCto6ti/rnfSZThYpm/ev1KsIbhRStYh9IhRf1Cf4DLTP?= =?us-ascii?Q?x+fCrqQvYIbqJ6+pdWaS4P+FVO8nGqgMg0rl/hVN0VFDQ7F7X1FBhyMiQTfF?= =?us-ascii?Q?6XnDsfOIWf7yBMVd42DRvxi2RP6nwZhHo8aJtnrpeIsU5uLTI53ewj+RWF7V?= =?us-ascii?Q?WWSuJdatTgqjPlHdu6egjcIbblT3H4qG5YA0HyGB88Iom4X0aXQMLRyK8tEn?= =?us-ascii?Q?MNMH+cdLs2G3j2xm2hnwrQdEmJhAkPDmINdJm39bwVaMsmOo8jCDtRsWaCjf?= =?us-ascii?Q?4U+Prq6MglBKgKJVWMny4IecMYs4jLxklX3Qyjci0NkxDTSPS1uKgbv0HxDh?= =?us-ascii?Q?cUY1UcadyDxfuRGQeaxvrgGM12+hacmi+0v11tSDNgp1hYJmI6Z00Gr8lJlY?= =?us-ascii?Q?r4Ett//89zswARNjoCBPGOfnV9mLtBukXpEFlpUcnEVMdpAPTQztsPgt5Hxc?= =?us-ascii?Q?8lxy2vWw0sl/CEFFechvKZL9ydisZm5xIDgT1lgA1MN70d/SYZlMDB+2eslK?= =?us-ascii?Q?94KSHxn5s=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB609;5:0ePBroJKDFJexNFIHV3n5aiR0Sh5p5Vy5h4zk6iz9VstF1Rz7+ufMXYZwtgakj/jletZ+THC8vYcj1RNam/ftsAQaRD9SSi/X+5WYPcunDfLkZWrLD0FmTOV9JucxkDN9OpFH4xTxLcoExjPUkSHLQ==;24:FU1iMy7F+NO3GNOBBFClRk9fzEe9cbTWslYNon4ZoeDfEFTzFlyV38Kid/qXMXvuUr7fwcmOdiKRvKag1cS3k2OKtluIDLG+n+6KadhsgDc=;20:y1n/KTDXgTtqyQ88WbXOxSlymoXlNT04hvVx4Bos0PNv35xhEnADJA/py19DQmR6iKcJqKmkMBxmqDx7RjPH9A== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2015 21:19:32.2784 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR07MB609 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski This patch introduces is_a32_compat_task and is_a32_thread so it is easier to say this is a a32 specific thread or a generic compat thread/task. Reviewed-by: David Daney Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Signed-off-by: Andrew Pinski --- arch/arm64/include/asm/compat.h | 31 ++++++++++++++++++++++++++++--- arch/arm64/include/asm/elf.h | 2 +- arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/processor.h | 4 ++-- arch/arm64/include/asm/thread_info.h | 2 +- arch/arm64/kernel/hw_breakpoint.c | 7 ++++--- arch/arm64/kernel/perf_regs.c | 2 +- arch/arm64/kernel/process.c | 4 ++-- arch/arm64/kernel/ptrace.c | 10 +++++----- arch/arm64/kernel/signal.c | 5 +++-- arch/arm64/kernel/traps.c | 2 +- 11 files changed, 49 insertions(+), 22 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 7fbed69..9700e5e 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -299,19 +299,44 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; -static inline int is_compat_task(void) +#ifdef CONFIG_AARCH32_EL0 + +static inline int is_a32_compat_task(void) { return test_thread_flag(TIF_32BIT); } -static inline int is_compat_thread(struct thread_info *thread) +static inline int is_a32_compat_thread(struct thread_info *thread) { return test_ti_thread_flag(thread, TIF_32BIT); } +#else + +static inline int is_a32_compat_task(void) +{ + return 0; +} + +static inline int is_a32_compat_thread(struct thread_info *thread) +{ + return 0; +} +#endif + +static inline int is_compat_task(void) +{ + return is_a32_compat_task(); +} + #else /* !CONFIG_COMPAT */ -static inline int is_compat_thread(struct thread_info *thread) +static inline int is_a32_compat_thread(struct thread_info *thread) +{ + return 0; +} + +static inline int is_a32_compat_task(void) { return 0; } diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 663f25d..01e032c 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -149,7 +149,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, /* 1GB of VA */ #ifdef CONFIG_COMPAT -#define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ +#define STACK_RND_MASK (is_compat_task() ? \ 0x7ff >> (PAGE_SHIFT - 12) : \ 0x3ffff >> (PAGE_SHIFT - 12)) #else diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 6b4c3ad..337f8e1 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -58,7 +58,7 @@ #ifdef CONFIG_COMPAT #define TASK_SIZE_32 UL(0x100000000) -#define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ +#define TASK_SIZE (is_compat_task() ? \ TASK_SIZE_32 : TASK_SIZE_64) #define TASK_SIZE_OF(tsk) (test_tsk_thread_flag(tsk, TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index ff4abec..a415dd0 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -39,7 +39,7 @@ #define STACK_TOP_MAX TASK_SIZE_64 #ifdef CONFIG_COMPAT #define AARCH32_VECTORS_BASE 0xffff0000 -#define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ +#define STACK_TOP (is_compat_task() ? \ AARCH32_VECTORS_BASE : STACK_TOP_MAX) #else #define STACK_TOP STACK_TOP_MAX @@ -92,7 +92,7 @@ struct thread_struct { #define task_user_tls(t) \ ({ \ unsigned long *__tls; \ - if (is_compat_thread(task_thread_info(t))) \ + if (is_a32_compat_thread(task_thread_info(t))) \ __tls = &(t)->thread.tp2_value; \ else \ __tls = &(t)->thread.tp_value; \ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index dcd06d1..7d03565 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -110,7 +110,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_FREEZE 19 #define TIF_RESTORE_SIGMASK 20 #define TIF_SINGLESTEP 21 -#define TIF_32BIT 22 /* 32bit process */ +#define TIF_32BIT 22 /* AARCH32 process */ #define TIF_SWITCH_MM 23 /* deferred switch_mm */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index bba85c8..854fc82 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -420,7 +421,7 @@ static int arch_build_bp_info(struct perf_event *bp) * Watchpoints can be of length 1, 2, 4 or 8 bytes. */ if (info->ctrl.type == ARM_BREAKPOINT_EXECUTE) { - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len != ARM_BREAKPOINT_LEN_2 && info->ctrl.len != ARM_BREAKPOINT_LEN_4) return -EINVAL; @@ -477,7 +478,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * AArch32 tasks expect some simple alignment fixups, so emulate * that here. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else @@ -664,7 +665,7 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr, info = counter_arch_bp(wp); /* AArch32 watchpoints are either 4 or 8 bytes aligned. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c index 3f62b35..a79058f 100644 --- a/arch/arm64/kernel/perf_regs.c +++ b/arch/arm64/kernel/perf_regs.c @@ -45,7 +45,7 @@ int perf_reg_validate(u64 mask) u64 perf_reg_abi(struct task_struct *task) { - if (is_compat_thread(task_thread_info(task))) + if (is_a32_compat_thread(task_thread_info(task))) return PERF_SAMPLE_REGS_ABI_32; else return PERF_SAMPLE_REGS_ABI_64; diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 223b093..a6b0251 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -259,7 +259,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, asm("mrs %0, tpidr_el0" : "=r" (*task_user_tls(p))); if (stack_start) { - if (is_compat_thread(task_thread_info(p))) + if (is_a32_compat_thread(task_thread_info(p))) childregs->compat_sp = stack_start; /* 16-byte aligned stack mandatory on AArch64 */ else if (stack_start & 15) @@ -296,7 +296,7 @@ static void tls_thread_switch(struct task_struct *next) *task_user_tls(current) = tpidr; tpidr = *task_user_tls(next); - tpidrro = is_compat_thread(task_thread_info(next)) ? + tpidrro = is_a32_compat_thread(task_thread_info(next)) ? next->thread.tp_value : 0; asm( diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 2a39b5d..d2e428c 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -79,7 +79,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, #ifdef CONFIG_AARCH32_EL0 int i; - if (!is_compat_task()) + if (!is_a32_compat_task()) goto send_sig; for (i = 0; i < ARM_MAX_BRP; ++i) { @@ -1194,7 +1194,7 @@ long compat_a32_arch_ptrace(struct task_struct *child, compat_long_t request, long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { - if (is_compat_task()) + if (is_a32_compat_task()) return compat_a32_arch_ptrace(child, request, caddr, cdata); return compat_ptrace_request(child, request, caddr, cdata); } @@ -1210,9 +1210,9 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) * 32-bit children use an extended user_aarch32_ptrace_view to allow * access to the TLS register. */ - if (is_compat_task()) + if (is_a32_compat_task()) return &user_aarch32_view; - else if (is_compat_thread(task_thread_info(task))) + else if (is_a32_compat_thread(task_thread_info(task))) return &user_aarch32_ptrace_view; #endif return &user_aarch64_view; @@ -1239,7 +1239,7 @@ static void tracehook_report_syscall(struct pt_regs *regs, * A scratch register (ip(r12) on AArch32, x7 on AArch64) is * used to denote syscall entry/exit: */ - regno = (is_compat_task() ? 12 : 7); + regno = (is_a32_compat_task() ? 12 : 7); saved_reg = regs->regs[regno]; regs->regs[regno] = dir; diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 1e3593c..f12f8a0 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -276,7 +277,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, static void setup_restart_syscall(struct pt_regs *regs) { - if (is_compat_task()) + if (is_a32_compat_task()) compat_setup_restart_syscall(regs); else regs->regs[8] = __NR_restart_syscall; @@ -295,7 +296,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) /* * Set up the stack frame */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (ksig->ka.sa.sa_flags & SA_SIGINFO) ret = compat_setup_rt_frame(usig, ksig, oldset, regs); else diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 9ce9894..bc973d0 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -365,7 +365,7 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) { #ifdef CONFIG_AARCH32_EL0 long ret; - if (is_compat_task()) { + if (is_a32_compat_task()) { ret = compat_arm_syscall(regs); if (ret != -ENOSYS) return ret; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: ynorov@caviumnetworks.com (Yury Norov) Date: Wed, 18 Nov 2015 00:16:47 +0300 Subject: [PATCH v6 07/19] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) In-Reply-To: <1447795019-30176-1-git-send-email-ynorov@caviumnetworks.com> References: <1447795019-30176-1-git-send-email-ynorov@caviumnetworks.com> Message-ID: <1447795019-30176-8-git-send-email-ynorov@caviumnetworks.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Andrew Pinski This patch introduces is_a32_compat_task and is_a32_thread so it is easier to say this is a a32 specific thread or a generic compat thread/task. Reviewed-by: David Daney Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Signed-off-by: Andrew Pinski --- arch/arm64/include/asm/compat.h | 31 ++++++++++++++++++++++++++++--- arch/arm64/include/asm/elf.h | 2 +- arch/arm64/include/asm/memory.h | 2 +- arch/arm64/include/asm/processor.h | 4 ++-- arch/arm64/include/asm/thread_info.h | 2 +- arch/arm64/kernel/hw_breakpoint.c | 7 ++++--- arch/arm64/kernel/perf_regs.c | 2 +- arch/arm64/kernel/process.c | 4 ++-- arch/arm64/kernel/ptrace.c | 10 +++++----- arch/arm64/kernel/signal.c | 5 +++-- arch/arm64/kernel/traps.c | 2 +- 11 files changed, 49 insertions(+), 22 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 7fbed69..9700e5e 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -299,19 +299,44 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; -static inline int is_compat_task(void) +#ifdef CONFIG_AARCH32_EL0 + +static inline int is_a32_compat_task(void) { return test_thread_flag(TIF_32BIT); } -static inline int is_compat_thread(struct thread_info *thread) +static inline int is_a32_compat_thread(struct thread_info *thread) { return test_ti_thread_flag(thread, TIF_32BIT); } +#else + +static inline int is_a32_compat_task(void) +{ + return 0; +} + +static inline int is_a32_compat_thread(struct thread_info *thread) +{ + return 0; +} +#endif + +static inline int is_compat_task(void) +{ + return is_a32_compat_task(); +} + #else /* !CONFIG_COMPAT */ -static inline int is_compat_thread(struct thread_info *thread) +static inline int is_a32_compat_thread(struct thread_info *thread) +{ + return 0; +} + +static inline int is_a32_compat_task(void) { return 0; } diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 663f25d..01e032c 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -149,7 +149,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, /* 1GB of VA */ #ifdef CONFIG_COMPAT -#define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ +#define STACK_RND_MASK (is_compat_task() ? \ 0x7ff >> (PAGE_SHIFT - 12) : \ 0x3ffff >> (PAGE_SHIFT - 12)) #else diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 6b4c3ad..337f8e1 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -58,7 +58,7 @@ #ifdef CONFIG_COMPAT #define TASK_SIZE_32 UL(0x100000000) -#define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ +#define TASK_SIZE (is_compat_task() ? \ TASK_SIZE_32 : TASK_SIZE_64) #define TASK_SIZE_OF(tsk) (test_tsk_thread_flag(tsk, TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index ff4abec..a415dd0 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -39,7 +39,7 @@ #define STACK_TOP_MAX TASK_SIZE_64 #ifdef CONFIG_COMPAT #define AARCH32_VECTORS_BASE 0xffff0000 -#define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ +#define STACK_TOP (is_compat_task() ? \ AARCH32_VECTORS_BASE : STACK_TOP_MAX) #else #define STACK_TOP STACK_TOP_MAX @@ -92,7 +92,7 @@ struct thread_struct { #define task_user_tls(t) \ ({ \ unsigned long *__tls; \ - if (is_compat_thread(task_thread_info(t))) \ + if (is_a32_compat_thread(task_thread_info(t))) \ __tls = &(t)->thread.tp2_value; \ else \ __tls = &(t)->thread.tp_value; \ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index dcd06d1..7d03565 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -110,7 +110,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_FREEZE 19 #define TIF_RESTORE_SIGMASK 20 #define TIF_SINGLESTEP 21 -#define TIF_32BIT 22 /* 32bit process */ +#define TIF_32BIT 22 /* AARCH32 process */ #define TIF_SWITCH_MM 23 /* deferred switch_mm */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index bba85c8..854fc82 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -420,7 +421,7 @@ static int arch_build_bp_info(struct perf_event *bp) * Watchpoints can be of length 1, 2, 4 or 8 bytes. */ if (info->ctrl.type == ARM_BREAKPOINT_EXECUTE) { - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len != ARM_BREAKPOINT_LEN_2 && info->ctrl.len != ARM_BREAKPOINT_LEN_4) return -EINVAL; @@ -477,7 +478,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * AArch32 tasks expect some simple alignment fixups, so emulate * that here. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else @@ -664,7 +665,7 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr, info = counter_arch_bp(wp); /* AArch32 watchpoints are either 4 or 8 bytes aligned. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c index 3f62b35..a79058f 100644 --- a/arch/arm64/kernel/perf_regs.c +++ b/arch/arm64/kernel/perf_regs.c @@ -45,7 +45,7 @@ int perf_reg_validate(u64 mask) u64 perf_reg_abi(struct task_struct *task) { - if (is_compat_thread(task_thread_info(task))) + if (is_a32_compat_thread(task_thread_info(task))) return PERF_SAMPLE_REGS_ABI_32; else return PERF_SAMPLE_REGS_ABI_64; diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 223b093..a6b0251 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -259,7 +259,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, asm("mrs %0, tpidr_el0" : "=r" (*task_user_tls(p))); if (stack_start) { - if (is_compat_thread(task_thread_info(p))) + if (is_a32_compat_thread(task_thread_info(p))) childregs->compat_sp = stack_start; /* 16-byte aligned stack mandatory on AArch64 */ else if (stack_start & 15) @@ -296,7 +296,7 @@ static void tls_thread_switch(struct task_struct *next) *task_user_tls(current) = tpidr; tpidr = *task_user_tls(next); - tpidrro = is_compat_thread(task_thread_info(next)) ? + tpidrro = is_a32_compat_thread(task_thread_info(next)) ? next->thread.tp_value : 0; asm( diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 2a39b5d..d2e428c 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -79,7 +79,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, #ifdef CONFIG_AARCH32_EL0 int i; - if (!is_compat_task()) + if (!is_a32_compat_task()) goto send_sig; for (i = 0; i < ARM_MAX_BRP; ++i) { @@ -1194,7 +1194,7 @@ long compat_a32_arch_ptrace(struct task_struct *child, compat_long_t request, long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { - if (is_compat_task()) + if (is_a32_compat_task()) return compat_a32_arch_ptrace(child, request, caddr, cdata); return compat_ptrace_request(child, request, caddr, cdata); } @@ -1210,9 +1210,9 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) * 32-bit children use an extended user_aarch32_ptrace_view to allow * access to the TLS register. */ - if (is_compat_task()) + if (is_a32_compat_task()) return &user_aarch32_view; - else if (is_compat_thread(task_thread_info(task))) + else if (is_a32_compat_thread(task_thread_info(task))) return &user_aarch32_ptrace_view; #endif return &user_aarch64_view; @@ -1239,7 +1239,7 @@ static void tracehook_report_syscall(struct pt_regs *regs, * A scratch register (ip(r12) on AArch32, x7 on AArch64) is * used to denote syscall entry/exit: */ - regno = (is_compat_task() ? 12 : 7); + regno = (is_a32_compat_task() ? 12 : 7); saved_reg = regs->regs[regno]; regs->regs[regno] = dir; diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 1e3593c..f12f8a0 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -276,7 +277,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, static void setup_restart_syscall(struct pt_regs *regs) { - if (is_compat_task()) + if (is_a32_compat_task()) compat_setup_restart_syscall(regs); else regs->regs[8] = __NR_restart_syscall; @@ -295,7 +296,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) /* * Set up the stack frame */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (ksig->ka.sa.sa_flags & SA_SIGINFO) ret = compat_setup_rt_frame(usig, ksig, oldset, regs); else diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 9ce9894..bc973d0 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -365,7 +365,7 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) { #ifdef CONFIG_AARCH32_EL0 long ret; - if (is_compat_task()) { + if (is_a32_compat_task()) { ret = compat_arm_syscall(regs); if (ret != -ENOSYS) return ret; -- 2.1.4