From patchwork Mon Nov 2 23:30:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 7538811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E301BEEA4 for ; Mon, 2 Nov 2015 23:35:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 352D2203A1 for ; Mon, 2 Nov 2015 23:35:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DAF982061A for ; Mon, 2 Nov 2015 23:35:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtObW-00062T-0d; Mon, 02 Nov 2015 23:33:34 +0000 Received: from mail-by2on0061.outbound.protection.outlook.com ([207.46.100.61] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtOas-0005JN-GV for linux-arm-kernel@lists.infradead.org; Mon, 02 Nov 2015 23:33:16 +0000 Received: from CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) by CO2PR07MB649.namprd07.prod.outlook.com (10.141.227.140) with Microsoft SMTP Server (TLS) id 15.1.312.18; Mon, 2 Nov 2015 23:32:33 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; Received: from localhost (109.252.143.100) by CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) with Microsoft SMTP Server (TLS) id 15.1.312.18; Mon, 2 Nov 2015 23:32:30 +0000 From: Yury Norov To: , , , Subject: [PATCH v6 06/17] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Date: Tue, 3 Nov 2015 02:30:35 +0300 Message-ID: <1446507046-24604-7-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com> References: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [109.252.143.100] X-ClientProxiedBy: VI1PR05CA0016.eurprd05.prod.outlook.com (25.162.33.154) To CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 2:w0SNM01WiR4KY3mQ8ZrAzmFPZDeiuVqlLpOj/nPq3vycflMzGHnOchTn/K8K2j52ALaNDZbKR4ZTAwL1QJYX3ZzKqi6KWS+3noJAd0CWFwFe0rBRCKYTCnnNmmbDUFOtmuAuy+MSUuzfSQvFV31jBwJdcJRlGUdbytIwblhJ8+4=; 3:L+LOP8Zpt/EJqpMnHg4ZVlyRj7IXsXoGZG4zI7wxDBKtjCa2XDx7GVtxMrkeTrK40lsclzpzDeRqytWikH341G8/G78e+2D0QlZ2kLSo78s9imXwwL6rx09JU/yGgNuQJUfPkaHfQtDMYG//fSKsrw==; 25:R9+T1rPHTozTVwZuswiW9dDSICjJh0mw1g6QUUQvuW5XYOCUDdVc+zwYcUgXOynnwmH/gsRqMOKKJ/Bwpr7qnvfRCtEudRCNcragJBHauSIbvWX2YPtzMXIerBvUcHDJ9S7KeMN86PdelTIshnLzhrw2iZuw/xdEQ+ona9HXHn+4G5JxR2mXT1p85HHjkf61dsdcK3O0nX90HVWLpwM7ENcugl95hNQkl+gp01ru6maksFRXTYFx+AQ3ZG0IY1t5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 20:d+Kd8NiB4ym9hZjtgiBww05lhqKY9kKuiUjBB3PF7UWx7BY3E6sLce0JNu6bNmrjLvfmB6Un1yB9xlrgOstYE9Vmu8/zm7XZOOVeRpMN/n2JJ/lU4YDyS+dSIjUh3HHko59ls2eT/Q4Nvnbzn9VGFANZEMbqvIv2NyR+vf03qVMBf/04K16LkDluwh0kWx4ppZ24h5BD/7W8IezmoUOk6WdSxgWENbpxY44De8pVZbCz2Cru+g6G3iVYZMk7q0F/+bWwj/Ol8LzQ+sO+dhW2CUNfZiQgk4oviqdtTyF87YABC7BV7p9jScw1a3W5GiZzsTqCYQQ9x2ViFGpL3VRnJ7/vqmJAJlqpA6LYPS5vnmt/RsZql0svMdl9T7BJGA4VlxUyB8jmOtkq5xJ5MYot/rktnXx31U+AiUkgaO38sA8G2WyQMshN91+QgmDWPefhQ/bMLPdKhpzFfp2++Tc3K4OWFZ/sVXDHuZX0mLrjTSdtnLGU2G2Onsu7scM5nPilQEz2FAikR159uuYcRGjX8DlBoJ+XbnjWKsKU8touzHgGzeHK6qVIRCxDtCG30HsDORGbfghDJVAaelchc91k31ybhAXTtKLOuI3IcDBYWTo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(10201501046); SRVR:CO2PR07MB619; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 4:plh2fYW1e29p1HA6iuA1lkWUMU9TrJubQQ7JXTo2V5MEOXB4k9rb4jBmaQG813ojo9hG0cnBXhA1uM4umL3G+6HdrUzyVoNVNvKsCKECOuqBSb2tQpFQzgrKvMrGoi+JI0k6uzLIsVrBIcU/BEnRV+wsFlnFtDOj8fAvsA85GKjQgaGN1bg11UnV1SKSBTq4WiUlAHik1d0d/jb1YtmyTq6huzDPiya3MP2/Hc0I6A72ifyeUpiqhP3o9/U6amXmRLgLZWbea2/RETV6uV7H2zBCsLTX88SthFcp/ajp357XPd+gp3HB5MSjvwqaEn6X7yLAUnLjYKkRE3k0gJA+Hvea5ArLEoZpytVsD7Hujb/pjPUqd4iYi07+Kw5xyoqS X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(199003)(189002)(77096005)(5008740100001)(4001430100002)(229853001)(105586002)(5003940100001)(106356001)(2201001)(36756003)(50986999)(92566002)(2950100001)(19580395003)(101416001)(87976001)(76176999)(81156007)(40100003)(19580405001)(76506005)(5001770100001)(189998001)(97736004)(50466002)(5004730100002)(5007970100001)(122386002)(50226001)(66066001)(42186005)(5001960100002)(48376002)(33646002)(47776003)(107886002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR07MB619; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR07MB619; 23:fEzLvtDnWdF582PkO/v6F6nj5GeU860F60n0B788F6?= =?us-ascii?Q?7uXsg6kfEKSjuwmEcB70Gsd/VoRfghh46k68K9I5l2FkKXk+PqsU9VkgFA2s?= =?us-ascii?Q?FJ3AppatKQMiZ6jCaN1xGRQUoZYQQVz0hkDfXkbMfnwIq7x8SRXSFVDDeB/o?= =?us-ascii?Q?gG0+nA/JrSKU1zJFWvwz094ZwUmOHrCkhLHzNvXSl0ILuya9x1JyiKajnr+r?= =?us-ascii?Q?DYlQK0ee7Jv+dmTnwHq9FCEbBdJYcfY8/7CtG9WDi9JM9tie/0aN98j/Vob/?= =?us-ascii?Q?crv6abfwat2hxQeGH38Y7jw6p/Fu7zcC1wr+v+aWSwQ8Jyu49TrK+UpbAvyJ?= =?us-ascii?Q?jfntK/e5gS1osTub7doxZ9dv9PNdEGU8eGaVFD1BTydtAkLH2tPAjxWbcMv4?= =?us-ascii?Q?nOY1REGTN1e84ce5ZSbT1slXOSFKYrQTkOgWSZ99MiYmZaByVVKyGU8Ol/14?= =?us-ascii?Q?tfRVVchzvFgwPIT/nWi2+l1lGjHP290FhNoVuF36Cc1EG8b0V8pk9OSVrD/a?= =?us-ascii?Q?4++EFmo0+Q1HQnTMaJ+5RO2jA63yCYVGS7HwudQM9vLtDpBdgR8qsoc1pgvN?= =?us-ascii?Q?1oYQHKJ3veFstpuGcmskkbeDUtD5zHsj3ErKBHPOi1OsXV619v+zDI6GbqhL?= =?us-ascii?Q?EGbVM2cLHXxin4DDhnd319Tq+/K+96md+IH459IiKsQYL9NJGViO6jkex4Dz?= =?us-ascii?Q?LqOlKimxCNDLcoGjrp4f6PdfQ+StyovD68lcSY3r38HCqUZvrfxEltFsS7QF?= =?us-ascii?Q?v9QpuLmIFttmD4ZaW2eafNOLtnTsZXHS0BIWCwGm1Tx3Drxe657h7+egBa30?= =?us-ascii?Q?y7wf6e98EcpEGZxDt1oDmstWoJRp1fadzVcq3YXxahwgLlKBsT5ulJ7j/hlK?= =?us-ascii?Q?9bRP+cbAClnSZIhvEOyaamrjGEEeT0uOfmzK7tSEd30iVcRnYZqZ6zp4gnQa?= =?us-ascii?Q?xGA7u5SHihNTq0tzlG2ZhtZ3B8NrHuJZ1lKgsd8fDUdirvabwFIULus9obpm?= =?us-ascii?Q?HwkZDOLTMdMZM5KtTpyqGUhebfseUChTWYKJOnyvPh3yhHHUH3il/gu38cA1?= =?us-ascii?Q?/JJYlljyK5cJGWOgy1o2SuT17qFh7wMi86AA8r/qHVaY5Hyw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 5:waKNpDt74nyFrQzUoI3FsU/1VUSPq/VBDIOMNQ8N/Z1QczQxGpdPwyoK/LqfhbLAd+J22v2y3h1GZ6uoKfiuPj711+CdRMch/KFLZDTn3FLc9EyUc92uyyojMkinowOe6dWRJyXxFCdmaWFZKxZWrA==; 24:RwkzbOvqhbpPoEaXAi/pOPm/x1SkGqVcVRchjwcijOwOhkqhQT/iIid/Bpn4nhlkDZtPilIOib2o4Xu2w3PdVUnRaXN5be4l3VZ2+7BqvVU=; 20:VNvBTWWrUFpodfbA7TH9QymaN5sBKtzamS9+6Oen9HGxTgLWJ1ILyIZyXdgOoUMhCJNZlIrrOET6inYoCea6Mw== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2015 23:32:30.8569 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB619 X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB649; 2:KRpTgu+8c4LUgO7lR5s43qjaadcx0gDiYHImHX8+uvqneqERkDZ+uz57V37GQDfbOwN4503RLI6LoztHpbgoEAGhe4Pw4c4IIUPBzIEkVvr/ZlR0wOWiTA1iFJ/LlKR89mQezedtjbjwkzrMsh8D8YBOE5S2bvhXMJ2/V2YV19Y=; 23:W78UvjbAkoTJ8ZdM8M0I86Jzjin+CjYpeIfUAr7IcZUdFnHWulVbxO7vvOw3SDRrZvRLkbQjmYkiiG3phpaG0ikkYphsOdfnh9JV4l0OH/syPlIX8dY+aWWS+wZzqb9yR1P2wa5hBmWxXtA9jdAI5s2p3DRRL1zsdanV7LS2+xTL7e5RYgwA7w7QXNBCGBxM X-OriginatorOrg: caviumnetworks.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151102_153255_037446_D1553148 X-CRM114-Status: GOOD ( 15.26 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pinskia@gmail.com, Prasun.Kapoor@caviumnetworks.com, Nathan_Lynch@mentor.com, agraf@suse.de, klimov.linux@gmail.com, Andrew Pinski , broonie@kernel.org, jan.dakinevich@gmail.com, Andrew Pinski , ddaney.cavm@gmail.com, bamvor.zhangjian@huawei.com, Yury Norov , philipp.tomsich@theobroma-systems.com, andrey.konovalov@linaro.org, christoph.muellner@theobroma-systems.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Signed-off-by: Andrew Pinski Reviewed-by: David Daney --- 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;