Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936274AbcJUUul (ORCPT ); Fri, 21 Oct 2016 16:50:41 -0400 Received: from mail-bn3nam01on0085.outbound.protection.outlook.com ([104.47.33.85]:52647 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932739AbcJUUuf (ORCPT ); Fri, 21 Oct 2016 16:50:35 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 11/18] arm64: ilp32: share aarch32 syscall handlers Date: Fri, 21 Oct 2016 23:33:10 +0300 Message-ID: <1477081997-4770-12-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> References: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: DB5PR10CA0014.EURPRD10.PROD.OUTLOOK.COM (10.165.4.152) To SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) X-MS-Office365-Filtering-Correlation-Id: 86ea4cd4-4c36-46b0-56a8-08d3f9f1ca28 X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;2:2g2W06+gQAJqlQmjkyTI4WTNfZUsXKuk3J1Wcx3OxFMfdFIczRBVKR/ypMWGcpKqozdND+zeFjZliY9+2OqEWeFeJiBFmU/+dxolAKscRMGgToX44QDLs2k2118RfseKMDX9Sc5Qc3Be0bVcLDlmqkgZELK6jEfMUcL354LJugeZQ37FIuu87oPuappssZzZPH3INzyg8R4tNmbsNqj1jg==;3:5t5zs86VfeFaFtlyLyUvFra5hMzl/gh8ytlefSYCfCBdhoLLLMPDpZPokDe4Mwwi5Su1guB4NqDAQ+Qaz5b2S00cYvz2/uIltFC7HDJ4LUlqPJky7+JpND/pX1J975CZqR0cEd4ZogIDqDvYtSJssg==;25:SucLabNQdZxZE4PGhD9P5WznGVp2c/9ypINdDK/I4MUtcZeIqcIfda11OyyE6Z7l+R8rW1A8vVlYy1N+xWWimoGSrFu7k69S8S60S4IItVw76YGk6wJFH1/z32vLzTZfUHqndCtFoj5IXVXHHDPvLng3uW8MevL4D/0go6HrMmvFY39kgp7M7/pazt8iGXIGy3GKrD1Ur7FJYT2krjYHkRVjDGenwVsZQjYbdJec7qwD3iSozyrdS4eYWQ0Y83cWcNmrqrjff8B5syIyIgv6DaVmbhNP6TbC+UmmSHFi7ckgjuFmGsJPGl+RaekuFofjrM+5IGF4eJ4z0ffvJDUqyXahRrjEiebxS9JZL3L4qMFDOUoJEIpmGj5GVqpzwTzdvUnf56TIG8z4MTBrbinOcav8Dm7V/u7JoGEkuybAPVE4K5YWPyOL6r0boeUhBgVe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;31:1Sy7Vxx+8WtX9EECDBV1fHAWOTYA0Jt4u+G+SyLPoDCpmMc68mHoY6tuylk2qoS6RScX7mLhAEU/FCP1wvmU/AjBjm8ZKT31+bZbauMC6w7FtQ5RhQ3msdWdtRtmBUC5yI4uLXgV5J9Cmr13SeBJRXeaSSs0Y/krEbvQDZE20WSYPa93zKCN4KHgo2nDputQJ5ohm8l2FFtpWXSUCjOnDGgZaWxsyKH4oYe9QMkH5/XPgRo1DbrBcc0W4/lkORfS;20:obO42ROozwbu+9R3l9iClVwK+XT2zgnsEqfdJXkr45slsJ0aux14yJriU8qmbDjV2Y/SPNwsFl7yp8XJbOsLpOsJ6Mnh1DtHx3A5roWS5LYSB9n6yP64ZtuKiahyEz+ekhSWMEz1OGZNpWIPfm5YFOANOmZENuOHTmUPZonOpam4WTy35+MlrNkKuEz129lKm5W0/gGHIWRMrBBk6sRrRSxJX0l/ZNfT3agiu4SpcUA5+D7e3XfZMQqXduNpr/V6iQYlj6UpnVjOK14AjA7Xn1lBMPv1ShHRMqYKyHA3l11yVSOd9GinhDkjleATCrKeNgcsvf/f6OEJ5gXhE3Yhg+kapt58nPNMYfUcpMFJRwZNI7mSSnGHlspVq3o+YqJFS6R0JsVg49O/uoSAb+R2ptxNA4DItdp+04PucxuoQXPpHqImEW04/WG49BRdjNdrneqRjFCV7UdLrRNnmDWaj/PAYPr/M50CBv+XYYGIjrOYAiSifH9OhwhywsvlVkRCBu2LnEDuTpevWcp2d1oNCaUUT7eBDiQwR8y46srVvIi8bdAZVK+yq4uPi+1BxFU7aDh+qWMjaeFuyrl1H1m+QMp7VcdEEVBuWH4FcZ/P82o= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:SN1PR07MB2254;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;4:+CPQ9TPRI97+G9i1Fy3LL/KL6kWEJIhOW69MiEn4UJk7TYEJtgBf0/rGByoAAFwAmJ0FVz/3r3ScRwuKGMGI94uZMFy1GDb5o5mxMpF9F8JXq060eU6tfF2C5RwdTxVZHiXWc2pn2Gipx343jyMOQgjY8YLuSNg5eeV8wYzKgcLrotjjM1WgZyg40XLiLZ1mEIXxtw9BU6KYlr0n/h8TT5JlDdW5IgIVAvRd0dErWTesVGMR484Ef/VK9xaiXw4cxqIP/XH6OWtPtEZXOJpv1KpD93nYVzX4NlT9FoZ0uMzQS1zf3XmDecj0QD4AVdv+9IZRQ0YV3iHznCDyldqwbes/HOEAmUzfM8Bm8RGggWyisHQw7CCDCxaVHvYWAs4k0BqzQji2HorplpGdsKmqSskAYDnscPX3ZFnAHHD106Ka9au+Kt3rTsLCzQiu/lrs3ElbU2qRvCG9QslJEsps7j3Mc3cPtrbiRWTJE8g7X37RWARsrRFyAaMXXfMvPEL8x6ULw9ZhnbIusEvX5neYOw== X-Forefront-PRVS: 01026E1310 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(189002)(199003)(42186005)(6666003)(5660300001)(76176999)(36756003)(15975445007)(76506005)(50986999)(105586002)(106356001)(2906002)(229853001)(47776003)(48376002)(50226002)(2950100002)(68736007)(33646002)(2201001)(81156014)(7736002)(101416001)(7416002)(3846002)(7846002)(19580395003)(92566002)(305945005)(8676002)(5003940100001)(97736004)(6116002)(19580405001)(189998001)(4326007)(81166006)(77096005)(586003)(50466002)(5001770100001)(66066001)(2004002)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR07MB2254;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR07MB2254;23:4Hq83AuVVKg+soWWIqXr5TLG7BL7MxpVRyCwjUrdA?= =?us-ascii?Q?1KFiSZR8SyUK+ZlZJvbDtYa1p48M2xjQUFCECbEcE8fmR/aIt/zRNqINQmXY?= =?us-ascii?Q?jXkObyWP9pJOGO9CwDX+dPlwSaNpvq4agHwpYGhxIr1B2c4245XT+v9sCdzk?= =?us-ascii?Q?QLus8Vb3eKD87zjIZPzCN1xN9PONJj4GFrtav9fB5u64uYmXk0ICQUmN2jE6?= =?us-ascii?Q?OeUsrKr/6VIVKJlnLN8jpDhdGvdml+62g/CYsFSTx+dJk9jBacc2al30GkeL?= =?us-ascii?Q?pc7JWZGYKCUnPdKl8iPY752xCYr4PCFhE4kvbv78txi24DeFcnr+E1B5lBty?= =?us-ascii?Q?+tRKZbggElUqsL0EAEdsAmHe2cDB5yU1gcatgbW66CKdmR/mdHbxIiY7vvpP?= =?us-ascii?Q?CDVNu3B8tyjoQbLr4G7GfQRodKwYp0BVwyPsOudkyM1ppq0PR4U4Wy2kcDFz?= =?us-ascii?Q?w81H3QX8dtTexEQjko9ael83DQAHsRRJ9aehGUdsx1lOtQzUd9HypjNbZePI?= =?us-ascii?Q?IEwD/r82MGVMWLFycqa6JrTBssTFtZAPXSJyjyRSOVxwExFmr7jP0FyC26jL?= =?us-ascii?Q?cIAgb4/tIEj0z22yGhYRCiryGlnuPYxWPRhhwZHpQkjn1UcmKhRgThWB+gRm?= =?us-ascii?Q?ivReFKBwWx0H3w3YCRWEJ31R/5lPj1b3bGtYIsZW7uTWZicMAP+cOrhLP8d0?= =?us-ascii?Q?d3eBrj84p8DhzALiImijtBaUIcSTakOPeraInooIEib0rZFMyDJbpD8Fc9Ur?= =?us-ascii?Q?cZVdhppnhnUrNYw/Tp1G9/nEywtzhIBU/7hoaea3F9YAhSiNgmEOfaLucQnd?= =?us-ascii?Q?wArTGwwvtqUzwGHTO4i3GChpjiYDo0Y1RjuWOXTsKS2bpRnee4lqa1yu16ML?= =?us-ascii?Q?BQKWnz3YLgIi5vO4lHQebq859Ri9UQwYChq6Kdu6WTjIm2tsqu/+Q0JUypXz?= =?us-ascii?Q?nzdQJMO4IgcyEiVxpoycOXBY1lBkU577TiMC/eWgMD3ray+wRJsQO+RX6Es/?= =?us-ascii?Q?xC78BKW4yQ7H1duOXZmZOfBZhn1NAgDDHyMJ3uFgEgWkkZiw6YqoobXft0ZK?= =?us-ascii?Q?2PmlGQIcVHvRaWKvIkK+MZhYZsnfOIjGA88IrO78lZWhIyBVIaTJpWDq3nm0?= =?us-ascii?Q?CjSqdTAStwhm0/QDNqjPznnZRaXZtiqSuB01438koytl1vIuAC/qJKysB54F?= =?us-ascii?Q?z1nfBhhcvr89XXfZwxFAx5qU+nj27n8ilxXaG4zxHSOYyVNjEJJ/7veXQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;6:G5bDOsReFS3+FVi0MPEoXQ6ktk7RIwcEe9QBM8DB7qqILaCRoy4nZlGKuTwgJYmGSYGMZdQup+OANMb9mEdlCuWb+sT1RFvF0rU4B887ESehkbZyW30gx1qGe2k1IAxa8XV6dm3sBMTHtqN0oGyvGZoNv8zFItJzlYOBvrnfLtRyMSCFrZ2h/nzGLmqzucPU6Q0rvSBXXb+gaBor/5UlWd13PfjN4pSl0VI3DWNrnsuO60CCpjoLBTZwzUAhlwNXH+wT7WACCYm1iuNw0PnuGM7XqBwReqvq7wZ2L+d33TYTL0ijAgG47TRGk1+mM36O;5:TYGVUHsiiTF6OqJQ0IQ9pqiqVqVw/OKuQTVmZYxQHi8ro4EexLqaAY7jDhQ/vJ8VqC7c0T8XG0Ng+d+YkhQCcbf+5IYbq2eH5TkzCWOS7CACRjxxofq+C2xB+AK/q244JrAqgZ1AQnmM6XNzRLvNRRsf4bafYauyLeeR8ESdM6w=;24:Qtgqku3esxIbCCExsp4CCHC7FPnrIGcTDrLJCLzeJ3rkQDG7c2ndPa9FLWv5TEaEKv2iXfX9gkFZkzFx1FoVGWnxw/XWbRzerMYa7ozngkI=;7:DU/xBtGgagS2jPe5UIHyeeOYxKJ48FnG378Gxw56iNr1miJjZ8kTWdUZy/KPEk6yBrQ5WXxe6xhUWhFUEfz9TzQaAMZhuCKW9xy/tJXoY5TTPDeZEihORHSWZ574jkuLLWqD9+RBt1nllaLwO7/a7JMm3fqGNXkP52D332AV96qEIxoLbRiieG7Ritk011z/VByxoq1rejZQggR3euruA3+PxDq+1ByfTsWTmbWxtuzgX9bm80Vch85v+8qr5PT/IfIRQAcEub3W0TvqeanllTtXizMZZyUHCY0ph5RxFOaZ3epM1CISCSiZFbvbDEp64NV4z8CLlO1ETjWwRL5PR6JnRZ4QHVYjImREo9gpxoI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2016 20:35:25.9484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2254 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6397 Lines: 227 off_t is passed in register pair just like in aarch32. In this patch corresponding aarch32 handlers are shared to ilp32 code. Signed-off-by: Yury Norov --- arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/entry32.S | 80 --------------------------- arch/arm64/kernel/entry32_common.S | 107 +++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 80 deletions(-) create mode 100644 arch/arm64/kernel/entry32_common.S diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f661888..9123bb8 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -30,6 +30,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \ sys_compat.o entry32.o binfmt_elf32.o arm64-obj-$(CONFIG_ARM64_ILP32) += binfmt_ilp32.o +arm64-obj-$(CONFIG_COMPAT) += entry32_common.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o arm64-obj-$(CONFIG_ARM64_MODULE_PLTS) += module-plts.o diff --git a/arch/arm64/kernel/entry32.S b/arch/arm64/kernel/entry32.S index f332d5d..4bede03 100644 --- a/arch/arm64/kernel/entry32.S +++ b/arch/arm64/kernel/entry32.S @@ -39,83 +39,3 @@ ENTRY(compat_sys_rt_sigreturn_wrapper) mov x0, sp b compat_sys_rt_sigreturn ENDPROC(compat_sys_rt_sigreturn_wrapper) - -ENTRY(compat_sys_statfs64_wrapper) - mov w3, #84 - cmp w1, #88 - csel w1, w3, w1, eq - b compat_sys_statfs64 -ENDPROC(compat_sys_statfs64_wrapper) - -ENTRY(compat_sys_fstatfs64_wrapper) - mov w3, #84 - cmp w1, #88 - csel w1, w3, w1, eq - b compat_sys_fstatfs64 -ENDPROC(compat_sys_fstatfs64_wrapper) - -/* - * Note: off_4k (w5) is always in units of 4K. If we can't do the - * requested offset because it is not page-aligned, we return -EINVAL. - */ -ENTRY(compat_sys_mmap2_wrapper) -#if PAGE_SHIFT > 12 - tst w5, #~PAGE_MASK >> 12 - b.ne 1f - lsr w5, w5, #PAGE_SHIFT - 12 -#endif - b sys_mmap_pgoff -1: mov x0, #-EINVAL - ret -ENDPROC(compat_sys_mmap2_wrapper) - -/* - * Wrappers for AArch32 syscalls that either take 64-bit parameters - * in registers or that take 32-bit parameters which require sign - * extension. - */ -ENTRY(compat_sys_pread64_wrapper) - regs_to_64 x3, x4, x5 - b sys_pread64 -ENDPROC(compat_sys_pread64_wrapper) - -ENTRY(compat_sys_pwrite64_wrapper) - regs_to_64 x3, x4, x5 - b sys_pwrite64 -ENDPROC(compat_sys_pwrite64_wrapper) - -ENTRY(compat_sys_truncate64_wrapper) - regs_to_64 x1, x2, x3 - b sys_truncate -ENDPROC(compat_sys_truncate64_wrapper) - -ENTRY(compat_sys_ftruncate64_wrapper) - regs_to_64 x1, x2, x3 - b sys_ftruncate -ENDPROC(compat_sys_ftruncate64_wrapper) - -ENTRY(compat_sys_readahead_wrapper) - regs_to_64 x1, x2, x3 - mov w2, w4 - b sys_readahead -ENDPROC(compat_sys_readahead_wrapper) - -ENTRY(compat_sys_fadvise64_64_wrapper) - mov w6, w1 - regs_to_64 x1, x2, x3 - regs_to_64 x2, x4, x5 - mov w3, w6 - b sys_fadvise64_64 -ENDPROC(compat_sys_fadvise64_64_wrapper) - -ENTRY(compat_sys_sync_file_range2_wrapper) - regs_to_64 x2, x2, x3 - regs_to_64 x3, x4, x5 - b sys_sync_file_range2 -ENDPROC(compat_sys_sync_file_range2_wrapper) - -ENTRY(compat_sys_fallocate_wrapper) - regs_to_64 x2, x2, x3 - regs_to_64 x3, x4, x5 - b sys_fallocate -ENDPROC(compat_sys_fallocate_wrapper) diff --git a/arch/arm64/kernel/entry32_common.S b/arch/arm64/kernel/entry32_common.S new file mode 100644 index 0000000..f4a5e4d --- /dev/null +++ b/arch/arm64/kernel/entry32_common.S @@ -0,0 +1,107 @@ +/* + * Compat system call wrappers + * + * Copyright (C) 2012 ARM Ltd. + * Authors: Will Deacon + * Catalin Marinas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#include +#include +#include +#include + +/* + * Note: off_4k (w5) is always in units of 4K. If we can't do the + * requested offset because it is not page-aligned, we return -EINVAL. + */ +ENTRY(compat_sys_mmap2_wrapper) +#if PAGE_SHIFT > 12 + tst w5, #~PAGE_MASK >> 12 + b.ne 1f + lsr w5, w5, #PAGE_SHIFT - 12 +#endif + b sys_mmap_pgoff +1: mov x0, #-EINVAL + ret +ENDPROC(compat_sys_mmap2_wrapper) + +/* + * Wrappers for AArch32 syscalls that either take 64-bit parameters + * in registers or that take 32-bit parameters which require sign + * extension. + */ +ENTRY(compat_sys_pread64_wrapper) + regs_to_64 x3, x4, x5 + b sys_pread64 +ENDPROC(compat_sys_pread64_wrapper) + +ENTRY(compat_sys_pwrite64_wrapper) + regs_to_64 x3, x4, x5 + b sys_pwrite64 +ENDPROC(compat_sys_pwrite64_wrapper) + +ENTRY(compat_sys_truncate64_wrapper) + regs_to_64 x1, x2, x3 + b sys_truncate +ENDPROC(compat_sys_truncate64_wrapper) + +ENTRY(compat_sys_ftruncate64_wrapper) + regs_to_64 x1, x2, x3 + b sys_ftruncate +ENDPROC(compat_sys_ftruncate64_wrapper) + +ENTRY(compat_sys_readahead_wrapper) + regs_to_64 x1, x2, x3 + mov w2, w4 + b sys_readahead +ENDPROC(compat_sys_readahead_wrapper) + +ENTRY(compat_sys_fadvise64_64_wrapper) + mov w6, w1 + regs_to_64 x1, x2, x3 + regs_to_64 x2, x4, x5 + mov w3, w6 + b sys_fadvise64_64 +ENDPROC(compat_sys_fadvise64_64_wrapper) + +ENTRY(compat_sys_sync_file_range2_wrapper) + regs_to_64 x2, x2, x3 + regs_to_64 x3, x4, x5 + b sys_sync_file_range2 +ENDPROC(compat_sys_sync_file_range2_wrapper) + +ENTRY(compat_sys_fallocate_wrapper) + regs_to_64 x2, x2, x3 + regs_to_64 x3, x4, x5 + b sys_fallocate +ENDPROC(compat_sys_fallocate_wrapper) + +ENTRY(compat_sys_statfs64_wrapper) + mov w3, #84 + cmp w1, #88 + csel w1, w3, w1, eq + b compat_sys_statfs64 +ENDPROC(compat_sys_statfs64_wrapper) + +ENTRY(compat_sys_fstatfs64_wrapper) + mov w3, #84 + cmp w1, #88 + csel w1, w3, w1, eq + b compat_sys_fstatfs64 +ENDPROC(compat_sys_fstatfs64_wrapper) -- 2.7.4