From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753720AbcANRZq (ORCPT ); Thu, 14 Jan 2016 12:25:46 -0500 Received: from mail-bl2on0097.outbound.protection.outlook.com ([65.55.169.97]:43136 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756403AbcANRZj (ORCPT ); Thu, 14 Jan 2016 12:25:39 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , CC: , , , , , , , , , , , , , Andrew Pinski , Philipp Tomsich Subject: [PATCH v6 09/21] arm64: ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Date: Thu, 14 Jan 2016 20:23:06 +0300 Message-ID: <1452792198-10718-10-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452792198-10718-1-git-send-email-ynorov@caviumnetworks.com> References: <1452792198-10718-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: DB5PR02CA0008.eurprd02.prod.outlook.com (25.161.237.18) To BLUPR07MB612.namprd07.prod.outlook.com (10.141.207.27) X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB612;2:MYPgcZktBP1Pv5UnRb+NFWC/SSjYsolzqy6dob7ERh86Z7U9ANPNB7QBeM13K6NL6kqHWc9sjl7hoWKTXNiAUPE1RtlHNnLD1a0MFpaApN0IBGK2aYUW9i3JPniqSYGWSqPpF2XLVvdXo3AIaeEQRw==;3:cOAdB2/svOiAAl86DofWSkgs64SLjjMaVSJUb7ni7YsVfdyZ5wrqVZYA+Ht3hx8yO1D6CARyod1NHwBqoe84BsCy6ED+25YBEDP/Bku0mo+GM/ghSyq9m4UxMf1XL7Z4;25:MId/H0/c8ZXBbk94+euuJX8j8F+C3TTPOOAvXKRJBnf8PQz1kIGDi27k+bWb+4Ob6KKeLh6oWLUK6T8oomdaTaP8vR7vi5eGriQ27MWDAwNTtwteqM4weUG+sG9g92T21y0xlgHpRdpLHekRbi10zJM3NZfdZsUifYzUJbzh/A7W+unnbQa11mqFHCd28/4FLY+ux0L5LroBtEMTmyZE1y5EqUcuBEG37MiC3dAxkY/j1c5Vlm+tvy4ioD4QXf7K X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR07MB612; X-MS-Office365-Filtering-Correlation-Id: 541f5ef9-68ae-4195-676d-08d31d07b5ea X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB612;20:THSLCePNk9SnGspgFpLpzBYNHwsC3uCEJsUGN2Upto3Av6N0fUMzZZKeUcDkiPVEtXRnD5NtNDzWKAV/w4HBqw22aSL2lXRdKXjXaVAufZniMIyabxCBeXG5VKwk72yDbKS7ckN6OjzS/3VKB8XDMC8UsLuLkcG7UgFZqOaZDemJazWh9GIdpUHtqA5gjlTVIhBl8XQUkOtEJxqAWuS4VN5slCl7Lv2HbzccqfquWJI/xOqy9IElTUV3Vtiw/WvSsfmI7pUEuNYqKYb+vEqw7Wsg497w6UA6Y151Kc2lrmCDh72H+/NROHF8soxAuRxOSUu1NwC6F9CUDmfqds6/wrpv7wOUSDyi6p2ECPmezCFaTb4s/j1ESUPwuyf4A5gnbsOlY7wqhWPSKOvfWOWFmaNHQ4UpX6VAcnVTNJvHNt+SFd9N8qzpt1i80+5NiX1a6qp8MsxO/CGGlfDYv0pwcwKFa4/xUQwQe4YT7Ug8tA7e/GzZwk5plmDRZBybqBFpBr8O7sxyWfhZk6Nb2ICAyaiJMCq+OXY+ISngjmNf8gVPgL4hDhtnhdfl2PGRiKVhd2A/JXE1CW1/tdDYbdteBLYTwbv0IHfL5scWR6DrJ6k= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046);SRVR:BLUPR07MB612;BCL:0;PCL:0;RULEID:;SRVR:BLUPR07MB612; X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB612;4:SU8u1Kwf6DNgau2k1TDrr8L5lFu53yaQ6RARpMUUa93N5alMkZHf3Netov1cz7dbUgKw/CY0bFDbRFO/ObwWxXp1Bf3BlEs6h3pzmdXEqeH+f280EZZr/7TM/8TeKnpIaYbrrTaGBBP/OpaziAG0w300EcmWVk+tb8ivrg1fPw/AlgygkboeJCtMnEVsvI3Y8ybAwYgdB1+4Qz/6bpVkdJvUDeCU+f9CuEGNL+Im/KsIfScVn7GrJ7z7eUCXvE51t0gdHTzwTODOTUtsza3ck9kkVwknrFOCGIWyVITKa7V4R6uMmJh43mY3WysKSgs6KtDcYBHfL95tBg+9+qQ1/ibRA00su+uPHnm34XsZt7LnwKozDkyaKZG8FhZU7/SgDOPFgg4VRPEO8Ri5lEXjGM+7i5eAUx/jgw5hVL/zQ2nfZR+AY3Cr+2OXFOY1FXf0 X-Forefront-PRVS: 08213D42D3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(6069001)(199003)(189002)(4326007)(5001770100001)(2201001)(5001960100002)(189998001)(106356001)(97736004)(2906002)(105586002)(77096005)(36756003)(122386002)(50226001)(76506005)(42186005)(5003940100001)(81156007)(5004730100002)(6116002)(3846002)(87976001)(101416001)(229853001)(5008740100001)(1096002)(33646002)(50466002)(48376002)(586003)(40100003)(19580395003)(47776003)(92566002)(19580405001)(76176999)(50986999)(66066001)(2950100001)(142933001)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR07MB612;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR07MB612;23:sHGjI+7AlLiYZQSD5OjWHtD/myVijRWkmO5S6Fx57X?= =?us-ascii?Q?bv5Tfs6TY7+gwU00VS9EGnYCqTN6s1jlh3bzqAbFekAgyi9txIjhCiV4auB+?= =?us-ascii?Q?vqzlOJ3mSi/jVpPuM/3C0tiPV9Ceg5/ngKqn3nqUCMGSltZ31tuF9a66KrOf?= =?us-ascii?Q?RjVMVsTGF1k1xkYjQ/QQV33KRYjc6yOy5NEu7UY8g2C0HWdpmLIcsJR5MXHE?= =?us-ascii?Q?9USKPI43AHJxDTBrftrKjePgnRYnjsxb7OX3RFF4IsY06lNDTL8XVZPruRwC?= =?us-ascii?Q?FqbRrwLqz5BJ5Chqpm+NcwRq2/WgrXxfiX3PpGeNpsfA16JGmNuA0bL18WpA?= =?us-ascii?Q?2iRRFHza7onVAw4bNj/pup9KhaPWrLg5mV4tbZD569M0v44YdUlbYjknRe3y?= =?us-ascii?Q?Ni67vr/tJX+JZNtMj9OVcVVWan5axA5nfOURV3waO0qe2ey5zcaNmlvAxqCd?= =?us-ascii?Q?FjaRevedOsqj7kybjBxJZzVAXboeBUwS7aP2x3v+051vF3CHah/dvT7AGjFZ?= =?us-ascii?Q?/1pW6PzRa2dsRxxo9XjGmb+F8thdBm///8mnc8KPZrHe1QnWhndELILzaS4X?= =?us-ascii?Q?MYGRQ+6UUBy7KOhZA4+uYFZAucgjdXLihYbRI9ch8VnVFmJw66RaTHEKrPjY?= =?us-ascii?Q?jutRcEx/g4nb+7IRAUrm+AjQCKfdIohif+ZDXtfuXV64q7s2qAkPZRT6JMRZ?= =?us-ascii?Q?lmj4o/in+SKPAHsRubpx8XNCJJ3ZVnmsSYnuiCWCnqX35OAB8Py6WyH4aO9y?= =?us-ascii?Q?CmBCW94O4JZVE/RQ+a4URCUOtp6XEfGiGFuiEN67rvaFVtwaYuxO5bJWleLu?= =?us-ascii?Q?NWB1NY/1b88JF1pyquOK1/GaqKqVMcnH2nGSiB9PsxLHZ4BA6qt72OBlTP5s?= =?us-ascii?Q?oPkTz5KMtkr+A5LzIUwSnxv0t7L4kNKUdoI505HAnH3hv+mE0D1M0T8uHdQp?= =?us-ascii?Q?SzaH4IfRK0vZkayAxEym7HGl5BxI0fpfhdfBg4EpzjI6lFF/R+lhAqmvScgX?= =?us-ascii?Q?N57/iRsF8zbWnuHdQHEHX/C31iZJHzhWf8rT+JTdzUNZc1dH0wu0kL8JdxIX?= =?us-ascii?Q?Lb0e24GKnMluRKtOwH9iiWFYPAZgB/1mp/8lpIB6PNoulOjAWKKP6jBtFM3T?= =?us-ascii?Q?2ttnR6caP/rNUUdQpxATQzw/eBMV1Y?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR07MB612;5:vmFM3hNzBL5m4QuuQ+mq/07lSVuJZVZfAHXt6hGxOgeNlcbGaX7nfGgnDQN+yxjh0wz/DkLG2Knb6/ffzwXjaZsT46LneY39Wb2xm3dIBVGXYU9wJyxzRlHbe130f64usM+nzbdAENyxuFuqnmweqw==;24:31Z1pn5L4+ERf16rVeCr0WnQJlpAiwV3jpsusFoAj95pzmYthmvGIRky9sgXwj0/UCK2XVECw1Ds/QbIVxYKFhVtAQAuqwO0vFAsKCHaVRI= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2016 17:25:34.0105 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR07MB612 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 are changed here accordingly. Signed-off-by: Andrew Pinski Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Reviewed-by: David Daney --- arch/arm64/include/asm/elf.h | 13 +++++++++++-- arch/arm64/include/asm/is_compat.h | 28 +++++++++++++++++++++++++++- arch/arm64/include/asm/thread_info.h | 1 + 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 2f62ded..5e27a64 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -135,7 +135,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) #define ARCH_DLINFO \ do { \ @@ -174,7 +178,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 6139b5a..55134cf 100644 --- a/arch/arm64/include/asm/is_compat.h +++ b/arch/arm64/include/asm/is_compat.h @@ -45,11 +45,37 @@ 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 */ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index dd046c5..c74d4f5 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -113,6 +113,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) -- 2.5.0