From patchwork Tue Nov 17 21:16:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 7642241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CB8AC9F2EC for ; Tue, 17 Nov 2015 21:21:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56A5220513 for ; Tue, 17 Nov 2015 21:21:06 +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 DAE3B20445 for ; Tue, 17 Nov 2015 21:21:04 +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 1ZyneO-0006WL-Dn; Tue, 17 Nov 2015 21:18:52 +0000 Received: from mail-bn1on0064.outbound.protection.outlook.com ([157.56.110.64] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyneB-0006E8-Vy for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2015 21:18:45 +0000 Received: from DM2PR07MB623.namprd07.prod.outlook.com (10.141.177.148) by DM2PR07MB974.namprd07.prod.outlook.com (10.141.177.156) with Microsoft SMTP Server (TLS) id 15.1.325.17; Tue, 17 Nov 2015 21:18:18 +0000 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; Received: from localhost (95.143.213.120) by DM2PR07MB623.namprd07.prod.outlook.com (10.141.177.148) with Microsoft SMTP Server (TLS) id 15.1.325.17; Tue, 17 Nov 2015 21:18:15 +0000 From: Yury Norov To: , , , Subject: [PATCH v6 04/19] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Date: Wed, 18 Nov 2015 00:16:44 +0300 Message-ID: <1447795019-30176-5-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 X-Originating-IP: [95.143.213.120] X-ClientProxiedBy: HE1PR03CA0019.eurprd03.prod.outlook.com (25.163.170.157) To DM2PR07MB623.namprd07.prod.outlook.com (10.141.177.148) X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB623; 2:e5qikbuKxJY1ES8kPjM0mWzNFwNhDskUD498hbjMsWcSmCpcqdPGlmyv53xuVDfjb/UNZOBeq6Us40wLY5U1lfkQeIoHo/99fhxnKdXlyFd/z1HnEnKVOMKgevLRXpe8j//BAN3lolpIOtNCgNl5w/joBiWTfb3AfTKut+k0lRk=; 3:F+X8i4NLSpH3ih9IEuvqN3qX73IiXn24nw0E02IUxwxDp6JEwhVYpCuWbDOLKAfv/Efa7cqgQZK0P8V69tpwFqc+AHzPFCj1vK5vydkS5V1pVcTJZc5LElt+hD4WG7ibeKORdmjKYHJoSWxGZb47Xg==; 25:eMgh3Xk7q9x7VciyqTvIPDMKl9EcAVjskFMnOeEDWOAsugAh5owNEuEUc12zHy5afGtdgLAP7YovpMvVFcdipjwOjOesg8RVd39pDgDKyJdWaKltngqvNZ3ePmC2Kh1xoREs9ICjJs106VMjsvgiM7nYDa+CdD39Z1s/bASK2HlqYQpvNX2E1WjhQtMZoGYnds6osHLL5gMKVwqaWp8Q1vbGVLzCUBVG9VuucHLreurAHps8OHlDl1kgc8WvpohJGduf/UY1SEXt+9X1DSBYgQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR07MB623; X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB623; 20:ch1NqtOEPqcRuV0XBB0I7+V/dFcOIGQjPEHQFlGqamIb90qmIpLYM+8OkmI6Pknkg6czdNUEldGOPJYzjAPUQgqjCIgP+UgzB7X4VCg/jIMt591kk6XfLyzM8OrE5uG77NiJ815rIYg1KvLsoYC3cvFUiC6A6V5kvuLXRK0Gko2JVCFc02vOCPn8juSAB1fiT7+mCrouw1dJuSbS/CGsgGnFKXIZHluUdmSJkoou1te+GdnafN0oBpLpp4Of/HYopV8Wd1WMW42GxXCh/iJ/rrLJwLb82HMhggjU0skY7XzNgNMwHBfK8NvPcdndOkKcQiHvYPViwogZo20hTkdtkvJC4NQ9mTE0cdApr4ERCMA3c+jT1iqFZYGlIUBUMjWN6cxvy/pyHhPRVKy9tuDufHeJq4K82n3+6uQZ44m1ihhvf2pKa9E3JU3/dQrQgLQk2864tbf8/Bm917dBua+IoZeBe0PVQYUI29RidH9M/ZJh7VcPJVwOyzqw63vz++Q3mkSxcNofmYnwgUmcjJevdbfUQk691PmEesncKmkaRks8StlVUDZ8Df2HqxRWd/jzNFs3PZ/azygpdBDavEhiVD2yQT3FXba418r3qBDRpUk= 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)(10201501046)(3002001); SRVR:DM2PR07MB623; BCL:0; PCL:0; RULEID:; SRVR:DM2PR07MB623; X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB623; 4:IqJUJyBgVcUJPfEgdr144aAQvegpYmO7SjdIbldcTn+ZItyXGVb/ZKcl0uG2j9DNd/JiD1TUuKIlCtwb2JWOsBMKnEk3KCdu/Q+nzp9M3GwdCVxIThEL9Z8XYIp/3RJaH8X3kb35ca7rjYXneoEMYTGD1C5Ba6w4hUiu5NCtw48pm++jg3tFAia58+dT9CkaTrp8VNWbKInb8bMWds4MikB8dYWW+cluxDswqeCa1hiQIYPQ7LHHI1fi2EIxxMnfRoWwh8dcp466iN1sG8uoedM5LbfgLaqSW3YldVl0iJtZcOdD79n/4V3y1lq5SBLmEmTWLpNkXLQw3/cJ6qyltRfyKyikOkk/8r+TUZurxNNRVdvzDhgsxBR29blyZuFr X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(199003)(189002)(5001960100002)(76506005)(5004730100002)(87976001)(5008740100001)(101416001)(5001770100001)(5007970100001)(2950100001)(189998001)(76176999)(4001430100002)(5003940100001)(50466002)(15975445007)(77096005)(107886002)(50986999)(97736004)(48376002)(81156007)(50226001)(105586002)(122386002)(229853001)(42186005)(575784001)(586003)(47776003)(66066001)(19580405001)(36756003)(92566002)(2201001)(33646002)(19580395003)(40100003)(106356001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR07MB623; 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; DM2PR07MB623; 23:ZVERSKB5nYJGz3aYcllMV614uaQQTC20+bEMulg56z?= =?us-ascii?Q?6ZQpnvT3EFwHwjgQMFIdbG3RKzEgHtSKs++n/lvte0RK2AtjK9Ua8kwbZVvp?= =?us-ascii?Q?wr8J46O2Kkm3KF5Pgmo555XkknkKC4IPUor3T3Vp3Fq1V+jbJw1zxj/0PrtB?= =?us-ascii?Q?YuaI0FTIfy9g4saJij9Dx8mRcQIEzCS8k1CtDxOGS3oBHua59vwNeTJRGv7D?= =?us-ascii?Q?odJNX7zwpYw10XA/b0G070PXmlKE05ANqKqRinPvqJfPUOySxdm4tuILBnVA?= =?us-ascii?Q?kuGSQkwUMEWXOGyMBZVU0kIfLDqJ82NOd1AcBxKpiS91vVNNtHbB2jA4IsYs?= =?us-ascii?Q?cNY98opJqjAe/7wK5LdWoE/sgXrqwLZJAv22gBwhbUBUp9++DNdYr5pxNIJT?= =?us-ascii?Q?XvvVImB2gBA0HHu1GUOQO0GjrqmZjJTnnsWM5wKZo3fab2CoZmL1kcf8bouk?= =?us-ascii?Q?qzjIB5hKe82Fyx7w8dR6enhlOzyTQnZUI+g/cqS2cSQm7WUG7b9RKHXNQc+n?= =?us-ascii?Q?Rj6Pp9YHjNJGCajvLUsBmYaqvIkT+G7xQriu8cc1FdP3dN1VA27kAEoDVNbS?= =?us-ascii?Q?u0SADFeDTULZ2Y2BJYnqcCQj4WfMu+76Hr8JLukQa4tKkDfJExfn4sb9B6QU?= =?us-ascii?Q?uUMleC/947RCqyaL26Ktt86mN8AXLbFgiofxZlDV9kHHZiyEIjtjlSZPZcL3?= =?us-ascii?Q?kZrebP4DLCZxfHByGIajxuqjkxFX5e214Z+N6DtF1BvmmvMOtaaNUtSomjFi?= =?us-ascii?Q?ZHR7rcXSR4wDVoEXIbmKp7YGhA1KWCfRhcz+ijCU0HSp3g1Js2jbo/sEp8I6?= =?us-ascii?Q?Q33mJ4ef3VprALRYxYLs5v0l9mZ+aEAAriu/WSqSIjnQi3TTXs/kchiLIoCs?= =?us-ascii?Q?i+4//3nNNkkx7uzPoN+4VUp2OZf39++WCObabvYZ1snYy5sQEOQeG6zNlGX3?= =?us-ascii?Q?LOrsEdN/BXQKMou+BnCGoE5mbVlYRQbjM1DLJ/JsI+wLTRndP/NZEPypM7Lj?= =?us-ascii?Q?HsJH7S599WfQmv8eYLKqXtnyBFwEcC6RkUXLK00Vt4cGainlsGEyZaQu/jaQ?= =?us-ascii?Q?TWonXnUlUS2Ny8RQx8iAZr21KkFwHjCJ4dgJn+yS0C7upktlJ+nNdYR0+pCS?= =?us-ascii?Q?yJZCvaiyDSVqZcAVq8SxYKOfS0+gf8LvZ2xOVK1ByuliNDq7Pu3g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB623; 5:eZOr3VaRsWjK7IhCpBCq/oW0wgKOa6ZiaY3CMaFXD5lKWhUcIrTIrWquEvbtkLNQmQCcdqxWMzVtr1NY8Ojl48eZaToaOY0V3xW43Xvh05mPXWYZM/nMPyFmiwwbQA2htSuYiFvZWUOuBQuaI9+Eug==; 24:iaZHUKbCSNxjwdII2dyf0lHyWxytRsjHKVZUhG9h0B0U65+bFkKsPgD1qgbwtvhrl/G174GY9AjLYQT20srptXVzu3oPBriIQMkE6ZyykYU=; 20:eVi6k5KYii5oGJjaijMG2PCHlJeZhXhDsvG64I/zdRz7sGB1QxdY9A+m12fV2n9gg13IS5EX5WbakT/sNfizAg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2015 21:18:15.0787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR07MB623 X-Microsoft-Exchange-Diagnostics: 1; DM2PR07MB974; 2:9+9DgAbNIrDhci73HKOd4YafsTfkXrQU6KY5HusmtJdNlmypZrtyIiNG+fy3xx5elRSBQR3lP05ei+kI38izopnhGL2/kY5T0YE1Vg8C/iTpYtiqTBN703L8vMRuUJyOf9FwKr4mhvkjs0PH/yVWaMHhfQ7h3UvgYlxFacM063M=; 23:dwda4M5RxSlZeJWJ6eieGoo3diB1LPctItRs1pbULj1XGYid6Nd6+rpnJev23GK46HRJf7rBKtfnOXaqaw0qyJci2KWc68kGvHaRR+Jtx43X/eHxtdIK/ZowXELmQZ8ErG7M2EDhI5oPEw+ACo7iqQit+JYUZy+OJsXZkrMymZ4bhiAhZdUT8gX4815lEm+Y X-OriginatorOrg: caviumnetworks.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151117_131840_576254_507E7570 X-CRM114-Status: GOOD ( 11.79 ) 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, schwab@suse.de, Nathan_Lynch@mentor.com, agraf@suse.de, klimov.linux@gmail.com, broonie@kernel.org, jan.dakinevich@gmail.com, Yury Norov , ddaney.cavm@gmail.com, bamvor.zhangjian@huawei.com, philipp.tomsich@theobroma-systems.com, andrey.konovalov@linaro.org, joseph@codesourcery.com, 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.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, 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 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/elf.h | 20 +++++++++++++++++--- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/processor.h | 4 ++-- arch/arm64/include/asm/ptrace.h | 2 +- arch/arm64/include/asm/signal32.h | 19 +++++++++++++++++++ arch/arm64/include/asm/stat.h | 2 ++ arch/arm64/include/asm/unistd.h | 4 +++- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/entry.S | 6 +++--- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/ptrace.c | 27 ++++++++++++++++++++------- arch/arm64/kernel/signal.c | 16 ++++++++++++++++ arch/arm64/kernel/traps.c | 2 +- arch/arm64/kernel/vdso.c | 4 ++-- 15 files changed, 90 insertions(+), 24 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index faad6df..663f25d 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -166,14 +166,16 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, #define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3) +#ifdef CONFIG_AARCH32_EL0 + /* AArch32 registers. */ -#define COMPAT_ELF_NGREG 18 +#define COMPAT_A32_ELF_NGREG 18 typedef unsigned int compat_elf_greg_t; -typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; +typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_A32_ELF_NGREG]; /* AArch32 EABI. */ #define EF_ARM_EABI_MASK 0xff000000 -#define compat_elf_check_arch(x) (((x)->e_machine == EM_ARM) && \ +#define compat_a32_elf_check_arch(x) (((x)->e_machine == EM_ARM) && \ ((x)->e_flags & EF_ARM_EABI_MASK)) #define compat_start_thread compat_start_thread @@ -184,6 +186,18 @@ extern int aarch32_setup_vectors_page(struct linux_binprm *bprm, #define compat_arch_setup_additional_pages \ aarch32_setup_vectors_page +#else + +typedef elf_greg_t compat_elf_greg_t; +typedef elf_gregset_t compat_elf_gregset_t; +#define compat_a32_elf_check_arch(x) 0 +#define COMPAT_SET_PERSONALITY(ex) +#define COMPAT_ARCH_DLINFO + +#endif + +#define compat_elf_check_arch(x) compat_a32_elf_check_arch(x) + #endif /* CONFIG_COMPAT */ #endif diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 50f559f..63b19f1 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -52,7 +52,7 @@ struct fpsimd_partial_state { }; -#if defined(__KERNEL__) && defined(CONFIG_COMPAT) +#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EL0) /* Masks for extracting the FPSR and FPCR from the FPSCR */ #define VFP_FPSCR_STAT_MASK 0xf800009f #define VFP_FPSCR_CTRL_MASK 0x07f79f00 diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 98f3235..ff4abec 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -79,7 +79,7 @@ struct cpu_context { struct thread_struct { struct cpu_context cpu_context; /* cpu context */ unsigned long tp_value; /* TLS register */ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 unsigned long tp2_value; #endif struct fpsimd_state fpsimd_state; @@ -88,7 +88,7 @@ struct thread_struct { struct debug_info debug; /* debugging */ }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define task_user_tls(t) \ ({ \ unsigned long *__tls; \ diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 536274e..1059b3f 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -120,7 +120,7 @@ struct pt_regs { #define arch_has_single_step() (1) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define compat_thumb_mode(regs) \ (((regs)->pstate & COMPAT_PSR_T_BIT)) #else diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index eeaa975..7097718 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -20,6 +20,7 @@ #ifdef CONFIG_COMPAT #include +#ifdef CONFIG_AARCH32_EL0 #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 extern const compat_ulong_t aarch32_sigret_code[6]; @@ -47,6 +48,24 @@ static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t static inline void compat_setup_restart_syscall(struct pt_regs *regs) { } +#endif /* CONFIG_AARCH32_EL0 */ +#else +static inline void compat_setup_restart_syscall(struct pt_regs *regs) +{ +} + +static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, + struct pt_regs *regs) +{ + return -ENOSYS; +} + +static inline int compat_setup_frame(int usid, struct ksignal *ksig, + sigset_t *set, struct pt_regs *regs) +{ + return -ENOSYS; +} + #endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ #endif /* __ASM_SIGNAL32_H */ diff --git a/arch/arm64/include/asm/stat.h b/arch/arm64/include/asm/stat.h index 15e3559..af04276 100644 --- a/arch/arm64/include/asm/stat.h +++ b/arch/arm64/include/asm/stat.h @@ -22,6 +22,7 @@ #include +#ifdef CONFIG_AARCH32_EL0 /* * struct stat64 is needed for compat tasks only. Its definition is different * from the generic struct stat64. @@ -59,3 +60,4 @@ struct stat64 { #endif #endif +#endif diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 41e58fe..4c2cbbc 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 #define __ARCH_WANT_COMPAT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME @@ -26,7 +26,9 @@ #define __ARCH_WANT_COMPAT_SYS_SENDFILE #define __ARCH_WANT_SYS_FORK #define __ARCH_WANT_SYS_VFORK +#endif +#ifdef CONFIG_COMPAT /* * Compat syscall numbers used by the AArch64 kernel. */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 22dc9bc..1470332 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -20,7 +20,7 @@ arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ cpufeature.o alternative.o cacheinfo.o \ smp.o smp_spin_table.o topology.o -arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ +arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \ sys_compat.o entry32.o \ ../../arm/kernel/opcodes.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 8d89cf8..e3bcf77 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -51,7 +51,7 @@ int main(void) DEFINE(S_X7, offsetof(struct pt_regs, regs[7])); DEFINE(S_LR, offsetof(struct pt_regs, regs[30])); DEFINE(S_SP, offsetof(struct pt_regs, sp)); -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 DEFINE(S_COMPAT_SP, offsetof(struct pt_regs, compat_sp)); #endif DEFINE(S_PSTATE, offsetof(struct pt_regs, pstate)); diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 4306c93..52be5c8 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -212,7 +212,7 @@ ENTRY(vectors) ventry el0_fiq_invalid // FIQ 64-bit EL0 ventry el0_error_invalid // Error 64-bit EL0 -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 ventry el0_sync_compat // Synchronous 32-bit EL0 ventry el0_irq_compat // IRQ 32-bit EL0 ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 @@ -252,7 +252,7 @@ el0_error_invalid: inv_entry 0, BAD_ERROR ENDPROC(el0_error_invalid) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 el0_fiq_invalid_compat: inv_entry 0, BAD_FIQ, 32 ENDPROC(el0_fiq_invalid_compat) @@ -414,7 +414,7 @@ el0_sync: b.ge el0_dbg b el0_inv -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 .align 6 el0_sync_compat: kernel_entry 0, 32 diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 90d09ed..d11d0b2 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -519,7 +519,7 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems mov x0, #0x33ff msr cptr_el2, x0 // Disable copro. traps to EL2 -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 msr hstr_el2, xzr // Disable CP15 traps to EL2 #endif diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 1971f49..2a39b5d 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -76,7 +76,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, .si_addr = (void __user *)(bkpt->trigger), }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 int i; if (!is_compat_task()) @@ -651,7 +651,7 @@ static const struct user_regset_view user_aarch64_view = { .regsets = aarch64_regsets, .n = ARRAY_SIZE(aarch64_regsets) }; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #include enum compat_regset { @@ -853,7 +853,7 @@ static int compat_tls_set(struct task_struct *target, static const struct user_regset aarch32_regsets[] = { [REGSET_COMPAT_GPR] = { .core_note_type = NT_PRSTATUS, - .n = COMPAT_ELF_NGREG, + .n = COMPAT_A32_ELF_NGREG, .size = sizeof(compat_elf_greg_t), .align = sizeof(compat_elf_greg_t), .get = compat_gpr_get, @@ -877,7 +877,7 @@ static const struct user_regset_view user_aarch32_view = { static const struct user_regset aarch32_ptrace_regsets[] = { [REGSET_GPR] = { .core_note_type = NT_PRSTATUS, - .n = COMPAT_ELF_NGREG, + .n = COMPAT_A32_ELF_NGREG, .size = sizeof(compat_elf_greg_t), .align = sizeof(compat_elf_greg_t), .get = compat_gpr_get, @@ -1109,7 +1109,7 @@ static int compat_ptrace_sethbpregs(struct task_struct *tsk, compat_long_t num, } #endif /* CONFIG_HAVE_HW_BREAKPOINT */ -long compat_arch_ptrace(struct task_struct *child, compat_long_t request, +long compat_a32_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { unsigned long addr = caddr; @@ -1186,11 +1186,24 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } -#endif /* CONFIG_COMPAT */ +#else /* !CONFIG_AARCH32_EL0 */ +#define compat_a32_arch_ptrace(child, request, caddr, cdata) (-1) +#endif /* !CONFIG_AARCH32_EL0 */ + +#ifdef CONFIG_COMPAT +long compat_arch_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) +{ + if (is_compat_task()) + return compat_a32_arch_ptrace(child, request, caddr, cdata); + return compat_ptrace_request(child, request, caddr, cdata); +} +#endif + const struct user_regset_view *task_user_regset_view(struct task_struct *task) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 /* * Core dumping of 32-bit tasks or compat ptrace requests must use the * user_aarch32_view compatible with arm32. Native ptrace requests on diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index e18c48c..1e3593c 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -414,3 +414,19 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, fpsimd_restore_current_state(); } + +/* + * Some functions are needed for compat ptrace but we don't define + * them if we don't have AARCH32 support compiled in + */ +#if defined CONFIG_COMPAT && !defined CONFIG_AARCH32_EL0 +int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) +{ + return -EFAULT; +} + +int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) +{ + return -EFAULT; +} +#endif diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index f93aae5..9ce9894 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -363,7 +363,7 @@ long compat_arm_syscall(struct pt_regs *regs); asmlinkage long do_ni_syscall(struct pt_regs *regs) { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 long ret; if (is_compat_task()) { ret = compat_arm_syscall(regs); diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 97bc68f..26352a6 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -49,7 +49,7 @@ static union { } vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = &vdso_data_store.data; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 /* * Create and map the vectors page for AArch32 tasks. */ @@ -107,7 +107,7 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) return PTR_ERR_OR_ZERO(ret); } -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ static struct vm_special_mapping vdso_spec[2];