From patchwork Wed Mar 1 19:19:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94755 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp35289qgi; Wed, 1 Mar 2017 14:00:53 -0800 (PST) X-Received: by 10.99.52.79 with SMTP id b76mr11274085pga.131.1488405653530; Wed, 01 Mar 2017 14:00:53 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n10si5695365pfe.80.2017.03.01.14.00.52; Wed, 01 Mar 2017 14:00:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753519AbdCAWAp (ORCPT + 25 others); Wed, 1 Mar 2017 17:00:45 -0500 Received: from mail-co1nam03on0050.outbound.protection.outlook.com ([104.47.40.50]:2561 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751055AbdCAV7u (ORCPT ); Wed, 1 Mar 2017 16:59:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8ncNOfRGiSCXc6ye/OOEpb8ZYt3RRh55wWX0aNMPtc8=; b=wD7Nsr9619BszSzn6Hnn9tYtmd/Iu3IR43RZa19WL62WPr2Id8NkGJ7eSxvOHzIPQNbqjWd+V0ox7DUkrev31am/yMRT2Q6c+YQQq/8JJvpxbTkyDL8JsRJROwdU+XPlAdkJE9fM91SuuGcEkSWjM3xb6X+2h1s81ocCt03HLyQ= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2253.namprd07.prod.outlook.com (10.164.47.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:19:54 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 01/20] compat ABI: use non-compat openat and open_by_handle_at variants Date: Thu, 2 Mar 2017 00:49:09 +0530 Message-Id: <1488395968-14313-2-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR0901CA0067.eurprd09.prod.outlook.com (10.167.203.163) To SN1PR07MB2253.namprd07.prod.outlook.com (10.164.47.147) X-MS-Office365-Filtering-Correlation-Id: 62c3d185-377b-44b2-b39c-08d460d7f170 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 3:h3ReObx2AosyrlFZaiIb9MPwWPFPWS8HJOgz5KvjR5OsjkEnLTNxMSUmnRDuOABQ5QmC9dFlm7p779a58wPX+bmfN8z0ED2/x0RG2Cw+BvF4sc2DatHsmWgri/5wyKSQQBwQJpVzATOlld7w2cGSFzD7B9kYresKGSsgk3hK++ydgRqeHIs9a1ZpQ0FAcgfN+1TzTro4FFpwhJurVpVRuvZQGsI07iUDG4feABNT7+FiX1w0GEskZtS12CKUZocAPlXKckPyc654c69Mo2J5Gw==; 25:f89HtbnXwMjJ3kMlA60vEG1n3fDvGIf06D9oJDCwmDsWpn4b/milyp9qQdfS5tTBwPb5n8bSSczDKSN8tI9xZAS5kU4y6r68s5pUgCnbs1spgmZ9vtrPBp5lTbr7n5yvF8v2Unu740n7vQ4QpGS/KikaDBs8KPVCAQKsblfofXWUH9TRpHvJybCWaPryGRs12VKXlWbfQWbMCxrs+4lRcQmgbt6e/SdOLzll+CV7+Sa4MSM8kL9L3y7QwxSbYohP9bzlPB4c08A+8g4DTN3RdMGFSKn5NdcLUHIbxuyTLkNZM5yNHx0kNiDyS6g05iXMT62GcsgnZI/68oO0IqXGQBDnVIWsSi5jgdnvVan0Lblj1i8+W5DoOJRg3csdKUrLAFDGeegfs+eV7tKAW3JXsxwNIVqEpoVH7A5RFM5ZM+QZwItGiOCX5fR8EBuL/rdcSpx/YL1naPtXjU10hx+BwA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 31:WNzLblRGT49ZtGRjjdYP4kAijSOQJ2zm9roj7pkehO6FOAFIQ77L7HWxPW87xqB4JrQ/GKIgUbcnPX+6xDOfseWf9chhfcnOnd/oyWhhkw+UCD2q3RauJ3h5zmX9+Vn5faLp3j8y0PVcImyeN0Hcytbqlw1DA9zbagoP4bw2w16NISAma+za/iDuqk5fpy+4Ku0i5THBbKITnrJiX5iXXVJTR2DXWXBAC3X6U6++k0OIaBOdWUCHWs3ZR84pe0ub; 20:jrtthS53smTeqh4FD+02AqosNf7hXByDOIW40AdbLBfIlZZKEHemCU1wOwJRmckVQgCqoL3OYvm19KZcsrb/fb9jUHBKNBAufbQ4xh7AMOeMRcfNR0PW2j3X+phgJCq3Z50yNg5RCV4L937zCBDKDb4xKNrNBI1QrbRXz0+tNe4oIAxdTJBGYEEgPOTtuIPinFkf3WEghaZR678a1npmgqKCD6/3d2auM5FPHkQhy/FaIXJBuD0DiynfQEkjA1LeWJ9orKHg7OF/42Q/4buDswbqijT3Ovz4h40l8bOgso/kgSQC2p/946HLZYj9FVu7NEzvWnFKbZZNul9i9qjBk3TjyH2Ri5+15RVHwSV7aB7eurB331+p4ZfP5j/S7+lXH/4ATCF0r47H79gDvNiU9A/Z+IcV0EoXCdawxhxr7kaogIEAmgROMKwy/IcYXsImUHE0SYgPLj55BfTFEG+buIXOm+EsLCLml/vaEnDAXps5Y7FP8smeEprscPfvtXiMQMJI7GDLm/xa9Hf5ggHzjRwzxm4l6R9fczzS5Ta/fI2RQW+MLbZ6crakfNXF+9e7tIrpl7aCWBUX7BLyJmTieupXkYSQgpj8Meyjz1QZ7u4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:SN1PR07MB2253; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 4:Ak/2CLdKv7Jwhi7kgNCLYXduqTUdU8dCJXR+QqLC4Lu6GBGYCdJwJICz7LGM+uvZQfsODYUcARHe3MfIzDUPAyhPt0V09G3BQxsHYFgMH+5BNrzw2zs+QG1lJB0l/2u0RqyWMN6zejssGgy4a8lPLrW/oB6w5cTrJE7HWL58zr35NBL8gGbhhbCpHbeVS57daimQeH2YCfL7ZgAHH/ZxgiDi1dRgE7+k2lCZX2KoEBcXWDH0mGdOG73gh+X+6N1kIWQ+IMZDZ8ND4q/h2AQYlnp/B4Mi0CCsMQgWXUxbovmDRDbk0xcPcv0hljuyLYoV/JTvC/REDOGjYvqyma1DklOKIR6QnJdTQcS2fLvEJ6+WN9wF9vg1ILXMcHqj3gb7W9tFlVGTjMiRAMVzfy5PWR8KbhBmNj4mJk4xSCEE/fGea9GMnttGKlIaCW5z5Z9N0tGEHHEyjq/73EgXGUCGOfGUESdQ6mRh95csY7DU4Yae8vqqk2krzzzPRvA+VR8t1sA6PiFLg1/oSCMAZT2Vmk5lLwT3sbhPjBwULRIwd713bowC3HmkUECTs2Aze3CR1sJ5Sqr0eNDwNpD9vQ3+3KQAnmEogokVZCYTKPQfmBo= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(2906002)(305945005)(7736002)(76176999)(7416002)(33646002)(50986999)(76506005)(47776003)(3846002)(4326008)(6496005)(6116002)(38730400002)(66066001)(48376002)(81166006)(189998001)(6486002)(42186005)(36756003)(50226002)(92566002)(2950100002)(50466002)(25786008)(8676002)(5009440100003)(5660300001)(6666003)(5003940100001)(53936002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2253; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 23:WJCPcm4yvYt6Q1q/IVAvAHHSwUPgFNhnEVVC2oTVhUSPq442/pgXLAAOsvC4+9kaufZ0bswLyb6oGGxmEsi2WvFow0dm+rHiV8YQZNEWx1t12A+T3s+SI0xq4L5FQMGo0+tQyVsCDnVzw63Bmp0SuogDre/svLkk2g+h4A5K2aRzvm9QyVmLz6pFatDZVTpp+UnhGrW7e6Yuonc1CBKhWL/g0Sgn5ce4XYiBbDblgnXJssR64XL/Z1rrPucjtVHW7ohiOqnSyzBLbIPxvOn10lekDpCFy7epVftmEZjv9LGKz8d3O4JWqINzIOF1DVqB6vJ3ZNSNgyS2Rmb7CVlPe+dQL5wMJP4TML94rqMyWTDrr0+e3olx159AlJu0En0nEP+ZHNM//l6HSqx2151Q9xbbV1SoJL87abd36rJ56asWvqVsA5u2uPr0dJmnDJRmpcIDzVJb/u3U6ifpiY8cE4TIJgwHAK+ZB0ES13Lr4issU0NZ2wfIXOps61RkE+QNg+pN0ErzfNoaTP3n9BkubqhYWpKGfrEBUbllkSPUjI54DUTQEMZNGSB7L+r7WZtzjXpb03nid2VY/LwXpYWoMVpTf/Is8WPOkOb2/T/faIsR2y1A2aZS3AUQUdJkroWT/yK0aiKCQE/3uPLvNvnxdygZrX4fXph7SLL8HFN8ozknkkCCjEcOnYzBcpxttf8di0yjeModSAF80njdiRdvigEpCwnCMWJshVY0p+57DMwAqy9hVmuBgpTbbMSaN5P3tHqBMr1PRMqzbyvBRXIUxMALkIVI9q60MQZNy+HJ2j5s9QZzQ4oSC7QXoC1WAN8iwQHkcQbXiEL5AGYLv8qag4ZnHVftYfOz9uR1We7YsQlobmqY5zmEpNp4M11IFNjYFncL/LrP5FJpjomd3myKmq0ng8t9xuQpgTmfoTq6egHZ95SGLwx3woP5wfxmIbVJX55nyYY9Emj+FBexqL6O1A== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 6:dvWqSgqRDQTRxg4iytvQ2ZWWHzGqABgkZtrWRjwTKhSnVGSpKuO0MPC0NdQNvLliSTxF0kFC9LZvOgF93Df0hWSOmV/N+9jZ3c6WnJxH/qXnGRUMF7maB7QoFwZoQS2eZANjGevQykBmVDqDAlXQlevhAX+nft2P/59d+WF1Qd5kD3gYGoxCrrXCTgq3RU4edDh51C/4vFY8gzIf78dR2uXR/IPo3CVjyCKaElQHiTGKtfYtWTitJDkvh9FuRjSh6ngCrTIHvSIBeOchsTkLMk2lV+J13z5rJeDUuhNIIcOYI6+pP3R07Rob7AuqhktDt7ohae2pxKKqyT4Kx0kUwprdwLJ7khVlW4gVDyj9TVr0Cc7ju40RGLTqC3TIqkjTlQWrpJildU77RtrhHN/KYw==; 5:lpeG96oVDoSzpiYQnR0M7eNjGhhZIWqYeCZgYqaTbI4jW2WEM/rXhXisKEwLVNvA8mbB3Mf4NuDE3WQC9GErp5VCsYo0M8W0RNlO2oVisu7iDHkyj79ih+X1fuQgZAcaAgvN29D/nKMoG15/QIChDM+EH5UEE1e0+2JfzIFY4mo=; 24:9ugBeVvQOy1s5zA8FVPlgArVKxpAmXa6CK5IFgaIIFF6Zt8G6XTyxFPDtUr1bvm6Z8e4LwYVuNM04krWsV823fc9xYPwfEmEw5nb5IFd2eQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 7:BUgew3GPDE5B5ew0OVYsnkkOEgmDQXATX0ZYrekFn2KFG3BmNJHkocL2+Oz+DUI34LVsDLJKDFR8AURh3bgieEyM4hTXvJuIqKKvE/U11L/EGQ+ODtymvOwmZyGA9zMNxtIdNeyOdjG6we34XYMiQm7wLY1+FZoshV6ba/BZwlxmdGuDHGbXgYNKfybVwmLU1Sq4QrQVN9h7JErZjq3P+FZjWQv3o3qca0LAwCC0ba0bMz2P/QKB4DKpCrzFvT+JcQvMXPGkekS2xbLOPa997HXVZV9BuIXWDrdpzr+HI5RRmsu5XRw/qhgXUflRMEN+G00diYUycxq9tgJxizKSqQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:19:54.2887 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2253 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only difference is that non-compat version forces O_LARGEFILE, and it should be the default behaviour for all architectures, as we don't support 32-bit off_t. The only exception is tile32, that continues with compat version of syscalls. Signed-off-by: Yury Norov Acked-by: Arnd Bergmann Acked-by: Chris Metcalf [for tile] --- arch/tile/kernel/compat.c | 3 +++ include/uapi/asm-generic/unistd.h | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/arch/tile/kernel/compat.c b/arch/tile/kernel/compat.c index bdaf71d..3b7853c 100644 --- a/arch/tile/kernel/compat.c +++ b/arch/tile/kernel/compat.c @@ -103,6 +103,9 @@ COMPAT_SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high, #define compat_sys_readahead sys32_readahead #define sys_llseek compat_sys_llseek +#define sys_openat compat_sys_openat +#define sys_open_by_handle_at compat_sys_open_by_handle_at + /* Call the assembly trampolines where necessary. */ #define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn #define sys_clone _sys_clone diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 9b1462e..a6062be 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -178,7 +178,7 @@ __SYSCALL(__NR_fchownat, sys_fchownat) #define __NR_fchown 55 __SYSCALL(__NR_fchown, sys_fchown) #define __NR_openat 56 -__SC_COMP(__NR_openat, sys_openat, compat_sys_openat) +__SYSCALL(__NR_openat, sys_openat) #define __NR_close 57 __SYSCALL(__NR_close, sys_close) #define __NR_vhangup 58 @@ -676,8 +676,7 @@ __SYSCALL(__NR_fanotify_mark, sys_fanotify_mark) #define __NR_name_to_handle_at 264 __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at) #define __NR_open_by_handle_at 265 -__SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \ - compat_sys_open_by_handle_at) +__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at) #define __NR_clock_adjtime 266 __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) #define __NR_syncfs 267 From patchwork Wed Mar 1 19:19:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94750 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1970771qgi; Wed, 1 Mar 2017 11:57:49 -0800 (PST) X-Received: by 10.84.217.205 with SMTP id d13mr5629937plj.141.1488398266922; Wed, 01 Mar 2017 11:57:46 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g33si5452265plb.206.2017.03.01.11.57.46; Wed, 01 Mar 2017 11:57:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752401AbdCAT5p (ORCPT + 25 others); Wed, 1 Mar 2017 14:57:45 -0500 Received: from mail-by2nam01on0043.outbound.protection.outlook.com ([104.47.34.43]:43686 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751485AbdCAT4K (ORCPT ); Wed, 1 Mar 2017 14:56:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8Kwk+52FPwTNfKXer45hS7VNvk9zjLvpEwabS3wT84s=; b=WuWdihiUIVRtmQu+uD9A3eRcSXiCZ2nxY9qeujLc2quJ2jY+Y6S9AIo3YHmi1CgKj8ufYDGg8cv8Fk1EWieF4we/QxglxApFQfkkM3I9wOAizGOU1nnDv4WOS2ZWGViU5sVFDVXzA71AkIdLjziAL+cEQ7Fn9ovEqCUA1hAw8r0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2253.namprd07.prod.outlook.com (10.164.47.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:20:03 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 02/20] 32-bit ABI: introduce ARCH_32BIT_OFF_T config option Date: Thu, 2 Mar 2017 00:49:10 +0530 Message-Id: <1488395968-14313-3-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM4PR02CA0014.eurprd02.prod.outlook.com (10.165.239.152) To SN1PR07MB2253.namprd07.prod.outlook.com (10.164.47.147) X-MS-Office365-Filtering-Correlation-Id: e5ab136e-351b-463d-a4ee-08d460d7f728 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 3:PgeUM6/fbxiJBd0qxthNW+zXNzJSIM76xPRvvqHuzl0pqYBktrdu7qDziqEEAoW0d8uHyY8tNdHmBFvsmAGx33XbV4xjtDcrTAn2yBU8Zt0l/ZRLnK/0abZLqiGGcdRcmGZQaRt7b1UPDw/x3t0MmNXDE8LBeDZPpGlcnzHs5b+LDpun4FGqdObJlcBTjbNB9FhEPbZ/O0CkpPam0e/EEtp/H+DAKrPj0xfku77GFKaBiVq0IKMigXxclIRcS0A6fb/9ZjhcUvMgSHcwKEEGgg==; 25:i9BVTj7RWwmWKtkQhYLTzrhVESbSJxE7vARnyxrs3QYMMXXDkAzYCLujLjSULQg3rVikJ03/YRxR7/euvvI5VZCcq6OT7A7ACAJRdttXqHwtULMm7OU8DHSg9v5JK/BOBoFOw6CtZru/3VgO3JaQs9YS67sG5O5mL76MIbCvHLlNEiytGK9rusUazNltei/l3Pic/+La/hCljSm6UctDlp2OZf4DWqYbYjvsIObNNuiB6VvCf+9DY0Xaniv3oky7OTawfpn8BCjLpTd/nfnHgBNWZ9JAqGxNUiE2Sz8ByVrWbnHC6NpVAnPmd5NpoR/WPJDktj5DtPYWOB1SsLYMgTVIxGTjxF4QYItWpigx0Ipz1wTlAMvkZKePi9MfAT2F1V78yCpgTExaaWtvQQcvj9Qb7mMc6uERKSXXORei3u786O3Pu3bNGVPSuHgcJ//B7P/BM/vLbkNiOUbZ0Adp9g== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 31:lrUNTy/NbtvMzekKpRROFCKWDAaoiv/fCozwbhdJRzXQMh8lTj/Iido1QOwFHNk0ak4uZq38ie22e5TXvwvfVJ15SHl0sedhg5BxXqBPnBMzHrI1XfmY7WNbkM6eMZfaj71RnZXnE4a2lyqquExaZpded7JjbUB1e5KSfmVO8LIa+xcRmqWzdNIMYWh84TQyaECFKKLp0gw4V9lpJurCYAON4mrSWleXmytTyeIUybrqt9MzlZ7CTxOmGvDpFHiQ; 20:7/GweytAyy6ZugOSCXFfd3yisnbVZNsIVWIBiN7sWKzWhnesd94miQFXofO13Inr5DyuWKhHGxi7DUaaaJLMq56Q/EXerfv7EmqpVCTi2DtiWCaCjOSEYz8FduXLNN8ZjVcQtFoGCPgiRgipwXycytKWrEz45f7zwJ0A5Ip9SsTmqquvAsT7eCgGcVMZoBwPJYunIPEknHjOUmt7F8/5C0NE6XVrBnPnspuHfPL/km+TA5lyvHI/FXcteF2yVzcYLFE0+steJSpyiAQ36JeEnGz6H047G7dcKec0QpXv56jtnS+R9U9FrFns0DSO3XbR8xeVDJpS775ZqxPuDN8BdwwXWHEzARiax4ciHLKiSf7NpNSQLN+PY9rzo+L93XJ6lvBdFb6QAsUBZlLbpDWQXuqjXP17Os4L918KjW3mhi4T9st2N0dsmIe+W7DQKcdKOL1JfgVDB94F+Y7ZByZ5fB3yBUpeBOWC0dMu0zPEri34bkgztmHKaa9QLJuVpdD7JeUcEM6Gh4rIojfS8JoHWxKn2av5I5qesWNdfw0VRamUDAd88NkJScQuWTKUU1Q2EUgzpGCSuSnQ8kkFVq1106lrRUS38xy41dqVH6UcZfY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(5213294742642); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:SN1PR07MB2253; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 4:s1IjqfaWaaT4wpj7aDKcZAI27dl8stUEy9MrvmDfAmvuT4WvVPbgd/FpcIjSY5iXQkCYfpDe0XjbTbvz4J5SnanITLhe4+oIx8hkf6z8xrRzUrcCGW5Q38DfOVr+ZsjESg/dq8sOcTqsEIJY07U1kty7dITrf36S5HJA1WU2hktNm/2usa8KwyU3lmprFSY+UYMAq237lMPEWdg3ofmgYWpk7cvcGNJTg4NzZWYCM6xwsHeIsFtNxvRz3PxjMLTbaLLaT0yH3vKPIULN4gGBF7zI5ME8s2Q6zu7boA9nW8fKDKBXx/f4vf7/xkWyou0xFTbPv3omctkLkOcUCDD68VsAhRxrtbROc2OeJlh/wat3lsN6J6Fv5aFKxsdGgV2lSY9gK/4UuwwGPBppTu/Vbd9U1ucVb/cWP9BZy5TC2C7qG9zBjfLoauMIXaLrSw9jrxbFsRQzauXKHabclyfydyGFxJcAoQ2nSyABlzJSK4NDN0ZGAUG9dNSnMQuyFL/NblEZIDSEpounxTDCqvtGvrykRFWktmBttovFNKIu3YQ6WMDzG9Mo1sIOsx5J8bR/QInisHKIP2DOXHI7Dgdwvtm2PbYTE/revoBxxVbNl/xEuDiyoyvfN2ODrJbgk2JxSQQ2oDTLM1FZvDnGmAjuvg== X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(2906002)(305945005)(7736002)(76176999)(7416002)(33646002)(50986999)(76506005)(47776003)(3846002)(4326008)(6496005)(6116002)(38730400002)(66066001)(48376002)(575784001)(81166006)(189998001)(6486002)(42186005)(36756003)(50226002)(92566002)(2950100002)(50466002)(25786008)(8676002)(5009440100003)(5660300001)(6666003)(5003940100001)(53936002)(54906002)(15760500002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2253; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 23:2oFbZPE2rLgVSuP12AYUywIz8P8G5fcKNw+s82oOuxh+omDM8Y7a3Oc3z0lao45F05HS8fdEsx1+F9+tsGj3EsYgvMp0FbL4LC4lN+qQWoZFOKA+yXB8h8fKL0SPgxNrqpmeXNWJr97bQ2m7HQswLwhIg35kEs8l0ZcJayBITwAibmNy87jgNKZkfdrIVqcG9popjlKnZtO+mgdZIEY1ulebSUEVpKLZhswy/0oxDsAZaO+sOevw2GK7Qsl1p12nGNqgX1wSbLOtvERfjspvZ4QIfRCn4427Baf5hKMKlNzTTOsr4+cvb9JhYmNmnZax+oGd3EIvGnJWfwy7bb9dpamh8pucTEKfO91N4QZ+RFeicAgO5FJth3Qvmmgz4RMRzxRDWGz5QncvkFrJbCMrLznBLkADV8W1bInLDnHfmsAKPSruQBI46AXYY2hrtuBq6poouGuwoakg63B5vdQNbmvj+ufVnvgUbOtADt3EfX0TtR5/6PSiOGe/awSdpMXL12eEkrClWuMd7svUIY/n1A3WqIviyzpIFnoImzgynCl9Xy2fpPsNnU8nLdGtWqqGKz13yvBSMpor1LcjLivjUvtSFOc37eYWSuz9agKkw03zVM31inFqc/Yn0ysVQkRi7d1/QLBaOlQN964uAmFiV7nVFNGsr+JVGQ/+YzKWYYauBqE0VMDbFCfWEYb2LAIyByuMEJxfR9W6mnMaqLalphJeTiriK+M5LOjvw4GpzTDgQJpV2cuUZ/rFT4HwLVaB4QVDB5rWmcrmByVO4BJEVBchYN1tDJoZhh9NaXVgaN2+teZ/y/9k4pBayL9t5PG5x4ZkoLuFQbWl9abe9P/ytzYIzWSTnJGJtTuJmDFrFUZVhkI6WqF+skDKLLUkqM9Ra2bfM6ND5wfBL0B2qjFyCceKbmlBkl59aJ4GezSZ9LbV/3ZnlwbjLONiEV+ZjARxLM0G98utKd6vJmUEqNLtIW2gjzkjCwetiSABm0zgcaoewUByM4ON7L+/796f+Rha X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 6:R5zTbCuKO+K7su1YoPnj5+1Cjomt5Cv0vsqRdpmtKdL4qJKm0mwDXoFxzZpWervhawB83AYn2mwAsdS8zPB5is9hkJ2qJQi1KVBVSQsgy8nuId9yCF6jAfVqeKP04NMYUSg33w6B1KDjGJNTKhDTuKY0yQu0ZnchxfEEsl/L28bMZS3BTuXP+yLarvHquFTBMOdpEuAu6PwBRu4oIQUTfb0ji2pT4yB1IhMG9B5xe3Rz01NUOgAwwsafcKfVUXPlIyKxjJJLVCnd1JMyHDqLjNObJdkEvgIV8mhtT6P5LDD8aStXx+0wWtJSV1MAE4f2A5KJPaHzHshyLcPGNYbRGLpL177EiemPdbh/0GnYltlmePA32LGCqjI/h7tMQbyhXvRtbhMjtO8O2eov/G8r0A==; 5:bKOtxPLVZfflQCUxsRHmjUqgYdzueoevjNULMzr3hjtYqJvAik7PoYbwVLsLIz5lDbmQ5TXZw33WMLGniORLh6iNj9SvuByOA5ZwJfODw9ML7FhkLbU9hgJPHr25H7IqOm7E7CHohu3QRiydVYHTip/MMR9asw7zTJYCw/i8PZ8=; 24:EvAIXXyIBa6tUy2q5EMqlhqaibjfFIu2ECHAfpgfYc8/3CYAFUj31YCcmTfkBYsi3XBDn0lvnzOVSpjEK8kFhldwdr3aUYNfH8NZSFSVNTg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 7:+S91ahXFzVTELHKs+bUa9EASG5S0yzC8/haXvVlSXIVmG+njmtjDVJr5J8kQB64JyM+5okR542LAObQXH2GzHtVOhK7ZQZaWJQEIMExWptQnmHhPmQYlKEbrfrTHAcOzwVfWryWrDZv8sOgC9u57RguWDuNGmMlSFyS2r8ZkDDGpNNUwQMiQQ50+2yv403p3VPH/4T5oPofh9m3qJGOXCXAQKSJ9z1vasfzQ3xygntT8owoFuP2E7ekMGtN/RGwtRm7Xsyvy8LP7BW2zvTcBegOWU51eVGk2jYkG0q7zV9RzsaKkfs3MPkV834fr6BS/lq+XQM+fvfz4ZFPxPJosfw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:03.3984 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2253 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All new 32-bit architectures should have 64-bit off_t type, but existing architectures has 32-bit ones. To handle it, new config option is added to arch/Kconfig that defaults ARCH_32BIT_OFF_T to be disabled for non-64 bit architectures. All existing 32-bit architectures enable it explicitly here. New option affects force_o_largefile() behaviour. Namely, if off_t is 64-bits long, we have no reason to reject user to open big files. Note that even if architectures has only 64-bit off_t in the kernel (arc, c6x, h8300, hexagon, metag, nios2, openrisc, tile32 and unicore32), a libc may use 32-bit off_t, and therefore want to limit the file size to 4GB unless specified differently in the open flags. Signed-off-by: Yury Norov --- arch/Kconfig | 4 ++++ arch/arc/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/blackfin/Kconfig | 1 + arch/cris/Kconfig | 1 + arch/frv/Kconfig | 1 + arch/h8300/Kconfig | 1 + arch/hexagon/Kconfig | 1 + arch/m32r/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/metag/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/mn10300/Kconfig | 1 + arch/nios2/Kconfig | 1 + arch/openrisc/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/score/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/tile/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + include/linux/fcntl.h | 2 +- 27 files changed, 30 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/Kconfig b/arch/Kconfig index e55e9ad..4130934 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -242,6 +242,10 @@ config ARCH_THREAD_STACK_ALLOCATOR config ARCH_WANTS_DYNAMIC_TASK_STRUCT bool +config ARCH_32BIT_OFF_T + bool + depends on !64BIT + config HAVE_REGS_AND_STACK_ACCESS_API bool help diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index c9f30f4..6a56461 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -11,6 +11,7 @@ config ARC select ARC_TIMERS select ARCH_HAS_SG_CHAIN select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC + select ARCH_32BIT_OFF_T select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d4e71b..5e239ad 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,6 +1,7 @@ config ARM bool default y + select ARCH_32BIT_OFF_T select ARCH_CLOCKSOURCE_DATA select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEVMEM_IS_ALLOWED diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 3c1bd64..26418e7 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -12,6 +12,7 @@ config RWSEM_XCHGADD_ALGORITHM config BLACKFIN def_bool y + select ARCH_32BIT_OFF_T select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select HAVE_DYNAMIC_FTRACE diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 71b758d..8c059f0 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -50,6 +50,7 @@ config LOCKDEP_SUPPORT config CRIS bool default y + select ARCH_32BIT_OFF_T select HAVE_IDE select GENERIC_ATOMIC64 select HAVE_UID16 diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index eefd9a4..2f14904 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -1,6 +1,7 @@ config FRV bool default y + select ARCH_32BIT_OFF_T select HAVE_IDE select HAVE_ARCH_TRACEHOOK select HAVE_PERF_EVENTS diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 3ae8525..29bbcb1 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -1,5 +1,6 @@ config H8300 def_bool y + select ARCH_32BIT_OFF_T select GENERIC_ATOMIC64 select HAVE_UID16 select VIRT_TO_BUS diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 1941e4b..bbcea8c 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -3,6 +3,7 @@ comment "Linux Kernel Configuration for Hexagon" config HEXAGON def_bool y + select ARCH_32BIT_OFF_T select HAVE_OPROFILE # Other pending projects/to-do items. # select HAVE_REGS_AND_STACK_ACCESS_API diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 9547446..d6d19f6 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -1,6 +1,7 @@ config M32R bool default y + select ARCH_32BIT_OFF_T select HAVE_IDE select HAVE_OPROFILE select INIT_ALL_POSSIBLE diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index d140206..ed6f90c 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -1,6 +1,7 @@ config M68K bool default y + select ARCH_32BIT_OFF_T select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select HAVE_IDE select HAVE_AOUT if MMU diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index 5b7a45d..c337192 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig @@ -1,5 +1,6 @@ config METAG def_bool y + select ARCH_32BIT_OFF_T select EMBEDDED select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 85885a5..643025c 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -1,5 +1,6 @@ config MICROBLAZE def_bool y + select ARCH_32BIT_OFF_T select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e0bb576..17b34e8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1,6 +1,7 @@ config MIPS bool default y + select ARCH_32BIT_OFF_T if !64BIT select ARCH_SUPPORTS_UPROBES select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 38e3494..75f226e 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -1,5 +1,6 @@ config MN10300 def_bool y + select ARCH_32BIT_OFF_T select HAVE_EXIT_THREAD select HAVE_OPROFILE select HAVE_UID16 diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 51a56c8..f9273c9 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -1,5 +1,6 @@ config NIOS2 def_bool y + select ARCH_32BIT_OFF_T select CLKSRC_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 1e95920..5539d08 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -5,6 +5,7 @@ config OPENRISC def_bool y + select ARCH_32BIT_OFF_T select OF select OF_EARLY_FLATTREE select IRQ_DOMAIN diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index ad294b3..6e4e91e 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -1,5 +1,6 @@ config PARISC def_bool y + select ARCH_32BIT_OFF_T if !64BIT select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_IDE select HAVE_OPROFILE diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 4940917..2540a99 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -80,6 +80,7 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK config PPC bool default y + select ARCH_32BIT_OFF_T if PPC32 select BUILDTIME_EXTABLE_SORT select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 507d631..0a9484b 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -2,6 +2,7 @@ menu "Machine selection" config SCORE def_bool y + select ARCH_32BIT_OFF_T select GENERIC_IRQ_SHOW select GENERIC_IOMAP select GENERIC_ATOMIC64 diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ee08695..1f99eb3 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -56,6 +56,7 @@ config SUPERH config SUPERH32 def_bool ARCH = "sh" + select ARCH_32BIT_OFF_T select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_IOREMAP_PROT if MMU && !X2TLB diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 68ac5c7..a0b79c7 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -48,6 +48,7 @@ config SPARC config SPARC32 def_bool !64BIT + select ARCH_32BIT_OFF_T select GENERIC_ATOMIC64 select CLZ_TAB select HAVE_UID16 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 4583c03..845dcbd 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -3,6 +3,7 @@ config TILE def_bool y + select ARCH_32BIT_OFF_T if !64BIT select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_WANT_FRAME_POINTERS diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 0a3bfd1..9629fd8 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -1,5 +1,6 @@ config UNICORE32 def_bool y + select ARCH_32BIT_OFF_T select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 005df7c..d058243 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -43,6 +43,7 @@ config X86 select ACPI_LEGACY_TABLES_LOOKUP if ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ANON_INODES + select ARCH_32BIT_OFF_T if X86_32 select ARCH_CLOCKSOURCE_DATA select ARCH_DISCARD_MEMBLOCK select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index ed56a1c..8436bcd 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig @@ -21,6 +21,7 @@ config 64BIT config X86_32 def_bool !64BIT select HAVE_AOUT + select ARCH_32BIT_OFF_T select ARCH_WANT_IPC_PARSE_VERSION select MODULES_USE_ELF_REL select CLONE_BACKWARDS diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index f4126cf..683f24e 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -3,6 +3,7 @@ config ZONE_DMA config XTENSA def_bool y + select ARCH_32BIT_OFF_T select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h index 76ce329..46960a1 100644 --- a/include/linux/fcntl.h +++ b/include/linux/fcntl.h @@ -5,7 +5,7 @@ #ifndef force_o_largefile -#define force_o_largefile() (BITS_PER_LONG != 32) +#define force_o_largefile() (!IS_ENABLED(CONFIG_ARCH_32BIT_OFF_T)) #endif #if BITS_PER_LONG == 32 From patchwork Wed Mar 1 19:19:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94760 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp75157qgi; Wed, 1 Mar 2017 16:05:56 -0800 (PST) X-Received: by 10.98.14.81 with SMTP id w78mr9097184pfi.9.1488413156293; Wed, 01 Mar 2017 16:05:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q18si5911692pge.19.2017.03.01.16.05.55; Wed, 01 Mar 2017 16:05:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753676AbdCBAFy (ORCPT + 25 others); Wed, 1 Mar 2017 19:05:54 -0500 Received: from mail-co1nam03on0040.outbound.protection.outlook.com ([104.47.40.40]:54304 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753375AbdCBAFt (ORCPT ); Wed, 1 Mar 2017 19:05:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=y4ANma2U3x7SbCCjVzTVCGHrPwHbCBb2Leeo7Pb8x3w=; b=rf4b3+9ISULQO5q8rQTAD9D/U+J+zq7mOOjffH8HfFWSe+HLo/0vGEPyvnOi0XYcRZGsprLOK8c2c5oBs15ZSNUdMGcKkyemN7gC32ZKkVD46qXq5hxYkahxgOFcl2NXWCDIyYamVtvzze83hOpVGO69ZEa4Y/PjI46fEYdW2uw= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:20:17 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, James Hogan , linux-arch@vger.kernel.org, linux-snps-arc@lists.infradead.org, Will Deacon , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org, Richard Kuo , linux-hexagon@vger.kernel.org, linux-metag@vger.kernel.org, Jonas Bonn , linux@lists.openrisc.net, Chen Liqin , Lennox Wu , Guan Xuetao , Ley Foon Tan , nios2-dev@lists.rocketboards.org, Yoshinori Sato , uclinux-h8-devel@lists.sourceforge.jp Subject: [PATCH 03/20] asm-generic: Drop getrlimit and setrlimit syscalls from default list Date: Thu, 2 Mar 2017 00:49:11 +0530 Message-Id: <1488395968-14313-4-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: HE1PR02CA0057.eurprd02.prod.outlook.com (10.163.170.25) To SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) X-MS-Office365-Filtering-Correlation-Id: 8f4fcdda-9f0a-47bb-2104-08d460d7ff83 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 3:01TKOZho1iAs9EMk+8qWSADXPSoOBlBrNcY69KTFxP0DAttMa0JcA/4tBiaQ1N5wbtwULi/nO5PwlTYHWW1orLRWCfH+5e4kbJlLfMf6rAVmLza5OMEYC1ig2uu9M3lavMimTzzpWJWR3Iyvg/zxYK9GmAe/d0d03dv+Xr/6qftzxO6sMjjfftVQQEu3v211QPh+wwxyTE6q2g0YmluVNw61aqiC7/9AqI7fRmz3yhdRIwnk6t0mzL3MRwEJ3wniu/n20ej9jAnLsve9Rd+hbQ==; 25:ediwKYHnrvZVqqClYeUjvveAM9hQq7qF2Sdkw4/UK6qAfIe1Jvqki3f3AvopChHYO2n7+HxBtEoCrH/s1YYndXbo+3NEvtZWWUcjN3/SD0TGYvgJJOKxeSw91qkxk688h0EO8aLnNhuKG9oPhcId2Dhhp4V7Ft6JH2mO/xYiUTjvZvblMKSm7qZnyv0dujHcORGLjUyvmEBSiM48rf47nNNRMsiGGJ2m6DBLRXvicErqFwHfzAPgU2fgtI3RnytMwq2F2jocY+orsakedjKDYc8AzaqrfHoGGLqJxRneZ/Aa4njjHvcMcWCUISiA/39LyOob1Cs42B/pTmU0rUKGbC0vZbo0EByMYfb7qtK8+J7h4IGONBjDHRJHDBeQ58su++suPEw1oWnr5cZ3vF3BYL2n9Ih6x6wiy08LCK3cdt/ygyNQGYxqTuM1XLme6XG0md+2AaNND8677GAc6g9sqA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 31:3Kq6K30DtGHKvHvAeF9eRMKhW4kD+FXKi1Wg1b1kVhmnlmeRuQOC96Wxl9R4eOm/kkNz72rlWWTWc1E1EcSLnA7cUzy4emBcQew7Jskibs+VPdmRaGk1P+Iw08imqdLOol10Nb9k943UkjJl+MCwjIYThqCN/gZNpvY1Y6UKadwYdd8N++dQZX8fkfxW9zWPbPJh+dkvnQVYtuwsw+uRwzuYEREGnwiulAav4YBUxfs=; 20:F4t6BXT8ZkRk2XW+HIuXhvqiHp3P4hSZpqi241cZmnUviza9ZE0Zw8OZW5kvF4nt29WOW59EyLEXeXn/7UwnsIsCcQMs0liol7KQNJ/SZhJahhmsMLtKRfkeeTN0ebmVSMs2dxtIhCVOGxhBV2BQGtuT0RNoMwU+h+aznCVK1a8XyEZ2h9G/5K1nS71G9Dvks4SiuTXKeF/GdrltSlhXpMtNi3qVplQsEGR4B8r7uXnhTICWeFWfLs1VTkpxSShd3B5lS6VbdGcCJjvuttlIsrqZ8bBL060gnSUaDopPyKRftkK9CNa7Wfz08B2WWveYw31WKqRIlHErSd5VBiEJPFRDN1NRG8tndVh944Qlw+/KrLkkewJHa1w4NQ6IezITehFb5VdFdwKPpDPSs1GKhF2/7QKzZhGHie8DF6+exNB8SzqhoOcm7xtr/c+e43CFjsDRJE9UCRRE1f06W77AOpg1gwufXs0jiGfh4sRZHShjYlOvUWcH0ThqxpZprmCYGj7LXD+dcNpisShcpuvaDDC/Zr12jXD409IJlGF8FXNtPpAsQYnavThTd3/2E4tCVokSD5cOayfj72XYDnnbG4aslXhm3zP5s2S+vt6dpwI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(31051911155226)(9452136761055)(80048183373757)(258649278758335); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:SN1PR07MB2254; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 4:FoC7GLqXtY0XcwCXEyrXSlDYOV9G7r9FwEcgWt8ER2lFP3KSJWXpPUrqVUy/7jRgi6ISLMRlWAF6hBnIxPavnwGl8d6AtUebqFAWSH35wRsyvzA9LVcc5JPJWGe5RzoG6qZGsq6NlLo++IeM/qZKyX2iSjWQuFYLnCRyhVpRonDx84gCOttYsAoTT+lU8NuHzpp+74Rb3UwTzg3qUIj47mAxWod3ytpRxnHE3Hy1VxbexZOOuRmwVRORHmkLDsGEN1AgShsSQBxKagYJ0+r5PlYec/aelo6F8j0d73Y3VsdxHzjsuW3ybRy1srzh85BJn+n4fVRFW34+2964hckzP7eHm27yX37EZGtd/g8IwGUCWQMjs9kSo/oi2cZQFHtMXMyiQAzgkKlNs45IjWvGj/5MJW19VZV6WS1CHCvIH/xomW/6SevUyyl3dHVTtlFeg+oY5aDCQfROgJkY9AiSFr7grPVvV9YQnyn7fXmMiH5fi+9C64oODeNbMNND+RqE+aS2KSjvZExgXPiwHKP4FE+wAboqCia4yr3TabMaBX1e9yimHoFr83QrjhyahFsKr6AXC2d8/DOqL+uL5awtp9lJZaxdZ9ZLxj58wG3D+1ypzj3TeyABOztM42+1nr6u5Pm5ZPm+ouHLSY5XJvNsy8phLrYnvWvYqVZaWVFffxT+hFbph5EpA5FBhJUm6X/dntOowxaSAVZR2FT4WEiTn5DaHFvXmV99Lker9Qanim/9n1m2Iwhtm+Ql68lVjwBsX3YJXECp74/bVLa1SJpjXrBmOtH9dOXLUG0LWMGA4Hk= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(66066001)(2906002)(54906002)(5009440100003)(36756003)(7406005)(7416002)(4326008)(305945005)(7736002)(2950100002)(6666003)(5660300001)(92566002)(38730400002)(53936002)(76176999)(76506005)(575784001)(6116002)(3846002)(50986999)(33646002)(6496005)(8666007)(81166006)(189998001)(8676002)(50226002)(48376002)(25786008)(42186005)(50466002)(5003940100001)(6486002)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2254; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 23:TVHdwmidFEEDwX1w9UQUM9MKWAkjg4My3CzONBz4P8kcJY1lFj4ey2Df0CQ3hW3KNhoRqYhgS/w064QmFrr3H3IAGgODAbQHNs0Q3SEORDT3veEw8BaGCmb9Jp3+osekQfxbeo0tVxF3TriTYOZ4DLaR7qxYL+EzeSFeAG8wvChFBwnwa0mGNFxwI07akpxAqoXxdb+/HTvl7WMjVj88K1QYQZWg7w84B4tLk+gWsTnvanxZcKngn3NwPwsIoshsVmw4QEKJQ6ZeOLGCM5RTQFXLm/IQN96utSBE0+K+kQ6R0ft9Q+S1kQb5BY38TXtIN+9HWEZxbyETMXZwztLcvQNBtwMnBK1WtouLjHyOXURKqkic10LkqLB+HGJqfsnwLIX4MgEQOVsFERAttYIKWXuqdEzlYk5hpGh2ye2CMQsWxgfZGyzWmzObIGWfpPREfEJ/ANREfQrsoRAfTZLFFc1EuWXG+GQy6SSUR5AmLANwFyXg5t7QaZujw/SHl4oh6xSw+jWLu69aoa8ZdT4I7IJ36wuomS+vKPJVltiA+nRwUnBQlbJJ5l8pVqjVNxQXdBQ7Tq62D7/1mO55MRePyHm80FhdDr5pGHnWGKl9GwziRWqwrRv67TsSa731i7qO23MBMy7ozOyA7ps5jNYIBTWgemgv5K29/pWrx21Rvx8OIWXZFDPDciL/axRnZ2z0NTrsenLhZZ25sppvNaUFvz0RmGc4UwvYoVT+xWIg/2uz9jZim6V0yR33UWtKp1L11hInaC7Ujx9XpeZcD6tAS1DhS2V7WNCcvfrw0GhOvlq1hKLG9ydTgA5prd/LwnOeUYAAv35DuIsqTqvoxQTkIO7lXl2STrYP+iQS5D3Opnd/D6z++IRmNFKhElZOZ1+6LM2wGI6Q57jOqPwPebgKZEi5gHovS6MuGjkv6aGngm4t+ZXG53gT8UopBDDUdgFmAhUETYIJ8zdQAGm0/L2owixeIJt4GtlLl8mDbYumsSonzU0nDbVsTffNFUIKKZ9XJn15/6cSgKoqFalq4ABWTw== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 6:E0JpysVS0W8Zaa5c+9rmnzTLKFY3ztZGnJm2P1OvkRcC4HWMbWryIqsD33U/q1cWfLZoFG6CmoVzGFY0FoJeuBrs0lhLkzkeBlIeGOzWxPsE7Fzb3tKwYvRWDbI2pPql91sUeBGJHiCrMTvIVjD2+ORuPC1zDzzgw5BcQsazMFe9C43OUU9tuog0mGbNZgamH3jM41rkSUWcgEc5KWNcwyowONt1vYBjkpGY1eV7ZRXX4KpR9M/b0AZp+uc42LGk8/cDs9J+dq1/21RExJUNtHfmMp2nmxPfNATCU0PZDnUnIkgV9XZtCONgh6+9nYVXzygj9otiB2B7o0Q6OUTwMkK8qEN60id2hhpz62+GnxZSapGVg+wZwTj+GPASAvaCKtoa5ef5hm170makAMukrw==; 5:t2h00kAcLY0aH49AX5im3JYsgP2XFiJbf7VxAlTe6FtS/4DFAiMpHrKbGRwxPWoMts9V3HM5GYo+x1Yvf6O4H2jIxV/bRasPQzOgb8BvbqW9ZKHHRvo09OQQJfRp4SBhYb8tKd+sCj0uBx84WmN/uPHCTji7Z3V1muIrNdyX85U=; 24:A814mjvALSc1HwlqypJT6f48qE0jKmIg814O4Hcgov9ABJsb0fKbnAFzKhwBnjiqdk25B40q1guSv0gfSfGZ54mn8S/x5wo9skScchEyXE8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 7:vpK4MymWw/xM5mXOBBGLiHqJg/OnRMdKxBP4Gv6E8JBiEIFl7SMyW42U6dwo/2s8qicZz+pcWBzmGnQFvmr5Cw3u0OPGplovm0ecvHHOxan4wsGfhSSlGzPKHKIWzh+Qa1wXui4IBTz2O+68yuxLI6mtMscNztsApDxNEiZab5B7YOS6UyLNFbaLPkHiIM6li3t4sIBPM/BOnm/f0c1p5COTzUjA1Ak7/MwZJJsNMvKY1OisohwA7uOTPNmCxEFUM5Eer/NJV7Z9julhSNHamDAvmMeTTcIsYO2PYn4IsQgYexrnAafPwjNyWWtRjWurwwz0F0q7V4FkyYMhROSoHQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:17.8507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2254 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newer prlimit64 syscall provides all the functionality provided by the getrlimit and setrlimit syscalls and adds the pid of target process, so future architectures won't need to include getrlimit and setrlimit. Therefore drop getrlimit and setrlimit syscalls from the generic syscall list unless __ARCH_WANT_SET_GET_RLIMIT is defined by the architecture's unistd.h prior to including asm-generic/unistd.h, and adjust all architectures using the generic syscall list to define it so that no in-tree architectures are affected. Cc: Arnd Bergmann Cc: James Hogan Cc: linux-arch@vger.kernel.org Cc: linux-snps-arc@lists.infradead.org Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Cc: Richard Kuo Cc: linux-hexagon@vger.kernel.org Cc: linux-metag@vger.kernel.org Cc: Jonas Bonn Cc: linux@lists.openrisc.net Cc: Chen Liqin Cc: Lennox Wu Cc: Chris Metcalf Cc: Guan Xuetao Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Cc: Yoshinori Sato Cc: uclinux-h8-devel@lists.sourceforge.jp Acked-by: Arnd Bergmann Acked-by: Mark Salter [c6x] Acked-by: James Hogan [metag] Acked-by: Ley Foon Tan [nios2] Acked-by: Stafford Horne [openrisc] Acked-by: Vineet Gupta #arch/arc bits Signed-off-by: Yury Norov --- arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm64/include/uapi/asm/unistd.h | 1 + arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/metag/include/uapi/asm/unistd.h | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/score/include/uapi/asm/unistd.h | 1 + arch/tile/include/uapi/asm/unistd.h | 1 + arch/unicore32/include/uapi/asm/unistd.h | 1 + include/uapi/asm-generic/unistd.h | 5 +++++ 12 files changed, 16 insertions(+) -- 2.7.4 Acked-by: Will Deacon diff --git a/arch/arc/include/uapi/asm/unistd.h b/arch/arc/include/uapi/asm/unistd.h index 9a34136..ac64965 100644 --- a/arch/arc/include/uapi/asm/unistd.h +++ b/arch/arc/include/uapi/asm/unistd.h @@ -16,6 +16,7 @@ #define _UAPI_ASM_ARC_UNISTD_H #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYS_EXECVE #define __ARCH_WANT_SYS_CLONE #define __ARCH_WANT_SYS_VFORK diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 043d17a..48355a6 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -15,5 +15,6 @@ */ #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #include diff --git a/arch/c6x/include/uapi/asm/unistd.h b/arch/c6x/include/uapi/asm/unistd.h index 12d73d9..f676231 100644 --- a/arch/c6x/include/uapi/asm/unistd.h +++ b/arch/c6x/include/uapi/asm/unistd.h @@ -15,6 +15,7 @@ */ #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYS_CLONE /* Use the standard ABI for syscalls. */ diff --git a/arch/h8300/include/uapi/asm/unistd.h b/arch/h8300/include/uapi/asm/unistd.h index 7dd20ef..2f98394 100644 --- a/arch/h8300/include/uapi/asm/unistd.h +++ b/arch/h8300/include/uapi/asm/unistd.h @@ -1,5 +1,6 @@ #define __ARCH_NOMMU #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #include diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h index 2151760..52d585c 100644 --- a/arch/hexagon/include/uapi/asm/unistd.h +++ b/arch/hexagon/include/uapi/asm/unistd.h @@ -28,6 +28,7 @@ #define sys_mmap2 sys_mmap_pgoff #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYS_EXECVE #define __ARCH_WANT_SYS_CLONE #define __ARCH_WANT_SYS_VFORK diff --git a/arch/metag/include/uapi/asm/unistd.h b/arch/metag/include/uapi/asm/unistd.h index 459b6ec..16b5cb3 100644 --- a/arch/metag/include/uapi/asm/unistd.h +++ b/arch/metag/include/uapi/asm/unistd.h @@ -8,6 +8,7 @@ */ #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT /* Use the standard ABI for syscalls. */ #include diff --git a/arch/nios2/include/uapi/asm/unistd.h b/arch/nios2/include/uapi/asm/unistd.h index 51a32c7..b0dda4d 100644 --- a/arch/nios2/include/uapi/asm/unistd.h +++ b/arch/nios2/include/uapi/asm/unistd.h @@ -18,6 +18,7 @@ #define sys_mmap2 sys_mmap_pgoff #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT /* Use the standard ABI for syscalls */ #include diff --git a/arch/openrisc/include/uapi/asm/unistd.h b/arch/openrisc/include/uapi/asm/unistd.h index 471905b..6812d81 100644 --- a/arch/openrisc/include/uapi/asm/unistd.h +++ b/arch/openrisc/include/uapi/asm/unistd.h @@ -21,6 +21,7 @@ #define sys_mmap2 sys_mmap_pgoff #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYS_FORK #define __ARCH_WANT_SYS_CLONE diff --git a/arch/score/include/uapi/asm/unistd.h b/arch/score/include/uapi/asm/unistd.h index d4008c3..7ad1bdc 100644 --- a/arch/score/include/uapi/asm/unistd.h +++ b/arch/score/include/uapi/asm/unistd.h @@ -1,6 +1,7 @@ #define __ARCH_HAVE_MMU #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_SYSCALL_NO_AT #define __ARCH_WANT_SYSCALL_NO_FLAGS #define __ARCH_WANT_SYSCALL_OFF_T diff --git a/arch/tile/include/uapi/asm/unistd.h b/arch/tile/include/uapi/asm/unistd.h index 24e9187..cf0505f 100644 --- a/arch/tile/include/uapi/asm/unistd.h +++ b/arch/tile/include/uapi/asm/unistd.h @@ -13,6 +13,7 @@ */ #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #if !defined(__LP64__) || defined(__SYSCALL_COMPAT) /* Use the flavor of this syscall that matches the 32-bit API better. */ #define __ARCH_WANT_SYNC_FILE_RANGE2 diff --git a/arch/unicore32/include/uapi/asm/unistd.h b/arch/unicore32/include/uapi/asm/unistd.h index 9cf71c7..76ece52 100644 --- a/arch/unicore32/include/uapi/asm/unistd.h +++ b/arch/unicore32/include/uapi/asm/unistd.h @@ -11,6 +11,7 @@ */ #define __ARCH_WANT_RENAMEAT +#define __ARCH_WANT_SET_GET_RLIMIT #ifndef CONFIG_UNICORE32_OLDABI diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index a6062be..d65e232 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -465,10 +465,15 @@ __SYSCALL(__NR_uname, sys_newuname) __SYSCALL(__NR_sethostname, sys_sethostname) #define __NR_setdomainname 162 __SYSCALL(__NR_setdomainname, sys_setdomainname) + +#ifdef __ARCH_WANT_SET_GET_RLIMIT +/* getrlimit and setrlimit are superseded with prlimit64 */ #define __NR_getrlimit 163 __SC_COMP(__NR_getrlimit, sys_getrlimit, compat_sys_getrlimit) #define __NR_setrlimit 164 __SC_COMP(__NR_setrlimit, sys_setrlimit, compat_sys_setrlimit) +#endif + #define __NR_getrusage 165 __SC_COMP(__NR_getrusage, sys_getrusage, compat_sys_getrusage) #define __NR_umask 166 From patchwork Wed Mar 1 19:19:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94756 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp35298qgi; Wed, 1 Mar 2017 14:00:54 -0800 (PST) X-Received: by 10.99.66.3 with SMTP id p3mr11384965pga.214.1488405654734; Wed, 01 Mar 2017 14:00:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n10si5695365pfe.80.2017.03.01.14.00.53; Wed, 01 Mar 2017 14:00:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753533AbdCAWAt (ORCPT + 25 others); Wed, 1 Mar 2017 17:00:49 -0500 Received: from mail-co1nam03on0040.outbound.protection.outlook.com ([104.47.40.40]:22588 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751157AbdCAV7u (ORCPT ); Wed, 1 Mar 2017 16:59:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zwGTS0MN7zngzmuxfrn5ZPOr1gCd2XFmvRIjvKjJQqg=; b=KlK1RRO/IE1lMRyjQueNMIsTh0m4aXpGG6GeeovOYZZUG84ccMyB2MuJh22cDSOJzR6X5SmfPPomYpIt8X2DKJeadiRVXHuiyn+OBz++nvBXxGiKKWgoypGDYT9F+pfQ5r5M4OXgF353kVwytq9BDWJRqeNBl1YKsOabzlqbgd0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by CY1PR07MB2247.namprd07.prod.outlook.com (10.164.112.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:20:28 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 04/20] arm64: ilp32: add documentation on the ILP32 ABI for ARM64 Date: Thu, 2 Mar 2017 00:49:12 +0530 Message-Id: <1488395968-14313-5-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM4PR0701CA0031.eurprd07.prod.outlook.com (10.165.102.41) To CY1PR07MB2247.namprd07.prod.outlook.com (10.164.112.149) X-MS-Office365-Filtering-Correlation-Id: a0ad8f82-71eb-4f29-4f67-08d460d805e8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2247; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 3:CLseu6ibl8FHOKIAaZ0UfxXgNupxX4huEgfOC9gpjhN3pR6gj7Mr0oKP+kd6MF2ZGxf8tOSNmGI1MSFWMa0iWE3LWtQ43o9ub9lMQY5Eszy/65+M30dnFTgLfiW8k7n5VT5ArKwaqan2kJm4USHdb2cABAdXBgGZ7C6vsFgQ3uqXgpKR1Csq/+3X8GvibnAmC1tn0/WH/TnyEQzqz6/XfIGWCOigkwMQIjprFtTAYqFa43BEV9Q15Wl3rFmGXMmnfTp3mhio7JEnPjj0cLzPQQ==; 25:JPYn1vF2sTNc/GILrtf7nV2U1kESwymIxTYAprMbcvyKMMbNrkSmHvlTqzUobCynEhXzHKW70ofPkPwCykZaQIb4XbVHvPNbXIXQdj3Wa8UklkxrtBXal2T6VVo2iQJ8i3qWkJXRrdAs+ECGT840+MbeXIzQ2v7O6Fg3ExmIfzPFlAe//rUqiDfSWQpEi3XW1wwK7scZI0a2/vepmU+GHCkmDk892c0Kn8xOAGEZODQ4e9TSrgNwysHmBprgkzt+iRmd2LQXe+hZSiMR8Elp3TjLauaHK6DfescXb+s/Rp8chWMuVsdta2nN9HqidyUGvuA9pGGnxx7HxbsnBEr9SVzQOpSn+AeRCBozICZYHY9Wel/rZjOEgL62VRYF1CbZnojaqxljKctb18T9UL+9Cft5vejYQshvOyrMBLQpnPTJGok6OAo8+hMuS4V0O+XVIrlnpNYdB0IiR7hBT4/Slg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 31:GN2i7i3U4aqDd1PljKkVm1lwps1+DEk6JqZNrpWezixnTZ+DSTEYksmbCPMy224jUPjY6kx6dR1DPcqvOl8xg8eXd2dF+vQOojJdlkVoHUZmBJZSFtjMugYKHIk+6AFXpZtS+jFBq1aYf3tx+M+DzUuN580dONPYFHGb2GldoJKYwgAj7JhP+Jtzq0psZSbVKXtFU8cQ0NoWsp3redZ/5SBN7PL+tdYPtG6s9h7ziAA=; 20:uiR/Af9Q5baS0gVpGgzJ0n/eRkJHWI3GsHAPldkWgobNOLz3UDF+cKlQbPGfc4h8l6+R8BKQ0iq7uwAaw1PnKodm4gtZDAy5JvZcRsYA4ez+SnPJoASG38C5/blZ0k1eDbtLuiRJpOt7g4unhcb8ASU9+50+6GArR+i+nkLepHgDGNmkxxbtf7TtJKN5w8MjCCSxEQCe2rT+Dd0eayjOfFdl2RxS2bw/XyMYNaTYbv76mE5kxb7X+bK/NNnsfubbKet8OjOkRyu7YKXrut5oagx6PkEy7uKSt8ZqERA681osw7N+xIIpPdxCnyZYX8aw/WsmAQzNjd8fm5UVFlXJ/iWL1rIb+IKVsVFhz1b/Zw0bFQboDcAHwLE9RnhdX+2BPVwj3nbpGBWGYA4Pf9KhEusx4W0OS0NApgpk9q4FrcRDQexN7WkhQXD/cKZIDiTwdwpIOyYdc463jLYRu9GK87g01G+CdYTT09KbD93OtaTLZgKPcmzHUt9W0eDTAxK5SPyjHffQZPTV1wcnwz/yMRRHIRQseu79kIhYpOSQzNtnIXzm9UFCmAUaCULa/W9KGAlzLKJzlVojETtoUhwQJmNEQoZoz5LeQYN3+v41z2g= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123558025)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(6072148); SRVR:CY1PR07MB2247; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2247; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 4:um7UdqNncDElTL2H7aYnXmiYCYTZ3KilO9SZKFHwqrUYq0DPQaHdMEeI6b9RwwQJbxAErj/luqIqfIeWON8KF4HCzTEtImgqT4PkzvqM+MHCSrRZLFoXK5NyRdR14H9wCoCzQOdX/tT2HTjoSqGsmjWxYHNFx4UB7zgJ/fzT+zYoq46EVIj4G3Brog6NsvEig1oJiiF/hJWKSKFUlrfrYTO+JNfIskWnpUgf8TNeX3vDM+l11jsycywkJkYDVvujAW5h5oJlb56vHD0THS0q7r2VP1uqzHiodqGBlVwohI6nSJlR9GuZkHgVGTrDWQ+z4D0mPj2mIRWaz6a6cPO1OhWI+/YzTjPEmTk6QnvhE0/FgQSjBCUgOGPA3zxFf14k8GZ78prBQyaWpcN8MncZDtrYJC9fSRZsWwq0SZNd14uSYPvciLs1jjKgV5TNSbWYQwJQyQrvVdvySSdyFlrVg1OKFyOXq263jlnB0k3YIZxBOKljf/MbezKfDEHxnxHPuAZtsARKd1TW3xtIizEajvyPD6lMrvux3Fcj3fomWoYyppP9JXePl9xwzPJuDBYulcwHnPc0ZcBzjjhoPBDeOx5jB2+ILUIgz96EektRwu0= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(5009440100003)(3846002)(2950100002)(53936002)(92566002)(81166006)(25786008)(33646002)(50226002)(8676002)(4326008)(50466002)(48376002)(54906002)(7736002)(6486002)(305945005)(6666003)(5003940100001)(7416002)(5660300001)(2906002)(6116002)(76176999)(50986999)(6496005)(38730400002)(36756003)(66066001)(42186005)(76506005)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2247; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 23:LSg3R58W4v4r5gaHKDgIzSZ2Muva7K7cSNbuSOfCzOBRnNlrhZT0mObTRqACd0j1gaZKKYSXu4CgVn1JDV1UbOxp5aJ5xzpSw78rKtMfVRjmz6NRgguDpQislsLy2HTkXS/KNoZ/g9Lwzbo+dMcXaYKnqdfSJ6oUQvNBO+h9DFeLmh1XAHMTmhDnRGOMa+6x+FQbF8AhMjxHMy0p59f0YnFAR7V+uEA9IMFe8CD3co8y8RM9W1FWERkjQ9va81Y+3ZnyQYSzJuFeqwSgDdAf0VIPuMih/BXIUKM/bHUhD4EaHYgB2dun8TEwLQCzlaR/FH88MuJvItLxx8lCfvfdc1kKlBlXu+5HRgpFdNszSX/aW/1lnshyLYL15XmkKk1+BOk/jR3AckeVF0DgXUET2cq5Cyrrdb/Em4hVwUa8UEVkpujwP5230Eiei9ICQpRAxQAwAMCPRWwPeXq9dBXqXT9VMuVorGYS71l42R2nDD6qRGUsqgqLifqWf8IL7gcntDaIEMEbj+a/a06TDCZrPMhS3KLYzrxatfzpbiVDyVwsXRyfKDhzFQhW5duCBbkR+G7wrDSL7kLEysvg1kPTKc1p+bCCOk2+WYzIDln0c7YJy811tzIx8/I2EbOqW2GWE480FROlVwpzzqBEEHPtlO6+QvDHlUC7skWYhP32fLJyZI0GVRnXCqlTP2EacJ1y+AZgNZD/7WJ0bj7zirSUqUmGCqBCREbxfQrQU+RXc/LTsngZypqoXSyGjzltdXiFdSqg8trUFggFFzWMj5sAVMU4rsKiQS9oKBFkJRslRNtzuQE+QeC5W3vUjIgqkD1DmyHlmjLrGQZCAr+Z5vuqjzDVErPiRqiE5g5T1BSgA2qVP4HacdlA/4iuqJmWMLQV9oTcyNKj2I9exTuJyUhPiQEPa2Zg4YwCNwc1RimdWnb83FKk6t1ZQL3frJiHmWNS X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 6:e1zOy57jlc9nPVzzE4sDbdwrr4y3G4pnNkc1SucFotNwTGzhss/t2y8x8ekZvOelfz80Bi/TKGXSace2zOjqFiO4bfINs3/dZo3RHsTQ9EuXu1LZKzQp+vqjEehMI37030CCsA3CWE/bN1GwTK6B/f/yCNygJtdZnGe9WolQeelAww2yFehKAxvEiUGx6Tq09abj5K+GTou2Q3P8qTUDqXWCWGtAvOHcub8tC09O5/tPF11ayXjAwC5MZU4KEwURJAeDJ4IwaJZVCkdgri5dy7hPFQUy1F4N4YoG9hDyyDctmsgvgS/gFp2tdtBXFELLh6kaFZ2qawzEGUCW7M3AiQ/p6Kw2DWM2A1Id6p4Mvx4fLOjjoD6ypa9je/6cGXCsGVAInEO+CKuHARfQ7BhnGA==; 5:RZGP7fNzG7XKPAGu+XjJDRgWY1qkvQ+mcwZmUXXk2k0xM2mO5A/kUubnJSafFkPpLz/kK0FndOKSAnQl6Xc9534fStQ+UCJ6tecIiAOZxn7iY2fhAwQ/ZA3Al74d71igSTxMyX1h59PzTnTRlMzUEEEung3Zmx/4vdTCRpNOh1k=; 24:ZACuhfl1pBqGp3yRN92pXtr50xUUHeyH+5E/UG8x6uxrNyQHKHKQVg2HU+xuLESTV2vzEbD04NjPi9sQwQTjsUFTXM2LXCx8flv+kSuQGBI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2247; 7:1r77vDz8+lwx1DU7YMp7iYGAgUWgfda0ZnX4ZW4Go1EMTyJnTs1ra5EUU4MBV7eniSyDzw0Lsax+LsjCo4cQ5XEju7wLwgQpnGHAtLt8fcgaEsRdfV3q069xUai8LTtpPBSOY9I1ntgh9gIH4jQ+EBw7RQZFcnzRezI1wE0mSB6/POj9SfnrmCbBep5g2sQqWq+X6GIn+IdulSDVMSPBqW6+mo7LXm8UcLa6ZyUYTzrJp/qQlkvrnN4VgqPEmqJjjtbLHnu6E0gE3jub9doG6MwjaqxgLZrbwV/1BPv6jTSkdWk6cHP1ymbZ4SRAXty3iAFK1qSdTzFW6Uwcpuc1SQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:28.6114 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2247 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Based on Andrew Pinski's patch-series. Signed-off-by: Yury Norov --- Documentation/arm64/ilp32.txt | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Documentation/arm64/ilp32.txt -- 2.7.4 diff --git a/Documentation/arm64/ilp32.txt b/Documentation/arm64/ilp32.txt new file mode 100644 index 0000000..08935a3 --- /dev/null +++ b/Documentation/arm64/ilp32.txt @@ -0,0 +1,45 @@ +ILP32 AARCH64 SYSCALL ABI +========================= + +This document describes the ILP32 syscall ABI and where it differs +from the generic compat linux syscall interface. + +AARCH64/ILP32 userspace can pass garbage in the top halve of w0-w7 registers +(syscall arguments). So top 32 bits are zeroed for them. + +Comparing to AARCH32, AARCH64/ILP32 has 64-bit length of following types: +ino_t is u64 type. +off_t is s64 type. +blkcnt_t is s64 type. +fsblkcnt_t is u64 type. +fsfilcnt_t is u64 type. +rlim_t is u64 type. + +AARCH64/ILP32 ABI uses standard syscall table which can be found at +include/uapi/asm-generic/unistd.h, with the exceptions listed below. + +Syscalls which pass 64-bit values are handled by the code shared from +AARCH32 and pass that value as a pair. Next syscalls are affected: +fadvise64_64() +fallocate() +ftruncate64() +pread64() +pwrite64() +readahead() +sync_file_range() +truncate64() + +ptrace() syscall is handled by compat version. + +shmat() syscall is handled by non-compat handler as aarch64/ilp32 has no +limitation on 4-pages alignement for shared memory. + +statfs() and fstatfs() take the size of struct statfs as an argument. +It is calculated differently in kernel and user spaces. So AARCH32 handlers +are taken to handle it. + +struct rt_sigframe is redefined and contains struct compat_siginfo, +as compat syscalls expects, and struct ilp32_sigframe, to handle +AARCH64 register set and 32-bit userspace register representation. + +elf_gregset_t is taken from lp64 to handle registers properly. From patchwork Wed Mar 1 19:19:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94761 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp90803qgi; Wed, 1 Mar 2017 17:02:16 -0800 (PST) X-Received: by 10.98.159.80 with SMTP id g77mr12286239pfe.34.1488416536674; Wed, 01 Mar 2017 17:02:16 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 73si6011130ple.186.2017.03.01.17.02.16; Wed, 01 Mar 2017 17:02:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753977AbdCBBCG (ORCPT + 25 others); Wed, 1 Mar 2017 20:02:06 -0500 Received: from mail-by2nam01on0051.outbound.protection.outlook.com ([104.47.34.51]:59136 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753486AbdCBBBh (ORCPT ); Wed, 1 Mar 2017 20:01:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=vr7PivzgllxcEuAOPPRJbyNJeLyxQeXhsBUL0yM2zCc=; b=QJbqt6VaMG6fcz703mC0gdzbkKFZtlQwHIvzsST8iD+i0AaqS8vegysIqkhRwMk29rfpAgtAFTW7NKQ7YJl1/w0BxZg+UDkSYGhhGISWFZHZFT3mMhYYKiHjUKOKGzdIhXdF6pZvSungCin4iPfIuS5buM3iyM74IU1J+dzp/W0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2250.namprd07.prod.outlook.com (10.164.33.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Wed, 1 Mar 2017 19:20:41 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski , Bamvor Jian Zhang Subject: [PATCH 05/20] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Date: Thu, 2 Mar 2017 00:49:13 +0530 Message-Id: <1488395968-14313-6-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR07CA0050.eurprd07.prod.outlook.com (10.164.94.146) To DM3PR07MB2250.namprd07.prod.outlook.com (10.164.33.148) X-MS-Office365-Filtering-Correlation-Id: 7d8bbbf1-0203-4c6c-490b-08d460d80df3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2250; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 3:SIKDTglwZsUSqaLJgg7DNdlxbcBmKuL4xbYQp6EUQ6jn/mxzQ4MyIVtYMEguhMrxXO3ORVuspREfXVcCICcoHFJXJ1P9UC9yen/I9xvOQzydcKFkscTKAQ1MnE6dYwVZRZqGEMgJ+UMnX/Ljf95V0FK9Y5F4rMb7GtgXN07EstAYXyC6WGKgSu0QHMTFjOB1Nu9mGtmUDaDN0jhZ1OA1J00sYxxyMYPC9Cian4BZP83GN8bl4Lk36TeeQJibQIAJiYbkOnNCjwkuZXxA+73EZw==; 25:QrOOdNJbzJE1YO6mT6uFMR2gEDeJFcv5nKrAGLdOC2mfKmpTfo5o2bsOUIzvCLXtT6eXV1MbdxfoH3GHVEWwgl8ZaKhhO6w3f7kShV+4Ry3EEKeVDShwQ10BXCo0Y9hvmnet7wHI5WWcNwv37Uaci+tbev+M+509OG1S8hgPpYMXvCse/h9AiTjhA66jXdV5fyjpgKNkYTD08B01HJOG667zNRHTYvv3sW0YbrIhWML8nSsJxS3GjRQ50u6P21u2aCkX7FzCV6VqbPQvQJWMQ/XUGN1ntyUHNp/JRKhibzf81bUK/wFGcUQf1WHy/u4DptzmjugY45g8doVaTnJb+W9M5knxSwXK0YAi9umN2oRzrSZdHNi+8/fwBhV3FzLUHxj0uwvO1+NmfB/L5fCh6DOACBxWliZyx0nDN2tDekXD4TUC03U8TZGJ4jbErnhYR9FLvnxDR+KL54ms7g5bvg== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 31:6Qkpze11mLv4s4ysDKhvMn1mlIM0KFvc3sdT+uE8eZU/l8tB76VXWg5fpOvLhUhyq6tajDTAjNTPXnSE6+YtvTeguyDlA8hMOI6nEtju1p92lVIqGK4WSPBUDGXt92AuYyoRi1Z9OdH0E840axddIxAmPLSGHgrQ2vOdR+mDQvDBTcA8AAurYqebNACq0xSuQfdtNN8jxbvcA7JJbP+Qe3NvpfyWruJN2Ormbb8q7FQ=; 20:Jp+GFF/aCvSErePG91iFm8HKjF9+V/0K3BWSF8E0xtg3E5zDRVEc/ccaTndQMUbz18MTIHSlXmbLEnBz5kAagt4UuO2I80TPvrcgnAqIS3R2rmEijvjO/Cg8fwtD2v0443Eg5ksoIbVZPzJlBMzQdbZbl4CDlPVloTMRzMQhxPUBFb+L2xNfO1H07G4L0lV4Sl7RcQGixqYmNF34z2Vmdby2/kMkQZRUsskNVItbLWr6E9oohg2D9yZYM+7mV37nbC4SimweLPgAREe39Cmuhc2MdU0kkrINot1bx08sV8CzYaD++CZ1sSCi2ISpb5Vbf7vzQvcNh12uYyO7t26qqnO5KHgzwSxtlSqZOwsQNxxaYvCM3dPerx2hwVwkTHbkd+d3kkrDq39phfegscetGdmtF1DxAUp4r2jzW0MkASkCcPkjxHdgTXxhWhKPlWRL/V0J/qMKjTwzBh1x5Sez/7noBplf3SN8xjNUbJWTanR847mKKsRmVMNKaCccFt4tJepm/NOgsnttxD9Q5QhHgkrCYbA58buYaLAnx0hKgx7CJZ7hkH8HJen7H52bXlZrAIIR09lZLz3JOVo2mJuVb6/JCibUbdEGX/KVaOx5kh8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:DM3PR07MB2250; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2250; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 4:PlRrBNs0DTTtju/eSG6SqtTkL/OWxbu5ObwsRIlu0XddNg2Is2B+9csE41oP0mKSsl5uOlFlOphttcLoUB3MuSKMC/IjNpmmxw1hiVeAtnnhCYlVEwgqOZNrXzTEb6MIrR3Xz+aQ76fyLFVVKLqLsGahfNQONsiw058LwMdkL2yVaHyB0WXVnupD6VAx+YowIz+esgUPw2gg3Ir/PzIscMCviO/MXXhP9ubrEqwqJO18vbTmidpFUENrE8C1XFkxBv+0ez/yKNBOtAOPzh3tcnCUa5zI6Jw+3JcyaKJE6Xby86KUSQprpHAFAGltaBDxDL5BsIfar6KnpGdlmLt9c6OTd1oBKcazbBnJHVv+Gt4J0FkmK8304JPdJX+M4wCt1giEZvuGZDTMIAWMc/jXT4KMX0GUNafMumZPtabokBcervMKOPyplI22mP2X++CPjG/BuTVUeIOvgwzSi9qkSeol9IFP9NHCe8YvF+5DkiIMCRc4SvSjHELYB8BdVKnzhSa5pT+OOlIFKldybo135yS418MH4gKKEoARz5LEJzdOjIithOHYx7E4HP6tsv6g7ErzDqYRzwg1X12tw0evqSNsY1khZqt8+poGF/nLiOXo/LoyXINqZCDPj/NWRzylsyfd6FDK61t9Sx80AcfeBjFmbvwR8Rh7XhA06SqjSDf6At288P3u596HX53lEFAy X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(3846002)(5660300001)(6486002)(6116002)(33646002)(2906002)(50226002)(42186005)(2950100002)(25786008)(6666003)(54906002)(6306002)(5009440100003)(50466002)(48376002)(7736002)(53936002)(66066001)(305945005)(5003940100001)(47776003)(189998001)(575784001)(92566002)(81166006)(76176999)(36756003)(8676002)(7416002)(50986999)(4326008)(76506005)(38730400002)(6496005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2250; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 23:UvsnQYS82zKWoVzEEp85O8Pht+N/asRkktJ/qULA3F8v7jJbN+rznoYrMDIIb6ohswali2CSmormy3kI3lGClS1J4xS9j4FigDNeFNXoNUXKqLlKahIToNdSBFgxHsFcXuCB0nZL/0He8jYHrDCOa6myh3D90Vzj2rBO5GuOdu+lItbKId6uFOKy1pMZf9AxlV+kpEaLidtoH7GUhuBtWUij6xW3dtdu2c9AZwPCZV4GYtq6WySi/P1JNMUnyw1esfzULS0tyeUehIZkP6ubtQ/jgZre2d2MlJXZq3za5oMZ7Bh3q+wJWnj/xnNzlyo+Jr0pq24JMoUmEeBFfM0elKy1vO2F5eLoD43DyLMbHwUQMFCWAVaLJYikm0kIOrlo10SSRLFGyo/FO2KG1v6BhwCNuovy1nrbLzvKP2ifSmcJBPKxGrmMDtazo4HWZCu1BKoWufJnleVEgGFM16mwgsSGaCk+bmDfK1s0BfajbgqeJCgKxGZvNaYaI/WdPXsovng61jH8D1Y+TYACe3HdWvA871QpX1awwKPYxy3aFCNbOu1hsNRiTxMXiCa0/DPZ19iaZy545HtORHjFFfJgIDe6IS3VWo+AAo6cy686GzpB4sf7LsoNV5Qq2j/+EhItHWm6xDuSpkKz1ACqxeRaa5vBaPLczSXjvQ7okQGu3KxDDG11NdIOZ3qhDBQmbONN0SlK2/4LPLamJNPkdvrJw3G8jp8vwnrWjTMy7ZINcEce1Wrd7czme69Y9W70oLO6v9vDTQM90QG1tzqp0Fu7jgkZNWG8ohZ1j3CXJa6gj2GsGIFDfM5qVA7hVG+NOfJnv7sO3To2dlz0fp9cXhzWYdIvt+GNf3YJBrYgk0AsgHIS/f3g6UxmcBWtEQKcGPcTlxrk0gSYQMh7ugYSitzu2rGpgN1NTLDOmXyCUQuUS1TNTPF/thysXXpdkhIDEzQsxfpyEZLsJKYnPNpKQ5NGYELIbxy7kPG0+w+4wEIoGtHsqhrXCow1JeH8M6qqfbAY X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 6:u+VBod6uAMc12X5q4FcBkES5n7Ky2Ahykbxz10QaI75zu/N4iHEARwgGXvASp8rMQiH0X4n1vGF1ZZq08Mb4e0kuhGEHcELxXNvgWX2t9Bwdjcq0nff3koBgWCtWj1cNTxc4sMJ5SoicqZRZRErm7dxCZJDag9ktNH50XvakKKMxwZWTXs7iK8nV9sr98dT45CP8Y8IBWbkiBVnhNb9238FsBrB2EWP0dZ6wjNbqJarwKARi/JzasdfQesGRmFRZD76/Ukmma0PTs/VWxcDC5mkCXt7O0tbuF/8/8rRNslsbD+Odnf240JwQiCTb1DJMDWSd2FIIw5BVOxPjwy2ZOxsMpWCSGiOpK02zntUJA3RmUhFg3GvJMBGG7oltT0DPKwuO2uoN1j1NGZBdQat7OA==; 5:NfJZwUJ8mdEQTEJWFDBP9m2Jf19xhEWZjQY2cmjiHk6FDwm0H1xSOyB7msp90Vb+YUqI0ccMOQHSTD8Tp/kzb4oHm1ET/+ShaKwOAaOWtlNlylQ9xMkEA76McIi9Y8ogWOlC72bBdjHohM4H0bMWw14GdnHD4yKuwSvdIVelVc8=; 24:b63M0LFuUzta55SUIuSx+hQoK/b6O6DUenY/RsW2dnK02O3bCsmc09qthyt5PkuopmZUvTbiFiWPZJkoi+/8VU1ZJYT1Q9rLJQ1HwUUdcNM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2250; 7:6Z9yZnJRPmibZOMcY1SqbUi/BxyJulqjTHEAFc4oQ2NnFQ0EvUeh3QbRQyg1IQelLD+gNKhLJX7i/NAEwTYFH06CCXHVg2do5jnWg2jKNwSJpxMqQ9hhFfOzpQM+0g+BDF9qxf0F8qyIpDYUSl2lZfEedIvoQ+p5rRYgWwuu1j8xvv+F/I3uawBdLewRqo6jdUKy4hm3q6KFB5aJg1Eob6lRRNdB4TBDVOVlaaokN4VzJlqhm/y/2XyPTz2M/3Ii+iqGQtcNIS50ARlJbpV5nPvyXuZIsnnTdm0Ul2i+iIfzH7fZ6DPs2ElBGWqCBvIK+Ju5zeKZHhzQIYgd3b2W4w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:41.9957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2250 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski In this patchset ILP32 ABI support is added. Additionally to AARCH32, which is binary-compatible with ARM, ILP32 is (mostly) ABI-compatible. >From now, AARCH32_EL0 (former COMPAT) config option means the support of AARCH32 userspace, ARM64_ILP32 - support of ILP32 ABI (see next patches), and COMPAT indicates that one of them, or both, is enabled. Where needed, CONFIG_COMPAT is changed over to use CONFIG_AARCH32_EL0 instead Reviewed-by: David Daney Signed-off-by: Andrew Pinski Signed-off-by: Yury Norov Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Bamvor Jian Zhang --- arch/arm64/Kconfig | 10 ++++++++-- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/hwcap.h | 4 ++-- arch/arm64/include/asm/processor.h | 6 +++--- arch/arm64/include/asm/ptrace.h | 2 +- arch/arm64/include/asm/seccomp.h | 2 +- arch/arm64/include/asm/signal32.h | 6 ++++-- arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpufeature.c | 8 ++++---- arch/arm64/kernel/cpuinfo.c | 20 +++++++++++--------- arch/arm64/kernel/entry.S | 6 +++--- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/ptrace.c | 8 ++++---- arch/arm64/kernel/traps.c | 2 +- arch/arm64/kernel/vdso.c | 4 ++-- drivers/clocksource/arm_arch_timer.c | 2 +- 18 files changed, 50 insertions(+), 40 deletions(-) -- 2.7.4 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 896eba6..d35cea4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -403,7 +403,7 @@ config ARM64_ERRATUM_834220 config ARM64_ERRATUM_845719 bool "Cortex-A53: 845719: a load might read incorrect data" - depends on COMPAT + depends on AARCH32_EL0 default y help This option adds an alternative code sequence to work around ARM @@ -764,7 +764,7 @@ config FORCE_MAX_ZONEORDER menuconfig ARMV8_DEPRECATED bool "Emulate deprecated/obsolete ARMv8 instructions" - depends on COMPAT + depends on AARCH32_EL0 help Legacy software support may require certain instructions that have been deprecated or obsoleted in the architecture. @@ -1042,9 +1042,15 @@ menu "Userspace binary formats" source "fs/Kconfig.binfmt" config COMPAT + bool + depends on AARCH32_EL0 + +config AARCH32_EL0 bool "Kernel support for 32-bit EL0" + def_bool y depends on ARM64_4K_PAGES || EXPERT select COMPAT_BINFMT_ELF if BINFMT_ELF + select COMPAT select HAVE_UID16 select OLD_SIGSUSPEND3 select COMPAT_OLD_SIGACTION 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/hwcap.h b/arch/arm64/include/asm/hwcap.h index 400b80b..2c7fc5d 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -46,7 +46,7 @@ */ #define ELF_HWCAP (elf_hwcap) -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define COMPAT_ELF_HWCAP (compat_elf_hwcap) #define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; @@ -54,7 +54,7 @@ extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; enum { CAP_HWCAP = 1, -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 CAP_COMPAT_HWCAP, CAP_COMPAT_HWCAP2, #endif diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index c97b8bd..f3f3599 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; \ @@ -119,7 +119,7 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, regs->sp = sp; } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) { diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 11403fd..d668b39 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -125,7 +125,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/seccomp.h b/arch/arm64/include/asm/seccomp.h index c76fac9..00ef0bf 100644 --- a/arch/arm64/include/asm/seccomp.h +++ b/arch/arm64/include/asm/seccomp.h @@ -13,7 +13,7 @@ #include -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define __NR_seccomp_read_32 __NR_compat_read #define __NR_seccomp_write_32 __NR_compat_write #define __NR_seccomp_exit_32 __NR_compat_exit diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index eeaa975..e68fcce 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -17,7 +17,9 @@ #define __ASM_SIGNAL32_H #ifdef __KERNEL__ -#ifdef CONFIG_COMPAT + +#ifdef CONFIG_AARCH32_EL0 + #include #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 @@ -47,6 +49,6 @@ 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_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ #endif /* __KERNEL__ */ #endif /* __ASM_SIGNAL32_H */ diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index e78ac26..fe9d6c1 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 diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 1606c6b..b688bcd 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -27,7 +27,7 @@ OBJCOPYFLAGS := --prefix-symbols=__efistub_ $(obj)/%.stub.o: $(obj)/%.o FORCE $(call if_changed,objcopy) -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 arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index b3bb7ef..aec5b6c 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -67,7 +67,7 @@ int main(void) DEFINE(S_X28, offsetof(struct pt_regs, regs[28])); 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/cpufeature.c b/arch/arm64/kernel/cpufeature.c index abda8e8..37d500c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -36,7 +36,7 @@ unsigned long elf_hwcap __read_mostly; EXPORT_SYMBOL_GPL(elf_hwcap); -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #define COMPAT_ELF_HWCAP_DEFAULT \ (COMPAT_HWCAP_HALF|COMPAT_HWCAP_THUMB|\ COMPAT_HWCAP_FAST_MULT|COMPAT_HWCAP_EDSP|\ @@ -892,7 +892,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { }; static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = { -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_AES_SHIFT, FTR_UNSIGNED, 2, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_PMULL), HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_AES_SHIFT, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_AES), HWCAP_CAP(SYS_ID_ISAR5_EL1, ID_ISAR5_SHA1_SHIFT, FTR_UNSIGNED, 1, CAP_COMPAT_HWCAP2, COMPAT_HWCAP2_SHA1), @@ -908,7 +908,7 @@ static void __init cap_set_elf_hwcap(const struct arm64_cpu_capabilities *cap) case CAP_HWCAP: elf_hwcap |= cap->hwcap; break; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 case CAP_COMPAT_HWCAP: compat_elf_hwcap |= (u32)cap->hwcap; break; @@ -931,7 +931,7 @@ static bool cpus_have_elf_hwcap(const struct arm64_cpu_capabilities *cap) case CAP_HWCAP: rc = (elf_hwcap & cap->hwcap) != 0; break; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 case CAP_COMPAT_HWCAP: rc = (compat_elf_hwcap & (u32)cap->hwcap) != 0; break; diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 5b22c68..51b61b3 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -136,15 +136,17 @@ static int c_show(struct seq_file *m, void *v) */ seq_puts(m, "Features\t:"); if (compat) { -#ifdef CONFIG_COMPAT - for (j = 0; compat_hwcap_str[j]; j++) - if (compat_elf_hwcap & (1 << j)) - seq_printf(m, " %s", compat_hwcap_str[j]); - - for (j = 0; compat_hwcap2_str[j]; j++) - if (compat_elf_hwcap2 & (1 << j)) - seq_printf(m, " %s", compat_hwcap2_str[j]); -#endif /* CONFIG_COMPAT */ +#ifdef CONFIG_AARCH32_EL0 + if (personality(current->personality) == PER_LINUX32) { + for (j = 0; compat_hwcap_str[j]; j++) + if (compat_elf_hwcap & (1 << j)) + seq_printf(m, " %s", compat_hwcap_str[j]); + + for (j = 0; compat_hwcap2_str[j]; j++) + if (compat_elf_hwcap2 & (1 << j)) + seq_printf(m, " %s", compat_hwcap2_str[j]); + } +#endif /* CONFIG_AARCH32_EL0 */ } else { for (j = 0; hwcap_str[j]; j++) if (elf_hwcap & (1 << j)) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 43512d4..a143d00 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -330,7 +330,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 @@ -370,7 +370,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) @@ -538,7 +538,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 4fb6ccd..62663ee 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -632,7 +632,7 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems msr cptr_el2, x0 // Disable copro. traps to EL2 1: -#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 a22161c..d924ac4 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -183,7 +183,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()) @@ -765,7 +765,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 { @@ -1300,11 +1300,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ 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/traps.c b/arch/arm64/kernel/traps.c index 7d47c2c..010c110 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -545,7 +545,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 41b6e31..9d44902 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. */ @@ -108,7 +108,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] __ro_after_init = { { diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 93aa136..5d904b9 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -485,7 +485,7 @@ static void arch_timer_evtstrm_enable(int divider) | ARCH_TIMER_VIRT_EVT_EN; arch_timer_set_cntkctl(cntkctl); elf_hwcap |= HWCAP_EVTSTRM; -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM; #endif } From patchwork Wed Mar 1 19:19:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94748 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1964676qgi; Wed, 1 Mar 2017 11:41:03 -0800 (PST) X-Received: by 10.99.56.23 with SMTP id f23mr5549783pga.167.1488397263203; Wed, 01 Mar 2017 11:41:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p19si5380003pgj.415.2017.03.01.11.41.02; Wed, 01 Mar 2017 11:41:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753354AbdCATkp (ORCPT + 25 others); Wed, 1 Mar 2017 14:40:45 -0500 Received: from mail-by2nam03on0049.outbound.protection.outlook.com ([104.47.42.49]:11306 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752078AbdCATjl (ORCPT ); Wed, 1 Mar 2017 14:39:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=JLYKsTmO7xAQnTgYatE7+N0XYhTkHhyRSEKY+l1RTfo=; b=rxCkLhT5NLCQd0K0w3BINxOfGRhnJ8wTgV2Ink+voV7ZX3BRPFG1aYyw0ux7vFdj5GWC4EzWM1Kor8HSHmijidK3/XQWjR7RK1ZlMJTirOwtoef4miAME9cpYtTzaxRfrJMBjhj1Unc1CBvptgKPjxyFXUFb1zgH/1eI5Hkt8so= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2252.namprd07.prod.outlook.com (10.164.33.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:20:52 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski Subject: [PATCH 06/20] arm64: ensure the kernel is compiled for LP64 Date: Thu, 2 Mar 2017 00:49:14 +0530 Message-Id: <1488395968-14313-7-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1P194CA0007.EURP194.PROD.OUTLOOK.COM (10.175.178.17) To DM3PR07MB2252.namprd07.prod.outlook.com (10.164.33.150) X-MS-Office365-Filtering-Correlation-Id: a8e9b55b-472d-4b8e-2837-08d460d81425 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2252; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 3:+vIkvnVYRmA5QfBXhj64sgnHjrsOsDalwOE+DsqMeOnrVw5Q6qKEzUFyDTHRs/Z5Ddm0cfQHrzi13O/0PYb2SyMzNiKv48JcMYFclTgpwWzUhH3A9Gwqmj4mTckkGzKo4LP9/Qy+8jKWWvnri8tXFyAYBVk88dc+LKbNmc3z56wtshdsnLv+4zfxK9uoB/42efofXd4+uURqONALo6ZRwvv7yKRE1pmmQx/jfbXkp4YRUxn8bRL1x0sjK+wwCzQAQBm3F4zQaSxCqK4fLVkh7A==; 25:TwKD43XNCb1c1lcBg5/8yjUqhq4SGPqrYZEicMkQJfMA2ddJa0jjWmilZhK4FsX1CKLaPWLj1Qx4rTxAmuGLmZag6mV8FxOoMu2WL/ncFih70Ba78IyUbtp4lL16P9350tVO9SmBsMDIr5n3/EJ4Y5u9CwdiXCYgVozLoimCxh2CL+NhS3bmcywTKltrwADJ/KKlvSgl3f6TDop3G+kczHd1UiYyp90GfsM6nZBvnQJXC3ndfqGZyrAEHjYeEshquJFFehtG1uL4ryZRZE2TH3Vqix0dxsO5p4EnKnX/m483BXlM3Mv7dkhcActOHOQhi2gcOt1WMdviF5+pjCf3mjyo/iIosv6X04bRPGKU4s3hyrkIznllKQrA9BuxdukIkGVldCDgXFqB97axPxrZsfcrnCJqu9jajnxotu4bubPq8r6V/A1Q+QZli38Gi4gHOf62p63zAhBN5OCpjUT4cQ== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 31:7d5yzKheJKyY1yLjDrxFtGtpMfkYmLZ2gsCl0vsB+2MAJj2YykKWhNyg0IxYBxNgVvUse2NZJedKwQS93lwIIIF2urPAIfGq7m5S71yZS6W44NKVxIHW0MyMWP/pTSFkErcJvapvvnyycxKgLpwB5aeBOcCjts8Ldq9GiD4GIFMjDYJJ9KttDlB8BIM6Gr8xk0P9K1AHPTfMOU0miXdXAnF0AVr7blw1C2Srkb4XgeQ=; 20:xkUtRc9Cf6BE9VP8dgG0ANEF4XTOYM0pXpGHp9dOEytxdcVrKY+9pC6NjcJuNYxHYhzTowT5UkDoJa1LTfyvH3bwuAvDCKmOpsWBnr+Ev+O6390xsWOGJEIMGjlhDVaC4WEALfCeeQeyGctqpoNsanmqmtDlZlRrl8520hEG3+HNVqP2r/PpDI0OxmQIwmd9Sq2oXt4rTmD92/4ylOPQTWNltgo6ESawJTghtV3pDxOqpTIvNPuolsnDPFi+7zpKeuzxKjb64Cm9vPpLvar5LrN6zrLV74VdX97asMG+Ooa5fbwtT7OxwJT+kDqrQ7qGlnMxlDMbly5rXPRfgopLcqymgofb94up9smvRtOzMeTQCHOJNja7AkUtbpF5Pew+qyLlUQgfqFy8P/F7mp7zZmJ0YdB/lqrt17BSfYcPZ5oDQt/6mgtLx59aG1anYyr83I+8S0LqtUtT0OtXmo36O6a7do/QyDkQ8GTkHc9JziKziAYMfFeWhafRYk+yEPYheZvf9z/GLfhAR2KE0MRQ7mRRFwtVgQNjUXCuBSmqS2imq9d2e2s7d7QaXOWmoB3XiK5iRQxDpICypDsYWjj5F7ivMOFdxKFZy0Dtq69wa/8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2252; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2252; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 4:SuBM6Q6qBGdCiPhBtrCDUQC/E0Yb0x6MmD1N8vxPdJnAKIP2iN37kzwxfeiqnkUlsGOE3euxdsSmCZJM1fW1woy1ttCS+f7HYOruuucChLStTOo6+J+V4Akz+SnNuBukzwCY+9KS+HXQXlFCgUM2DCz5iXJiys9+0YIiMxhz8bh3hyJopazvZiQhDOMqk5PYzybyvMPq8/XtM4OBeLdhmI8diiYinpXx4cJrnUQ5Rqa53P96I7VHh/8SaLlscBCHZF/Mrq6WU4wI3ZcggRrilBtVyb/JRBSCQgGBR7CH6QGjZUesQccGbehwKbtTuR1qb4nAkXswoYz3O7nX+Ee7PE18CRfAMsM7Amg1+CisAwfU062LmD9HwzFaXfILFwBt8gkQHSLtbNCEvpRqfQxQ45To0EL4QFTqYR6Ja1WCSrLhGxj084Jw/Ud2XsPF+iKJOo4Q2h1uTuSPpOciN6Sf48zFWhJKl/SdmUX/nP6BOZZAwfSE0/izghqVJc1GM6B/4nUO1eul0mseQvMsFSkbHSGMCEhfuVNDdT4F07reVY2aZeRIF8RddNStzIip1vbZLPHJVTIrhK9cZWuOBbsJ7AI+5zgM9wb8U2Z3mSUFHLQ= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(50986999)(53936002)(42186005)(36756003)(5003940100001)(5660300001)(4326008)(3846002)(76176999)(48376002)(50466002)(8676002)(81166006)(50226002)(2906002)(6116002)(5009440100003)(6496005)(76506005)(47776003)(33646002)(66066001)(107886003)(54906002)(7736002)(6666003)(25786008)(92566002)(305945005)(38730400002)(7416002)(189998001)(6486002)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2252; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 23:YoCXc8XhgQKZnUUvvDD1PtFiDQlBoV431FOtcPyv8WPP1ilr9Z+9RJox60yHoegJPNY+iuFzGibgyIcFNVzZEfRWKgjb5WlJK2XSebzyLVdGaVMI113Fnc+LbnM60miUB7BhSnoj21MDJ0cH4QtLbJuBTvRYXNrRBFvp85W5Z0SlKvlbfEg3oG+RjawhyCHNupR0vZpr6gv6ti+mZ+NRhooFvYiPHgC2VVzgmJ6ide4Fpkcp3VPeDc1+y5WdlWsx6CUWEJXODXTqF/c0qPNN5wem7ZXogNnnt335L4CG0kOO7gSV2zt0C2QWoOOaI1k7EFwjUK/UzDm27Gxk0B5se1iYhdVsv3Zos9lrB4d5HBCO3VNDEqIz9pn0MYoh+qNuTKnhgqseVcu7q/TmaOduB4dHl9Atdg1XpwyEsU3DKqCsHh7J4JWlp/J6blOm9ir59cVe5y+Dlah75HtV4Qya3Ec3Ei0rVO21t5/vF7mcwB8iB+xP9nU+6Y17CEQ0cdZ5iZoC58fr4jW+4dF3M21afy/ad/yjf8y3vvPj7ZNEBBSsGg07joNiYEgoiY2ULH5WHw47Fcexaq2QomuXQ1hk0eyCtePwXKxKRT5wOgdqFo1lRSRDtafmaETO+qmf1YgHAkyU2Px+RfU7JJc+vlyvCWsjzX++bhwT7kC2uUboRPLDN9n6WgfxvNzCfWthhKjY9bSx/EZNMiPKxNMuq0ZHC7uk7JtEBfp8ik3KJBIZVTth/qsBjFxUIBiPWfvsgKIBihVTkl4+cO6JZUIX5MR3zLMkm0xIJRo8Ap8JfWaP7OJtI44T/KuycCGZOKRkcu0hwsl478vCJfIRHlfLBfIyp3zHjVn2TubV74/4NbRg4wSV+1Ad1pP0hlbcQQJsOZF/u8KsPgQBmcOUiJWPWBNaXIie5Wifo7360XYh7Ui0zxzbn4DA44b/3y6zJZELxbCthlGNw0Q1hMSpElhPlOBPRro3PExgUs8FWFbgKmacbB0= X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 6:epJcqquzAIdy6k6kUSWd46MJgDDM4tXGTd67TLiwliw4+3LfpNHYSDtz93qhFMy6OOqtQSfvbg/T2O6U9cUK9OU+roH95aFD9x2aoXOGWUzoh2VokQSD+jvghVBcsG1qxvnW+fo8Whbw0DjJmcuA8ingA09+0HYudsnY5xvOHZaeIPAUh0OD1Q3pUDDs9+waFI38yvxZLidDyzEq7lhKzDUT6Pe5i6a11lNl2sMijs4E58YKYnR4XAnIXgqm/If8vad7O+9T20TZPKJlLTv5o1iVt2ZpVlR+9hm3+bTRoW3CDAxu4jp33p8lxbJBxPxQ2S9tUT6fa7CR0l58yuLKjQlALtYHhwZhBsgHnQY6r34LBC7unI2Q0h/vL8QxoF0HX03vbcYecCiYymH29s9pyw==; 5:j68Tx9i3n8erRpotACWD/jHR8/d8ZZ+X4mPpCGHrmi/gLK+1hrEObouSr1RMMdvmKccEDpK6i4pnH9RRuo/oonNogH9EIn8P7pyj8OePiy5wPADESwfkurIU4P0DgY99GT2EQOurtm6dIe2dcUwIrAPAZE/ijIFXMqIaD/D0KNg=; 24:mT8WGE4el2M8rQVhxCaetSfkVwhYJdB9A4Ju7y3LRcgYJme0wsl7XTSampd73kLEJeGItOoztG7db6jE4g6qCbKaNnnVtx1PTso6pWJzKAA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2252; 7:+oO1PHMvw4Hlizn36ggFYrEW86Pkvseg8QYE57Iv3JnfOSiTqoaqCYq2noh2mL5BCDsOJMH/9gBEpA7geu4SVun6a1H/qs64MLyzQCEVVt2iXlPIAmU+Vm6j3hViB0WWWYpO5JMGKWvhrGSSUfxF35c/2AEue3ubNX6Th5ffd17LvVSBDwXoKejYE9o6Ot48rbJCUQiSOKWzrmR8IFsL3VR1yBRIiTFfoD0xLq5mKw1tBHkbFhLgchUoXfTy8PLZAAkGdHY0qA2KeUYTUZyuK8wZeic2pZ2IusfLnzcztT0b9dp+uf1DYp7cpJ2dIYqZXQ/2OHH5+ax3/K71BYH7Fw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:20:52.4357 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2252 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski The kernel needs to be compiled as a LP64 binary for ARM64, even when using a compiler that defaults to code-generation for the ILP32 ABI. Consequently, we need to explicitly pass '-mabi=lp64' (supported on gcc-4.9 and newer). 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/Makefile | 5 +++++ 1 file changed, 5 insertions(+) -- 2.7.4 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index b9a4a93..c89734d 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -48,15 +48,20 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables KBUILD_CFLAGS += $(call cc-option, -mpc-relative-literal-loads) KBUILD_AFLAGS += $(lseinstr) $(brokengasinst) +KBUILD_CFLAGS += $(call cc-option,-mabi=lp64) +KBUILD_AFLAGS += $(call cc-option,-mabi=lp64) + ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) KBUILD_CPPFLAGS += -mbig-endian AS += -EB LD += -EB +LDFLAGS += -maarch64linuxb UTS_MACHINE := aarch64_be else KBUILD_CPPFLAGS += -mlittle-endian AS += -EL LD += -EL +LDFLAGS += -maarch64linux UTS_MACHINE := aarch64 endif From patchwork Wed Mar 1 19:19:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94746 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1964061qgi; Wed, 1 Mar 2017 11:39:35 -0800 (PST) X-Received: by 10.84.236.70 with SMTP id h6mr12598670pln.173.1488397175475; Wed, 01 Mar 2017 11:39:35 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 68si5406558pgj.250.2017.03.01.11.39.35; Wed, 01 Mar 2017 11:39:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751902AbdCATjb (ORCPT + 25 others); Wed, 1 Mar 2017 14:39:31 -0500 Received: from mail-sn1nam01on0075.outbound.protection.outlook.com ([104.47.32.75]:42487 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752492AbdCATjX (ORCPT ); Wed, 1 Mar 2017 14:39:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=xDnN7wZsQwk7ycotvPtUaMv9IPMz3yZsm2FCDIOnuzY=; b=JdEiuGc2pLiy9SUCTD92kJ0OExWuxkjg6GDJ70gNUkRiu33vluEd6BYeSRgkSfFXmwWBZtedWTAjBzt0xxcJtQDVM6VdGHNZrxbdFgKNKEOXmxZF53G/cJS8RQS+mwpmEwBoyhj5KUFyNSfWcxEPhY1H6Bm0EmXWU+d/cDldoXQ= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2256.namprd07.prod.outlook.com (10.164.47.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:21:01 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski Subject: [PATCH 07/20] arm64:uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 Date: Thu, 2 Mar 2017 00:49:15 +0530 Message-Id: <1488395968-14313-8-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM5PR0101CA0002.eurprd01.prod.exchangelabs.com (10.169.240.12) To SN1PR07MB2256.namprd07.prod.outlook.com (10.164.47.150) X-MS-Office365-Filtering-Correlation-Id: 32098d8f-289d-449c-b601-08d460d819d0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2256; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 3:oUc4aUHd5uxmcDIVB/G/CHWGPypYqMX2Tor+9cLlIEaX8u8yfWusKxYkOMKMeze2q9jm9fk4O70gj9lX1WJb80oGzYw43u6X6WAJ0VSXzHHoqoweAt5cbFwgn38Q+2zhYNGs5y5D16zelSgroxnYqg+NBOcLOK6V4g6HSzpOMS1ZVDssxzlgXYbf+pTYKiA3FuDwKLsH/wYyag4TP+mx1ky3ZURxPr5QMi9Lbl6lorF/UUzM6far2mL3Ufe0keSGbczhgXtNv0dRoSkypuc2qQ==; 25:7kETBw0VVAQRam4g1NC2ucI0jsRqw8nRWo8GOFxgvpaoR+yjhh+aAUf4vrLEnrTF29GqNmYNwD4qrqSC2itWaHyUbLCnjQsrEiirgSijvFuMKvtjk538aQyr1PUXkRXK+ppyUOiw0AQVhaab0tfMUdGIBWIxqDEc4dIi8oStQb1mktMTXMDsv9/dOmA09ac/GvQ1YBy5RD5QMGmqRuS7AKhI04pZs+xG7e2iQJ74xPqFj84tTd5UxEKF+vlKAU2UhfDf0kQ9UQe+8XtGCrW79i1Bb9wP5/lvlZnGoukRHzmtQ0hJ0lcO2Lxl7n2rYf0ktqa+5TRfoGlf+R/efcqeWkseI2si995PoNH+BcLoThCFYNF+1imFGx+ewn9sWYPVk4QUqbi9COGcRCwJsxpc7xNVPqnfyq+P+dKNxq47NPziybPFhdU4bOXYG2KC6P0Xa3cchphybU0dSdG0FAWEZg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 31:ROXyHSzCSwuy/Q/7nOKwgLxsyKj5EdtSR63srHTL+drOyXdBq/pZgDr/TaDBP9botG7kOCFfJUWVuDFpAkLWKwFyD2vJaO+IvMC6jCylssVgDREXkMNCM0CZ/6etaDJau9cRz7+gvH3pfpeDF4NZDGF6WQ/vYMvkDoaWdtn9NljWSAf+s02s6M72h6nNtlna0qXgA8JDGydRn5Ot9+u5isEe2WoJ5ElPAshgP0MgDTk=; 20:Ag1hbGEPPi72N5ZiHfaIW4Fm2nACKo3x8mepm1Xj+mbcfJVoaxqne9qn/pe8tdOSXOjh2xFt2vs0QTYoqjCMphxxEmYsRv2xn6lL+sfsZnRpIDxzdPId3Z0PMKBS6aFoQe3YKpZF/KHCSLpPbs1fAV1InwRdm1K8Zz4b1CEXDAMj4rIIY8LEuSdAEkb+hPLUDlU8NVybYCjrL1g78DDM3We48xTFDrgPy7klJiBFc9nmOMqSKeXZIzTsnY1qh2feSgY33tDZzxTXBiRwIORMlpzjXCA+u/2rp/IeQdLwcF+6bYcLJ+cwO8ral7L0RTTgfhxatsVhBvEeWTbHYQVNMhqBDSGL78Lj+J+Ji0d9YWnMRcf5lE3YC6ZIwNT9bSiq6HCYYO3vs2BfFfc0CY9vKiKdnMLqksmZKeou85iHIoIP5GnBr4j3bFivmvw+EasHfE6pVtNtjo7ChPVAIsMhUY9zDTTcKh3lhnZvqL9diILA01fI4GNOEX1c7QJV7fhwSJMhma3DZqybeLXSd09lsWHIDpDJCHprPtks7GfEVARdFaLKb1jMk5kSjnN7EMpmnjiKsU+54cUZSMs9KeUli8MlTDC/BisDIjIpdfqvodk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:SN1PR07MB2256; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2256; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 4:tgjlMdv7GL3ybW4iRsB2Hqol6kk6/HnpEbfv4WFIihJuwWROijUBVWYbXjAFkZFL4YHoKMXEOUr6aKQhKUUGhi/JDM9YueeoLo9yZ8StYm8Qff7otugabWEnvLlFukhMDiQ66yoaMqyZLmpgh+lVSnnZIuyKhYHzeSTV3Y7tkslwe2VGqzqCGBesRYpwiiK49MFvUWZRViMn5vrlxugrifAMLKO2uxONt266pse5Tf7aDJs+fkGUurVxzBXgOollIHahReoqfx9AyB4t36C1JKa7R9Bx2Ty+lAK+nw+18xhaQALREzshzpB/mpr6OC5HcRl7FKR0nhhf22nqQk0WNDjGz5O3JwqVsHpMQgrBg2O57iGzaDjmbtt5CIe8J/Q4s+vNGwWWz/DhGhu47gRJk9+DXpfcmvB88DMjae7wfXUdbm59xMYlSTwgT6kRnrIashYejKpynrCAzNeVZkFlHgendIExYYTkxyrx4ePz+EI5Bk9pL/MwQo2TswOVt4u4xWcpZZwOfgbe0cqeSakB3MyOQ2oFwPTa5GcUBMrTdIIS8aznpXSVB4J5tkTO0qMe7EqvXeyDTmhZI3O/AbH4YG2qTF8kDOgVyAB+AgG7VPk= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(81166006)(8676002)(42186005)(5660300001)(92566002)(2950100002)(6666003)(25786008)(50226002)(76506005)(6486002)(53936002)(5003940100001)(38730400002)(107886003)(5009440100003)(189998001)(36756003)(54906002)(33646002)(2906002)(7736002)(305945005)(66066001)(6116002)(47776003)(48376002)(3846002)(6496005)(50986999)(50466002)(7416002)(4326008)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2256; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 23:2W5uNwPZ69ZLpgJvFejagaLZMuMfuiwnxVvWHNpH5c6NnMuOnrPC5FUReo3MhxsXYf5Bf5wfb3dHspPDX71d4A+9mjrARDZ2+PoAReEIv15TLffevIKTLmUmUxi4B5DYDCNwceZZUTldUdu3Mah7LGVXyCuU6S/oNFSoHnEagXwlfB2vbADtj+BS0Ly+jtMVG8SPchEx6yroUEoDctukm1fkBW52go+1sWgv4uV0q2Y0KcePEvQkmkEUwNUlPloyIK5/SpCRPv43oS2gfyZTZ5Z2N9LWG10Fe6cRPibo7/kn8mFdAaetf5ihVFlgsrM/UWpRkZlahAZPeOf5aMWrg+s6XXEFGv77eNwYLxQR+8NIyUUEUUabS4ltAJvAOIp3ltJk7hQPPRLLbfKHjHxSFc8OdgdhQyDvtL76ZSSBYaSXJ8HR/9uGKX4po9jlRIX25cBsNZkGNgGa6Qqan65uRozJ6LJy1Kz5Vv5z4HdqV4PEhGpT9NsCeQCbLlhSQvoZRoipZcCM1N90ZKsuDMV+CudC3hNuzQB2A5z1fJmHh1QQdFd8ZyyaA8zpU+3tH/30lx9mWZu75uW/rpbPxn2IwFns+MAFDuq7Dn5T8CknlxtZV7v6dxvhLP6iXFCM67Va9SSVk/8XsQVtQXpjWyXv8O3RwYfHBaKYEeNGlYiAws8ZUcwIRNMyieWfW4+kHQ6WtTKe+Ri2wdXITlHZC9GdZnTqS7om4z8hBL2zlfIaFD0vvv3SI69b70wa8XMc68PT9fqRhpgKM+gwB0XD6gXBJIO8a8Kylz17kmreIyAofBG9JES3+qcXs5mHtz+PgXAdvGY92q1UyNsaAn5eZ2+HCbnu1VHTEIALsaUx2WSD0eySDz0xl1Luzx27PpaFeD9w1FeLYi1Yj7eunZi6unWcJDvUT+1xnIHYpoqetpienSkZfm1L4l2DtMzyNE3rp8Jlwt5NGzZOMwm5vuTP+sUYBjRaaQrePxa/ydTXTR5cetE= X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 6:DtY+79v8Occ6hwrJ+gTlmigLF9TFjZFOuvprWJsYaFj7voodEwZcOWslYp6coABZNuknHfQjOG3MsvxwjYIFTaWG/VC0LVA+nMg7t+7X1LyrLcCLu60zKS188WIC0T4gH3rgoJaEc28DDcLL3cuhZkIPiEYU8NWVj1ksOdrfRup7rOAzT3Xvft25tflBi0GNpE7FGiXc1DWtoEWhV2ZmvuS7rOP4It616nqMw1rTSxWpBm2wzmjlmpBv65z4LMZjjo9GMuFbOlOpALtT5Qs9HhfrQVyww0BYRDVdFUESlTXUU8J1vunPmsAFELUmRbzxttFwgWaw91A3s3Z8pvhKDJelt/AX/BiQcxVEXo2PoRxHxLpSGiA7NkSGc9PMWu6rBNX7lszDDSk/hFT4xh6YZg==; 5:D4dWbSzdys3KRr3xCqIaPxFeVH0O5kuKIWgG5kSDRQ4Ui8c9mOuhjZw53pboU7RgdbBKRfoE+VuZ4o9IjKxcKlC090GvMg3/sXsVQdG2axlXQQE4yDPdm0t0k3MWMJOgFq/zX/NBFbnFe2BdX9nKtGH+Miwtpwj8TlAwpUP6BK8=; 24:6jJFQi4sHdfOcceYbRbIHdbkPOGBbAvjv79c5nqBQ4Zu7ySY47XxWQsBmuft2gIGcgioGXjc920L9w4VsW2SCXd2Q2zGZxHriSVphvFYCeE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2256; 7:Tpaz01/FB8ZoUk53Bm8OoabxlUnkjfWf655RdbIBf6e0BDBCqAxTAHKiSZGD9zjFGHwLD/e2VB4IpzrC/hh8DQuuvbd2bw9+yn7yIBzrv6pBrGQlrWKyR4nfbdZG3fe9uVGlOn2P3v7axKuTC4IvVd+EAMVSmS0/5BQ3fsBJmX5kXy5C7d37o+lr2YXEsWGWIslP9Iezy/V+EsSumEYwj+fD9SX1h2FCCOjkagQzufCFuxEILBQyhIIAiPRqutaNJPsdZrran7Ay/RcDX3fn28+6y5wAg5wTSoDiQkx3b66SQWwcP36h7R+NYpvh1vxuMygaKWDV1YHRMQwK4E5PSg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:21:01.9955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski Define __BITS_PER_LONG depending on the ABI used (i.e. check whether __ILP32__ or __LP64__ is defined). This is necessary for glibc to determine the appropriate type definitions for the system call interface. 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/uapi/asm/bitsperlong.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h index fce9c29..4265243 100644 --- a/arch/arm64/include/uapi/asm/bitsperlong.h +++ b/arch/arm64/include/uapi/asm/bitsperlong.h @@ -16,7 +16,14 @@ #ifndef __ASM_BITSPERLONG_H #define __ASM_BITSPERLONG_H -#define __BITS_PER_LONG 64 +#if defined(__LP64__) +/* Assuming __LP64__ will be defined for native ELF64's and not for ILP32. */ +# define __BITS_PER_LONG 64 +#elif defined(__ILP32__) +# define __BITS_PER_LONG 32 +#else +# error "Neither LP64 nor ILP32: unsupported ABI in asm/bitsperlong.h" +#endif #include From patchwork Wed Mar 1 19:19:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94751 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1971141qgi; Wed, 1 Mar 2017 11:58:50 -0800 (PST) X-Received: by 10.84.141.129 with SMTP id 1mr12668800plv.166.1488398330765; Wed, 01 Mar 2017 11:58:50 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x6si5446884plm.259.2017.03.01.11.58.50; Wed, 01 Mar 2017 11:58:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751950AbdCAT5g (ORCPT + 25 others); Wed, 1 Mar 2017 14:57:36 -0500 Received: from mail-co1nam03on0089.outbound.protection.outlook.com ([104.47.40.89]:24736 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751595AbdCAT40 (ORCPT ); Wed, 1 Mar 2017 14:56:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=A1jkIVJJVHsYGAVR5w/Y8Pn5ReplGwW/2LrL3ExVzsU=; b=irK0RdXgGBcP1vp18De8kx7MYVjDcyN0JM2MPPmZtBl9h1iEqQisG+D3rgOopAqtSItJPdDzl7Glq6s9TKua3pnXaAthQvWq7Zt6MoGwfg/OTWaYYa9wvwxc9IyY3xySiVO6iQ7MNJmtVCdHxstjVqyqJrr+k/VroOP5B7UQzoo= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by CY1PR07MB2245.namprd07.prod.outlook.com (10.164.112.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:21:12 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 08/20] thread: move thread bits accessors to separated file Date: Thu, 2 Mar 2017 00:49:16 +0530 Message-Id: <1488395968-14313-9-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: DB6P191CA0001.EURP191.PROD.OUTLOOK.COM (10.175.236.139) To CY1PR07MB2245.namprd07.prod.outlook.com (10.164.112.147) X-MS-Office365-Filtering-Correlation-Id: 930f73c2-8b68-485a-6d7b-08d460d81ffe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2245; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 3:4RqC6PfJUmy52e+SCQ49xGxSzCLw283PdBTHcvsAmKAJNVky/0RDpSXWiyUaiuyUMlbNGHz67x/djBSHcH5ZrvlOVtPMULZBQghKRPth13WBWR1a6ewYKw8o4zBkXUQN2kLpPa2hBRtWuZyJGR0G2+UGrrdy6PnAeLxHPp9ICElbiMoTnF6jv+kEf0AmkmD1GMfMS6gFHqgvdXU4qU68iw9lMHhwqcZNFN+lp4tQtHl01sjYHrkgh3JMJWAE/yKNGSSRL9s5pahpnZq2KAvGFQ==; 25:OXOFhh1MtoXjjAtJkbSUvs6nlFlv5EoMvQ3rbaH4j1rPJZ3hAC+A0rS8hbToOrJRr6w5msIJBkCLrP2evWnPKxysR5mRLTwG15nwzGfgM6nrx46YC9AypM9VoRfge7LF/c6xlk7hE2eTvKDhH4bdl5htl5yK888VYHL5cWrReZFr+3xxKSeL8r0XE7Lnswjr7tjE1/cJOpa3y4NqbQrOC0+0PBpPavdiZElG2TMKbfu6LXx0BnKh4+LAgGXng/Pz0D14Z8/ceEVlxuMQVK/+NDhuNn9HCxbOIkHKNYY8ZsjBBY9oTk71n37sQiIdCM7pm68iv1eIhsQAJgTEI9K3z47veS40hrO77P8WPruGWO6Sxt8szmeKO20wTUymNs02NxCBWSfkhKCV/4c94q+IJvM2tqmCr8SP2FRagJmuXEr+Zh+2BvrYtNVi6LQOhSKoFFz2ximZQBAULspgbPE3QA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 31:lh7ZQmCGKMr+8D04CA201U19xdLCUeBDMAbkE1eNa6T1Td/E6Xm8IMtjuivhSFnsI/mKcGfpBMPc0ds9uMHerzDW59o87Un0CvIDAZo+fj+9MtWMqKvntVZtIeRd8jvZIRwbE4/34jJ3HmOVyLnE77PjDOH8ZfPctX/xIOq4DAwgLj3cGm2N7vr5VOIa5hb0RAq58eRhOsbC4Ww18Eq9tFxJXsP1o6PqbFHOVkE/z7E=; 20:ki2yaqtKFC9f4RB/iVvSMgUHMcEVP+AuC/QGAutKdFbE+087U0I8BPqk4LmvyCCjQryNniFJy6IU4+anrCwPxLXsHPaLtGNEMq50dckVLVMvy3aE6qc/L6EtbMs4DkdIm0bm1OFNSnCYlvixZ2vPc77uNz3CbTjSgEA8FsD6OeXGlNAaMRQacWitQG7oQMQedGUssAzFFoS/T+90+JiooCC4tL+VWraPTT4XSVvUIVBm9DOGcLPwbSodzXSvqysKbNjJ04Q5LyCn0FjKeKfidQKFwRgyJKrKklDIuybN0enbDzsOGftorotUagn1Yr1PjgaskycetYX5qF3MbO78Co7EKMeR5o4LS38Hjpr71rNYccPppbb/G1J0WBGo/Wxax+0+XOG/+/ogTmBnsb+P3/MqpVQ5tTocKSB0p2HD3k8oA+UpP6DdZxiU24hGcWHQbTMLTrlVS9thIiyXj02OroNfz+xFT/+y08TP7OcBqzl9FLQ8Pr1qkTVXNpkGzJUW8YSHfsTb2AxH7BEzw/IqNJ7SYxvyyUeuGUfbPFJv/hd/E909+bebftlxhkLNXhW9U0lT7t2wmHbUcsdQ0JGYozukGuK6gyE7MPFijd8e164= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:CY1PR07MB2245; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2245; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 4:DnUdT78FS36vGAXnzwiX5F0rV3kgbfJjsGIg+jiqGL8wKDVW6AKPqEbjRCcVg+m2fbOWzKvN1k6uDUvyDFu0BgkyWbL5AImDIp1vwzOFIIqdg0w1Jd3YDxzSPrURfCE3lHUlacmHmVJ0VBWtArkBAJAjPRiHNoN5SzE2i6JXj7P+7hq3f/TulYwhl5SOjwqrVEmeuJai7TSrpYp9O7AZd9+pGt82V+SVNrGKMPWYyuU/QZLOHTWQKvmgnQ96fbKDakQBeVi2DD+Tpr//mcZ5ZEis5uZ7LP3ImfMF6gbF04VLaIsmC1MbTgPsGRk/ue6hlS/P7pdbpBUfDW/jgN5zjcPk2cWC6dYg5LAv7bqe9f5NUNtUEiLccp4fmidiubVpNDShyVVaAJz3U3yphVkR7HmSwwohukhTj3baXVIR9/5rr37xt4nYfupBOiQWx3434YfxesR1uQr9QBMqq/kF67U/xb31OBAb+aZD9TSncxs+sqs5llb3pHWom2derpDOTPY7jpCmj+iCrDAJRNC+XOSkWeJKFCsZjPUd5EgmvXYN0QzX7tOX+w7xOJLOgpLR/Bhd8154cufV2QMTDuj7Rq8z+JEyhWh3Dq60hL4oOb0= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(76176999)(5009440100003)(50226002)(33646002)(66066001)(2906002)(2950100002)(81166006)(47776003)(50986999)(8676002)(53936002)(76506005)(4326008)(305945005)(7736002)(7416002)(25786008)(5660300001)(6116002)(6496005)(6486002)(3846002)(5003940100001)(189998001)(48376002)(50466002)(36756003)(38730400002)(42186005)(92566002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2245; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 23:nZ/P2rnGIGTjFDIeyB47k2NV2ZEOXo671+MIHEoADfZI8/vmVYhxhq6nYgpAYNc0bNeHcUZPSHLzQMaPrWBV+7lxkLekTilWmjBXGRDO6/iV9sCzMacXFaDL9PytdUp8Sdhc1lDHHztutiH5O6dMK1YQ5ReVkMc7KHbzwNKmOxRVlS9hp1qgp/d33kwO2xEuUZda1N5YgDAYPVfFrwdIy3dJuUsRr8LTisIDgx7znEK6RqxFXPxA+e3jMALdnGi4z15thgXgrqpAcDJG2STLGOkGaUjBUpILDeZH4uai1QCuJclzm4mTqER+/4K6WsEpBHSoDQr/GOHEqRu66/M43tHkve6z+vRfTVJGiQEdCyMTagvVpfiRPG2i+QfFKhzWN3V/1Drd4zM/x/PaoxEZ8KezMKzlFmJHicINoP63jxFVFMhfx5RpD/+FZLIoDwJ98lP/zI6tY6mKHhPWLB76IvMTASkU05/zctDpwUV9/+MnSFqLuS6Gt7hC2E8z9MjWA6z6wh+LYBnQaXx2UKLs4j4vV7d83PBE1a2mVUR2lZE8EdOgSzpp1CSgGlafiasfi4RfsS4E0ZGtoQnu9S5gX2+ZhGLAd2+s49PRYw6oixaVx3bgrm2nV7E5Zib6PwVU1calACZPmG3j55h30P+nejDZCRZWyJ5HiTi9YvMU1bM+NAoT1OJEFplOnQiSeEUFtmB59JTBn/KTdNqKSaS6zwOxk95kQ96Jrc/2Tg/FjhYD5rXFSoX2xG8eLGdXuU25SXMAJtwR+dlNwBYCTG1+5kQSJCgh667aYOanPbeE51bw4WJ5S7Ma4UOuiyhlus6jMTrDC5xAP1XG3kGcGj4PWxq7CQ/RCEHFLhMbbUMoPXKeGV/tgVNsKC/RIgTXCYCa7XvufcTNxobl6VW9DU3hCxYby3xH3odPbZljWs5oS141BHUTfeEg4jWt1Fasfhqe X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 6:fuewJkKdZRj1VTEJ4yq4a/xeH1DDMM9/dqbNkarr3LMfUZcMpepav/SyIrEOvcjzS91zTkFyhJvze0V0nGKWw6WNC34Hiztlfdj2LK8SFicdlOyq0J6i7/q8iBLjkD0QHfZLRbe+yMRrqUmOaiQ20MX2SBS5KXxKwm5TsaO4GA+okuCsTcVpjBSILJss6LS8cbHW9USURzDGW8YieEn1YVAKohq1PO+ds5IhrRPc/h1td8DwbHgGtDxQUxqo2THJRrSIYQI31uuiLMKeNaDavjKN1csHNW5WgRghc5nmuKLxQXtYqNTG1JFMMG59IbflMexI0KmGFXIF8Un9U/jdanECal1zNAkr/L2VE8rMME15P2ZHOneoH+lEu2+8GaCy52sbNVIK9OzOB0hq+NcaTw==; 5:MphyhzN0s9bOaOF2TnpVLVXXz5E5m8AW1I9GtmzyL0ltkarrZILEI8HaMK5gdoFXT4sMn9BXXx9BAaLU/ElALnQGAhIuoNjgOuKbp23gvIZ9Jx3y/x4IWVCG90Bt215jhgp04er/mRAxZOkPq9vrVH68DWiPF2miOk0FiKQht4E=; 24:QZIqrUyXZy1ufod2/kYLft6AvcwEwITHgWNPQT8Tu4DVp9zRkdaic1U7srZ8PVBiN7uo2rwYVaP/48Q+WyQXFssP1WEitoHZW1RZbHDdLHo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 7:6xoy+UOTfgWu1I0lL3UoHlxOwUcb+ISqGEUaZ5Hr0OgwntPD44Ab2IzEWnnePE740FsZBq1KuVBmH/c6ivWI+Z4RhN1QtDWpXojKAo/GiCZCcnVI1qNc7Og2i2slYLesH8nEggObikG8Hcno60VRORy23NZbgnnrEmUDqgM4BuXEou520OeaW1ENAgvVGjW2GPPKeF67tHFEUGYhIMO7r3z010VgWvOKEIt6m07nfvywz1GZuyO92l21EfZ1UdCkR3yf86ucFP3f2WWaT21p6K9Bnjnoc9np6vxwS+CiniloO5vZhe6vlAFUcVhqA/Aft0LetzWjQm64/lEb/DADtQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:21:12.4396 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2245 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org They may be accessed from low-level code, so isolating is a measure to avoid circular dependencies in header files. The exact reason for circular dependency is WARN_ON() macro added in patch edd63a27 "set_restore_sigmask() is never called without SIGPENDING (and never should be)" Signed-off-by: Yury Norov --- include/linux/thread_bits.h | 63 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/thread_info.h | 54 +------------------------------------- 2 files changed, 64 insertions(+), 53 deletions(-) create mode 100644 include/linux/thread_bits.h -- 2.7.4 diff --git a/include/linux/thread_bits.h b/include/linux/thread_bits.h new file mode 100644 index 0000000..8735433 --- /dev/null +++ b/include/linux/thread_bits.h @@ -0,0 +1,63 @@ +/* thread_bits.h: common low-level thread bits accessors */ + +#ifndef _LINUX_THREAD_BITS_H +#define _LINUX_THREAD_BITS_H + +#ifndef __ASSEMBLY__ + +#include +#include + +#ifdef CONFIG_THREAD_INFO_IN_TASK +/* + * For CONFIG_THREAD_INFO_IN_TASK kernels we need for the + * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels, + * including can cause a circular dependency on some platforms. + */ +#include +#define current_thread_info() ((struct thread_info *)current) +#endif + +/* + * flag set/clear/test wrappers + * - pass TIF_xxxx constants to these functions + */ + +static inline void set_ti_thread_flag(struct thread_info *ti, int flag) +{ + set_bit(flag, (unsigned long *)&ti->flags); +} + +static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) +{ + clear_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_and_set_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_and_clear_bit(flag, (unsigned long *)&ti->flags); +} + +static inline int test_ti_thread_flag(struct thread_info *ti, int flag) +{ + return test_bit(flag, (unsigned long *)&ti->flags); +} + +#define set_thread_flag(flag) \ + set_ti_thread_flag(current_thread_info(), flag) +#define clear_thread_flag(flag) \ + clear_ti_thread_flag(current_thread_info(), flag) +#define test_and_set_thread_flag(flag) \ + test_and_set_ti_thread_flag(current_thread_info(), flag) +#define test_and_clear_thread_flag(flag) \ + test_and_clear_ti_thread_flag(current_thread_info(), flag) +#define test_thread_flag(flag) \ + test_ti_thread_flag(current_thread_info(), flag) + +#endif /* !__ASSEMBLY__ */ +#endif /* _LINUX_THREAD_BITS_H */ diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 5837387..a325deb 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -11,18 +11,7 @@ #include #include -#ifdef CONFIG_THREAD_INFO_IN_TASK -/* - * For CONFIG_THREAD_INFO_IN_TASK kernels we need for the - * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels, - * including can cause a circular dependency on some platforms. - */ -#include -#define current_thread_info() ((struct thread_info *)current) -#endif - -#include -#include +#include #ifdef __KERNEL__ @@ -33,47 +22,6 @@ # define THREADINFO_GFP (GFP_KERNEL_ACCOUNT | __GFP_NOTRACK) #endif -/* - * flag set/clear/test wrappers - * - pass TIF_xxxx constants to these functions - */ - -static inline void set_ti_thread_flag(struct thread_info *ti, int flag) -{ - set_bit(flag, (unsigned long *)&ti->flags); -} - -static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) -{ - clear_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_and_set_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_and_clear_bit(flag, (unsigned long *)&ti->flags); -} - -static inline int test_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_bit(flag, (unsigned long *)&ti->flags); -} - -#define set_thread_flag(flag) \ - set_ti_thread_flag(current_thread_info(), flag) -#define clear_thread_flag(flag) \ - clear_ti_thread_flag(current_thread_info(), flag) -#define test_and_set_thread_flag(flag) \ - test_and_set_ti_thread_flag(current_thread_info(), flag) -#define test_and_clear_thread_flag(flag) \ - test_and_clear_ti_thread_flag(current_thread_info(), flag) -#define test_thread_flag(flag) \ - test_ti_thread_flag(current_thread_info(), flag) - #define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED) #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES From patchwork Wed Mar 1 19:19:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94745 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1964057qgi; Wed, 1 Mar 2017 11:39:35 -0800 (PST) X-Received: by 10.98.90.196 with SMTP id o187mr10660901pfb.30.1488397175049; Wed, 01 Mar 2017 11:39:35 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 68si5406558pgj.250.2017.03.01.11.39.34; Wed, 01 Mar 2017 11:39:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751499AbdCATj0 (ORCPT + 25 others); Wed, 1 Mar 2017 14:39:26 -0500 Received: from mail-by2nam01on0066.outbound.protection.outlook.com ([104.47.34.66]:45984 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752676AbdCATjX (ORCPT ); Wed, 1 Mar 2017 14:39:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IavqLRW6C+jN/3Fky2/H9fkizxN06YYfKq9JmbbsAPg=; b=VLgPsM3j+bnQJTlEy2bJHG0DflRH0ZhtSdZL4tilgvsA04qjurKRPAX6OIAw+FttUeEqXZplnfxcpmcXZwOSP5urnv3s4Izv4g64DPuFHaCOY/R3RUgjvw5CsK1dZEaNdgqIpkY55XNJB51SnMnTeovh1b8b+TPiGw93pj7pv4Q= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:21:25 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Bamvor Jian Zhang Subject: [PATCH 09/20] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Date: Thu, 2 Mar 2017 00:49:17 +0530 Message-Id: <1488395968-14313-10-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: HE1PR0802CA0009.eurprd08.prod.outlook.com (10.172.123.147) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: c1c3ff59-6f6a-4379-5051-08d460d82819 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 3:Chy1apVqV1PU0OkE7k0k5d3w5btsnrQqDux3uxG2vqA6FLSaso4gKOw9H3N9wrGtnEOjSu40q1Q6FQV8sL6OIBSRLPlVWz18EsrfMu4faIKW8zcydVbhDdowKaoOcY+gPkG9Kkt7HLOLSV/CBDm54hMOWoPzMLp8F7KG55Wycbicw7u41N/t119xKbdrpXKYCYYDwWSH0DbfH0a8prMNu8KJu+L7OWRn4VtCjQuJArQqBEKFAlbzO7FQQC/E3g9ioviM3GnYQK77XVN2GWdzPA==; 25:/t9w6fpaf5gI3xNirQFU29PiEbB4rwGfo5Gv+zssVHItcy6dHk4KL4z3hqkY8xi5Ts0R91cNsF1kMJe23XlZux1YoXr8kgGLPM9B5yqTKHMZDWR2pcqLkXdNMx/hjVDvLXpZUxadn6ci4arkVc20662ni7ncEBfcx6++IGVfE9Q8D2l7ugJltYeONdl5u6Gt108hqtFC2RonG+77LITYRoaqZumzWw/GLkVC8tw3mz6SNu9ZreemQ9pFkabL4XqDj9lFswWN6eCohVq1SRAq3eh84WEBmZBePm9UhlCxrjgRuGVOWr0GYNt/12DwJMWz2MBLwALk1NVpPTAhOCnEKJEOnWKQkD6KNqU9StWabqSwYu0s8ENLBLCvPekq/ndz5Gq+rifz9WJySG0aIlCanRn+PZvE8TKVxIxn/ymGNB2TodO4GtYZCzSHMs4lhvMGpwAbVCLgUxikeE53JTwmJQ== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:clfVL4ZcWoS//YDxlm+wcYMZJbdjHHlyzimNTWqyPqH1W7SZGsray+q/3wu0yA5+qHEP/dTr7TTo4RmwTsx/oS48Vaw366+AeA7723iDq1NZWRPTS8PFjMRQysShWzCo480IB3zilFuiIEwCLHX1LZVeDYr5A4K+Jc8c/kpS6XidZQHpDQfbKnxGLNp8Jb2M//BQA1XTRJLFRpQnFrMNGpQbb344rr2mi5ftayMn1wo=; 20:p60Iyv5wOcFLdgIEFEoUfXphMemEexM+Mgn+d4NgCi/YDyiCFaHyK6PIFvvc0f33N9VFAuDEDJ7F5Hdg/L7OYnmvpt32IRMGs1wB1cO/oW4/3RgIFRSWZE9O/gsuxq1UqOez1WljouiCJifo8T4/0kbHgJr0k7QdmeVmTI0lga57N1Zhtv0V8a2MQ4f9+lRZ7ZV6lRGny7k3qszZFjkj6CO82pU5zJ1PrTo+ve7FktNTiP8/eFVDfad7zAPIl1jG9axzwmfFDZ86Wjd21jUjFTReTkZrFWB1fEcnp8PgdpjcYqvsbOdr1I2yhdi9nN0Je910p+wQ4QrTF70/woFS9tSwnt0brwS+iqgZbQ7xahmMbWJQEKazQ4CHRykQJC/cK4kScPpvvYczh8TNaJfulK/uElBDbi4KmW4zTqBe79c8FzAoI3AKlqGACoTrtuizTlPWuNgIOfiRDEsKsuqdeMSGD//Z1uyxoYKhmj5GnG+0Lf9ymbBJVdild8U/1idnpiO/Gq6HhCH+aiRCg69Zzh2PWkD8iMlJ8dHL0CryPhzHP1qfjdr8/fhBI8FfD0ggNNmCpIo8lek4BYw1gaCFaeM6TgEQXug1FFotsbtyuhg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:SXMQnnP/FITPNlVSGZ6VBckKVlNhvzvr8PQ1YAHGgv7K3pdHMunKRiiBk22E06VwaKnbxF2FL/dqgIn4fKY5OuAvkJuQA3o7roOPVKTjNdJKtKtXkuPmae/Y1cHhR6d99XpiE0fDevztCxZzjlHPmG3qiokJB3jc6dNox/v3hyZjr0Ecb1qtJ5znjIq8/7228UK56LTyPM0u1BXDO0vjl9x0ja5pF4ihxDGWMpMjcc+2hhNGk9xN845seI5z3ZPfhzSavJceWIMvxchgGKfCJdsdBakUscDVXTfR16LaQKwusRH8AMhq2TxPc6PTyjN9lhsdxdi3ptM+mtb1YNmMT0gObXDZCBaxOsZjQiHeHGpcGdTM3djrn8NRnJ96Rp2r+kfobHWrky1yvEsjgYtC4wtHn8BUI6rdKdBpS66xmbXEXrs5/ZPenQ7GxDrksha0OCDMgOuDntpcZrQDtbqI+LFloJeyHfpbfjKjKYa4sAc1UWPs0MsoNZdQvbEzk2XggOrc73RmVRy6R5y5X/BN7NvBw0SztBxDQaZsohgh4nKFwSCaQ+LoOCJ82av7eRq9FNiF6ks5DmU9zGfVYz66g1GX80PAlVGhebY2U9zd0jPWKpElqJ+pLDW1DSoZ+3BjREuOEZY9kYusekymPrs0nBZ0immStdEGsthXQZIS5cGxy8lT1ZWXAYvFPqECZXUk X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(76506005)(92566002)(50226002)(6496005)(7416002)(54906002)(5660300001)(8676002)(5009440100003)(7736002)(4326008)(81166006)(305945005)(6486002)(66066001)(189998001)(76176999)(48376002)(5003940100001)(42186005)(2906002)(6666003)(2950100002)(6116002)(50466002)(50986999)(36756003)(47776003)(3846002)(33646002)(6306002)(53936002)(25786008)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 23:v1i/Zbc4J7jiUEqijqZ6bRHNirJfunCryIsl6V2AyRbusFYni3nnJ5+f6Tw7Z7VmnktAXkK+wt/NvMKyvnhOZpB289hk/2mEx+ZZoAP6Reyhg/LrCXoclngq4cSEMdwNqT6qg0TzbWjXzkF/KsN20T9dLwbSGOs/AkdAMNSq3dXoSt4xZ86A3XXFb52xXwj29IpPT4ecdCeG2Uip6n4w8WNbVNjCiWW99WEGMrcHOhjrbA4gY0TIc2emzMAA8Ov8FvIS8whlUH1wnvS4zDjGCt4Qgp+gZhRP+5Klmvm1FsZM8+PP3Op/EhiMoOFnkb5ymTzgu4LEEL5qXIBlWsygjvwkTWpXIp277UV2zsvFPifgj65xQ3W7t/t01Sa5hh8qPpGn0n5eq1KfNFyceyc7tFT4n7IIz/tgFIlOj8JqWZ+trssFZ8VxQsrW8Hd+9O2oruaibiCcKq7+QQ4YrYLbV8xIG1jXSzGJx6r/Q6xo1SjOItzm8uvLEmRh2qR2/d0ZsV4JDT5t0dmM4nj5jgA8yG/0+iNwxe+9gBMFbcdtsQTX1VgEYqdXxvD5LaQLteFTDwGmcjOqwsqwMh57WC6iPkYwgtDAj/j4o6/bwK41W57U10M5FRihv2nhcpZFHqZDwCRnNQh4QgkJcFCavrJLC0Fc7F6tBWnyr7DKwglxTkOLFHv+0+orTp61ZnIsK0hiY5UIV/2f9c6SQ8+VHrTbSqvd1GF0ezC5TouMy05lcKTXcgg9GTl5/YyZ7JKSXOps8S99ZmriLi9l8Fx0swSliRXARRQZuRaYy5DCEuCoZ0ohQ60PFs6s5yH7riGi7sz42ZCLrLT+8YAz15DmXgnzJ05XszWGV0WeeL2L+A5VTtKwzxjmbDyeGVNx2j0tKaGstDQDKR2ENAQUHgL8jf47147EivknOqptaP+Fc92LTwqsdOe3SJScu7W+2nccbCAKz4Siz6N3eJe2iJnSci8ke0DOIDM2xZkyrXqloRPA56w= X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:5F0WHUZWBiyJMFWc5IY+VApIWKfp8onwSxzM1HH1jxJ/0NFDBROZKdfXYpXmukKADcdyH1zLhnUkuPfk+6GZnjzoPzLjkSIIcgegzPLeHgYm/P6xDafW0+X3nfWx6WqRtTGPrStcZjoX4CzyfwgI9g67SUpA3GpTOfI7RUJYzSLlBQhKaD5X8V+Mvi+rfUEl9kBpHTtT2+edW9xJu4R6sMsjig21axfcFAocPJaBy3UejamEtTsv7yXLvGH4ZIgnWt+UUIXpjGKM8lY0q3bGcopTz3rdZX/TMOunBETUD49M1njJpWDcAbqdZ3j45ZEeULy5MrujfP3ry7y+Rgpr003vBI6Fj9JlzRCeEBwVahYj4yLOCr9VrOYaXVEiJ/hgvsJFvkVs1nIKVVrckchYUQ==; 5:H22tcABf3HZ/Eb3skim6rEzv7hcCB7dqhVGF7mLWALU84pg/ZoY+2pmjAwAf+4EsRZX9jDN+Iw5WsTvmFxOlwGASJhrSkP6uHUdW00Km33mSqge44MsIsHZ7Wh6EifTc3T/Q/Zx+JrYCd9rhBUITqVzdvT6L6VGFqkSr459BgDE=; 24:tyVZnnUpi1SpjPvCHhbj7b3GwVp8eQOhP4+6n7MTtX+QY4gcpzpR07NdeXUzEocrLcE8I1KDFzRkd8Dm5JNwdySYEmFLUYFK18w5ooBbu+I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 7:K2DsetEmFlxJocyFdWyoXKkZ6ahzgjoDC6KBuVv8BhQDFcMVF93WdxiDhlRVzOphz/JAUlOddUrFXGQdP2SFPWHV2RDWN0QjHGjQ8Soo2LOveu1YYkhs0nrjv0StnohvsvmB20YgX2mEDv28L0JLC1j0+X9vyNMCqUQjGI+W9EmrEHV/1vBC12gFkQMfCuUj+XSyHHXen3HqkfKloH6W7AuyzC3Z8XEb38hUpALzEDAEZ/ltdBGXrLv51yAi5pn9vM+Fpj7tPZ0VBNgFEL81l9WCMqrmZMXT3g9oIQ+a3LLghB5ulq8VcJpxc6ASxkLvv1LtpKy2/DxhVWSwqOdfGQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:21:25.7103 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Based on patch of 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. Corresponding functions are located in to avoid mess in headers. Some files include both and , and this is wrong because has already included. It was fixed too. Signed-off-by: Yury Norov Signed-off-by: Andrew Pinski Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/asm/compat.h | 19 ++--------- arch/arm64/include/asm/elf.h | 10 +++--- arch/arm64/include/asm/ftrace.h | 2 +- arch/arm64/include/asm/is_compat.h | 64 ++++++++++++++++++++++++++++++++++++ arch/arm64/include/asm/memory.h | 5 +-- arch/arm64/include/asm/processor.h | 5 +-- arch/arm64/include/asm/syscall.h | 2 +- arch/arm64/include/asm/thread_info.h | 2 +- arch/arm64/kernel/hw_breakpoint.c | 8 ++--- arch/arm64/kernel/perf_regs.c | 2 +- arch/arm64/kernel/process.c | 7 ++-- arch/arm64/kernel/ptrace.c | 11 +++---- arch/arm64/kernel/signal.c | 4 +-- arch/arm64/kernel/traps.c | 3 +- 14 files changed, 97 insertions(+), 47 deletions(-) create mode 100644 arch/arm64/include/asm/is_compat.h -- 2.7.4 diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index eb8432b..df2f72d 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -24,6 +24,8 @@ #include #include +#include + #define COMPAT_USER_HZ 100 #ifdef __AARCH64EB__ #define COMPAT_UTS_MACHINE "armv8b\0\0" @@ -298,23 +300,6 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; -static inline int is_compat_task(void) -{ - return test_thread_flag(TIF_32BIT); -} - -static inline int is_compat_thread(struct thread_info *thread) -{ - return test_ti_thread_flag(thread, TIF_32BIT); -} - -#else /* !CONFIG_COMPAT */ - -static inline int is_compat_thread(struct thread_info *thread) -{ - return 0; -} - #endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ #endif /* __ASM_COMPAT_H */ diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 5d17004..192d295 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -16,6 +16,10 @@ #ifndef __ASM_ELF_H #define __ASM_ELF_H +#ifndef __ASSEMBLY__ +#include +#endif + #include /* @@ -157,13 +161,9 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp); /* 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 -#define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12)) -#endif #ifdef __AARCH64EB__ #define COMPAT_ELF_PLATFORM ("v8b") diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index caa955f..0feb28a 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ftrace.h @@ -54,7 +54,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) #define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) { - return is_compat_task(); + return is_a32_compat_task(); } #endif /* ifndef __ASSEMBLY__ */ diff --git a/arch/arm64/include/asm/is_compat.h b/arch/arm64/include/asm/is_compat.h new file mode 100644 index 0000000..8dba5ca --- /dev/null +++ b/arch/arm64/include/asm/is_compat.h @@ -0,0 +1,64 @@ +/* + * 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 . + */ + +#ifndef __ASM_IS_COMPAT_H +#define __ASM_IS_COMPAT_H +#ifndef __ASSEMBLY__ + +#include + +#ifdef CONFIG_AARCH32_EL0 + +static inline int is_a32_compat_task(void) +{ + return test_thread_flag(TIF_32BIT); +} + +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 /* CONFIG_AARCH32_EL0 */ + +#ifdef CONFIG_COMPAT + +static inline int is_compat_task(void) +{ + return is_a32_compat_task(); +} + +#endif /* CONFIG_COMPAT */ + +static inline int is_compat_thread(struct thread_info *thread) +{ + return is_a32_compat_thread(thread); +} + + +#endif /* !__ASSEMBLY__ */ +#endif /* __ASM_IS_COMPAT_H */ diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 32f827233..9b1835c 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -26,6 +26,7 @@ #include #include #include +#include /* * Allow for constants defined here to be used from assembly code @@ -78,9 +79,9 @@ #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) ? \ +#define TASK_SIZE_OF(tsk) (is_compat_thread(tsk) ? \ TASK_SIZE_32 : TASK_SIZE_64) #else #define TASK_SIZE TASK_SIZE_64 diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index f3f3599..cd0199a 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -40,7 +41,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 +93,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/syscall.h b/arch/arm64/include/asm/syscall.h index 709a574..ce09641 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -113,7 +113,7 @@ static inline void syscall_set_arguments(struct task_struct *task, */ static inline int syscall_get_arch(void) { - if (is_compat_task()) + if (is_a32_compat_task()) return AUDIT_ARCH_ARM; return AUDIT_ARCH_AARCH64; diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 46c3b93..a7ffea2 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -95,7 +95,7 @@ struct thread_info { #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_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index 0296e79..a548fb4 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -168,7 +168,7 @@ enum hw_breakpoint_ops { HW_BREAKPOINT_RESTORE }; -static int is_compat_bp(struct perf_event *bp) +static int is_a32_compat_bp(struct perf_event *bp) { struct task_struct *tsk = bp->hw.target; @@ -179,7 +179,7 @@ static int is_compat_bp(struct perf_event *bp) * deprecated behaviour if we use unaligned watchpoints in * AArch64 state. */ - return tsk && is_compat_thread(task_thread_info(tsk)); + return tsk && is_a32_compat_thread(task_thread_info(tsk)); } /** @@ -479,7 +479,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_bp(bp)) { + if (is_a32_compat_bp(bp)) { if (info->ctrl.len != ARM_BREAKPOINT_LEN_2 && info->ctrl.len != ARM_BREAKPOINT_LEN_4) return -EINVAL; @@ -536,7 +536,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * AArch32 tasks expect some simple alignment fixups, so emulate * that here. */ - if (is_compat_bp(bp)) { + if (is_a32_compat_bp(bp)) { 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 1ad48f9..e3fe1ac 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -48,7 +48,6 @@ #include #include -#include #include #include #include @@ -215,7 +214,7 @@ static void tls_thread_flush(void) { write_sysreg(0, tpidr_el0); - if (is_compat_task()) { + if (is_a32_compat_task()) { current->thread.tp_value = 0; /* @@ -267,7 +266,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, *task_user_tls(p) = read_sysreg(tpidr_el0); 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; else childregs->sp = stack_start; @@ -304,7 +303,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; write_sysreg(tpidr, tpidr_el0); diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index d924ac4..09e30a9 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -186,7 +185,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) { @@ -1311,9 +1310,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; @@ -1340,7 +1339,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; @@ -1451,7 +1450,7 @@ int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task) if (!test_tsk_thread_flag(task, TIF_SINGLESTEP)) regs->pstate &= ~DBG_SPSR_SS; - if (is_compat_thread(task_thread_info(task))) + if (is_a32_compat_thread(task_thread_info(task))) return valid_compat_regs(regs); else return valid_native_regs(regs); diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c7b6de6..5fa1b40 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -276,7 +276,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 +295,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 010c110..eeda105 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -18,6 +18,7 @@ */ #include +#include #include #include #include @@ -547,7 +548,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; From patchwork Wed Mar 1 19:19:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94749 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1970751qgi; Wed, 1 Mar 2017 11:57:45 -0800 (PST) X-Received: by 10.84.247.23 with SMTP id n23mr12575786pll.39.1488398265218; Wed, 01 Mar 2017 11:57:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5si5431723pgk.270.2017.03.01.11.57.44; Wed, 01 Mar 2017 11:57:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752144AbdCAT5l (ORCPT + 25 others); Wed, 1 Mar 2017 14:57:41 -0500 Received: from mail-co1nam03on0085.outbound.protection.outlook.com ([104.47.40.85]:49237 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750947AbdCAT4X (ORCPT ); Wed, 1 Mar 2017 14:56:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0LxkUd8DtRSUoOpGSVGAf+FMhwnIpj3TVrLRuOsmckg=; b=RgiFBvNSXIPOBptJWhKID2+rsqLBqo5FrWKPCzItt4HbrZX1Pm4N/2kmYWr10/lXusdae8DKiTwUNiVg21KYg/CmkWR9C6nHFN9b+EdGsVZXn0Dp5vKZbsCZthpNoxcrmxUtVWfmQneU+wQVN8I0MNTt1C8rATlZWIxE4TzwSSI= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by CY1PR07MB2248.namprd07.prod.outlook.com (10.164.112.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:21:36 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 10/20] arm64: ilp32: add is_ilp32_compat_{task, thread} and TIF_32BIT_AARCH64 Date: Thu, 2 Mar 2017 00:49:18 +0530 Message-Id: <1488395968-14313-11-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR0901CA0068.eurprd09.prod.outlook.com (10.167.203.164) To CY1PR07MB2248.namprd07.prod.outlook.com (10.164.112.150) X-MS-Office365-Filtering-Correlation-Id: 2e557209-3e01-47ad-9745-08d460d82e81 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 3:Pfp/Ta0q85Mr7+TpyH6QrLTqALebGaf+TzZLf/OJs1SPiiSk8qVs7xu8R7YWmtNOH+bJUrXyeTB/srdFfI6mwVfEx/rZR1DwKJRvbMLlMaQERz0tkkWK5DjYfo5d9qPMghrlAoCK1GpCV139xM7aJ+9s0tGQnBx8r1cMsh7yHnvIqqlcDh4Z/2JVoayf43V/bA9h0WeEYc3VvYGzggDFiBNELWzzwz/163EuhHXUQLSc5Ni4eo8FyWOAdYWr4WlPiced6vZBx66APEUeFPZJjw==; 25:1JjuUIZqn+4F1J8i27BOhG+gyf8babzsy5H3zwIudKuVVtK2fYLwII7BS5KWu/d36QTK80FmSZFRF/N0Norn2fAFHsTiBRlAaxo/vskMBP47+lPjeHGXmPewanY3YwhFEuVsmt7XVq4ERQibdyao0ZllCTgjmDTs3t/gSJjdUvYR5DsZvT5KHQw+j4p+8pKo43P0mvfzTbGm13AWvwyhXH50Y00F2PFRXK51WXxOnN8psY1LQt7Fj4lYb/qDPWDn4qMUUnQguyO7tQXLa/GURO7MhWzVdJ+BEIi7MbQvQAWS0RDY8Zy2HsupJsmjfMXBYQjbG/dxRrm6WApOjkljUHeRaEBc3xBFd80wznWIMiJOwlUxClrz+zg9GFye4drN73yvTUFf/oI/On9d4MfCjI1Wn5BBlsIO7eAw9Bpd9+WCdglk5xSP9Zis50TzzyNa3X5j6aouQgsQ1PDTv8U+KQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 31:mlrKmmU/67G6U82dxeS56b47Nd1WIwQqtdK9DtvpcrTPPrzzNxFsrRO22JhcWJNbmNsmQBkZZHYU2gJbL8mknTWu3XvPDDZRgciLKFr0nSqefbHVGac9bW1ORH4X1X996/MBDYfGzwe5cwJxug48oy5ZRWCGu93wlzfVxOkL3r0nxpCepCW9DxuV0WSZEwQPhxQcIF8yS3ytHp7eh2Ggo2BpRRzDhksPTEmV8X6kIVA=; 20:ngKDJMj7Omojnx84l47WeKU04zTrEwgtiM9hEvf6ceo/Ms6mmUJXnpuCr1ex29c9MslQlo/gIHpu297oKL3qPSD6FVsmMIraDPdedvgDHa0IEm2b2oruBtKAWpFE5NNQmsNKmTdxuD2DffiFzdM7e496taW7eaoRge8Ww+LqNIsIEFG+0GPp1X/MXpMYiwTL7s3NDyf2ZkHh8FUYcYXP0Mc3+uX1JUscp6QirCKrLpppjNHzXjePksdDwDWKfCNjaA8ZX7i8ibDn4iIrsOfnRhdHj7pZ+80d/FRbC4/FS6SpRbKap3Russa4NckgLbredd6/zPycuzvsHbFhjzKfUrBA4jqzBUV4X+dpv+pir1tWn7xg+R6yVN6QuRoqsALI9D6EVE8JX/PoNPURbAtntLdRkLWH3zxvVQf5IxeyiYbExBR/qqkNZ1pZ7SQCHPd/eZ7avqrCOsfGC5CEJAvtAf+i4cx4r26RpGJ1pnBQV1JgnTft9MhuoOcWzmL/KrPd0A2Oj7IST/V6E8f+IkBXFNz4kc4gy4lxUPiwpAwZkCBqGD9daVGmCjHFC1lzy8Uxuf5uo59zNO5KnqWAlG4QM9kCRF6R41DsNvhDQ1m90Gg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:CY1PR07MB2248; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 4:9qieJLi7Cy5tODLygf3qDrR51tNkwcIzt+mGWyU/Nrr79O8y/ScWRlh36SuD6XHRA3P15xN1S+RoYVOszW/ESPtGmqT/B77ofy0vBKV2zg90AF4lDhqWC1kUO8mhs+DH8o+j7Cb8/5pS8dFLMGPhebf1ltXvDgZBIPqxYnZLQ8FHxHYqLBa8cxuKLMnQCFCg9OXmNsBOsiNZsr5QJopmAPJaBieEMoyD7rQhhRztpLkf15qHSZjDPS+2yh0UZvJcpfe8HkCC1F+L7AARBILRPMbK5k5Q8wv3w6B1ILYLxexiFXAkscB37PElsqB3qfjzuw3jeOOb1ror7uXhQuIE0i6jtdicJhzkiY2jZoc4vi0VWRMDZozeK/PsLItt+g+F+BQx8Qj1eeDZXDviZ3lRZjfNv9280B+xxDE9d0rCIYgodTMczsHwC8kX1VOGBDRZQTLnCZbLlo3TtEuqBeOlQfLL2fU8mjpBDWZDeM+cSeP5rGyJ9plYqU6Ak0dcC2AvZpjShlpyyLPo9I9zJpydi7Y5GhHU3ArdHY2Orz+2mbJViVAHpJ8ItUWEdlmgbuA6MZNxc7J6XlQ84J5K0Kn2FSgD6xfVRB/c/exvu0xWzMM= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(50226002)(36756003)(53936002)(38730400002)(76506005)(5003940100001)(42186005)(6496005)(7736002)(6666003)(4326008)(5660300001)(2950100002)(50986999)(92566002)(76176999)(8676002)(305945005)(81166006)(5009440100003)(50466002)(6116002)(66066001)(189998001)(48376002)(54906002)(3846002)(47776003)(25786008)(7416002)(2906002)(33646002)(6486002)(15760500002)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2248; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 23:HVISKkzFyf9WwVqqYZH1y9/41xdqjcvC3YHPYQRc2dGqU2NeY0yIc7UqrPIvDEev1NUIDQMX7oNhQPrUmr6Z7fsO6vV6extrOuZD8/UMKMl2HRWS9vOgMdHp+yuB1v/C5kAFA4iXJJjCk61jLQ+dynl4iglkmnk8o+LV5j8KmTeXTTb7OZqRK9RBEWYq4eT+9fZi9qxIoTrofjUubv7U5EGHqBIPK9qQdxUyoR3N7mGm/XtqqmQNHe7B08rIBDLHLi1BZIgF0tSb2WGI30oFRh0tGk2TEEWdoIw45YKB710IAesRDLduJBdeClhei0iWqzX/xkeQcZtsWc5t2Kl6q7+jVEJy+EbtM0kfcHAw0vvKeDjtu1VSmJJsAenF0KmBUaQe43EahTfnt5v+2NYPixMKHUDu9HNoPVQkmRzRQCxcNj7/ao8nirVtsu6O5PwgjkEWZ/a/Ua5yux9NXfmTBz8AOe6chY0AYMxdjBTU9RNP9t1Ry1eOYaT8gHPjyRGsMi4BPNq9AitzQLgY1WSKDbHsF72xUIHqtjm8/2qEbJy9b+lD0p6VOcuJKgGrFQBoaZzCyNH6EbvHw7cfxJM8C3omwH9RPh94GUbkqdjAuY5A8QSQuesYqw4gXCKwlXvdLq2Eiil3U3UOZUnREPztqW3p/i1A/CkLAaFTgNBcM6QOEr58Bwuv1FuLW8IP+a2Im4VHdm9cHVDmMvD3B7RuRCiL3wI+XPt64NvKAZ8SjoN2bNjZOMu6cLjBzMPPVCNaClUzGfzUEVs3dyhqv1DidK/PubpQRfMuuodVWAZfUHGrtLjLQlxpbwctnmw1cKcokdD+E+B8sB7vkBAkC4w5to9GnNfT1Jowypk8+8F4P0jaOZun6qOvM0QP5tyZS6li6mmt2UOOe2wGnLYgLsp5J9FOpSjq3mBZd6uRysCWrUw9x914JMF4KAyVw6+iNDlII2ndtzjGSSj1G0DBl79ptt74/1Yjiiyob672w2GokkidItMDQXrnOh2BE3h2fWGv X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 6:v2IMiUhd9lQhLIdMXhhSxQbosvIyen7tzHQGF4iAJzW1t9bd8IDeK56HZL9yIritH5CWZnVFp9229yh6mQuekhCAHpbfIGfDgBm7gJOHfSPawN7XRxETKoxXIliPfRJ6iX4P/w2pTBzD2tyC9f0z3ncJIc3+OyIIAgB7wB1GXsn9BHMIkKme4pYKmy3ZOmPBFUeVYXRid5p83iaCPN3t3E80IFH0mBqevIEaa/KpCVWaI+MCoo+mqRzOEpTF6XvGTn2ZXMzCxCaisxlsGlMORLjcHa0WihM4xfYGl0NtnbFv9MjqzrAegDHAGDvmTxhR1R06uyS5kG8LcdJUZ4fE6FFRhIiRFXQEBOwzFtcs291s99/qVFy2hXS9ZqK2YcM6fbWs0bP6l6ENLbwcgJ/sCg==; 5:H3Gz18Vz5ITGZ8pCgDzMMbQldPDZN307PIXAPK5R7BXQMb8vh+O/6EaSQfIc9c0o6COq/UbBrzjKeCIW3uIL1A+3BTWwe+FuXOzBo1cEGEKCJuWqzHOobRSCrNweQ8Y4cZP+Cy0Egm0TTOut+42rkZwavJkGuCo29HZYHg0v8+E=; 24:93OW+JrEz5qHEndYQ9OG4buM/amdP+AAdzS9ZZGuN/SG0fjyBfzmNT4eoE6O5WRScVR9Uv2yLfKcQqAQHYwdlP77OzfFfKbYAptM0IwL2Y0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 7:cmP+jeSVCFAK/Dv3l3cTmBf1drfx2jsKPhFvx2fJ2JiydblICZo/hfHGdg7FprkYVeV/P/a/TPcGWYNHivcIUmVyFCjRUmw6NeX7cTXw3rdidsuRVjE1/86WqSkwKX4MaNLnFUrgJMEUsqY4L87tbkE08es8mxvsTftjWYjZihweTU+92f1zsbPA4ye4COOOnpCESiGsKz1D6KRQCvRk2mcnYlIuDEUGyUKv0XyyqV7GRajfYCbEQ+9A7B1627OhTNJLu1f00Hs2LDA3HjzcE24SRVzotRGL8cFQC5HCDHSz2Q3BhBAPmc+9juG0D9lw/lkQf95Xg4TZqpOL93Hr6w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:21:36.6466 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2248 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk 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 is 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 | 2 ++ arch/arm64/include/asm/is_compat.h | 30 ++++++++++++++++++++++++++++-- arch/arm64/include/asm/thread_info.h | 2 ++ 3 files changed, 32 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 192d295..a0188e2 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -145,6 +145,7 @@ typedef struct user_fpsimd_state elf_fpregset_t; #define SET_PERSONALITY(ex) \ ({ \ clear_bit(TIF_32BIT, ¤t->mm->context.flags); \ + clear_thread_flag(TIF_32BIT_AARCH64); \ clear_thread_flag(TIF_32BIT); \ }) @@ -190,6 +191,7 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; #define COMPAT_SET_PERSONALITY(ex) \ ({ \ set_bit(TIF_32BIT, ¤t->mm->context.flags); \ + clear_thread_flag(TIF_32BIT_AARCH64); \ set_thread_flag(TIF_32BIT); \ }) #define COMPAT_ARCH_DLINFO diff --git a/arch/arm64/include/asm/is_compat.h b/arch/arm64/include/asm/is_compat.h index 8dba5ca..7726beb 100644 --- a/arch/arm64/include/asm/is_compat.h +++ b/arch/arm64/include/asm/is_compat.h @@ -45,18 +45,44 @@ 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 */ static inline int is_compat_thread(struct thread_info *thread) { - return is_a32_compat_thread(thread); + return is_a32_compat_thread(thread) || is_ilp32_compat_thread(thread); } diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index a7ffea2..abb60b5 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -96,6 +96,7 @@ struct thread_info { #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) @@ -108,6 +109,7 @@ struct thread_info { #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_32BIT (1 << TIF_32BIT) +#define _TIF_32BIT_AARCH64 (1 << TIF_32BIT_AARCH64) #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \ From patchwork Wed Mar 1 19:19:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94738 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1957897qgi; Wed, 1 Mar 2017 11:24:27 -0800 (PST) X-Received: by 10.84.169.36 with SMTP id g33mr12465100plb.36.1488396267662; Wed, 01 Mar 2017 11:24:27 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si5385056pli.143.2017.03.01.11.24.27; Wed, 01 Mar 2017 11:24:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753140AbdCATY0 (ORCPT + 25 others); Wed, 1 Mar 2017 14:24:26 -0500 Received: from mail-dm3nam03on0086.outbound.protection.outlook.com ([104.47.41.86]:18645 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752303AbdCATYT (ORCPT ); Wed, 1 Mar 2017 14:24:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=T+loiKAjkJBtF5dnj/oPsY8ojqFnkbLSGTJIR7VW3GA=; b=ieHZop7eyMjO19LVr71dINkk4iXdGfFnc5LRb/rRorQZvWG3ZgpA92BdpEYPocMBTD1t/234Uv2Hdo3YFzfEarUzCeG+543dFgoEFJc9wBn+mEDI+nMeMTch2X8ilupu3cspIFCWRN8dmN7In3HuRsLx+nbygyEthgFc1Qzz+sg= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:21:47 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 11/20] arm64: introduce binfmt_elf32.c Date: Thu, 2 Mar 2017 00:49:19 +0530 Message-Id: <1488395968-14313-12-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM4PR02CA0006.eurprd02.prod.outlook.com (10.165.239.144) To SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) X-MS-Office365-Filtering-Correlation-Id: 729a6682-1c69-4e01-84d6-08d460d834cb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 3:vnyKzOB0xyVgJmAyfMlmSMhHlikKc/W0PvFh2sMhVwZ1Nc7IUSdsyIwpTwEOE3zn5WkoXl5MnB3emggxWLJF/NT3s3+xA3IcjpgI8JLYiJZi7ewW6voC2VV10zmYui+Wc3I9Q6JxPCN+9YsdJMjE1D20JHZ/aty2ngxrCqAZW1U+lPWB+rYd1D50mT8eDP7tDCy9Xj/K0NVY037r80zwsRuFZlVeS2eaEROy5dOUtr+9DvWRCsKl4f5Q+Tpet5cqYynyrq+alNPuU8PplHZbGA==; 25:KslCciL57Q71rS4G449o61egUfEMgiOwd9V7pVZgRqJVumzaeH1QQO1wonPKKK/sWUUxpBGu+AnqJUsUB2cE8lwtfMPglKrsXTsroCOQLXRid3gx5SaOfenOQM02v0agdfKf1NmU6spsrdwDDN910TPyT+W8ZmJ1+SvBHmxQLVMbOwWxbt9Vs35GpuXBeuwbXGKICpjzssC+py4RFUQpZXwczfUWoJbkpy7iZJYig79+Kr5MwWRu22Pf9UeEhRtJAlsdATRIGhfny+mMzNiiqO9+8+0sEEWWJET92w6kQFgNAe+DMBBq7tHCocajeWkZvgAv6EOYx6KTrjz+TDNAjysZBINbIgp1uRhPZNzTTI5Bmpu5pL1nroBXTGoJZew1wRmgrpoPKFCWqqqAOl2w3zVZN8Tq0y1I4ESZOGnTq8pXaBTQ5O1PBLH2GQpuSiAe5r0Hm5os5rAdp966YeAx4Q== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 31:YOtH7O6uXipXr8tQ1EX5yvZcofSa/UD+bkPNuVdGONwzaU+z6FbaKgzcSSLtNWg8jc/+9OQIPDETKAJbbpgEkMG+Vb/1Itm5HOLl9NcUQYHJ8BybaL5yPQqHCDNWKW4H47+C9kQTr0dxrij3z8LXHRd75m4nLhDMps0NPSQzkxfNnfJ0DBSdpFH83hrZwgcOSBNzsO1T/ecpwx9/CNVq1t68JbmRlDLHnzz7qZC6Hpk=; 20:3BdNn3g8ibdysHEkV72Yh7fskMOEtystXtApaRyMIV2mCstLD+USu9vpGfLo7/qoRJulvWTZ2uFAYiZyJJv5MF+/oiWmi5MLr5ZPEGVApdVvIZf9/ZrDh6fHtPUmcXFITMWxZgglQo9/cTmTyorZLqT/RHOVyNh2AyF4maUvJdsYik7Qn+ibsPPMNqn0q9BmpTLOP7MireRrrb8aSg+h6v8BxNWaEgVtfLu0xo89VsiGbSl7WQDvrlqHSMBFMLFref4qnJzLc3CKKe1X558pvTsiHJdMLPJrtvbnXAYyJCp7/E/VO1mGeGJBzKmm76pGaZyUASOjUuj9t4QbJq4/5ifSIYiSHBSjFdBvLOPXftNjEmVwb/ZS0XRXKh9xDTr+EDWUzA6VDusggA3lpLJpUOJ6zMX003cHj51o04LhZjPI35XCkPpj2p4m3z+7jEkA05Z6SG/fqPkVdI0Hz95MAaa1HaqWbhXyUhlIEPAalm8nBmyUjLqtX5h1+2JIlQKwxnTIBmGNBsuU0PR8yJWDFcHs5n3YaKBqWgwxJ1rMxeh8CmB2EeGh6w5Lh4mbTwLh4NwZLnKldmAEN/FAHQJ1dnCC3MBznmd87WIaRxT0q34= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:SN1PR07MB2254; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 4:CXPrPDwVj36UYP03JNdjJf/40hwkPSIgElccLj9/1uhdFJvMBr2rLiArp6EddUc8bS+cI7auBsMghROCyDJn4hOIRW5eKbAhApney0lDfs3rVR/5JyIrRm7Gfh6JeZtA2ESHvFOP6e0zoS1T+KZv5zYVg/WC9yYRQmcaY0S/56nI+rMxMxQcD0QnS1LMSS/WNzwK5BXQ2IOVEiD6miMQTBekfKrtpHcbfW3axQEkzbGdRgH9RuOE02y+bA8NMaaCKhpFzOttOvIu+JFuKOpmivGMNHyigCaqctVv2Ipb2qkQssxTB4bSzsrc9lN6bfLyVqGCugpj+JlKjteOTg//Zf3426Q4GI+FtpEXzkTSifaqo8+yT6izHFZDgGTCVzX0YALpkvN3rQdVDbRLNipGxXCNU7VRlw2Oj5RkL6GPxIX3N4EhP21CKMLNzCPsrKTjd17Eng0YYXfwbcJh7Q+I5HoCcGXNfWQQihcXSHCq+AdTM37N00y6TMqY7GHqqCYfwIMGi5LX56Xo7hx2Xk6QXyMV/iNciWv7cAR+AuQeNVbVw24RUm19bMxcNyxaq8YjRQquEifqpl0K4niTrKIyhnBNaV25lxlP7p6TA9sfM5E= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(66066001)(2906002)(54906002)(5009440100003)(36756003)(7416002)(4326008)(305945005)(7736002)(2950100002)(6666003)(5660300001)(92566002)(38730400002)(53936002)(76176999)(76506005)(575784001)(6116002)(3846002)(50986999)(33646002)(6496005)(81166006)(189998001)(8676002)(50226002)(48376002)(25786008)(42186005)(50466002)(5003940100001)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2254; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 23:xNQCNC28OovJqyvN98NkAdDSv9PcB77i05ZPaST1IqRKypgQ4tV+WRqWH2pylPW+z5be7/yTmTNJMw9B+GMKDzM/M+Fn00yQcl0lDzUR5DEtCZ6+EiMc0f5PRunrIY2r/96AfCKPYKMQF/4aIOJI7A2NtstA3pPQKpSuiM4Xj/fDILns72uhE67X7R9aDkSUs7SyBI9E2b9nGoa82ASfi2y0GA33yPwvwjuX/vkk/3RQjI37xoCRDIPoakRakQyY8GJe29TGa0gP8Yl+MxrTZ6j3AxmRC1lrDaJ+IBzTLXVLvvLXwwU7dlD10vivTD+A5qOekcGGoe+uUvqr12uzko9IhXGTe9UXAz2iud98Tsvv7y5fVrcgBlIYAtq/wsZ5TEP3q2/9YikFRXR9En0aCHMrCONJd/+64RTpISxewQewPnCJ+3gjjYyAfSXiYJh2dpTIJu57+bYa9WjRnem/9OAdiGBz+YC0ETgXPzH7BDQyhpRpbL3O/dVa4JxQYGsmX42Y6p49TsSRpzPD7dPO+jw+ff2Tf/2piP/3dHVA/qx2CNVNuWe2XLAf3/N5XBJu53w92QhaqAT+3I47u2nljmI7onNTFiNBEXaoqDoepC66XgTPP51AEZ/NbLHMEXlzTcp+17ZcYwCI4hsLejjmh2SLpUsnoW8wgbbL3ICXEvReZDqxojiFNXvY8Rhr94lJvistPd3RGr7JXFV5rEdHNGGGx0VzlQuXC4SvqFUSFeGvA5o96AaGrjfqN/E38WYZXSQsUPAlyGGzlfzKi7sSdInW7NZienkyTZrcAkbWRh/jIvAulpHbgBi7pym7Ilgm4QTCEVtG/bE9Y7kv5iHxt2yfG+Um+yLQSuPewkTxYDhjQ0Zb8m8KMX8rq+E2moHv9ssLTvgg8cfi0hGg7i6EkfbHd2ImXt8A0dwg6NchQE0OjWwMWBb/7VeZSIrnL9zvoPeHYKEP/jiQULIoaB82KQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 6:wXvb0BOuEX2KKWAwbgcF7htDMYmPkiR2BitFir/sco0RWE7WP83QIzYa9MnK+FGXs4IMnzG43HCl4FPRUYXCxufP9jn5HcFLV99CQelU9rQrHOJiYvXOhUCF+S2PtnR7ZAbfh59NMtBcnB+y0Fyc5OSsGvn0DFlJzDrSTDNcXUahT+Ew1YykO5jvSqgGUmggG1DNtLi6D2WPVHqY+afYU+BO/5lxW057MAIXAMywpB1w58ln+8YNiW7y39kfLwFQaKYc1U6HJcpL3J0b7YUgfS31Q2kvNUptIR86TprXFTeeDMAIAyPDgamy4fnD9lHSzIrUD7AiGGRhEI1722Owss4pRVFgLqfdHbpGZ48zMjnIIZ4qxsXwmK10YAbW2SMOgYEe27xuMbx0xQmgrLCiCw==; 5:RizZebw0A9kO1C7q7IkkI4DHeJrk3syLI+jOcmtw3ScaRs1X4z6Za/WThQsnFD/yyq3iK5h6c79krQ9JUY4TQgG1h7S4MYaDVWHZZ4S3jOpX5w3QnKL7elYbsr9kDv0Z8V6lAcWs3yGqVs61PIeu7d8mY8barfHF6NKhoA2sU2k=; 24:SSLyDMhL+UBo/g7wl9WKca722HZkWIKjeA9yV31DuU8mwAwxtLUXu7waPsTWMlMhBz/ePa9sb4uRgY1/FdfXNefULY21GttPnaVzWDHqJpQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2254; 7:cCgC/hhEI894OQgsGVqE3wFdH9tkXSk3v+Mo3Tws5r5vV7rvw3BmLeS6rqtrCSqDH2GU8nD7nR0pWbw+s3e4iTv+bMIpK4TYPamyR+avCzj5JU5xO+drvn4Wr6FVk/4ynKwXgdlhz52peS/GNzkX6fnmVGAdsvJr05YEByUG3xM/G3YZEYfdmkv4DqyNejtOqcB4ewObDPOrYbXLcrXtz2DZu0M3MF6ELOdRiIjKrTlSS3N3wK7pCQTmE0RPQ1XFLxmGuJETCoFzfiJWHWIOoeS2S671cbr4KXpQp/3ePqDJxIZHruFlwKUJWi8fNo5y+2GZEsTaFrSfK62fFe4J4Q== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:21:47.2756 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2254 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we support more than one compat formats, it looks more reasonable to not use fs/compat_binfmt.c. Custom binfmt_elf32.c allows to move aarch32 specific definitions there and make code more maintainable and readable. Signed-off-by: Yury Norov --- arch/arm64/Kconfig | 1 - arch/arm64/include/asm/elf.h | 22 ++-------------------- arch/arm64/include/asm/hwcap.h | 2 -- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/binfmt_elf32.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 arch/arm64/kernel/binfmt_elf32.c -- 2.7.4 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d35cea4..d059063 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1049,7 +1049,6 @@ config AARCH32_EL0 bool "Kernel support for 32-bit EL0" def_bool y depends on ARM64_4K_PAGES || EXPERT - select COMPAT_BINFMT_ELF if BINFMT_ELF select COMPAT select HAVE_UID16 select OLD_SIGSUSPEND3 diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index a0188e2..453e0da 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -176,30 +176,12 @@ 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 typedef unsigned int compat_elf_greg_t; typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; - -/* AArch32 EABI. */ -#define EF_ARM_EABI_MASK 0xff000000 -#define compat_elf_check_arch(x) (system_supports_32bit_el0() && \ - ((x)->e_machine == EM_ARM) && \ - ((x)->e_flags & EF_ARM_EABI_MASK)) - -#define compat_start_thread compat_start_thread -#define COMPAT_SET_PERSONALITY(ex) \ -({ \ - set_bit(TIF_32BIT, ¤t->mm->context.flags); \ - clear_thread_flag(TIF_32BIT_AARCH64); \ - set_thread_flag(TIF_32BIT); \ - }) -#define COMPAT_ARCH_DLINFO -extern int aarch32_setup_vectors_page(struct linux_binprm *bprm, - int uses_interp); -#define compat_arch_setup_additional_pages \ - aarch32_setup_vectors_page - +#endif /* CONFIG_AARCH32_EL0 */ #endif /* CONFIG_COMPAT */ #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 2c7fc5d..99dfd92 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -47,8 +47,6 @@ #define ELF_HWCAP (elf_hwcap) #ifdef CONFIG_AARCH32_EL0 -#define COMPAT_ELF_HWCAP (compat_elf_hwcap) -#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) extern unsigned int compat_elf_hwcap, compat_elf_hwcap2; #endif diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index b688bcd..aeaf474 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -28,7 +28,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE $(call if_changed,objcopy) arm64-obj-$(CONFIG_AARCH32_EL0) += sys32.o kuser32.o signal32.o \ - sys_compat.o entry32.o + sys_compat.o entry32.o binfmt_elf32.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/binfmt_elf32.c b/arch/arm64/kernel/binfmt_elf32.c new file mode 100644 index 0000000..7c38a22 --- /dev/null +++ b/arch/arm64/kernel/binfmt_elf32.c @@ -0,0 +1,32 @@ +/* + * Support for AArch32 Linux ELF binaries. + */ + +/* AArch32 EABI. */ +#define EF_ARM_EABI_MASK 0xff000000 + +#define compat_start_thread compat_start_thread +#define COMPAT_SET_PERSONALITY(ex) \ +({ \ + set_bit(TIF_32BIT, ¤t->mm->context.flags); \ + clear_thread_flag(TIF_32BIT_AARCH64); \ + set_thread_flag(TIF_32BIT); \ + }) + +#define COMPAT_ARCH_DLINFO +#define COMPAT_ELF_HWCAP (compat_elf_hwcap) +#define COMPAT_ELF_HWCAP2 (compat_elf_hwcap2) + +#define compat_arch_setup_additional_pages \ + aarch32_setup_vectors_page +struct linux_binprm; +extern int aarch32_setup_vectors_page(struct linux_binprm *bprm, + int uses_interp); + +/* AArch32 EABI. */ +#define compat_elf_check_arch(x) (system_supports_32bit_el0() && \ + ((x)->e_machine == EM_ARM) && \ + ((x)->e_flags & EF_ARM_EABI_MASK)) + + +#include "../../../fs/compat_binfmt_elf.c" From patchwork Wed Mar 1 19:19:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94739 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958143qgi; Wed, 1 Mar 2017 11:25:06 -0800 (PST) X-Received: by 10.98.23.207 with SMTP id 198mr10750005pfx.103.1488396305931; Wed, 01 Mar 2017 11:25:05 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x126si5382449pgx.184.2017.03.01.11.25.05; Wed, 01 Mar 2017 11:25:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296AbdCATZD (ORCPT + 25 others); Wed, 1 Mar 2017 14:25:03 -0500 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:55242 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753267AbdCATY5 (ORCPT ); Wed, 1 Mar 2017 14:24:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=KkhS2RMloPk8R/kS34iFqkZ+mXrzTe/whapE529Hit4=; b=ZsIanncnQ2BBMlzPh89WsbkCofdSaWh1lASVG3gArtlp9OXTGP3CDnNkGlgKH9mouxJP2AuOCGMAQQCgDccI6FzrZ1Y5r+ZYptYPqGp/ORu+aky5RuCJ1/KaivH6hqNrQCbjImYJMxhjYG+fU/f9U020i9FFbbOxTG0uqlUFY2g= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:22:01 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Bamvor Jian Zhang Subject: [PATCH 12/20] arm64: ilp32: introduce binfmt_ilp32.c Date: Thu, 2 Mar 2017 00:49:20 +0530 Message-Id: <1488395968-14313-13-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: HE1PR02CA0072.eurprd02.prod.outlook.com (10.163.170.40) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: bb731659-6225-4c88-060f-08d460d83d45 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 3:Un0BvK2YQojwcYSUrRZMQH702TRFmeZUzn3d2sdeqYAiyoDGNJ5sUSVmcfIHSSy39R53LcjYbuQeTgbbVJ6iHyhSI1O6NiYeE9nquiFDpHVN+L5U5KBzMaL1jN8MZ7djcK63YvbD+mcEmzsDHekER1NkEwcr+FOH0aPvfB9jcxM8OxiEORwvP+jOHwrH8yD+TZMBZVrl33ceNglSq4EfLKqvtJf/XVnRM8Sh7rMpW0iQlhNEpalsKxTGT31ZLGyVkwyhI/NFNZ2d0pnlVoWLYA==; 25:7mDUmDOQC/+NBtq9Xgr/ufKXIjG1v9bneyNTDFBOp4Evc5AN4yerxYWIQvJQnpB8MYIkzDxhsHvWcZEKpikTaOS0KGUKNlahCUDdp/0NaEdWmbi/MyAgR3Umcd2egMpTVXsBnOqN0CR5cszLzhZG4x2aTwqDQB7QgKeoqPZ3EAtE8yzDGMxEwlbDCzbyI95/pXu3XiLsm86ig/rk4MmHbM8ouc0uBa9TPK7kTR0aYeU6f/UfVKcj2oyVc52FUtS21ofTAAHy+ORJ/yhr3kSKTsgcLnl1qG7FVufKdJz+U0lrlIG2h4fNHcnUxGnWNkHGR7QiTdsMlm5BGH1P7E9fDsRzhhHf+OJrdyv0nLAO7vgEgQkxiGBl+cZ6P4XAUkycvf372HMAlc+pp3g4fu/AIE8Ayt+P0XmH6y+Ammmfdf0ILlmBqaOtC5zwMSXQoz8iqoh4vF1F3h8vZausC53QSQ== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:UGblbdMxwo0SJ0Lq9aSYo6Wm4sH7RzY/l4xa3YDCjuR/Mtd6t82mq6PpDldcT8heXGXnglmZEIMHPQM6DT+ysL8z73HzUH24FzSoUZAScOtpCRJtf0vvItj/nSUNJ8xv1P0P4Il1IAHYIvkyA9gL7SEttQC8CsP9PcZ1xINDYp7NhPRP900BG12iWUtaEZPKj1nrU8rwSbYvVrTnmvjbmuIwiuxzNvfQNnYc9dPj3vI=; 20:X7bxu/zwJO/ZKERmEViDouhHY7lCe2kSKZfVwarleEjEtNtX/S01AfSfALOPxgbDYuqrrri26OQR7DHSfn0sUmAjeKuZ6Ia0gFWymrGXVCUv4PvLUU1wi/BugE9SVQWXS4QMnlXE7iWeqSbftIZMQ7SFIEwdVaACJpVbhz2iTj+Fc2OLUmkv3OQw2itB0UW1Jgo/ePZc4JPbWHWq72NxuDC9Nn3zJrDeYnp9H4eMDaZwyPeqy/+s0+zjKUCP7sd17NQn33DhPalck/1XxU2UsBz3wj7kFuy8quKMiq5erZHtbQ79ZyuzcVnMknNNtGDaze6xHs0Xlr12gn9UZYKME3jJ1ynJakrKlDloSul9m9BF+nbURvRBwByLjEy6Vy+6qQKa3Tcx56DOI49N2nDtyl1IL7RycDIswUywc0YlQCpCN1Ukx4vPbR/fnKaH5Qfg4z23B3lXDyKiZ5j3VCdqQNjXi0t71bv3EV74jJgFSpTDWAKUDPmFx7ppO0qOZxXQWdkDe2LkJ5sL4GqqAwTTCzEVUJzvkcBeE9Iv7NYasad1k0tCR7FuDkCR/9p5C8pznL2/gwKfsSQ3X+c5SKJ3EXiONmrsgOuU4EpIv8EyxWM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:wHBB4SCVrdp/Oq0dVO8xVk/s/tCEjtgQfyyxUuQEwUecuaMxyIG/nuVd40VozYkf6REosZBZQqUiBF5zcmLmoYUnna850ZcfGxMXyQuWBIJmQqGNCbpncw8EfXEISpVmqvZTdWljwRWyUR2BxgdDJDdh+7anWuhOwzT9i44DOHwTt7p2Y0+O3WSRhEByhPHVEEw5qEu5ZYQD5qcH4NzoPtn+97h9zbqxhuM8TUTDF00NoGrXGYf+oMpVTI6h6ucEpxaErSGA+j6W6tn6O8Cdw56bOmzdnZU+Fl4zgt/6X+aX7mAJFCbj2kez8L3YE1FeJC1KR8fCHDGNp993rxEv8Uw1UjVEbwwF7p1NcsSqJ+cAVsdpegKaw/FFkhuPDNcv2/GGC29StfuhllbNoLtIu6DpKcyCKl4n1pOWWRcEUX3MldmQvPcnigjmW88tnE0eSkZ+tVyGGSxSQdzBZMlbDwVav9+StVbIsTn4Qa0XIyw7tj89vcw8sy50Rzc4jHdm5PlhVMWbUkgQAZyLll+DEBh4VHBxWXhZ6ohHLjGBvEJUTmQdGmr9/njlwqkaf2kMRaEK3FYOUYDBmVS0GbGOYRFFRpj/43j8Cr+u8qdOj+U= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(76506005)(92566002)(50226002)(6496005)(7416002)(54906002)(5660300001)(8676002)(5009440100003)(7736002)(4326008)(81166006)(305945005)(6486002)(66066001)(189998001)(76176999)(48376002)(5003940100001)(42186005)(2906002)(6666003)(2950100002)(6116002)(50466002)(50986999)(36756003)(47776003)(3846002)(33646002)(53936002)(25786008)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 23:H6xf8TCKFOD6IHJLV5+YuKNkKs463Vnu4r64d4klbOMMQ1Ti2DjhLyww3G2ZffzwPgcOiXPQeCfq42n/Qeqadrmu+g81sTUj1q8XZh36N++bHdp5kmgcWtwBTmGEUkgR35PZILwt5He+gvcbboJ5Aol2IEPtw3BYguQeA7jmCSQlQpy8QIQYKBCn+q3ISP05T/ZNmjz5Nj1oeHTtf1lD9VnX6+OvA1Yqal1OF6j2oP4bd3QwCyakodJVC0zqoSmK6OFVOvjoNTPsJCWED5eMUjqHFonCgC01/1SBuIGLVwTE/0lt70G9BdHkOuscwJz1fvjING8oaR8mseyhPjZGzZ65iakINwliNbYZKH2Zr6yqxHeNK1Oj9xDeFRAqHq1z/jWltcrIY2xjDI6/WbdHeR945dnYrLF4R5aPxsFGn90w2r+UwucSh0AJ0bxCG+wSNCObZCHqcGSur73suywiZcoU81EBL+ge4l80oytF2hYwZ4SORiQhwgD6TPXcWUGUc4niU9/Exs6FwSSIFf5hmC84Lr1CzA3Op3wQKrTOlpdW68wJ6XBeCVIDMnvMxrLqDL5i2i4Aab6zxJQb6+5IhJCKRVRSpVI7E7qxnBg3l2DbD6a6371e8SDM/FSbtQf99xFH80cXK5dF/hAJ9Hf3P+MzhTVcMZWTGZBqh0NV93TSG+hCGl4cbOwb+MEIfUc+NGb2is78QCHdmBv4rvHmM04xLOJKJsNSoPCjjZTcw/Gme54KPSeYHam4o9N9/bGQPeAUwwLsILzVUvTyvgP5BE6V1dJAzMHGH71159De8U3KFlv5+V5w/C+PEFVnJQuxir4+a0LZR1cvod4gjJagmcUa7glxEDEnp2l+M/ZgvkR6yRvD8htLOwKfCtsOdocWPCej+J3V10bZ/eKRktz3bt2UkJOqY9pfdVfZ/dYuFAKDmA3nVUipDyBNDg43P+Hys/rMx9RkttHZkKx3+zhJGQ== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:fIezW3kb2P+xOXC3oiFReTWWY9WH3DR4cfnXAxAHBE9YUygDuxFU23J+WYP2ywjTRAg8ztO1imDvN7ent4+YckLvPM+jjeIrKSZx/Y/m3B4q7ktraMPlA1sEDtryi4TFZ6XkrWmBwzCe0sB9+xSrNa2nWjAj+QeaTDzkNx4EcCfjWfu05mhdNSRsLQUPdswuW1A6e36bfS+VnV5zuNqQt0rvIj3O+EGnjjlt847/sA+qH5Z37wNJuRHFowQReFi3H2v7hHpk1egN6zypbWRbpNBOUIFckYoiI5cZqn1lIabK5cxKlQ/MjSLteojCligHLqel9C4egbVdJ4u82YGjzq8tPcHcbYPa3/kdv0pY3czkpw74P9VPnYCfuBZ1gnpn5wGV23D6HciVI1vHzGS8yg==; 5:zyWLFbNRcE15pY/BuATWVzd36UQMjPRuDnHmBjJfgYu0QmrkxGdGuxSbzHZHIK5h0dy3v3m0kyqISEAapXg4BvT/sUf1+hMZtpJE408t+Js389NgK7rDfzcIQuiZSSVMIWs+nNHYYVN5+m8BH3eD7Rxi8/RNvy7hZJK07QKB8Hk=; 24:AQLKUUt3ADHg9D1rsIG30wWydlZ4Pztwl4oMPOgWDGOA6AMavL58OXXLbVwcQbBpU7p6BHjwbGs7Rzb3Uj9/dVrcXwrKHyE8g47o9TuqoKY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 7:a5laB2jnK9xZYxCogZ6wg111Lv5UcntG28qd61k6PsniN2TmmAVUwvcVCgX1JHvKU3a8pruk9n4tTJBD4lD+rURMwJmt/kLoB/+n+B3eRuFVvaUf6jgLE/6TjIK/bCejgV90TOhjRA5oHzU1rcTf1zyYIIsKNiMyqr/cZ5+oIEJsoMl9wBGgXDSePxBPsP2cILBcYwPfG3TFV9K28rfJ8GK66wdaERrBN1HYJ/GgojQbldIoqNZnOIvyRDc0b5+mfb5sImX64LrHyuoq5LZMcvSHinQRypT2QD60zFzIjGMCqjPIsHsLEnZublGm23t4wynUrwgZNBrpGD9zVEV55w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:01.3891 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Like binfmt_elf32.c, binfmt_ilp32.c is needed to handle ILP32 binaries Signed-off-by: Yury Norov Signed-off-by: Bamvor Jian Zhang --- arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/binfmt_ilp32.c | 85 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 arch/arm64/kernel/binfmt_ilp32.c -- 2.7.4 diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index aeaf474..b6f14a8 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -29,6 +29,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_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/binfmt_ilp32.c b/arch/arm64/kernel/binfmt_ilp32.c new file mode 100644 index 0000000..bb31325 --- /dev/null +++ b/arch/arm64/kernel/binfmt_ilp32.c @@ -0,0 +1,85 @@ +/* + * Support for ILP32 Linux/aarch64 ELF binaries. + */ +#undef CONFIG_AARCH32_EL0 +#define compat_elf_gregset_t elf_gregset_t + +#include +#include + +#undef ELF_CLASS +#define ELF_CLASS ELFCLASS32 + +#undef elfhdr +#undef elf_phdr +#undef elf_shdr +#undef elf_note +#undef elf_addr_t +#define elfhdr elf32_hdr +#define elf_phdr elf32_phdr +#define elf_shdr elf32_shdr +#define elf_note elf32_note +#define elf_addr_t Elf32_Addr + +/* + * Some data types as stored in coredump. + */ +#define user_long_t compat_long_t +#define user_siginfo_t compat_siginfo_t +#define copy_siginfo_to_user copy_siginfo_to_user32 + +/* + * The machine-dependent core note format types are defined in elfcore-compat.h, + * which requires asm/elf.h to define compat_elf_gregset_t et al. + */ +#define elf_prstatus compat_elf_prstatus +#define elf_prpsinfo compat_elf_prpsinfo + +/* AARCH64 ILP32 EABI. */ +#undef elf_check_arch +#define elf_check_arch(x) (((x)->e_machine == EM_AARCH64) \ + && (x)->e_ident[EI_CLASS] == ELFCLASS32) + +#undef SET_PERSONALITY +#define SET_PERSONALITY(ex) \ +do { \ + set_bit(TIF_32BIT, ¤t->mm->context.flags); \ + set_thread_flag(TIF_32BIT_AARCH64); \ + clear_thread_flag(TIF_32BIT); \ +} while (0) + +#undef ARCH_DLINFO +#define ARCH_DLINFO \ +do { \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, \ + (elf_addr_t)(long)current->mm->context.vdso); \ +} while (0) + +#undef ELF_PLATFORM +#ifdef __AARCH64EB__ +#define ELF_PLATFORM ("aarch64_be:ilp32") +#else +#define ELF_PLATFORM ("aarch64:ilp32") +#endif + +#undef ELF_ET_DYN_BASE +#define ELF_ET_DYN_BASE COMPAT_ELF_ET_DYN_BASE + +#undef ELF_HWCAP +#undef ELF_HWCAP2 +#define ELF_HWCAP ((u32) elf_hwcap) +#define ELF_HWCAP2 ((u32) (elf_hwcap >> 32)) + +/* + * Rename a few of the symbols that binfmt_elf.c will define. + * These are all local so the names don't really matter, but it + * might make some debugging less confusing not to duplicate them. + */ +#define elf_format compat_elf_format +#define init_elf_binfmt init_compat_elf_binfmt +#define exit_elf_binfmt exit_compat_elf_binfmt + +#undef ns_to_timeval +#define ns_to_timeval ns_to_compat_timeval + +#include "../../../fs/binfmt_elf.c" From patchwork Wed Mar 1 19:19:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94747 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1964506qgi; Wed, 1 Mar 2017 11:40:39 -0800 (PST) X-Received: by 10.98.88.133 with SMTP id m127mr10715807pfb.155.1488397239109; Wed, 01 Mar 2017 11:40:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c22si5438300pli.5.2017.03.01.11.40.38; Wed, 01 Mar 2017 11:40:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753289AbdCATkb (ORCPT + 25 others); Wed, 1 Mar 2017 14:40:31 -0500 Received: from mail-by2nam01on0064.outbound.protection.outlook.com ([104.47.34.64]:7968 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752044AbdCATjl (ORCPT ); Wed, 1 Mar 2017 14:39:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=m92prL/KTx+fN0hQZxS+11pWV0L9FRzR98oEifCv994=; b=w24M2smBsEHwqJ0Rm8wQG9PmlZVW6bgTZYqWa+mdEyqAy1OHtX8MKzHSraoA82A/7EKdXQG6rFOZnxuTxtdpdLlOXB8YUJQQMIltyiCuzCewDFenM0U+t4yQwglOy4yfG6OVFh5Bw81xD+bJaafB8Ptwdd/xbZAveCSuZe3OK5Q= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:22:12 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 13/20] arm64: ilp32: share aarch32 syscall handlers Date: Thu, 2 Mar 2017 00:49:21 +0530 Message-Id: <1488395968-14313-14-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM4PR0701CA0023.eurprd07.prod.outlook.com (10.165.102.33) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: ba7afd27-4cd3-4783-37cf-08d460d843d6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 3:/++N3D4H4ZC5phWYVV1BPwzTYOyKdGIvJGnwCIlANxEeyBlJ6cSnyREINSWptkFAECduNhPTU/xTGL0ypUlcjDRFJpbst3Ut2QKuhXjVdAm/m7hG7cZDqOinBvJ79ADbvAF6ITWUzNmlSdqHqyx3Q0ypcMkCR39Awt76cjNz/FwIPnlb+o4UKvI9xq1pX773IWI+hu5EnObFUQ9+ZbQngWDkKiFSp1XAfsZAPXD63Z9jSNjN+miFXLFM4AfWY0yqKzST1k/xOacwV/w5gyOPDg==; 25:VwMe7MQQB12ZYSG64beEC0Xs/RifHcAVpnJgguCBM7/lMS2KCGR2mZwK5mqC1ybQ8UaAE7LO2920aUCoulMi0pBfESOxOQfHImePcYNP7feRosar8wkqnumWKbpArXLlmtadyNYI4AcLO9uarEZfP/FpMnLdyqVzfcCd9EFOxzkoVghqxrl+I7Me2fNLsPN+XfNHI8R2B78+BRSuOFJAxw7gfoMsvk9IJ3gD4FiMML1TT1FZQE+W0jUGdv5bpzKtjtVWcKg+vLG6x+DSKG+5Ahse7FzmJ7j5huBFyP8w1ZQulGeOG0ZwV13YqQXh5753VJShY8TSOmSc5NmVwjBpVr/hdDkbltLB72Dt7h4fp+auvC456+8RNom9xfnpa3QrQ88NbO47sw5Yjk2Dqdg8cOVHjoJU7FOXmwJ+BrubZkt1k4DLdPRiMdu4RAHH1IW1WjO98n/KZDtH9eH7OuWtUg== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:Oe/E56n9HNqw+DwfmOD/5vEH1709wFZj6KvZKzZ9tcIOrDuZ5fD+cBvEJZNAI6uE7thF1n8155t94sCdqzCFgiyl36nSyQGqtlrd0HTw1+vVQsU3Y0Eu3dZvL04qPFeeoUpvnC8PaMTBmO3A3zsM4Np30c5khsUHkVeg9iyh2K21H6n6B4ebGhPv3tJIPboiCof88rRRCtGLH7hdADTVoNb3z3U0Qqw45lo6UdOxnCc=; 20:gq3TQHIzsThVek/eIAqWkRGP0TueyxA8UCK1j9f2t7D9zQKyx1Oe/wvbuqCqSr9JnRAFK7SBLZeaUTKK/JV93huJ2lh9SKgarIF0+9wqrWsxDjY+LHyCIeWjdIR50z+XwecKMbIgGb8fAlPwhuz5LOSFqmAQp5nde1EbtjLYEmT33eW35isuzJgnuiX02mdj9RYjtD+sxp15A9waWC4MMhMgu0qp7osKN/T1dowRFHsqNNgHWl837hGu+Ls9OLZPhEsJIixTxl12jGTawmnlaptaduP4K/kKGhkg9vLyLrZoQOPc2/eMcSF81x1JLvAwiRtJxERp4FjwFVGQCOT+YsoB4mwPAnCyIU1dr8rOhMwc+6wghvvqyEKZL4Kg1jIdDc4VOvay5s0UcWyAvdAMIfEVGwljeDsfQh/Da8niFAmE0271eWFcqXg53ok/XprCbqf5w4ZgvErc+s02Gw15Ue4dQr5NueM/odRTgaaTuhiu3+mlVn5DvWD1L4FvrLRDrBW5TcyAYui//or3l+a+x4hYqTOflrOtgxWpT6zcjuhPdxjO+ijhnwdenQiobUtTS4FGbiHU3My9u2Zddo3VUHr7eeLQpfV0qXV9fAxIlrQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:KWSudKFMmrJ7FjDVgMxEcdUmgRKhgsJw+sI7mYwGamtC+sMsNV7c7A8ypz7K7H8AuSLeksusRbvySN6mVALOSwQ0v/DOb0XgpvpbybvxmCU36MmvAQFg1302wc/xiZAS9bShKQOO+tnuY2j03kdUUn2Tn5bAO4F9xz7Uqx9iKlN1bxwlSKeWDB2Rz57r/V3bbimLKE8CXzdOHVKK7sPUyrW7W/RRSMQHNZuNUXEsdSLlFve9wQYc8qGrAD5kvCOz4kwQ6LPhtxpxD5xD4VthOG1gLY3IYK5EWCixbrTjdm1FJiXOGp5RFZa2/zUWmUo0yw9jkBNjSrgaj5g1WbDcg6ULIMUnIYGPP3nClxMf1Ks00eq24JZa2ekgJanYJgTyKhe5Cebp+inB/xQMrx8f+Sn/5kw7TdcrIaW5x6uRaGEVJ5BGf0T//5Tg7MFdMHMDfsq6ZelBhkT5D6GwZpUwyCDXEAhI34oBQythHlTbrRaFZsWRV4vZobMOKmN3UZ6YlsoKj63qRWob9w4V0YExT/AxyD17F4JNmIwEbqsUVvOrUscj16n6ESgxpZKQ7OIN/+FTGLXFt6q5LA910+0lZdtoJxnmj4k58OS2F6jCYdXXcgKa+/qWK2xDw5ny6gHcJEZutYvjOGUDGSbrWqWF0lginVm3SvbgV2+/AI943SHedHkl58WfP1bRjXVcFvi6olZmWVrrZqdmfkE3hJ2mHCvBWnS/2rfujw84JpQ0Bzw= X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(76506005)(92566002)(50226002)(6496005)(7416002)(54906002)(5660300001)(8676002)(5009440100003)(7736002)(4326008)(81166006)(305945005)(6486002)(66066001)(189998001)(76176999)(48376002)(5003940100001)(42186005)(2906002)(6666003)(2950100002)(6116002)(50466002)(50986999)(36756003)(47776003)(3846002)(33646002)(6306002)(53936002)(25786008)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 23:T1SBAS5zjagsfaG8c6ecWfW+qr8WcTQSBhpSLgW5GhG5HfITtClSE7732MSvXPi0PCk2NNFdax//Lqh3bkd1TcjifXSIFOOoudiwArYxhL01tpuInUBj0pzCjgzqXHrhlOxogsmrK0MUZmmEKri3lYRx6Prr6X+085YVDR1QS42fkjiw6juU0sT0pBo3564F8sz+YfiEwahYqq63KH0Tp2GP9A18ziFGdUK5xVM5/V8eDmUSRHe99KTV4htf0/PMRQVztTzybuG2c9fmuozWrirqBlSKERP8ylLFWo4lUBRmGfqomZC8L7orlvfYueovk77rVsqZC69O+lGFNhbqVJVBM6UzihjDz/4fa1fCx60maRya4Fk57no2++/sltp9zPEioZ9kNm21vj9H2sN6Rth4RttQUKx4NDnY/XrXH58ZfhWCxFrsHPi9B/V3rsZhliA9jRReWYjBaB9boqKdFezQnp6Nw7tXaBwpnMWCLLzb5Z4C2dtoww4q42ISuMu0bcWFzmD8ynFutbJHVbeFlLb9cF1ItR3M9NihO/pCHnHhOjkdiuQAncqKFDux9YhFC6+/eAx02LVJ+gSNG0BHL5EhElBRCot8ev02NtukDyISO14G2fsDxOEGjFa+rzu8RPibFrakEl8dZDb5UQQ6BghppNe4h/cAcjoCyWGsvdJAuZnQQNDppkX8oPthbgPSjlcOodz7l4qmzl2mOlXJq05SFbsW2P8ppX19HE7bu1ZZnqc77PhRiLfwgiJTIYKRNL4kw+TCSai1vJYEy21ZR2Fei6LNXQOJLK1RhoBjNRkgi7bwtEzLrdRvWccnjnch3yw/nqPM7+yenD00GOj2kYG80vutkcWYM6LEKj2Nr1R8Vy3Gk1V7uJ7jCd9yfZ5ZKK6tcQyuHAqrW6ayYcgJqj4sMYCC5zDvCP43FU/IUw6NJl2uPzApyTs+dSAGg3CAIdIiEQxcNcS5v3WtMLIQv1GXqlTwX8fXX80hU4CLzmU= X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:dN6UbYwgdyDGOwXWnKSwBJ3X/PECwFkJMC4hBiqeaCc+yqqqLvmSSEdY2z5dmgLrjWnW63WeoSs/fsilXXsQ//HXYnfAZ0QAxslq7G0iH3mO1/mZ6jbl8mlaCmnNtcdie6okSfGkdbSZvQYr9x4Q91eRKGWgNpBISOrHAQrPnnJYvgKK6uJs3jND7ixj/JzVTMV4JUxbd4SXMauhimdWfaNP3jVmHWzow/iEGBdJmmqAXDD8/7bxa7201vpuEucbcj4ecDnzB6BSy9Bu/sYYGv9NX5RtLJldI1y+O2AaWxj38q27U8+a5e5LhNC14FHzc7/azJ3SvhD8UWnHw8KxpH2kgl1Qefo2umOrrFif5W+nAx6rj+fKI+FOJaOFhk2M/6L9xXcj+TvUKT9T6AuAkQ==; 5:1LTbzEXKB6Q/i1AhQqETRfTImdSLUlee3tFTdyC2G1SUe2lgVdX2JWiw3KiZTeX415FAea4QtzRb8y2nK/LQTPlZk1Y2ccuUeua8HvUwm7x27U6EK8vsUk35A8jaXEwd1BJxiAjlJw7b00Fsvh8hBjiiBpaLCbCQEdBC/nMC6X0=; 24:+rjgLo0zDiyGjpi1danXLw48zUJdjJ7eBiNvBY7TfXtDFm8Ia6p5tHSty4IzRe5hZ6HPeWcEMny1PksTYsHpp7CA0YnZD+n5r8onwiJULb4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 7:+kUaSUlzcyWyhZtr2BAaOYuIa9MiH4NfkfUqORV8QBrbTQpcO93ISGMpAsynvNAoUdkR4DjmlpCNGSZXFUXJj+o1x1Jf5KBwYxeCANvppj1V7olq6RAIottwuIxRZbPD1Uj5JCoSXYT7mSQzOFBsFLPPq+Ox+hx/j98tiRVw8RI0wXzLxwnv42c81570pQJpAJDF8BEYCev5+EG7eJnizSVOoTQotfJXI5vb59JHtD7RxUX6Mpclp9z1KRSh2A/wVFOjvSv6DIY+lb49fCpz6jMIRC3DdnMQUjo9Jx+jPdeEWZgsGnxGN7oOutXW9KX6Gh82f68XkSIO59GaDvG1Qw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:12.4370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- 2.7.4 diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index b6f14a8..e0798d7 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) From patchwork Wed Mar 1 19:19:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94741 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958498qgi; Wed, 1 Mar 2017 11:25:56 -0800 (PST) X-Received: by 10.84.236.9 with SMTP id q9mr12221408plk.96.1488396355919; Wed, 01 Mar 2017 11:25:55 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p16si5400104pfi.88.2017.03.01.11.25.55; Wed, 01 Mar 2017 11:25:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344AbdCATZo (ORCPT + 25 others); Wed, 1 Mar 2017 14:25:44 -0500 Received: from mail-cys01nam02on0076.outbound.protection.outlook.com ([104.47.37.76]:25060 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751291AbdCATY5 (ORCPT ); Wed, 1 Mar 2017 14:24:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+Jo9ALhoawYW4pf/6b1D30K6EHcFH+QzYyy8tnSgOZ8=; b=binN8rD5awoPXglsCm4MJhlHTgCt/0YH4BEMZua13HFF2Lu/F7ZY4ulO+A7oLODgYfi0lVgr+atty6H6nAthnxLRvPJ+qWg/1GyrlzTRIzNpwU1TmqGT0SWbdzglso621Q5l+9+gp7ZY2/+o7RIsht8ZTvVe1OA6LLSLNOuI634= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by BN4PR07MB2244.namprd07.prod.outlook.com (10.164.63.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:22:23 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski , Bamvor Jian Zhang Subject: [PATCH 14/20] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Date: Thu, 2 Mar 2017 00:49:22 +0530 Message-Id: <1488395968-14313-15-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR07CA0049.eurprd07.prod.outlook.com (10.164.94.145) To BN4PR07MB2244.namprd07.prod.outlook.com (10.164.63.150) X-MS-Office365-Filtering-Correlation-Id: 06fa051b-c57e-4c7e-fa3c-08d460d84a63 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN4PR07MB2244; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 3:KYWAIfdot0Z6pZFej293f5WjzRiktJjwJbG2nXyYygCLkqbK4Os3plpT8KEGjZ09KTzm3ybHXXu8oadJb/SCB3YuOC8VbuHqaYey3frXJ8+uvFPH2k9jVLqapxn/IpP0Oynbe+ffQO1iSWcjSdCy8OFgfzdpBQaLNAhlMj/EqPCb0r8HFz3aQuffDzTbBZ7sLLOqbWee54eE+A6Gh0fVPKMgtASHSsujIp11RoNszX0AyO6TOQcGYX8w9k7JYwasaZdpLJlHrSSiNtjZpD4fEg==; 25:TSIxc8bhQtkrTZkZG1MDgwWrj+sGf/ycPnQuO4ff9Tt3Pslr1uDkzB0IF0cBX/viRkM5mSNfRsUGpvwZ/GXLlJoreAt+L3OLgw5dh1nsZmlNt6Qvm8YzdsmA9gqBkgJIaagO0D1Z+Xd2i9/nzMjuIh9baL0rKb19IJ2FNojb/ZAdvQZWzg+WWTIpVriRLIQGAo8QufpXKWf6KLiKh7/uVCOaPJYUwbjRaXSDmszBAX23yb2fq7AvmYhW4iIAjZbBT68oSGT1xagKfFU2sh8qit+hsFGeBOMoXbGYxw5P8K6w6XDyjzMqsPmYmkOVyZyOVOoFIKxQYmvHC08RyL2Gp2cv+VyXvOsHA10m3F4wkzvWs543m5BKvF2LnfciQsbrRj6Ttiup/6w8fDrti9YSA6Oguie5ezao4BvJTcZbLPYnk6ci4CfpaUm6V4WVlC0jbQtZS1RCXOFuQ8DqQviaxw== X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 31:wmxu/3N7DIOgoZmuEuY5mP0NB3leel9wtP2+bY1Y4Jyb95LfQGwoci/FopJXFevUeuHdofDUJyy2/YihrFUdUGUUCFYX7te6EIcPwydUtLQquq7LfrSC4Owd4Muypfszw+tnc8bdjMG/hQehHhObgcqMpqE5jKvYacMmY+E0odcd0dHoWepwXGuWrBIlOCFdjpaBKjgTSLDsyQK5+5ljFy0jfDAYmikZASuVxIQm+n7vrexbwGif1vxkgke+AvG4; 20:NzPFUjRfgRmO9OiM39flTqln7H4tJxwjxTPvptGP3/2NdLKxx/60TrQ4alwkuDKJmaKX5Q5RiLZv9Z8g1Vwe0wi9fTI4we3355yD8yOAnpnzL55EIR2eVwGbaKewjdx/yGUtXMCWYukantMNIPL2GL0Z76vXKXgJ4iTS3RrrpzchBeCT32YuaZYTOYKMHvEtsrId/FGg69y4VH9FGA3CCTyYxuNwyojzIVz+yZNoDutVPBvJfbx+WhUjHb5+JGPnykqBnD3tvEqOEfyd0yLOGFNYPYczSInM/CcgVOVDQpjJtjp2HlT56Jfv7bKktUaYgWqhXNrnrJl8qfH1HchAw3Fx9oPSLugjnQ1g8sU2r7WDE9zRZCRM4AiMCgRqi9WpDUmndcKaG7TLIDKA+YiCpJ7nf3SXaB+PECE2jqR3jK626qn4eVyqWvffpLSm9pWcZs1nnLHWSaP5Zq9ClGiW2AfO1ITpegXT+zLFVBZPM4z9oO6TXzDjw93K8pBHqtXpVomPXKCODqN78BvBCmtq2t4QuMqXK/rB2CoPkiJ6o1qKo4Cv6G49YNl7ilic46MoBjB5++m+04pjA1ZZ8YlKC+1P++yKA8hjCFejQyPt0D4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:BN4PR07MB2244; BCL:0; PCL:0; RULEID:; SRVR:BN4PR07MB2244; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 4:VQyhnUcE4NSWMkwpyzs3Wmb+qnu000nVE3yY4Ol79HAoC7rvayaK86GAXlvGyXz0umF5V536FEXNqzoGE0lBnCi8QjlkUG3zCSdOMd+fO5B+/H4WHOt6gPz3NuNq2G12SM3OUOqljAosrVD/lV+OoffFRERFzC6JkPN4Ppyag3ZjijN4iY2+nNhfnWsO79AcfrTH5ST2Iu7iYxJJ7sUj1dhhgjYmXc7Boj5AcTz5uA/syO0Nm1muqFhB3CksngD+VCrhkJ5Z1FUKk3tXTUVRUlLHNDiiA3mub3JuP4bzJoKhS1x/WlH2FZ9n01SjqJFy1aJoP34JufiurCXpvenn+UmElLHiYwaUx7y9cwGIA7k3ev5H7daZcAjM9kwXZQ+0ayx00ly+Q3vaTR2paKak8/3V1BltWInUFxpZqPIBomoCB7zvjdNaGkV+BUZtwwHjOLi24L3iM9zqxu5/8mb5DrzDRXbfBedRUv65sisoTxijLqAYEdR/KnKnTTzU5vnar8tGwDrHczWXkQTJoyUnEVUsrQUlrCcaBymUbTmY2YxWE4UJ1JQ3PY2DPrnCKKIvDz11fykuSWtp7yTbo/934ED4P4JzpJ+wc5kOHxLiWt1Ku/Xy5qQEOL7QTGmdRdQkZf6ijHJwMeE5txyAL2khI/mrJ5SQS0RZXH59lqW64iraO2lAT1RHu35DvMzCN+p7 X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(6486002)(50986999)(7736002)(76176999)(42186005)(76506005)(66066001)(50226002)(305945005)(6116002)(36756003)(4326008)(2906002)(48376002)(3846002)(8676002)(50466002)(81166006)(33646002)(25786008)(5009440100003)(5660300001)(47776003)(38730400002)(2950100002)(54906002)(7416002)(6496005)(53936002)(92566002)(5003940100001)(189998001)(6306002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR07MB2244; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 23:N4DPIrgvD27BOSmHFoHp0KIjqKG3Od+h08l50NfHIG1tLS9Fklle3pz72C5Y9S4SNSTuzwiGat52xhEO8T2VaZKlDw66iDQfAYxHT4MKUOhtXAqaxULXjABVmIYjILzTrMnRdSD6wMiLdMud3wzNdvKYFCcU0CqW+EyPLSy+/+NaCYrbFMeXwH+mJm9LB0ff157/q0ijMzr3e1kcwzW+Gawg154WFKXloVX/nc38XwjQ0itPA6zrF1QjRet8ZgyLTQX8ILvkK9tkst+n45HClld3slYHd/1M1SyJGV5LAkrD7RvIrbPyuKyCmwTB72mKFiQlbwwNKzZmelJf5ra80YVVMA5tCg2m8d0uC2BGrbnQlbQHNgdaELiooTY4nBt71q1wOoxYL15DP3pDHpti3t8HPsHteehiBCEdfG/Hh/3+U4jKBrpb/LBXwpUcdO6E0uIs8T1OduepJcKCT3JT27bbNDnfOG9z/gN7omiAM5YVLwJBrYhxePmiaLKRC257Hml9Z2nIXn9M+N4leimlroKzss/kC/i9/DD/aW49/u94i01HLdacO78R8upyO5HZl4i9rZ/k0c2Yo05uJE6MrjfiYCQC/PIULp09+MKaXGHxFI5899bJX0T7uidVEKNuXXf0+fw0opLEBdfYPpbjMQQ4pHVt3mWaqbkk77kEOrtRWODY1zxvVQGhpTlB9MhKa5G5WY2IX3hM0+S+csNbXycjTwUcg3xh/WPJHBNuDzS7R5LksRFo0PM90XPXJVowpDAbIY9yj6iEA2PJJUANVXEBxcI/AKcCcRtqfyi/I7fV3Dwj8clcHclfZztN9C+S1iJm1rRKXbpgLZ73a9i7MqSseXYNFKq1APqLrdefbdrO5aIWdK4BCKrUDi6TIKLfmwmhDSOH7F4IWaFdPGfSnCW0/e71zIXItNvh1JrP4ThQmc8dWne7H9z4nn/W0/KVoFI78zB+awbh0ufLn4BiQg== X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 6:lK53zIdnuskCHXaGk1Jk+WXAMoq5uY76NX2SqoQBio5V07VuS1UcNTsiJLtmtkOowrYQmI705TQdpYYzczcYgr1yk9wAoOaeJ0re/w8EYsBuoDWYmc2KfIXkcjutPmVKZZDIhFfcU3A1rgUvbauZ1R+NSjQ0KLKeMXiFeZr9v8kaE6pvGn2qmcAw8eiXH9ClUTcCam7ijAPo2sd+xMegrrmUE+4kRPE+C1T21rDZn5dQwrlsRT1PAw5IIVtuyJRfegWdoTAkr7JAB06mHtTMLS185qvlfFMffEXX9ytWWSCFgpkrWuLW740fXy0VLGpmxQGGaCkEHC8ek1BzgYzmXwhe8oHyh+ubLHX1+a7ctLnM5YYAFxJFK84CyXC85sS51jaNk68NT15GMdlFWalAzg==; 5:8Apr/X3o2f3F/9/N4GslDzyymoxgnFOKW6qNr5J+oPCm8IOCvAmcXP1tn0Kigwp39bFVLQzA7XHaX5EOPJza/b+7iHIS203P4ZVHCazBuyntUp0g3zgawt3nZ0vLTWQ21BAUaUofsSBBUILfk8jquRMERRcS42ZMs8t/ipE1i04=; 24:h7NEZ6uv4Pa1ZhyhKE4v5eLIhScr0WvByBnl0VjEZvOdkAvUOWSHoq9rjPZvhv3cQLZk9TO0wRh2SoF8sp5ZVbYfhHXn+klufFcAwegkQME= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 7:HfWlSiBjHs0KXU6kN6TGd7Qsb93V2VQVG5MO8J/mQ8cSX8tUDveknGXFED4qYelARqKzkxrDy1MZ5m18ep+ngCbxtsOGCilT6kj/vE9nYNIQqBajJYubTe/78XHSnuraIpCKk4z2xIaVnbnDTMHhzNOmVtlzNXHHYP9Y2A9LwHccHr5kzx9cQjVyuk6B+Z/B91NcxgQL8bX5+Uu/pWGwSyLTW7mEgpChHjZK6V1qXRCWmhmwAZoo9XApGG5g17YK68GP35r4+Hwe55kQgbEPZ3pu4PhaIG1GghWTQbOG1vGSeWOnGKfGJGkGuulMxw3x/fnIm/H5w8lPuSCiyGvwgg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:23.5069 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2244 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski Add a separate syscall-table for ILP32, which dispatches either to native LP64 system call implementation or to compat-syscalls, as appropriate. Signed-off-by: Andrew Pinski Signed-off-by: Yury Norov Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/asm/unistd.h | 8 ++- arch/arm64/include/uapi/asm/unistd.h | 12 +++++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/entry.S | 28 +++++++++- arch/arm64/kernel/sys_ilp32.c | 100 +++++++++++++++++++++++++++++++++++ 5 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/kernel/sys_ilp32.c -- 2.7.4 diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index fe9d6c1..851cc8a 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -13,13 +13,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +#ifdef CONFIG_COMPAT +#define __ARCH_WANT_COMPAT_STAT64 +#define __ARCH_WANT_SYS_LLSEEK +#endif + #ifdef CONFIG_AARCH32_EL0 #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 -#define __ARCH_WANT_COMPAT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME #define __ARCH_WANT_SYS_PAUSE #define __ARCH_WANT_SYS_GETPGRP -#define __ARCH_WANT_SYS_LLSEEK #define __ARCH_WANT_SYS_NICE #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h index 48355a6..e7106bb 100644 --- a/arch/arm64/include/uapi/asm/unistd.h +++ b/arch/arm64/include/uapi/asm/unistd.h @@ -14,7 +14,19 @@ * along with this program. If not, see . */ +/* + * Use AARCH32 interface for sys_sync_file_range() as it passes 64-bit arguments. + */ +#if defined(__ILP32__) || defined(__SYSCALL_COMPAT) +#define __ARCH_WANT_SYNC_FILE_RANGE2 +#endif + +/* + * AARCH64/ILP32 is introduced after next syscalls were deprecated. + */ +#if !(defined(__ILP32__) || defined(__SYSCALL_COMPAT)) #define __ARCH_WANT_RENAMEAT #define __ARCH_WANT_SET_GET_RLIMIT +#endif #include diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index e0798d7..4ea7b97f 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -29,7 +29,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_ARM64_ILP32) += binfmt_ilp32.o sys_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 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index a143d00..7dbb473 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -308,6 +308,23 @@ tsk .req x28 // current thread_info .text +#ifdef CONFIG_ARM64_ILP32 +/* + * AARCH64/ILP32. Zero top halves of x0-x7 + * registers as userspace may put garbage there. + */ + .macro delouse_input_regs + mov w0, w0 + mov w1, w1 + mov w2, w2 + mov w3, w3 + mov w4, w4 + mov w5, w5 + mov w6, w6 + mov w7, w7 + .endm +#endif + /* * Exception vectors. */ @@ -576,6 +593,7 @@ el0_svc_compat: * AArch32 syscall handling */ adrp stbl, compat_sys_call_table // load compat syscall table pointer + ldr x16, [tsk, #TSK_TI_FLAGS] uxtw scno, w7 // syscall number in w7 (r7) mov sc_nr, #__NR_compat_syscalls b el0_svc_naked @@ -797,15 +815,21 @@ ENDPROC(ret_from_fork) .align 6 el0_svc: adrp stbl, sys_call_table // load syscall table pointer + ldr x16, [tsk, #TSK_TI_FLAGS] uxtw scno, w8 // syscall number in w8 mov sc_nr, #__NR_syscalls +#ifdef CONFIG_ARM64_ILP32 + tst x16, #_TIF_32BIT_AARCH64 + b.eq el0_svc_naked // We are using LP64 syscall table + adrp stbl, sys_call_ilp32_table // load ilp32 syscall table pointer + delouse_input_regs +#endif el0_svc_naked: // compat entry point stp x0, scno, [sp, #S_ORIG_X0] // save the original x0 and syscall number enable_dbg_and_irq ct_user_exit 1 - ldr x16, [tsk, #TSK_TI_FLAGS] // check for syscall hooks - tst x16, #_TIF_SYSCALL_WORK + tst x16, #_TIF_SYSCALL_WORK // check for syscall hooks b.ne __sys_trace cmp scno, sc_nr // check upper syscall limit b.hs ni_sys diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c new file mode 100644 index 0000000..d203dec --- /dev/null +++ b/arch/arm64/kernel/sys_ilp32.c @@ -0,0 +1,100 @@ +/* + * AArch64- ILP32 specific system calls implementation + * + * Copyright (C) 2017 Cavium Inc. + * Author: Andrew Pinski + * + * 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 . + */ + +#define __SYSCALL_COMPAT + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * AARCH32 requires 4-page alignement for shared memory, + * but AARCH64 - only 1 page. This is the only difference + * between compat and native sys_shmat(). So ILP32 just pick + * AARCH64 version. + */ +#define compat_sys_shmat sys_shmat + +/* + * ILP32 needs special handling for some ptrace requests. + */ +#define sys_ptrace compat_sys_ptrace + +/* + * Using AARCH32 interface for syscalls that take 64-bit + * parameters in registers. + */ +#define compat_sys_fadvise64_64 compat_sys_fadvise64_64_wrapper +#define compat_sys_fallocate compat_sys_fallocate_wrapper +#define compat_sys_ftruncate64 compat_sys_ftruncate64_wrapper +#define compat_sys_pread64 compat_sys_pread64_wrapper +#define compat_sys_pwrite64 compat_sys_pwrite64_wrapper +#define compat_sys_readahead compat_sys_readahead_wrapper +#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper +#define compat_sys_truncate64 compat_sys_truncate64_wrapper +#define sys_mmap2 compat_sys_mmap2_wrapper + +/* + * Using AARCH32 interface for syscalls that take the size of + * sfruct statfs as an argument, as it's calculated differently + * in kernel and user spaces. + */ +#define compat_sys_fstatfs64 compat_sys_fstatfs64_wrapper +#define compat_sys_statfs64 compat_sys_statfs64_wrapper + +/* + * Using custom wrapper for rt_sigreturn() to handle custom + * struct rt_sigframe. + */ +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper + +asmlinkage long compat_sys_fstatfs64_wrapper(void); +asmlinkage long compat_sys_statfs64_wrapper(void); +asmlinkage long compat_sys_fadvise64_64_wrapper(void); +asmlinkage long compat_sys_fallocate_wrapper(void); +asmlinkage long compat_sys_ftruncate64_wrapper(void); +asmlinkage long compat_sys_mmap2_wrapper(void); +asmlinkage long compat_sys_pread64_wrapper(void); +asmlinkage long compat_sys_pwrite64_wrapper(void); +asmlinkage long compat_sys_readahead_wrapper(void); +asmlinkage long compat_sys_sync_file_range2_wrapper(void); +asmlinkage long compat_sys_truncate64_wrapper(void); +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); + +#include + +#undef __SYSCALL +#define __SYSCALL(nr, sym) [nr] = sym, + +/* + * The sys_call_ilp32_table array must be 4K aligned to be accessible from + * kernel/entry.S. + */ +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = { + [0 ... __NR_syscalls - 1] = sys_ni_syscall, +#include +}; From patchwork Wed Mar 1 19:19:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94740 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958183qgi; Wed, 1 Mar 2017 11:25:11 -0800 (PST) X-Received: by 10.99.150.10 with SMTP id c10mr10630893pge.160.1488396311561; Wed, 01 Mar 2017 11:25:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x126si5382449pgx.184.2017.03.01.11.25.11; Wed, 01 Mar 2017 11:25:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753316AbdCATZJ (ORCPT + 25 others); Wed, 1 Mar 2017 14:25:09 -0500 Received: from mail-sn1nam02on0051.outbound.protection.outlook.com ([104.47.36.51]:23784 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753271AbdCATY5 (ORCPT ); Wed, 1 Mar 2017 14:24:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6yiab7oij4IQ1dzXRxRCYjk04/PGDgT7Wd/sDlWR3B8=; b=ZmBMoToPttaccFbAGrRSA0YUfra4ImjHB2OLDs6M8p6cjPy/2KT3yhaMf6x6Ub3pU/uAas/ApEVFgpUt7jW9gjuCz65vNDSRnytlxgFVrKTdaaTtFEyB6VXQ4AjS/yIYwSlONyyB9K+2c2nfxmERrV9tUbjwVfEKxr0nj9N9Qb0= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by CY1PR07MB2248.namprd07.prod.outlook.com (10.164.112.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:22:33 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Bamvor Jian Zhang Subject: [PATCH 15/20] arm64: signal: share lp64 signal routines to ilp32 Date: Thu, 2 Mar 2017 00:49:23 +0530 Message-Id: <1488395968-14313-16-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1P194CA0012.EURP194.PROD.OUTLOOK.COM (10.175.178.22) To CY1PR07MB2248.namprd07.prod.outlook.com (10.164.112.150) X-MS-Office365-Filtering-Correlation-Id: adab1b09-1e3e-4874-03de-08d460d85079 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 3:d4TQdpDAbcrrNWcJdizBC4YnHyG+DEChxRFBcoyNPfXxa4BEz3FnPILyROuZldffRM/xwBjH7EmweKGF2GwLGWYpJ1LfncxDVSUK0/ie2j9jMFa3N7iezCInJ3nrjdLd8VDbqwS9kWn8l06m1Y81XM04U1xT1rCTpvGMessZUqbMk/o5gEOewVgKEJs30lLnI0m+f06GVh/LDCAkHJOzRBqnEZLJYraEA3laGERRbXtBVh9P3GglhEkPsGkV06Pu7pv22T16UqptSPOuHS28jQ==; 25:r9Caq2kiQM3S4i1fK0HBPjnI6+oTQiA6YHw+VoZP7bXyz5yvsHyL76SaBc2W2bbcM75iTABjL340U2xFWMi/3/u0o8atTs64FaHLS1AuYmv7x7WknKHLjutXl4gdaPuxIKWXdjDaew5/qqJHSzdi0/xTQnWI0CucZ3ykyyRqK8gp+I/w/67iKVYUGlSjMIXB6M3fDc+lHppYvmXODz1tgsu+IE6Zul7C/PFHKPFh/Dt6RIJxaBtIHKFBuDUp3/Y/LFyqtiLRzGq0zYT6QBbXwIl4X/lHNIWeS6zHFU7Cuybb/jyDCWrJEc5rDJ1t+3AVRf96UZJ+6aeYCTF4CyFk7VaafT++Q0Za7KCVRGWBM2Bf9fwGWHvoZxAMNxlf5T8bWsiWz0m5nG/Q6ZTXk4Pkh8KEeFI8ILLTq//4/QIW77PjtaXvW6jxsDZyP8QlgNkjen6IIFuHmvxyYsPXKmC5KA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 31:S3eckfbEUKO+iF77xnZWFReDwSsoz9SxGuA4Zh9rRJYOc2/+Bo3QOFkU5bI5nHSqcRxu//XM9phr2R5Prw4oOVwjac4P6IaqSxtgprfBjQ7X7cbfqNkShcLKnF4LqTKc8q3Xz3CYovog7F6U+p0Sp/y2NVokJmW8hm8DvJYEQ3IpBhuX3s2SdQiZNwBDLHo+1mbwrkaqFCQo7iOQGMSCc2tX3KdLPa1lXZLRM1xhDZJHQ292VFqjlOWMOhwlAmvTq7sXYK50Xrjpz7+PS5ySnQ==; 20:SO6KpcXBUoH2vYRw7ckkqPbYX4CFKyP3ozYih2dIAqdronOh5sOCsdx+YdjNmrhfGEDsO7dV4DfjiY6belFB2pLiNIa1k5Himy2DaR+xyXbbWfSgPiAMbEvUPdear/DzIMAdePSexLH1stf9pnAnmwT7YosOMoaelvORd48PB253A3En2/qJsrvH/Sn+OekGvxOoTPr+mFpA2FcLZfxvP9T3VFyvHSDLkt814mpJ1qWGoJ16jqxBri57brxcvs/TcktTgdVDKndSjkpME45geEKWr6aHYeXZVarvcv7V22ojAK8cpcjPYWlwwaucm8U9/Lq8yUsI+Gko69+sP1EJKapDf2g0FLfe4+N5aGULfhaXI0LFKxrUZSRoM6qvzS5z4JhQnaXzJoNq9Q081ykgzi7CLctaA1/zylCFrkCnjv4ABOk0v4IMXaMgCatbZa+4esmx9MN//xMBvS9erFlqhYM8oBFviDayah8wBUmQes30uIzaA8h6K/F13C7g7pMmlZv6z2SEHzFt/rnLh7uowxNUNYtWUGsTF8ajCh0Y4M4Vwh9sQUhUU0axkAijyYwvOVZCDp4nl9z4AOJVQ70aa/yXDYb56Q3faZQKBw2R0k0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:CY1PR07MB2248; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 4:rkuJm38my4r8DEgAmfmytbO5NQ+gYrs/giLOcEWwVQfG9jDa1aY60dej1r58dT1QPFXzcdwJeY2gGdXANrgHPyQzvx++1GWhgSx2wQvh6dOMIDrMnLQSAU/tXff25zt8OBCVhHJgJHZX7W1/MaCpdOmGgm+ketntA61vzpmKoSZAbYeTOOJg9UmuR+rZqHdhYfiFXwoKpH9rzwTIp9+ryX5VW7poAUhrPyMOYBgZQKN/jjzkhNaRTELG39Rrtgp1jDh1ytGf4hIwF/aI406OLRQM+EK+Svb3Wwdjy3MiAAkPp5TNx11YifbcrYCUDLzcYZJQrNY+TUeuwPefhrC5fi8uxPgAtdmG+XDxYMxUoLW5/B8HQIFLH3SwxlWvUkXHDBQ39u9PYeOtxhRa+NA0UsAivHrDnclEwozYsA33jBTAvQSpmgpIyt/gl1EFihL4/8eCxfqqCrOfjqAjBhBFJC7JOGt8k4L4JvdM0VOTH1sSgXjgjniEFYdBguw1eciw/QKAEgbHuq3OfM+8ajjIWNzcPrfH7+FbXl0GU1N7gJXEBuHIXtvTPakPaI9opY4d/5fxUGKS/GQJ5q2kHdjGh4xDUrc5GEK0uwMxsZTBb+UBhRNcXOK394awZdTJ1C2jmjswJpVQf9R4Da2WpsGkXwmOEli+vOaiaTISnpDLjKBoPzseYfe9fFS3x8Fz1iYg X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(50226002)(36756003)(53936002)(38730400002)(76506005)(5003940100001)(42186005)(6496005)(7736002)(6666003)(4326008)(5660300001)(2950100002)(50986999)(92566002)(76176999)(8676002)(305945005)(81166006)(5009440100003)(50466002)(6116002)(66066001)(189998001)(48376002)(54906002)(6306002)(3846002)(47776003)(25786008)(7416002)(2906002)(33646002)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2248; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 23:UQPF4bZWX5tOz/J6plqdKH2+JJzYdeYpvsgwMfNTr459XAaAvOM9K95JqJUqGRZ1BE9A05gwCcFJOMZfnLCPX6m8wOROnQBxqEwTN/ef3j1Vt0e6GqwfUWnrdLgvMRVy+uh9HF4qeJXH7WqCuBOIXOrMXQNcAK4n4T3HP9FgNDLeeYgatUma3X71Mi1TgnxA/+A3wTpJSnPwWToOJw5awcj0CMg0Or+fSbepjwzE4eLsULMGq6ecRtfPsrC8AXJO6DqEwyjAfc5sfPC1dU6SbBWiLhypKgt20sLRs/WvVrJJdZ0tXRhRhuapurSay9ytxVnP5HByki4hrfGb2IPOAKs7mMrXy5cF7/nym/CTL+VmLh0UkinEoOZY50bYShEO6zS6CmAeoRJ/ind7JCa3OUTD07hCHON8WmD+rM1va5moFe283sUzdqCnqba9fLVu3QXgZhgFDc2ANI7nyAqYOwFBZQk5NubUruQuPqLDcWJ8Vs79OnnEVifv7/9TU/EPy1xhfwgg5LjWVkcNeRGHEejeaaXB/KFbt54ucmh/X6OV1XeOOsHtzhl9IYcqKhFFyRaomnki9Ejlo+4b1MnzU2CtK5CqoZEGm2FlOAMwATf5SzbEd9xz6tPyASIDL+7kmi0SRD/FSgu3SyPys7tdfBcclPgMDTnwLlU2z3bHe+kHnXjKjZAbw2dEb87ZJyb55ZolbkOJVpScdcn36eErZTZqbsjhmDoBhBA7f6sJ0074yeIL5ew7R43zbgi28cJCADBIZXDoCI2wZPQkzPqY+PQjAXRJoC29fUyP1ZBJLr+LyUte5LcMUTXAFhsl80TNdc3Fzv+QoE2Gw3qcw+wWoYO6QagCfwCu6ZAWb5hHQOkLPnH5cxYdc0vPRZh3szAk+QUmMSp+gfQAIMZ5empr5+EnrlEDQefk0NanKdyke5itRYIv6s7S49grNYIestzpPTbq+emjlePbGl6CEJSesHXF+V7AJsX9batPtrhqLQo= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 6:i4ISn/FG3XqhJrjA8cnvMqGn5DsHuHrbAmqDltMGd/BMJv998Rpznk7Es0nr0lnhyxrP55xRDaPp6gKgRDNMEzhwtC121H01yR7lKkhysK+qc6LHqgSexLMRriF1M2QEGuLuLiDYYNJcwfFDG/B7sdOQsagp8UGykhKQgrY+Brx2mrwKDD38VAaFxtXJtXvVPgj7na5YIDGmYKgQ+upt1kY6HXdqQKO82twy6tcSvMI6hvGiJqcao10KKddXH/TNYmXSWp0afK/MLaen6Au/Q8123ulYmQwt4XhD9Qc2F9g7KWyIYF+OstvbMVa32qfPei/cqfYjCkUiMRS3jrfQjmdzfyuf+WmyjHA9O/S61RI0vwZmfzUdoJe5Ifkwlvk/8ZpKkQYEXxVwpKiCTml5Qg==; 5:eP6sfHDTeXS1d62HQEaC27k5ZgGuphiGxgA0kT/kZPNGmqTBz0kGyaOWy8pkSlmudUhrzRqw9sUv5VE5O37N4hCIqtXk3TOZHQC+OrB3qeAZUDF+qmOMPC/FnTQMv+aE3qM5tEUeRWXTnjtdyiR3BI6AcnkXKUWV+IhNYtGqIW8=; 24:iTt/Ye287si7TWk2pLtpmAOaK+geAklqhSxDgVi70OHyQLPEd+sWqDFdmVBhKKqF5l9YVtoYVFoVOtTpc/habrUE/U7ASiO8X18ogFmfTeQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 7:DAsnK8SvOoEdY1HnH3fSPmBoTwXs66EfD10kCSxA6r3huY2Kvzux1Js8cKIbMO5ocK/PQn6K2zFK/cVAvrqUX/XoY8URcD7FbMJ0AhfhXPgRYe7eDBa4PpEJJcmF4Bh8avYcKzSP8xb4HoDgloXSl+By3v3QZoX58b0l/kUvHZ9qEf4FzQvSWNLxPutZ+VPF7PnuMbVRM35rJCst7UIlD2r+4nhqmwbyMQWNEfGllnqQyit0gVS7ABitrGfPjH7HVtwiWCObVd2SctxKM0kibg9qtrnGmPEyY65KPKLbpcdDpxfNISPvB1hdNGqlQMefqcoYseddbY6iTtkXaM9Qqg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:33.5080 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2248 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After that, it will be possible to reuse it in ilp32. Signed-off-by: Yury Norov Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/asm/signal_common.h | 33 ++++++++++++ arch/arm64/kernel/signal.c | 93 +++++++++++++++++++++------------- 2 files changed, 92 insertions(+), 34 deletions(-) create mode 100644 arch/arm64/include/asm/signal_common.h -- 2.7.4 diff --git a/arch/arm64/include/asm/signal_common.h b/arch/arm64/include/asm/signal_common.h new file mode 100644 index 0000000..f682381 --- /dev/null +++ b/arch/arm64/include/asm/signal_common.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 1995-2009 Russell King + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2017 Cavium Networks. + * + * 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 . + */ + +#ifndef __ASM_SIGNAL_COMMON_H +#define __ASM_SIGNAL_COMMON_H + +#include +#include +#include + +int preserve_fpsimd_context(struct fpsimd_context __user *ctx); +int restore_fpsimd_context(struct fpsimd_context __user *ctx); +int setup_sigcontext(struct sigcontext __user *uc_mcontext, struct pt_regs *regs); +int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sf); +void setup_return(struct pt_regs *regs, struct k_sigaction *ka, + void __user *frame, off_t sigframe_off, int usig); + +#endif /* __ASM_SIGNAL_COMMON_H */ diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 5fa1b40..9f2ea60 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -34,18 +34,26 @@ #include #include #include +#include + +#define RT_SIGFRAME_FP_POS (offsetof(struct rt_sigframe, sig) \ + + offsetof(struct sigframe, fp)) + +struct sigframe { + struct ucontext uc; + u64 fp; + u64 lr; +}; /* * Do a signal return; undo the signal stack. These are aligned to 128-bit. */ struct rt_sigframe { struct siginfo info; - struct ucontext uc; - u64 fp; - u64 lr; + struct sigframe sig; }; -static int preserve_fpsimd_context(struct fpsimd_context __user *ctx) +int preserve_fpsimd_context(struct fpsimd_context __user *ctx) { struct fpsimd_state *fpsimd = ¤t->thread.fpsimd_state; int err; @@ -65,7 +73,7 @@ static int preserve_fpsimd_context(struct fpsimd_context __user *ctx) return err ? -EFAULT : 0; } -static int restore_fpsimd_context(struct fpsimd_context __user *ctx) +int restore_fpsimd_context(struct fpsimd_context __user *ctx) { struct fpsimd_state fpsimd; __u32 magic, size; @@ -93,22 +101,30 @@ static int restore_fpsimd_context(struct fpsimd_context __user *ctx) } static int restore_sigframe(struct pt_regs *regs, - struct rt_sigframe __user *sf) + struct sigframe __user *sf) { sigset_t set; - int i, err; - void *aux = sf->uc.uc_mcontext.__reserved; - + int err; err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set)); if (err == 0) set_current_blocked(&set); + err |= restore_sigcontext(regs, &sf->uc.uc_mcontext); + return err; +} + + +int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *uc_mcontext) +{ + int i, err = 0; + void *aux = uc_mcontext->__reserved; + for (i = 0; i < 31; i++) - __get_user_error(regs->regs[i], &sf->uc.uc_mcontext.regs[i], + __get_user_error(regs->regs[i], &uc_mcontext->regs[i], err); - __get_user_error(regs->sp, &sf->uc.uc_mcontext.sp, err); - __get_user_error(regs->pc, &sf->uc.uc_mcontext.pc, err); - __get_user_error(regs->pstate, &sf->uc.uc_mcontext.pstate, err); + __get_user_error(regs->sp, &uc_mcontext->sp, err); + __get_user_error(regs->pc, &uc_mcontext->pc, err); + __get_user_error(regs->pstate, &uc_mcontext->pstate, err); /* * Avoid sys_rt_sigreturn() restarting. @@ -145,10 +161,10 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) if (!access_ok(VERIFY_READ, frame, sizeof (*frame))) goto badframe; - if (restore_sigframe(regs, frame)) + if (restore_sigframe(regs, &frame->sig)) goto badframe; - if (restore_altstack(&frame->uc.uc_stack)) + if (restore_altstack(&frame->sig.uc.uc_stack)) goto badframe; return regs->regs[0]; @@ -162,27 +178,36 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) return 0; } -static int setup_sigframe(struct rt_sigframe __user *sf, +static int setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set) { - int i, err = 0; - void *aux = sf->uc.uc_mcontext.__reserved; - struct _aarch64_ctx *end; + int err = 0; /* set up the stack frame for unwinding */ __put_user_error(regs->regs[29], &sf->fp, err); __put_user_error(regs->regs[30], &sf->lr, err); + err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set)); + err |= setup_sigcontext(&sf->uc.uc_mcontext, regs); + + return err; +} + +int setup_sigcontext(struct sigcontext __user *uc_mcontext, + struct pt_regs *regs) +{ + void *aux = uc_mcontext->__reserved; + struct _aarch64_ctx *end; + int i, err = 0; for (i = 0; i < 31; i++) - __put_user_error(regs->regs[i], &sf->uc.uc_mcontext.regs[i], + __put_user_error(regs->regs[i], &uc_mcontext->regs[i], err); - __put_user_error(regs->sp, &sf->uc.uc_mcontext.sp, err); - __put_user_error(regs->pc, &sf->uc.uc_mcontext.pc, err); - __put_user_error(regs->pstate, &sf->uc.uc_mcontext.pstate, err); - __put_user_error(current->thread.fault_address, &sf->uc.uc_mcontext.fault_address, err); + __put_user_error(regs->sp, &uc_mcontext->sp, err); + __put_user_error(regs->pc, &uc_mcontext->pc, err); + __put_user_error(regs->pstate, &uc_mcontext->pstate, err); - err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set)); + __put_user_error(current->thread.fault_address, &uc_mcontext->fault_address, err); if (err == 0) { struct fpsimd_context *fpsimd_ctx = @@ -229,14 +254,14 @@ static struct rt_sigframe __user *get_sigframe(struct ksignal *ksig, return frame; } -static void setup_return(struct pt_regs *regs, struct k_sigaction *ka, - void __user *frame, int usig) +void setup_return(struct pt_regs *regs, struct k_sigaction *ka, + void __user *frame, off_t fp_pos, int usig) { __sigrestore_t sigtramp; regs->regs[0] = usig; regs->sp = (unsigned long)frame; - regs->regs[29] = regs->sp + offsetof(struct rt_sigframe, fp); + regs->regs[29] = regs->sp + fp_pos; regs->pc = (unsigned long)ka->sa.sa_handler; if (ka->sa.sa_flags & SA_RESTORER) @@ -257,17 +282,17 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, if (!frame) return 1; - __put_user_error(0, &frame->uc.uc_flags, err); - __put_user_error(NULL, &frame->uc.uc_link, err); + __put_user_error(0, &frame->sig.uc.uc_flags, err); + __put_user_error(NULL, &frame->sig.uc.uc_link, err); - err |= __save_altstack(&frame->uc.uc_stack, regs->sp); - err |= setup_sigframe(frame, regs, set); + err |= __save_altstack(&frame->sig.uc.uc_stack, regs->sp); + err |= setup_sigframe(&frame->sig, regs, set); if (err == 0) { - setup_return(regs, &ksig->ka, frame, usig); + setup_return(regs, &ksig->ka, frame, RT_SIGFRAME_FP_POS, usig); if (ksig->ka.sa.sa_flags & SA_SIGINFO) { err |= copy_siginfo_to_user(&frame->info, &ksig->info); regs->regs[1] = (unsigned long)&frame->info; - regs->regs[2] = (unsigned long)&frame->uc; + regs->regs[2] = (unsigned long)&frame->sig.uc; } } From patchwork Wed Mar 1 19:19:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94753 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp35204qgi; Wed, 1 Mar 2017 14:00:42 -0800 (PST) X-Received: by 10.84.173.4 with SMTP id o4mr13580622plb.106.1488405642371; Wed, 01 Mar 2017 14:00:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a74si5692531pfe.100.2017.03.01.14.00.41; Wed, 01 Mar 2017 14:00:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753445AbdCAWAF (ORCPT + 25 others); Wed, 1 Mar 2017 17:00:05 -0500 Received: from mail-dm3nam03on0054.outbound.protection.outlook.com ([104.47.41.54]:24736 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752642AbdCAV76 (ORCPT ); Wed, 1 Mar 2017 16:59:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=p7vA5waVmPEl8vKlVc98Vx0xVyOq1Nd5UbCR81Eh16w=; b=lm4jnldDe8WrLQWpsVbm+KLk2wpOfp9wUjwbbQ0KEvGMIBvifEl0QTUfXoy0AUWX9aIBPKGuvtgqwW1PaHJx7YYIOWthkuQ2X8OSuM8aZS538OTXB8deGl8UabDB64lPWhR/zbCrHb7BlfbFwxtTnM9tthPvDqWESN4Ses+y5VI= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by SN1PR07MB2255.namprd07.prod.outlook.com (10.164.47.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:22:47 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com Subject: [PATCH 16/20] arm64: signal32: move ilp32 and aarch32 common code to separated file Date: Thu, 2 Mar 2017 00:49:24 +0530 Message-Id: <1488395968-14313-17-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM5PR0101CA0008.eurprd01.prod.exchangelabs.com (10.169.240.18) To SN1PR07MB2255.namprd07.prod.outlook.com (10.164.47.149) X-MS-Office365-Filtering-Correlation-Id: 66fac827-3b5e-44a7-d977-08d460d858da X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR07MB2255; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 3:br/ktN7/ZgMX/sOt36qZF8TGl76eLV5wxYN/U75hab0ewphbdFowPPqSQFU5oS4/+2wPssPx1fHmWKiMDovCb6HRrZvUQMMPHgv9mFiIBaqQqB/ybT67K84EV0AaWIvjr4Cwbg9KuW9CS8FXmh2/4lMyxpjs533IvjU/ViTZ0yGCkPY+Q8P+gS1hrn/SwFupaHYF6BbGgdJXIPnq/7E/MG+fIL/ufW3m7KHtm56BAbZjiUyCdnBc0g++ep9iLLU9BIWmFaZzEyy+rfItZ+PdpQ==; 25:Xl6nMx0rXEI892y487yakywrsyHAgnaYxm+q0ct/apJay+Xobr0QxUnsu4FXSwlu3L6bup9TmzRc7MDfr2TA1/Mx2hcJIe3PrNJ+oNxjcXlv0VLBL6x7cuFpFW1Jtv4jRCDavqPS3OHl0nCJ7j1Hs+d2rHS3ZWWf80Bjc9pPj6LvvDmpGYfNPJvn5Jot+GiZI5B2NSURo8g8dTaD/AOo7z/f2wa1nVXC5Kik7Zsis8khHA91Z13ChS0BDsZxxWjkk3UlU3C3M11cKwra7F7R1J3OTihIT/rLje9H8Nd0EE1R2eBLv2hzp5xsHiVWLOa2jPr+1YKFz+5Gy3n9NtDQQeRarQF6GLkX9kH2rSmGosqoY8GwctURnbcUhrJt21Uwb+nFCcinbb4v/31zY2FAUytGO1hoaWEkBTiMUPJw+mFMfIBhEnORahVtJb/E9dfdUGeAqxUahQ4fqo99fjMpOA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 31:Dq34M2hwdlIaQVKXDI0dpSeA9VL+whQBqE1sYJ0cuaPCtLIK4DBpJ6zoOI7IG36JpHahMMqHxiAfAKSICCpDIsPu7j7w37DAQL2vrz1Uitmf141VrZzR4mXi3Zy2YqlBMVkLQCsUiM+dABurYt+hb4tF3Y1Mg6WaGlTuK5oVgJuW2kWMlyxM5NTKgSpjjJWvWllMZTUisdkplwIrGj7KqpF/APCO+wDN1YU81ZUBSjE=; 20:gzcbgbyv1b4nSycfk04qbKlnxWzmn2lMwHhFgIr6A53HQNJAxUtZgvdYERduM/4x5dNqkckN9NrR2OKKHbvvynAD6MbwmBGczmNIQn8oowPXGMYQrp99mqxku2C8PQgPcMVNG7iyc7QjzgtcfY4Nggdi1fXvzFRXn7MBM+y4OUGPzf+H0KsU5YYR9gyZtqzcFZya/aXDmiUIbnrJNDx87M32ikdiyab0EVu2SlapvXJw1GU65q3SIlcDRaVIDZmXPPIyuPnuW8kLVmYzWrk/uFWD/rM1QV33sn+1dSZCFhDQ5DtU6/bWwqYvaCE9m7jxCTs5H2Es2emq35GE8ZrPmLiijvNYmuwfcJ9ZuX4hOoRYHQdVnswYA+YQ9M97IWq6hyovTM+PZPnQp9VKOU8eiBcjQhby6IW38lXLofJ3N9WKe8YHIjDt4RplG3dR2lyAsvhqvUi0rwMCmtxKwXzTiARA3Zzlf3MyCYIeu24Ei2M+2RDSI0dqTcelxfQlx5PjfpeFurQLbhnS6/s/s4OXVdX7/1UFL+Dyewn5/7AqEz4EQhMxooFjUuQtHiP5urTVxHZl0LX4mxzP9nOldiBWGhrgSvDTvhdd1p1KSQppfR8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030)(192374486261705); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123558025)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:SN1PR07MB2255; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2255; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 4:lYqIEVyRfwb++17XkodtNbGcjr8s+wx2nLyEcB6TEY37CD++C/FeJkuVKyHRyxEktPAYOV/5Wt2M7qQNAFUydibKypD3fpdZH0pysQxZHLyuQc/vi0oOyspFM8db72Yde+FKFPHCMDN2eoe+vnq0+9LMf4Twtsz9pVPLudetANVIfD996JidrsHo4jaa4ge4CGhTCv5I50VGwVGmd/Je0OYAXD6UfaaJxCEVRYBQGuEsXI7Cb+SSy5q6nca87qJEnMR5HqSdYsblYT97zNQU/+dXKOE4L83c+dnDuQZ7XAny43UTxmOYbyqA2Tg1je0A63p3aZ7uoEQp8vMvnxAgBNEdjpw+jlLAMtuljbubUzqL7DV10UnY4hgOhDHzdfa0Gc49nTzfBOn5Jk0gYX8kEC6VxjdeJIh+JpiK1T57HmhRir5dipkEeW27qtz+ykVvfNwVJRmmCMUSwp5Y0qKRszSbTG6SwLuaFEPKGrLNkFzdGudsbtB5dz3akPDrm7QObf8hgOwev/t6TRmq8jYiY3EM0PIsY0bz1stWQ7a63RuHLhpZ+ZW/yjENTNjwg0ApPWrBRhmpygedDKUgaWIecl3oDBZ3AIa8nS0Bd49ZPzf7Ubmvq490CJii2JcqSp2v1hQYZ2WVnMy4CD/FP1taltyrkHrxb0ic4eZ49sKPs4nC//gGEiRrTumNCCdb6U3NSEfEkDO6GKolKzSIuqBeFC/kLftsWkyEw6FtxjmUxFYSH+ns5+1gGDoZQvY97wQt X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(2906002)(6306002)(575784001)(76506005)(92566002)(54906002)(38730400002)(66066001)(6496005)(4326008)(53936002)(47776003)(5009440100003)(36756003)(305945005)(50986999)(76176999)(7736002)(6116002)(3846002)(6666003)(189998001)(7416002)(5660300001)(48376002)(50466002)(8676002)(42186005)(2950100002)(81166006)(25786008)(33646002)(50226002)(6486002)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2255; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 23:H0M19ahPF4YEZJbzb7RCfTCsWgAeQgKnSTbDtScmmo2Yu2C0bohjoOZ7AIIfWup+K84j55+ngDWvTTDxjT9JOqrYLTS+3GqUx384NHFP4fVPT04Bvi2Kl9SJkK3hz6XYLUdtucKst6avVMLrQiovFPEo9jzHoMKVciwQrVUBIM2nKGmKblxg5x1WbSxGMNGIMk3dnig+GwWqWttkBjhcAL/jUacv6WaqP2j71n20Ds8Ok++JdcY/KAlSuSC20KsxyoAkjuy+cXsbJ9mY0BsCY2K6GadXmyOe+D2bwTWU6AiVCQtNykau/5H6M+9uoCQOEDtGigTLwdKsJXUHBsC/FN2qiCulAsvNkIUrgerDwoYEZbehPW5G54Yh+qUKX6Qqs08lbB2qfhnquZbG25u4N0V9fN78144U3m+QN0ikJW5xdxKVsI5x+IgCw1ItT5TX+Wcx+7Lt7DazQThKcj7w+Rc0aeG5TFeH6WOCZkQrlLzHXH+Exu/9iGzN00Ck4NmS7Bir28uAkiMcWcOSfcrTbJ5Fiu5OHL4gyDJHi+XbOQ5kETS6BLxGO6QAUmy52GtnEQHB9YRovWbM7EgCZIGX3sgdVK0YMqgo9a5BKLK0rNhOgISLfXOZbfsPzLY1GyC6WzOPfl652IdD4wX3DW6YG7IcGZNM1zHCbTwXIAudjjTzBdd3ghco/cCpvWJjxFGkDceBxjy04oRqG2iGBW3gNWkKsuYY9AhT+ib7AW9G3iSrNhN8uw2suHO6+dW7+lD7s7JpTAZEenCX+dzCRGRY3xbW9Qjrpb+4SSNslswyD/jAQF4rwbFNecZoeN0OOp2kiXzdRsX8D6uyBW7edbPxM2YlBR3qe13nPu8sW1ocpQglIRARlMsx2zUFjSpRpy9IFV41lxz1cAtKH/Bmp59oQMh1VAQPQSf0lTAVQtOFT3mtk/T0CKzGPqCrDyRFt+Y9LIi8bgrOT4AqleONGq5T1aC8Ysm0cB315ws39CaaaXdPd06SeHwCSUtzx/ASif5h X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 6:fBIvX3VFWJcp3TDDCHV74vdNdDQFao6kgRRGizUAW1B2nE8Xh0dkjfeRRlIqChUmDh7W+xl9hlW3BEw9gwU55AXbSb+oGszNYkS/gm9cmsCa8RIx6w24VQ80AKiiAHtNuQsR1ucmH/eT2ZP/WikzxJPv28NxMX74ozxP5X1yLAO4tFADOBf0H1/ilhxC2lAaP6UE761xYQWAeK1khenCD6ayq6iRC2YI4nChh/izi9Xfsgo9Y5C4vbs/48hR21Og11rl4t8HiHpiSZ6s6ecpZeCoCqd+YQLmm5zrK97SH9tWsrZ08qiupdxe/IqKuyXDWjJ4XosBlmZXwdk70/1Lchj45E8wrivKhhVmF565or+6V/SToewVTUocMwGeTC9jK7d7c7/Hp6sBll8gwS3jgA==; 5:Cp+64TzTS4tkase9uzuMWCHcqVWilQanTGSc+Old5vyZiOuXAb7+C7MSteslG6QMhLMHz4zHagemBTrT9mXCynesesH6MNHIl8BAxfuo6SfGEzPpjzCpsel/YGlYEWNzdaT9IK7lKn/xAxr0q3s+M/OW5OoRjfJSn/8TmVQa9GM=; 24:JRRmGW3x2E/fDzMgFrot9OwYWv+xXAoFJLEXrbi9gn+jZ9Y8j/pfE4K+5wTkyfCFr7rKLC5+Z17HitCDp7ljiBgcRt7R91jkkFar67x1T0w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2255; 7:y7b+zD93Ye6Qux58KvSDgqaBENmTNmgmZPkMbArQ6zlwi4yijyXc2GzmK94MiQmmLbgsWGPOh4K3kcI9hWJSVHA3pBvVp7jsHr1Gj5YCeT6pOI8+FLxuwi+bH8WshcwwznKTbK7xlZgwJjqRRE+81B8zgEec8iSE58BSSXKMozns3u5gNe2DmJb3ae4cY50yRaqikJxWH4i4IwUMbcHN844kdGa7wIwobjJ65tL0y8kP3YJno+WjVBW5eIDBqkgkk/sYFs07m1BLljv8+7BRGiiTijpdIG/nahS5/gd9LxpHnShhqCF8nMwQMGYNrBYzujhGS12Fq/hZ0nhvYGYnrA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:47.6959 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2255 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Yury Norov --- arch/arm64/include/asm/signal32.h | 3 + arch/arm64/include/asm/signal32_common.h | 27 +++++++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/signal32.c | 107 ------------------------ arch/arm64/kernel/signal32_common.c | 135 +++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 108 deletions(-) create mode 100644 arch/arm64/include/asm/signal32_common.h create mode 100644 arch/arm64/kernel/signal32_common.c -- 2.7.4 diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index e68fcce..1c4ede7 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -13,6 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +#include + #ifndef __ASM_SIGNAL32_H #define __ASM_SIGNAL32_H diff --git a/arch/arm64/include/asm/signal32_common.h b/arch/arm64/include/asm/signal32_common.h new file mode 100644 index 0000000..36c1ebc --- /dev/null +++ b/arch/arm64/include/asm/signal32_common.h @@ -0,0 +1,27 @@ +/* + * 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 . + */ +#ifndef __ASM_SIGNAL32_COMMON_H +#define __ASM_SIGNAL32_COMMON_H + +#ifdef CONFIG_COMPAT + +int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from); +int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from); + +int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set); +int get_sigset_t(sigset_t *set, const compat_sigset_t __user *uset); + +#endif /* CONFIG_COMPAT*/ + +#endif /* __ASM_SIGNAL32_COMMON_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 4ea7b97f..9463af5 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -30,7 +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 sys_ilp32.o -arm64-obj-$(CONFIG_COMPAT) += entry32_common.o +arm64-obj-$(CONFIG_COMPAT) += entry32_common.o signal32_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/signal32.c b/arch/arm64/kernel/signal32.c index c747a0f..181cc30 100644 --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -103,113 +103,6 @@ struct compat_rt_sigframe { #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set) -{ - compat_sigset_t cset; - - cset.sig[0] = set->sig[0] & 0xffffffffull; - cset.sig[1] = set->sig[0] >> 32; - - return copy_to_user(uset, &cset, sizeof(*uset)); -} - -static inline int get_sigset_t(sigset_t *set, - const compat_sigset_t __user *uset) -{ - compat_sigset_t s32; - - if (copy_from_user(&s32, uset, sizeof(*uset))) - return -EFAULT; - - set->sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32); - return 0; -} - -int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) -{ - int err; - - if (!access_ok(VERIFY_WRITE, to, sizeof(*to))) - return -EFAULT; - - /* If you change siginfo_t structure, please be sure - * this code is fixed accordingly. - * It should never copy any pad contained in the structure - * to avoid security leaks, but must copy the generic - * 3 ints plus the relevant union member. - * This routine must convert siginfo from 64bit to 32bit as well - * at the same time. - */ - err = __put_user(from->si_signo, &to->si_signo); - err |= __put_user(from->si_errno, &to->si_errno); - err |= __put_user((short)from->si_code, &to->si_code); - if (from->si_code < 0) - err |= __copy_to_user(&to->_sifields._pad, &from->_sifields._pad, - SI_PAD_SIZE); - else switch (from->si_code & __SI_MASK) { - case __SI_KILL: - err |= __put_user(from->si_pid, &to->si_pid); - err |= __put_user(from->si_uid, &to->si_uid); - break; - case __SI_TIMER: - err |= __put_user(from->si_tid, &to->si_tid); - err |= __put_user(from->si_overrun, &to->si_overrun); - err |= __put_user(from->si_int, &to->si_int); - break; - case __SI_POLL: - err |= __put_user(from->si_band, &to->si_band); - err |= __put_user(from->si_fd, &to->si_fd); - break; - case __SI_FAULT: - err |= __put_user((compat_uptr_t)(unsigned long)from->si_addr, - &to->si_addr); -#ifdef BUS_MCEERR_AO - /* - * Other callers might not initialize the si_lsb field, - * so check explicitly for the right codes here. - */ - if (from->si_signo == SIGBUS && - (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)) - err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); -#endif - break; - case __SI_CHLD: - err |= __put_user(from->si_pid, &to->si_pid); - err |= __put_user(from->si_uid, &to->si_uid); - err |= __put_user(from->si_status, &to->si_status); - err |= __put_user(from->si_utime, &to->si_utime); - err |= __put_user(from->si_stime, &to->si_stime); - break; - case __SI_RT: /* This is not generated by the kernel as of now. */ - case __SI_MESGQ: /* But this is */ - err |= __put_user(from->si_pid, &to->si_pid); - err |= __put_user(from->si_uid, &to->si_uid); - err |= __put_user(from->si_int, &to->si_int); - break; - case __SI_SYS: - err |= __put_user((compat_uptr_t)(unsigned long) - from->si_call_addr, &to->si_call_addr); - err |= __put_user(from->si_syscall, &to->si_syscall); - err |= __put_user(from->si_arch, &to->si_arch); - break; - default: /* this is just in case for now ... */ - err |= __put_user(from->si_pid, &to->si_pid); - err |= __put_user(from->si_uid, &to->si_uid); - break; - } - return err; -} - -int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) -{ - if (copy_from_user(to, from, __ARCH_SI_PREAMBLE_SIZE) || - copy_from_user(to->_sifields._pad, - from->_sifields._pad, SI_PAD_SIZE)) - return -EFAULT; - - return 0; -} - /* * VFP save/restore code. * diff --git a/arch/arm64/kernel/signal32_common.c b/arch/arm64/kernel/signal32_common.c new file mode 100644 index 0000000..06f0258 --- /dev/null +++ b/arch/arm64/kernel/signal32_common.c @@ -0,0 +1,135 @@ +/* + * Based on arch/arm/kernel/signal.c + * + * Copyright (C) 1995-2009 Russell King + * Copyright (C) 2012 ARM Ltd. + * Modified by Will Deacon + * + * 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 +#include +#include + +int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set) +{ + compat_sigset_t cset; + + cset.sig[0] = set->sig[0] & 0xffffffffull; + cset.sig[1] = set->sig[0] >> 32; + + return copy_to_user(uset, &cset, sizeof(*uset)); +} + +int get_sigset_t(sigset_t *set, const compat_sigset_t __user *uset) +{ + compat_sigset_t s32; + + if (copy_from_user(&s32, uset, sizeof(*uset))) + return -EFAULT; + + set->sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32); + return 0; +} + +int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) +{ + int err; + + if (!access_ok(VERIFY_WRITE, to, sizeof(*to))) + return -EFAULT; + + /* If you change siginfo_t structure, please be sure + * this code is fixed accordingly. + * It should never copy any pad contained in the structure + * to avoid security leaks, but must copy the generic + * 3 ints plus the relevant union member. + * This routine must convert siginfo from 64bit to 32bit as well + * at the same time. + */ + err = __put_user(from->si_signo, &to->si_signo); + err |= __put_user(from->si_errno, &to->si_errno); + err |= __put_user((short)from->si_code, &to->si_code); + if (from->si_code < 0) + err |= __copy_to_user(&to->_sifields._pad, &from->_sifields._pad, + SI_PAD_SIZE); + else switch (from->si_code & __SI_MASK) { + case __SI_KILL: + err |= __put_user(from->si_pid, &to->si_pid); + err |= __put_user(from->si_uid, &to->si_uid); + break; + case __SI_TIMER: + err |= __put_user(from->si_tid, &to->si_tid); + err |= __put_user(from->si_overrun, &to->si_overrun); + err |= __put_user(from->si_int, &to->si_int); + break; + case __SI_POLL: + err |= __put_user(from->si_band, &to->si_band); + err |= __put_user(from->si_fd, &to->si_fd); + break; + case __SI_FAULT: + err |= __put_user((compat_uptr_t)(unsigned long)from->si_addr, + &to->si_addr); +#ifdef BUS_MCEERR_AO + /* + * Other callers might not initialize the si_lsb field, + * so check explicitly for the right codes here. + */ + if (from->si_signo == SIGBUS && + (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO)) + err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); +#endif + break; + case __SI_CHLD: + err |= __put_user(from->si_pid, &to->si_pid); + err |= __put_user(from->si_uid, &to->si_uid); + err |= __put_user(from->si_status, &to->si_status); + err |= __put_user(from->si_utime, &to->si_utime); + err |= __put_user(from->si_stime, &to->si_stime); + break; + case __SI_RT: /* This is not generated by the kernel as of now. */ + case __SI_MESGQ: /* But this is */ + err |= __put_user(from->si_pid, &to->si_pid); + err |= __put_user(from->si_uid, &to->si_uid); + err |= __put_user(from->si_int, &to->si_int); + break; + case __SI_SYS: + err |= __put_user((compat_uptr_t)(unsigned long) + from->si_call_addr, &to->si_call_addr); + err |= __put_user(from->si_syscall, &to->si_syscall); + err |= __put_user(from->si_arch, &to->si_arch); + break; + default: /* this is just in case for now ... */ + err |= __put_user(from->si_pid, &to->si_pid); + err |= __put_user(from->si_uid, &to->si_uid); + break; + } + return err; +} + +int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) +{ + if (copy_from_user(to, from, __ARCH_SI_PREAMBLE_SIZE) || + copy_from_user(to->_sifields._pad, + from->_sifields._pad, SI_PAD_SIZE)) + return -EFAULT; + + return 0; +} From patchwork Wed Mar 1 19:19:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94743 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958687qgi; Wed, 1 Mar 2017 11:26:22 -0800 (PST) X-Received: by 10.99.67.130 with SMTP id q124mr10610172pga.221.1488396382090; Wed, 01 Mar 2017 11:26:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w28si5395401pfk.112.2017.03.01.11.26.21; Wed, 01 Mar 2017 11:26:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbdCAT0R (ORCPT + 25 others); Wed, 1 Mar 2017 14:26:17 -0500 Received: from mail-cys01nam02on0083.outbound.protection.outlook.com ([104.47.37.83]:10364 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752154AbdCATZ4 (ORCPT ); Wed, 1 Mar 2017 14:25:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=nUwypbFKrpE8LZqqltO3DnlQM2rXzo1vYVT7dq4Z/J4=; b=EG1cjaEpb1rjQPLHMQ2+ZfEjv7HTpSOaLF2KOgybeBjtWfkp2ixqdIs9KDS9m4io17LNpLhTQzjFkwVOYc6t/BRK3itf6xNlrzVMIr7PlHtYv63sz1vv4beQLUoCcTg74QI32uq7/2b6sKb7RL6hvNIT/+QYvbRzDh3mg7jgFFA= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by BN4PR07MB2244.namprd07.prod.outlook.com (10.164.63.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:22:57 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski Subject: [PATCH 17/20] arm64: ilp32: introduce ilp32-specific handlers for sigframe and ucontext Date: Thu, 2 Mar 2017 00:49:25 +0530 Message-Id: <1488395968-14313-18-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: DB6P191CA0018.EURP191.PROD.OUTLOOK.COM (10.175.236.156) To BN4PR07MB2244.namprd07.prod.outlook.com (10.164.63.150) X-MS-Office365-Filtering-Correlation-Id: cb14b573-0d5d-4b63-46fe-08d460d85eed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BN4PR07MB2244; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 3:D2dODN1gMO4rR1OEegvcn63l5HTgEHCtXzagoH43LhVLFoYrtWNwWWitB+43jyIk6U/n7EZXKpfmvRXipHvO2DdLnaImX+CDu0zhdC7RgKpr7R+TwiWgVd7AGFz7GAZZhCa4iE+CDxHXcMeDZxsFmmiUVUCEsEKY6RiJZp2JZJtln7lE4rmF2sATVijrQUs/WSuemjKRifsntcHyJRWvPy5RXR/3O/zaexHdhUxQZTTxVuk/t/hz2FB99IelpxjSSIhts+gHMzHsPSr+LEqIvg==; 25:nbxOVw/gM9XQT7xEApH/LBeCLlzjvvojp4c5DRxCkY9LndwKmzQoghJNI0m/LK3tCRBNXk98z3YApztgusSlQh9MZtCtpHgXRYImLCCMHgTFYSu0CsNba2hmEY4H2hgv0wLNdu4g9qA0vRs0KV4qtOK7Mj0FPU/S1s2VyOk/XA5MI+ufMDY7Kc1u7c5MiW2vcHFHyZgg2cbBGaZzqKMHNl4LPN220SWc9wyCZagnipDkMJQEslOsQ1V+iYN1v1ipojyNBMTnB6uFsg6D8+bPzJ9jkhlNs5xZnCZa8ynKy1RUICkB4U5n1qPj1XlBOpYEV+m5B2qKFngopox8td/KRwfyeDrguNQcGvPnbXF2zkYfkLYSbJrsy3Gr5rqXyY/b4PhnpTkC/PlBCXvrCgqUWnPIbOK8fsKCXma9G32EGIleP9FMD1GRHYCDRr7vFoMhbzsjS/ekaW9tNkUrz6Yr1w== X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 31:EJOsPatGCSz71qXKzPE1Ss872teIVNXHPX+VhC8VeV761Q9ONp4+TUaRClVP7pL4kgPYXsJR+fXZLNnOyIDyhHuTTY20CIAIs0aF27zH3q404KAtM2zMD9BFPMfhxaqm2Pvfrp6dtR76i+jOKrGi5D43D6mH2wOVMAVllvAFXeuQPXOhGk7NEP5YewOwJSh1bmtMaun77K/C8e+dU1ZyjHpY4BbYmyR5Hq33G7wyvY9PXlgF2XzVKcTeIlmRyfG1; 20:zSwF74kirYXwnZ7rtCCfcFIaLKXNlakL17Z7eii6JzeOLuru3TYsWCUWjpUWoPgfRUcDvCik4d+0eADDCeZ/lzeStub64RtKewixhfmhZM5t3JtnuXnY23PPoZSLRmwMCM9rVhn7yx9LAIoBv0FfrLa4EZgtUE/YoFokppW8VJii/JV0D9MQSLxm7Y5OkL+eWf6SwVlVcxCcKfaPpX/rl9kP2Hv1M5InmzjRNlvCCMlt0GUoBKPKeq9Y5AvbPYQk/LSbAZ+MzChBKZy6GN+nHEztOTQq4Z9G3MZrUyXSddUq+y7Yw38KOw4ztmBHFbOey9Yb6g68u4Eq1suQ+aRS5EO2N7ZAcenWzTSJR7B2uh6vJkIEGJWNKCzIRLQI8HvutM52s2D9oFtkZQvUWfFTlpFAopxbfcjkqXfhLQ4ecjU0VLjznGxkONxz8yA10v0dpvGYfkZO+4x0xyxy2so4ihLcGxLa8GHAbU541d/3UfYI1025mnHIiVr3IkCIZaoyp5mXEuZYp6vT9iw9kQL/8I7KO46hZ9fTNU5hxtaOnZFYFMrC796kCAe/owQ/eYSM6+ZLzuijrNBghu+yrZxHx1EP3ZxQFHI06lnGmHOuSjo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:BN4PR07MB2244; BCL:0; PCL:0; RULEID:; SRVR:BN4PR07MB2244; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 4:Zsg52N3KWUs8Z810bwBd8To4CX1ak7ylf1lYX1b1bpoIDuVE6r7hxgGR9m8M9kBUXJDFT3ddnAt3xK+CiJaR4f4vWj8WZJdQfzgT4V3pSESbMlGroJBdDc9VYtMaQauSBUMqF21RBISjZuh0va1b3RUU7441TCUjIj0ktSNQiHX2gjNnKhtLUJjNbJYqv96lyxasmK6dNORPL2s9ywOu14DQyY8laYqvn1VnWQ/pDaCIugGOTSR8fRp6qN0g6qHjtq5MKR1qPiID1GNGhS9qFKI9jxln4TCIQsjTT0TWlIEgpwzte2vXebXb8I6AYD+nP41MuSlPQ7AwLfCsM8zFO3N06UaNW0kb+hff6eHaiasqR8kVqdELj4c5wEjrQJCj6dzeyElg47i6G18bM6ALgfVTzxG3tDTpm4dzuoQOArXJljC2tgeSXXQhhlirspDUJpFevZrCU2Lh4o5ZmXLiWfYB7/iico74diqbjTxj0nFPOvr12FI0VpjhDbKKyISqQ9Lj4VZfOP+tXpJYbNnEsBwB28CzosPfSyqQYOxpD22g+6Rq3f4mE/MzA6J8sGDqWUMtSkTFDzHUY+p6xs/lL+hy27JbyUfFu5dDE7uiqKrpDu5GdjmHKclLzMrB+Z8g3Bla5iDApPR8WJ4m/Qx2lKcNdDF/d8hpohwfYRonJb8Yuv5EqN+/XRtNWcDRFPrk X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(43544003)(6486002)(50986999)(7736002)(76176999)(42186005)(76506005)(66066001)(50226002)(305945005)(6116002)(36756003)(4326008)(2906002)(48376002)(3846002)(8676002)(50466002)(81166006)(33646002)(25786008)(5009440100003)(5660300001)(47776003)(38730400002)(107886003)(2950100002)(54906002)(7416002)(6496005)(6666003)(53936002)(92566002)(5003940100001)(189998001)(6306002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR07MB2244; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 23:CvnAWhdxxSgQStKuas3F9ymUvnMJ6/OleUqIU6lKWoGrt5AaGPb+GWGI1ZkGoKJ4P83kszwZ3oWMg/6mdBOTx/LPaUDJUC9pIp8kFFl7Cz7wL30p7qf9zkMzglg+qv239X+78I3HRShNwobnl98TePLRtFknS1Ikukhky4PPmvkySQkfi3nvTGIZ4+4XCUcT8H12ySteH+WRYPhwjzupz9YcoKFIj7CrSSFNgmqCsVwGvC/rf/WVg4JJDblPSaiJvtlcab9mLuE3gIZzEkTItfFX1cUIwzwvsRHyTB4A9UW9dgBdY44epPcXADhx9KPCsxx+QvWfPcKdpOGOiJZbh4jfhvvoYlpXPNu/6clTaod2LossYERd49igt9/3IgLtJMYGfZhD4R5DdvZ5WZacZlaXD9QgKHHWC4TxkDL+ungDUMa+Op8SDTa4H7ePzXq6RM4tgZB35EeiutEf50zJGXsXos48xt2624gL4Qr0DuOep1lSPZ7d2nRJtQfIIidMB3JPVmadYEwCIUjrbxT3ArNdFGPbrzCE+fFHHwSsmJG4O+PLvreX2wxFIYrTX1KRPkO4hMQxMofmSqAtP2QDk1/Mn4bnPKhImvCrt6H65mQn2xOFSpDltcCNKTLkfEsuVcnCmeUC3UfnsgObZc3+zpHfJhqrP/WR+k5SkYB3vYe9CswpZgV61baXUe7k8qxV3nEjVFSmy0Tee+/4cpQ8Q2ilqYIRtHDeTK7B0TYP9NSBE8CSPrJTpNTVbKJgxnwgbb9JaJDN/VhPy2GUEKMCnIQH50fnYVZ8ab++nCknwX1bWl1wbcHAj1J17D4cC8KBDdasg0A06aTIE0JgVdfmY4ZjBXEo1RA2hVoN7MN6QGmafPExnuiqyc3+kPi5nj4gLCMoulnZ3/zBB+wiS5tRTp1o2VIz60CNol4UL5uh53MFz9DmISx1V7tC+d172zMJ4g92tXa9lj9MfcXz3310nNrheefq6WRXoDjyklGdxm5QiF22PdcWE91X3SKExBW+BQV37hJ3TKIgKvfIkUGFPg== X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 6:X1dKNXZOrvj1LdQkGg3wYLnGMR51NoMnhBl4f/28xS86UuzVw+6YZLc+JG+RgA4nmGo+aktpy7wz4/mMsScJbHbPa2vMztYOLnsackw946W7e+wtR9pHJKp+qY797NBtoB1287/+y6jry8TSlYzoaANc/l+QEcwtq1ZZOK9SctF28BSxch+3b6M5x6I5gESisMWrJgRgLh/3lRM8Oh8Z2RNiJEAf0lBm1sHeDQt7OARzlhsJdcXoi54LO2gqzo+PqyY3xYm2GCVcb8H6rEvf3xrw7WICHCVXnoCJO6Clevm08wgis4Gg0OpH9ORSytzamLXfoaZIcLdi4dmyGKnEErlJ1IwwHCEkLECKjywCj3gyDrK6pef8x0iNtS21IFCBLw8hmx+8ZgI8q34Ge5qW5g==; 5:+43ZO7w5UsCY3mJaScjDsjSnvqtujnkS0ppxrZXtPJ8bi7AiouxYw7FxypaJ4scxaKRq/QYPtjTeJrVyiRDjm+6TUWTVJz8x1q/tD9IQ4WTZLlQFgr8IDfUlTFQFhiMeR0XKePzUCWkGTNnVCWyq8N5cO9KLPJ4Z489yzR+g70w=; 24:/o0bSP+30MPnqwfZ8+lzv4Ty7wzI2nkZe44HS0mF13BZpxI+WbOQ5JQIAwB4eLMdb3J9Ya6ToKKUlcMUJjBkniMcf7utVpBubPfmH0EZDEU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2244; 7:rkaPEIQZy+7nvBRe9oIAIapuPt/iPDq07QI4H0TR+4vZrwKlnP3drUp6nnw63rRoJb8EpVaBRrYEe5lZcLbXjG0VXpwTWeiU6ZE9BnDlwSvkkEqRMxP0Tvk7uNAXsJ9FdNYEKTWVP06fxUfidTkbgBVWzPAYZ+6Lym4N/V1HLvuhHLpOa1AsjYCqkqSCg9yH9HIT5neQR+oFBpV1W09/9t7AUOTI8KAh/59oRF3mfXnRRRbz5GGMjbPV0x37F/JMjwN0dD22yTeLDoR64yA4UbNI7OdaNr1O8Uptsrc/Roe6bNLCY2rvVRdkcp2+O4jUO77EqUmapORqSyfcJly0WA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:22:57.9143 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2244 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski ILP32 uses AARCH32 compat structures and syscall handlers for signals. But ILP32 struct rt_sigframe and ucontext differs from both LP64 and AARCH32. So some specific mechanism is needed to take care of it. Signed-off-by: Andrew Pinski Signed-off-by: Yury Norov --- arch/arm64/include/asm/signal_ilp32.h | 38 ++++++++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/entry_ilp32.S | 22 +++++ arch/arm64/kernel/signal.c | 3 + arch/arm64/kernel/signal_ilp32.c | 170 ++++++++++++++++++++++++++++++++++ 5 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/include/asm/signal_ilp32.h create mode 100644 arch/arm64/kernel/entry_ilp32.S create mode 100644 arch/arm64/kernel/signal_ilp32.c -- 2.7.4 diff --git a/arch/arm64/include/asm/signal_ilp32.h b/arch/arm64/include/asm/signal_ilp32.h new file mode 100644 index 0000000..3c6d737 --- /dev/null +++ b/arch/arm64/include/asm/signal_ilp32.h @@ -0,0 +1,38 @@ +/* + * 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 + +#ifndef __ASM_SIGNAL_ILP32_H +#define __ASM_SIGNAL_ILP32_H + +#ifdef CONFIG_ARM64_ILP32 + +#include + +int ilp32_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, + struct pt_regs *regs); + +#else + +static inline int ilp32_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, + struct pt_regs *regs) +{ + return -ENOSYS; +} + +#endif /* CONFIG_ARM64_ILP32 */ + +#endif /* __ASM_SIGNAL_ILP32_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 9463af5..d6089e5 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -29,7 +29,8 @@ $(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 sys_ilp32.o +arm64-obj-$(CONFIG_ARM64_ILP32) += binfmt_ilp32.o sys_ilp32.o \ + signal_ilp32.o entry_ilp32.o arm64-obj-$(CONFIG_COMPAT) += entry32_common.o signal32_common.o arm64-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o entry-ftrace.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o diff --git a/arch/arm64/kernel/entry_ilp32.S b/arch/arm64/kernel/entry_ilp32.S new file mode 100644 index 0000000..a8bb94b --- /dev/null +++ b/arch/arm64/kernel/entry_ilp32.S @@ -0,0 +1,22 @@ +/* + * ILP32 system call wrappers + * + * 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 + +ENTRY(ilp32_sys_rt_sigreturn_wrapper) + mov x0, sp + b ilp32_sys_rt_sigreturn +ENDPROC(ilp32_sys_rt_sigreturn_wrapper) diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 9f2ea60..b78f4c2 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -35,6 +35,7 @@ #include #include #include +#include #define RT_SIGFRAME_FP_POS (offsetof(struct rt_sigframe, sig) \ + offsetof(struct sigframe, fp)) @@ -325,6 +326,8 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) ret = compat_setup_rt_frame(usig, ksig, oldset, regs); else ret = compat_setup_frame(usig, ksig, oldset, regs); + } else if (is_ilp32_compat_task()) { + ret = ilp32_setup_rt_frame(usig, ksig, oldset, regs); } else { ret = setup_rt_frame(usig, ksig, oldset, regs); } diff --git a/arch/arm64/kernel/signal_ilp32.c b/arch/arm64/kernel/signal_ilp32.c new file mode 100644 index 0000000..b9a3372 --- /dev/null +++ b/arch/arm64/kernel/signal_ilp32.c @@ -0,0 +1,170 @@ +/* + * Based on arch/arm/kernel/signal.c + * + * Copyright (C) 1995-2009 Russell King + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2017 Cavium Networks. + * Yury Norov + * + * 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 +#include +#include +#include +#include + + +#define ILP32_RT_SIGFRAME_FP_POS (offsetof(struct ilp32_rt_sigframe, sig) \ + + offsetof(struct ilp32_sigframe, fp)) + +struct ilp32_ucontext { + u32 uc_flags; + u32 uc_link; + compat_stack_t uc_stack; + compat_sigset_t uc_sigmask; + /* glibc uses a 1024-bit sigset_t */ + __u8 __unused[1024 / 8 - sizeof(compat_sigset_t)]; + /* last for future expansion */ + struct sigcontext uc_mcontext; +}; + +struct ilp32_sigframe { + struct ilp32_ucontext uc; + u64 fp; + u64 lr; +}; + +struct ilp32_rt_sigframe { + struct compat_siginfo info; + struct ilp32_sigframe sig; +}; + +static int restore_ilp32_sigframe(struct pt_regs *regs, + struct ilp32_sigframe __user *sf) +{ + sigset_t set; + int err; + err = get_sigset_t(&set, &sf->uc.uc_sigmask); + if (err == 0) + set_current_blocked(&set); + err |= restore_sigcontext(regs, &sf->uc.uc_mcontext); + return err; +} + +static int setup_ilp32_sigframe(struct ilp32_sigframe __user *sf, + struct pt_regs *regs, sigset_t *set) +{ + int err = 0; + /* set up the stack frame for unwinding */ + __put_user_error(regs->regs[29], &sf->fp, err); + __put_user_error(regs->regs[30], &sf->lr, err); + + err |= put_sigset_t(&sf->uc.uc_sigmask, set); + err |= setup_sigcontext(&sf->uc.uc_mcontext, regs); + return err; +} + +asmlinkage long ilp32_sys_rt_sigreturn(struct pt_regs *regs) +{ + struct ilp32_rt_sigframe __user *frame; + + /* Always make any pending restarted system calls return -EINTR */ + current->restart_block.fn = do_no_restart_syscall; + + /* + * Since we stacked the signal on a 128-bit boundary, + * then 'sp' should be word aligned here. If it's + * not, then the user is trying to mess with us. + */ + if (regs->sp & 15) + goto badframe; + + frame = (struct ilp32_rt_sigframe __user *)regs->sp; + + if (!access_ok(VERIFY_READ, frame, sizeof (*frame))) + goto badframe; + + if (restore_ilp32_sigframe(regs, &frame->sig)) + goto badframe; + + if (compat_restore_altstack(&frame->sig.uc.uc_stack)) + goto badframe; + + return regs->regs[0]; + +badframe: + if (show_unhandled_signals) + pr_info_ratelimited("%s[%d]: bad frame in %s: pc=%08llx sp=%08llx\n", + current->comm, task_pid_nr(current), __func__, + regs->pc, regs->sp); + force_sig(SIGSEGV, current); + return 0; +} + +static struct ilp32_rt_sigframe __user *ilp32_get_sigframe(struct ksignal *ksig, + struct pt_regs *regs) +{ + unsigned long sp, sp_top; + struct ilp32_rt_sigframe __user *frame; + + sp = sp_top = sigsp(regs->sp, ksig); + + sp = (sp - sizeof(struct ilp32_rt_sigframe)) & ~15; + frame = (struct ilp32_rt_sigframe __user *)sp; + + /* + * Check that we can actually write to the signal frame. + */ + if (!access_ok(VERIFY_WRITE, frame, sp_top - sp)) + frame = NULL; + + return frame; +} + +/* + * ILP32 signal handling routines called from signal.c + */ +int ilp32_setup_rt_frame(int usig, struct ksignal *ksig, + sigset_t *set, struct pt_regs *regs) +{ + struct ilp32_rt_sigframe __user *frame; + int err = 0; + + frame = ilp32_get_sigframe(ksig, regs); + + if (!frame) + return 1; + + err |= copy_siginfo_to_user32(&frame->info, &ksig->info); + + __put_user_error(0, &frame->sig.uc.uc_flags, err); + __put_user_error(0, &frame->sig.uc.uc_link, err); + + err |= __compat_save_altstack(&frame->sig.uc.uc_stack, regs->sp); + err |= setup_ilp32_sigframe(&frame->sig, regs, set); + if (err == 0) { + setup_return(regs, &ksig->ka, frame, ILP32_RT_SIGFRAME_FP_POS, usig); + regs->regs[1] = (unsigned long)&frame->info; + regs->regs[2] = (unsigned long)&frame->sig.uc; + } + + return err; +} From patchwork Wed Mar 1 19:19:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94742 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958682qgi; Wed, 1 Mar 2017 11:26:21 -0800 (PST) X-Received: by 10.98.133.133 with SMTP id m5mr1724187pfk.146.1488396381715; Wed, 01 Mar 2017 11:26:21 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w28si5395401pfk.112.2017.03.01.11.26.21; Wed, 01 Mar 2017 11:26:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753387AbdCAT0J (ORCPT + 25 others); Wed, 1 Mar 2017 14:26:09 -0500 Received: from mail-dm3nam03on0045.outbound.protection.outlook.com ([104.47.41.45]:62642 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752492AbdCATZz (ORCPT ); Wed, 1 Mar 2017 14:25:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0PGwg9aJNc0thMC9+9jPh9ETKPDbzM/r88kaFrvWCEQ=; b=uIEvkDxXg6k0J1K/OWFqMVx2Oi7HT8QfZ4X2xwOwjNiKwKEgVARrHeYCFMmDXP9/7n7vx6S5l0OpJlcSlPnDTnPvytSPu29rPszV7QcZPf6mNjZ/RslM9Mch6uBKca6lAoQotP0EFPKs212fPVpG9nT1DlzOvpdn5og6+nwM0Xk= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:23:10 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Bamvor Jian Zhang Subject: [PATCH 18/20] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Date: Thu, 2 Mar 2017 00:49:26 +0530 Message-Id: <1488395968-14313-19-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: HE1PR0802CA0015.eurprd08.prod.outlook.com (10.172.123.153) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: a43768ce-0e4e-4ded-7f82-08d460d867be X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 3:k0jU9qPAJnRV6zWsNbAmchnZmgxn5H8dRUoZ8ZfJRXSafnIpDt6Nbijwgn6BYJjPjJTvIQsyUMtrbb7rg5VL+zxJOJ8ygcVg4+cqtDkgNgSYyCy3yWFnLl5ZgPO96+5cub3v+U+wWdIrX1bzsubZIS6jOeGtChPtGT56bohfgwTcK66RWlJd0izmHKvX7QuXJxxnMokV8UaEoajhTmr2xkyyapiBq2t6s6YMcLxOOorjOT2bYbq1UbOBUG2cwRD5Aww1+Gyx8ZJ72thybEzm+Q==; 25:sPXMD417gkopBDTPj5sS/epz7bma0o3yxB1enbeyxUUqS6ryGOtmas4F+4eTmnwxx4TB2gEZzW9/yG4ER7VuRcTRvXDzYwVsqmGNPNstIRHFzqXjWtZrDFHRqqkmRXlLgVU5b77GQNAwf2gyFwVdUSOOrUdleyO9q11vmWpTOwmtlfbeZHcNWGHKns9dujMNjFaa3q+0eSQsWBkj9OTTch223j4HhEH7cbDkYkl7/EbY+oxxj6J9kDn94UpusmRJJX4cKGVy44ola/6ZfB8nhSHpcWJl7N1g+5nG9c/RLvuh7d/kEvy/+M1E+PaRw0T1EaOX0r5lKVFC9SDHKkhKB/zwraL+fAkOysdbjOCGUVtJoDPdgvW6ek3XKM5ucxzY/NlQhtew4sJY7EVOBTkNlspteSSV/r0To8K9tEv4bfx+f24cVj/CIWlBdOg/AESn85hFc4SZ97+RldA6r1/vog== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:3EV3XIjB7PP/ETvbwgGVdfYsoP0toZNOEmP9H4SToB77El5XzEQZ/PXBcHCOZOOIAI3ChMoBTbmsMk+0S1t31Z645lIDJPP5Rh8exHEtdsI4WxKhxHrH3f/q2X3M9wgdK4YTa4ItDJbp1fyfYNx52e/mQ7ANPzAaGHpmGppthC6GoLrjZ2j0t1DJL0I3Jz1z0d7jZDNyuQKs7jLoO86U7KVM1PRyf38eRmix/+P2/9g=; 20:z2ECsiCpGERoVbSO+Zc7vLCe3VfVdy6q+BaF1Msz944xqEBXdPhqwvwiIywks9LGPtqrZf7pyAbBG+yxtt44xlJf59Ee6GgyxCg+7krNSjvkYvPky9i5LnyScbUlBi/4TkFETShyzvOQWXE4ShFGA9Q+26xwO4FbOlo9tsVs/D43Yl57aveE/nNRI/b/bz/9Z9U+krYAjlrPUoqrRDNqI1+LFjhKgnnfaYN/4iU+etbCDtS2AVtccznwNnvzDfaciDKXOWMjZ/bEDs2HIzNQ7W+myNoOG8QxrkcDgacZb0uxOG0NwoDFOcAm8FIUxMZ/FGMl/Lr948tfxsS4HMbkEyRprMH7Ad4aCODlrhKHK2heWmqmvTGfj6gWD9Qqi5i14FunZtho5vHPdeiBSFEk+Fuw2Y8mcTLtVT3Tx5RCTTAw14Fzhqn/0aN9yLv7nucvJIQShTOFKDpLD3xus2CWc7VymXOza7QJz8U5tlMTgs9brjdqObBcrqu8aCw6DKRJuL6GA5GJcqZjIvsgAxI6JF5u95Mr9LXuf8Va7F4Gk6wvkhvbo1j+1HfJXFpLOZ2YvLteSRXhuGxdMCPBX0VAxqb7fUwZf2UqJGXjEf7OogQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(50582790962513); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:2lwPxgP1FDhGT1pZ15+AxKELahsxk6D0D6usVakTSlIfJ+OFWpehpxiE6G8ahQ41jrgdmyoyVcE0PubWfqzLSqT3grA7OeD9nZFFrICxWlXVN6Vw6jVnQdFgQp16blr+Ds1Ox5oBYEi5BCApdiWDhRgnp5b2GIdkcFJpHmOHNC5wTNHuSroWREfJ83CNBfxkV/FH/Bt/TmnLo9KmHR7YoHU0TWdT6nkNpx86iM41vGOK5LoEeckFb2uPcw8urkoYvI+9nkyMtssngPt5CDN7VLiNZ/sMCyqQi6/KJfqznrPpcw0lkgp1+Jg7LdS1mCwXeDlT0sEmGkJF9EjeuL945tT3qKsaUohhEeW56t1Q7s9mtgHoawVpc/o9hpiC3nhoHNADwJAGi4TdX3pomKoOYtM2iO3EFSpszfTO4JfSowpY4pfext3XOja54QaUuCcB2t7TFNPM4BhKVS1Hk8jGHrXrBSferBsbTEIyvLNDPicBRuDQioRsXfCeYqfopz2cxH/EMCJncL3pJTR3sgC8hkj+3r0AbESwnFtqx43eltyoob34Bhkist8uZ8mfQIM29bEJTYFWgw0sClzpcd5ptaB673pKlAyIOnKL4b5kcaQUyqVAmF4J23l/nC+jKdk+j1A2Mx7yz2jB62bN4wVWwQ== X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(76506005)(92566002)(50226002)(6496005)(7416002)(54906002)(5660300001)(8676002)(5009440100003)(7736002)(4326008)(81166006)(305945005)(6486002)(66066001)(189998001)(76176999)(48376002)(5003940100001)(42186005)(2906002)(6666003)(2950100002)(6116002)(50466002)(50986999)(36756003)(47776003)(3846002)(33646002)(53936002)(25786008)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 23:WbTOF9wwctcMLtDrhI/CeTEvaeyKaIhCEtrwJ8YtKO4aoMtMAtE9cg4R76aIJ9HU0rhivqQ6APEicefANaQc/SFXOTtm8pr+59olDpxBPKVGXtrUFbrwWKvjrKEQJM/WrRoqfgM1n3FICSwmWKcJVhtGXXrI2Y0ITaISYhsdA27gA4QBkkKspbc8fnXvbic+kNvt70NgXBHnN/nieb3gjpqZBOqAXUgaXo7PUylI7ygBieS8FOkCjW69re78sLpyYsdARh/xpCfaVIwgj8Cw7btlmmzJAs+UxRj+tNBlMYwes3DIsDGS1f66gh9wd49cpDLL+4FdWNXRKidV5qwtdxBahI1hLmzgI3OK6I/cfHeBKwjfakx4MC80qCSnvRUUVTPqUlHCcQ5FBnwkwppb7dUcEztdXAPh2R0sehRr07TwVgnjD4F+Vd9LSnMSsnT0nQjVq81lsH6CG8vueuBUyLDpuOcpBLvSZYhZlf58zE1EkqNzVqnyr7Mqwt7+FWqe0Vqdn7BLNkHTD5ZbHQ4LtRzbKdwvuvkQrE4E+9Uyi5hR1IbJXjN3SEYvsnEEVbF3Lh5dmjNZyrcYKfZIRDGSNcsFxlP/JAcbqNunQAvggxjfmMokOjjS34s7UCoC9fdrLCLlPaYzFl4krYtKyozXU9u4iyDn1AFH8Wq/RfRH3atpWwtJSbhmgPHBcdeO9ROycPP7WGO+XvXu4C+A6m1+02eWVit7pf5DfXdVJueSwNvBtw6ZZtY5jk/VpPipqP7eM1hwZAGcKOBvHRCGZuqZ8JWA5nwUDXW9oQ1drQseiQBfPqIEQcZDBaecs1cqCfz+U8MPHXVUd1UGe2u2jCL2r66ctyYDOlB+ESVSVGLPoZdY7vXexw8JE7BLsKUihzGvEpMVIUKxc7e7n9jRON4voCAoVLPFf+aaR9l9puLAfG0qVx0xqf3cbFa6kj5nUvsH1o4F9xINt31OF8lCzDZsnA== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:TfrHZJf9FM9NeJ8n+61shhH0tT6gEHNyRRMYsjsj6l7ask1ORT1TL7An778HU5Gr38B/0MSErWfV0SbcD+O2WPKdaGY3qwqI9MRzgSyOsxPyR8zsRYNyjwF4PkHCPTqLnD4iwnnw2wmg9MtMpjkeOh+rhAIb5YqAKH9ynd0Y1HcbLzUBgq4/LoEEXN6nQzN4tBuH8R8jCLTZ/+rCKKyfBA3WhfRNuSq0fy+/ljb8tFrlcyaCQaaRZquCIJP5Uyx0xf3+9GgmQVDZT6GSBUrZhUJqw269lfCNrdrerqIlfwWyTOaxO+SAz4DJ+9Dt4RPCyOIQ1ohVxTsYyQJe8Z0+v7p13Dx0I04rUk58R2HFB8E/E6gUf207ts1ldoeI7Ufacmej4E0/1Nx3XhEzHa81zw==; 5:vq6XM+kMoaFHmTuVUAyuybiro5/LqGfAwpwcrYO7gXSWvzt3uoFo6aK+JRHplsLfkqin2gH8w2rT/20CGHb698cw5cbfD1h57SvydUPjQC6urL0oNsk8yyE1bXaJUtdF1HBojyErn8ZvtutoTKpE6JakkBd491Orha00siEliKM=; 24:1QaK32uGAE87HVvfi4wryR1hrH22WJySTftLWStcMiO94OiTcnCItS4K8G36xDttoY8yVTPxQWI7CXDtKmS69NDJ6E0jPxM+U2xCbLZk/wA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 7:wtYhXKQVNXLLWxkFqdUfWex7OYVWyhY0U7uKGCBK8XSTckqZTz32aRz1SgONSZe8AZ2mmi+iRy7qRvM44m+4VIrMm5891kIEI9XdpK9CbNtmZoYc9ga0fpPSGxfnkBC3YjaI93YKX07m3zLqgc765G5B+o1ktEMgvCtsUKjycJatOvyAJdK7qpLKFnkXYljAESOHHwCs7trkxO1qF/uu1MIuMrA9nkDvAOY5nBasDtOxMExBX9AlpJifDPVhWXGfGjHQTkXnJvjqCbnyAXhd8kYQ0GManr/3aU3gjh5GZwKC5ySChMwe50Z31Ha3UaIk6ukaSrDtCfhEeWIHbFZAZg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:23:10.3176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ILP32 has context-related structures different from both aarch32 and aarch64/lp64. In this patch compat_arch_ptrace() renamed to compat_a32_ptrace(), and compat_arch_ptrace() only makes choice between compat_a32_ptrace() and new compat_ilp32_ptrace() handler. compat_ilp32_ptrace() calls generic compat_ptrace_request() for all requests except PTRACE_GETSIGMASK and PTRACE_SETSIGMASK, which need special handling. Signed-off-by: Yury Norov Signed-off-by: Bamvor Jian Zhang Signed-off-by: Chengming Zhou --- arch/arm64/kernel/ptrace.c | 65 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 09e30a9..81d23ed 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -764,9 +764,11 @@ static const struct user_regset_view user_aarch64_view = { .regsets = aarch64_regsets, .n = ARRAY_SIZE(aarch64_regsets) }; -#ifdef CONFIG_AARCH32_EL0 +#ifdef CONFIG_COMPAT #include +#endif +#ifdef CONFIG_AARCH32_EL0 enum compat_regset { REGSET_COMPAT_GPR, REGSET_COMPAT_VFP, @@ -1222,7 +1224,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, +static long compat_a32_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { unsigned long addr = caddr; @@ -1299,8 +1301,67 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } + +#else +#define compat_a32_ptrace(child, request, caddr, cdata) (0) #endif /* CONFIG_AARCH32_EL0 */ +#ifdef CONFIG_ARM64_ILP32 +#include + +static long compat_ilp32_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) +{ + sigset_t new_set; + + switch (request) { + case PTRACE_GETSIGMASK: + if (caddr != sizeof(compat_sigset_t)) + return -EINVAL; + + return put_sigset_t((compat_sigset_t __user *) (u64) cdata, + &child->blocked); + + case PTRACE_SETSIGMASK: + if (caddr != sizeof(compat_sigset_t)) + return -EINVAL; + + if (get_sigset_t(&new_set, (compat_sigset_t __user *) (u64) cdata)) + return -EFAULT; + + sigdelsetmask(&new_set, sigmask(SIGKILL)|sigmask(SIGSTOP)); + + /* + * Every thread does recalc_sigpending() after resume, so + * retarget_shared_pending() and recalc_sigpending() are not + * called here. + */ + spin_lock_irq(&child->sighand->siglock); + child->blocked = new_set; + spin_unlock_irq(&child->sighand->siglock); + + return 0; + + default: + return compat_ptrace_request(child, request, caddr, cdata); + } +} + +#else +#define compat_ilp32_ptrace(child, request, caddr, cdata) (0) +#endif + +#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_a32_compat_task()) + return compat_a32_ptrace(child, request, caddr, cdata); + + return compat_ilp32_ptrace(child, request, caddr, cdata); +} +#endif + const struct user_regset_view *task_user_regset_view(struct task_struct *task) { #ifdef CONFIG_AARCH32_EL0 From patchwork Wed Mar 1 19:19:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94759 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp74032qgi; Wed, 1 Mar 2017 16:02:56 -0800 (PST) X-Received: by 10.99.143.13 with SMTP id n13mr11723146pgd.10.1488412976131; Wed, 01 Mar 2017 16:02:56 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 34si5915447plz.66.2017.03.01.16.02.55; Wed, 01 Mar 2017 16:02:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753657AbdCBACy (ORCPT + 25 others); Wed, 1 Mar 2017 19:02:54 -0500 Received: from mail-sn1nam02on0086.outbound.protection.outlook.com ([104.47.36.86]:21742 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753233AbdCBACw (ORCPT ); Wed, 1 Mar 2017 19:02:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=W9S5X6VgDOc/NPnNKrmjOvmq2x1zNZf9tTrakKuBt7M=; b=mnhYCu6ZkAiwKSM21ULRvPeCO6HDLwIiGbWjKdmuBhY0qRg1DqyuyDSToOfMZzFwqxiTISLTtjMw76BLSFBQPRW1vzWnaDFSxmICSPlVBd0PfSP5gX2/XB/6F6f+vRupEWQXaXu9IhIXiV/5tBvbX3X9Icc+wnbsXjqKm1MlLXI= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Wed, 1 Mar 2017 19:23:24 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Bamvor Jian Zhang Subject: [PATCH 19/20] arm64:ilp32: add vdso-ilp32 and use for signal return Date: Thu, 2 Mar 2017 00:49:27 +0530 Message-Id: <1488395968-14313-20-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: VI1PR0901CA0076.eurprd09.prod.outlook.com (10.167.203.172) To DM3PR07MB2249.namprd07.prod.outlook.com (10.164.33.147) X-MS-Office365-Filtering-Correlation-Id: 6500cbe5-1b5e-43c6-d8dd-08d460d86f09 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 3:yIX0/Cob4t81ooqIAtc3PRr0j2eWIqD3Z60R7AWvrp5ZKvvbdfym5n/WwOgUIvyLRaw0pXpi0IoRvRCWlPhIrMVT6bEUBbSeb5lyGK0Ov2C8tzEYfFPYK+6G/+45PzepQRTw5WTzVV/zO2dvP6GQLceGjzdkwHKJb96KUarE1sOgpasU7PiNfiZ8CVpGcPPwws6tT4gzLr6nL9eT80Ur6K0FdpGwGvRcNK94NRWj+lQMHakQHPJsl6+kaMBkBkUNW7vNNgjInNouA3lYlRbdsw==; 25:9PujCgmRpZbFCERsxnIejEKhPBA9jTFwmPx9LsYrdnbx7o1zKMtIpEfDWnJDEuVWgMYMTCDWvVuLScqU8jS1nKDiscwLrFLciCi+06TJDm6KFWHZgqdcobGNvfLhkqr5E0v1xM0iRfjUi92CjyYFGhki2FGwr49sZb2bMoY/ZkGJ46ZPLQpDsKuj8IQBNMhJiAu9mtPyCMemdJUwrI48EapPIhqhUUo7/qmlOnQNmzXqlTYOdv5U6bQDcepqSXvzupGmVGg3Yhm8cZ3H/eN708tanurFxirXgRSQQ5Ioam4LttRzFFSLe3rJPnLcy74LPcwITliw6itttNhfXt+ZJeNCybF9dDTmD9CroYKHfK36XZ4+gyZ7u+xAw6XFzeVORAN/aZ1mkJeEh2I+Qqb0fBLsu9ySKRF54QaeMKG94tDSZl2E9eWHWW0T+TTaMU+A X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 31:IWsLeIXZsBOtuNjWw7r67qjZHg8x3Rt/NxWqGPNswneZNiKI/2+4CFyHGSzFNWEHkYGgxROwyk/C7EZCbZPpRbZ28r7zQ9tynlmF9Jle9GEhS1Ps0SHMlS3UDVHlivCKM+8mGj6Q69sb61TFndrgC1Vc56yLu6+g+0lXl1QKV1hOWk61D4e8KfDyF0wBWRsfX9IVgw90YrYYoiDDHBiKpeOyab4QmMHVxe9AAuDu8hqWnPYayxwdWHnUtBYhVvByM8kX43VrmnEoBAtW8tIc/w==; 20:0DT5d39/uwPyfduom/s1fONQHJwr1mCkm9/8Xcpt9sckkgW1tD049sF4qLqFsnHSWzSAPe0s5hUtA91DHzxEQS/QLxwF1d/qRJBwzSPQ2mRZp4fL/ZdV+EBDA8HS8HLrpALLY2ZvUoqvWpNvjzAgxm3xI262WnttJOjiVSwYQVrHlwFrAQDak6fmq7SKr2tZy74J9agBJ2vhiPF4OOZmRJLk/XeUHBnN0AJMWm7Azs78gIu+yIyDg39oKi4EvY7VMlp61ESRDtiafxnqz+XUfHT+6nAnlo7JbYtaiWwWFWWZJ+WRCcQcQ9U8H9Pkzo4WSjeSxpFAz9Z/BenSGd3aP+J7EOaOmFy4rdxsz4y/1KQwde5yk43wdJfxqHxz4rWW9dF12CqNFezKm3xMTTQaQPQPgORhf7mtBX6O3NXqOxdqRPK01RghHi+9nMoXnzhMEvgnmg/4fdeMRbkzWlLd+ubxP1/EYMUELk1fz52JVYYm6xKY9+L5zNQumtTkWMqCNyxdutMy+waOnpbkPhCZjieK8zbsuUyk2A9l1SWnzy8ppHBqep+xKl1vJwUE4TmEE4DH2gm1G4LDTA0/drwSO17n2zKLZUO8x4RgwJ6QG/M= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(20161123560025)(6072148); SRVR:DM3PR07MB2249; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2249; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 4:6ffRhF0KRf2EAGyk8i1VbJB5XgFmoPaUKaM5zcYg4AYrus83w75dx+NcQtQGgO5fVZ5bzWOOPgSt7hI8uDRq39f55ouDtiNq9iaxuDoJazuLi31TqxWh8kQ5AyrojW8yT5blhgsvkdJ5PDORznsRobko3dOUdEyvQY4rhyHmCRl1ClS3RWjlNvUYImEM4xsKhcttXTVVcip6In0hhPtkqsV0zKvA8f7co/LaDkRhbbWbia6fdLPF4GXgA0Tl/vhtuOPoT0GEDcNr+M8Q0UHLFTFRB9MYT1vL8YnlnbnXClLXW5gmlf2Fa+uAH5lrTQPkekX4gXUOukVeLj9OQATUr7rmKHN8yiSgRi7rhS5vvh5hIih/BiZ4WNdOld5j3wTbC9akUjDbTdWAWMIh3RayVKoBIWz3gcQ8lyp2nm5oxDks1FmFAxiQQaYVtL7ICzSSn3WNTXHhrBIotKrpVqqR4D2HgbKYy+WnR6adnXp2F+U5ilIAvm0Rdh/tSxgsYxr6SizvuH7db+4PuXW7iIokaPz8Wk7VNdeGp/g8hA4smd/DuVcctqDyMAOj0/9c4fLlcc6ZHmniJ3tCwRE0zZzboqTGbZ1ibBi4s/hd1YmLU/yO6HuPCf3dOh68y6/ALFz6cKcvUYv4mP6z+4mHxegGXrxgalI+E7lasHJsjjvQ/dwl8NNIbo8c9jz3XQqdoN+kD2M1QSNrcHevScUYhX1/ng== X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(76506005)(92566002)(50226002)(6496005)(7416002)(54906002)(5660300001)(8676002)(5009440100003)(7736002)(4326008)(81166006)(305945005)(6486002)(66066001)(189998001)(76176999)(48376002)(5003940100001)(42186005)(2906002)(2950100002)(6116002)(50466002)(50986999)(36756003)(47776003)(3846002)(33646002)(6306002)(53936002)(25786008)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2249; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 23:YnGd4Raw4+VVX6V0u72YyB4ueLJmwAZFEL3j6y3JiNSMyFEmBuv1Uy5SBnVPbYCIydDH/m9qx+xUZs06b5OzrjHH+e3HdSm7nlYl6j4enli56JfdC0UxNfGy6N88kLLzSmRNZI70XQqOd8jfo7c/SX+KnLyRsW6KHtLv2hWlGcPAY07EKkBXWBzJWAujVqwpyewzWKCq1i0KAyI6rW+8hpqiDMnSEa4CVJEarh59KD4oh65NgIq3phgby5NrUlEkAA075CFr7FqJiXVVsZrEXsUPKArwocrPa3qQJ//aw3dJnPojrcgp1H0VGaiiwgcaxUAK458/jZXnhQzHDtilZGPUoAP7lP7NpzED57y2Nuzv6MwZFJDz7PeMUkbawzW+FUNjEZOxHTwJR4cYnV0d54KgyRtv/4ah91aRCjEJWDj4njpSWZxVs3hX7DvEs+Kc1WMdXQd6D2l/HiBTFUsvBfrrkBrlLkNpMztf7tKvxTh004GklqSfYAQLpqEeLEQbaybrjL3y1z/kna3G08yHIFreumPFCH3dKmEGamqZLWLf2CNCShnakudksrICTMvURoRooSR/fSAJq1H+3bFMsiSg09gfT3NQo4J3C6bwa9roewKaDT31NBExdwiwRSqtvOaw89v0amtjzP2d1NOCPFnPohcjQbek6yXdxzsQ3zBj7TloMrKUlfYdpVUma1XFdLlS7EA9VTVXHBrpdRmFWRzzzD6N25GBIUNbY4H3B45IgJ4gXkHj2GDdgLlcPWqJgb+Fw1Nx7pYIqHV29UaLxPpSOxp0Yqo7bXxrBY3KclcWH8IJhVAMS8DjDj/Hl7IN8wxECmniyVQ7dDs/G0gH1F6xqhDvZp5pOaxSb2VwGpJKtlAsR23lQgu64vx7jqR/YeONVlmORc/OBq4/cB+VUdmQQLkEp8Yu9UeWT3SwBU7x9N8SMREsIXBrb7MjJ+AzImnQQPp7fgIoSTAUcPgIGA== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 6:ZRXksTiIQl+vFx/ZFdZjTvnD3QUxvNpRmfPYpEFgcHQdWdd3Z/mQ/RHi/4JOKBST5Br+VBtl99Er4+XgdXM9IibtG7dTNrv1NFWxLiPTlW403WecIIwba8WhBY/FvmlEHyrZnadPQ8k7G4iX1pqYVc2PHzhcMs+Y+XJFPqUFImOW+JuefnEA9qnfWxeGI7nI7VOGl9BQJX1fhxdop6B2++WSrWYzsjtMvxaz5IOMRHx2+7+qjgpqrcLwgNQwvvfVMAehbd+xmyhYC4dVI8OZUTIvBiQsLFgFOm+ceDMnBn+2JiLaf6NI+UAo0YNjiZHsw8nxcYkYcERpC8SLxH/9m3CSyaOvp3AcEaNkUdjVwwmE61GcYZQhXn5H7N/+FuFw0fQCGpFlxtnMpxnLywHykg==; 5:2J6CCBs3rZBM4su0W8b7olqnK171+L9Kd5tz8rjMP281uKhuaP2//nOM14TEAKV4hEDA+ysF/tOQ5CxXm/UIVB77M3LzxWBZXqZ/ao/0NkkCXB+OAG5WgRD9TTnxUCZhqJImJdMf/ffYepjE8kiU5NTHTc++tUrlIdUtK1LjECQ=; 24:J12M0sofg50r/o25oxX/DrKnNYnbuKbCC4QRKui/0IdVZOMDddFJc4kPB+wVeXpI6Umvg9RvLVt4vK2aVTAJGwiCKty6Wkyf3TRGylQFJr0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2249; 7:SAQ6j940JBt0QwqvGj2zMBPamzD8ePH1y9o3bEMF5+O6ofJxmtngqouiARcWWOWtrYszsGwWtjN3uRwRC4VzHahYRWCxA5UHUDnYxED8vMll+kXJKXJyq7yPf7+V0Fz2OSwi1+Ao8bHMpYveZfAOOfJ3a97mqpouda0TR2h0glchEilB2ivRcjsTFhwUW+LoaXAWs8L/gKOX4FucPTESJMyidjO/6CPZ2MrlJdENXJxcx/l8JsOEbjlU3rZiRw5X+DlPTY96vOxGdZYTOgp/yEUirgwhL9R4uKNETtXtUSunYqVfTsHqcBqmx9wSQwgxofT1Eu9ZD498YdwD3eZnrA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:23:24.8293 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2249 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philipp Tomsich ILP32 VDSO exports next symbols: __kernel_rt_sigreturn; __kernel_gettimeofday; __kernel_clock_gettime; __kernel_clock_getres. What shared object to use, kernel selects depending on result of is_ilp32_compat_task() in arch/arm64/kernel/vdso.c, so it substitutes correct pages and spec. Adjusted to move the data page before code pages in sync with commit 601255ae3c98 ("arm64: vdso: move data page before code pages") Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/asm/vdso.h | 6 ++ arch/arm64/kernel/Makefile | 11 ++++ arch/arm64/kernel/asm-offsets.c | 7 ++ arch/arm64/kernel/signal.c | 2 + arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 74 +++++++++++++++++++++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 33 ++++++++++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 95 +++++++++++++++++++++++++++ arch/arm64/kernel/vdso.c | 65 +++++++++++++++--- arch/arm64/kernel/vdso/gettimeofday.S | 20 +++++- arch/arm64/kernel/vdso/vdso.S | 6 +- 11 files changed, 305 insertions(+), 16 deletions(-) create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S -- 2.7.4 diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 839ce00..649a9a4 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -29,6 +29,12 @@ #include +#ifdef CONFIG_ARM64_ILP32 +#include +#else +#define vdso_offset_sigtramp_ilp32 +#endif + #define VDSO_SYMBOL(base, name) \ ({ \ (void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index d6089e5..8720416 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -55,6 +55,7 @@ arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ cpu-reset.o obj-y += $(arm64-obj-y) vdso/ probes/ +obj-$(CONFIG_ARM64_ILP32) += vdso-ilp32/ obj-m += $(arm64-obj-m) head-y := head.o extra-y += $(head-y) vmlinux.lds @@ -62,3 +63,13 @@ extra-y += $(head-y) vmlinux.lds ifeq ($(CONFIG_DEBUG_EFI),y) AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\"" endif + +# vDSO - this must be built first to generate the symbol offsets +$(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h +$(obj)/vdso/vdso-offsets.h: $(obj)/vdso + +ifeq ($(CONFIG_ARM64_ILP32),y) +# vDSO - this must be built first to generate the symbol offsets +$(call objectify,$(arm64-obj-y)): $(obj)/vdso-ilp32/vdso-ilp32-offsets.h +$(obj)/vdso-ilp32/vdso-ilp32-offsets.h: $(obj)/vdso-ilp32 +endif diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index aec5b6c..c8a0971 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -121,6 +121,13 @@ int main(void) DEFINE(TSPEC_TV_SEC, offsetof(struct timespec, tv_sec)); DEFINE(TSPEC_TV_NSEC, offsetof(struct timespec, tv_nsec)); BLANK(); +#ifdef CONFIG_COMPAT + DEFINE(COMPAT_TVAL_TV_SEC, offsetof(struct compat_timeval, tv_sec)); + DEFINE(COMPAT_TVAL_TV_USEC, offsetof(struct compat_timeval, tv_usec)); + DEFINE(COMPAT_TSPEC_TV_SEC, offsetof(struct compat_timespec, tv_sec)); + DEFINE(COMPAT_TSPEC_TV_NSEC, offsetof(struct compat_timespec, tv_nsec)); + BLANK(); +#endif DEFINE(TZ_MINWEST, offsetof(struct timezone, tz_minuteswest)); DEFINE(TZ_DSTTIME, offsetof(struct timezone, tz_dsttime)); BLANK(); diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index b78f4c2..a7f201d 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -267,6 +267,8 @@ void setup_return(struct pt_regs *regs, struct k_sigaction *ka, if (ka->sa.sa_flags & SA_RESTORER) sigtramp = ka->sa.sa_restorer; + else if (is_ilp32_compat_task()) + sigtramp = VDSO_SYMBOL(current->mm->context.vdso, sigtramp_ilp32); else sigtramp = VDSO_SYMBOL(current->mm->context.vdso, sigtramp); diff --git a/arch/arm64/kernel/vdso-ilp32/.gitignore b/arch/arm64/kernel/vdso-ilp32/.gitignore new file mode 100644 index 0000000..61806c3 --- /dev/null +++ b/arch/arm64/kernel/vdso-ilp32/.gitignore @@ -0,0 +1,2 @@ +vdso-ilp32.lds +vdso-ilp32-offsets.h diff --git a/arch/arm64/kernel/vdso-ilp32/Makefile b/arch/arm64/kernel/vdso-ilp32/Makefile new file mode 100644 index 0000000..0671e88 --- /dev/null +++ b/arch/arm64/kernel/vdso-ilp32/Makefile @@ -0,0 +1,74 @@ +# +# Building a vDSO image for AArch64. +# +# Author: Will Deacon +# Heavily based on the vDSO Makefiles for other archs. +# + +obj-ilp32-vdso := gettimeofday-ilp32.o note-ilp32.o sigreturn-ilp32.o + +# Build rules +targets := $(obj-ilp32-vdso) vdso-ilp32.so vdso-ilp32.so.dbg +obj-ilp32-vdso := $(addprefix $(obj)/, $(obj-ilp32-vdso)) + +ccflags-y := -shared -fno-common -fno-builtin +ccflags-y += -nostdlib -Wl,-soname=linux-ilp32-vdso.so.1 \ + $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) + +obj-y += vdso-ilp32.o +extra-y += vdso-ilp32.lds vdso-ilp32-offsets.h +CPPFLAGS_vdso-ilp32.lds += -P -C -U$(ARCH) -mabi=ilp32 + +# Force dependency (incbin is bad) +$(obj)/vdso-ilp32.o : $(obj)/vdso-ilp32.so + +# Link rule for the .so file, .lds has to be first +$(obj)/vdso-ilp32.so.dbg: $(src)/vdso-ilp32.lds $(obj-ilp32-vdso) + $(call if_changed,vdso-ilp32ld) + +# Strip rule for the .so file +$(obj)/%.so: OBJCOPYFLAGS := -S +$(obj)/%.so: $(obj)/%.so.dbg FORCE + $(call if_changed,objcopy) + +# Generate VDSO offsets using helper script +gen-vdsosym := $(srctree)/$(src)/../vdso/gen_vdso_offsets.sh +quiet_cmd_vdsosym = VDSOSYM $@ +define cmd_vdsosym + $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ && \ + cp $@ include/generated/ +endef + +$(obj)/vdso-ilp32-offsets.h: $(obj)/vdso-ilp32.so.dbg FORCE + $(call if_changed,vdsosym) + +# Assembly rules for the .S files +#$(obj-ilp32-vdso): %.o: $(src)/../vdso/$(subst -ilp32,,%.S) +# $(call if_changed_dep,vdso-ilp32as) + +$(obj)/gettimeofday-ilp32.o: $(src)/../vdso/gettimeofday.S + $(call if_changed_dep,vdso-ilp32as) + +$(obj)/note-ilp32.o: $(src)/../vdso/note.S + $(call if_changed_dep,vdso-ilp32as) + +# This one should be fine because ILP32 uses the same generic +# __NR_rt_sigreturn syscall number. +$(obj)/sigreturn-ilp32.o: $(src)/../vdso/sigreturn.S + $(call if_changed_dep,vdso-ilp32as) + +# Actual build commands +quiet_cmd_vdso-ilp32ld = VDSOILP32L $@ + cmd_vdso-ilp32ld = $(CC) $(c_flags) -mabi=ilp32 -Wl,-n -Wl,-T $^ -o $@ +quiet_cmd_vdso-ilp32as = VDSOILP32A $@ + cmd_vdso-ilp32as = $(CC) $(a_flags) -mabi=ilp32 -c -o $@ $< + +# Install commands for the unstripped file +quiet_cmd_vdso_install = INSTALL $@ + cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ + +vdso-ilp32.so: $(obj)/vdso-ilp32.so.dbg + @mkdir -p $(MODLIB)/vdso + $(call cmd,vdso_install) + +vdso_install: vdso-ilp32.so diff --git a/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S new file mode 100644 index 0000000..46ac072 --- /dev/null +++ b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2012 ARM Limited + * + * 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 . + * + * Author: Will Deacon + */ + +#include +#include +#include +#include + + __PAGE_ALIGNED_DATA + + .globl vdso_ilp32_start, vdso_ilp32_end + .balign PAGE_SIZE +vdso_ilp32_start: + .incbin "arch/arm64/kernel/vdso-ilp32/vdso-ilp32.so" + .balign PAGE_SIZE +vdso_ilp32_end: + + .previous diff --git a/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S new file mode 100644 index 0000000..ba98794 --- /dev/null +++ b/arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S @@ -0,0 +1,95 @@ +/* + * GNU linker script for the VDSO library. + * + * Copyright (C) 2012 ARM Limited + * + * 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 . + * + * Author: Will Deacon + * Heavily based on the vDSO linker scripts for other archs. + */ + +#include +#include +#include + +SECTIONS +{ + PROVIDE(_vdso_data = . - PAGE_SIZE); + . = VDSO_LBASE + SIZEOF_HEADERS; + + .hash : { *(.hash) } :text + .gnu.hash : { *(.gnu.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + + .note : { *(.note.*) } :text :note + + . = ALIGN(16); + + .text : { *(.text*) } :text =0xd503201f + PROVIDE (__etext = .); + PROVIDE (_etext = .); + PROVIDE (etext = .); + + .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr + .eh_frame : { KEEP (*(.eh_frame)) } :text + + .dynamic : { *(.dynamic) } :text :dynamic + + .rodata : { *(.rodata*) } :text + + _end = .; + PROVIDE(end = .); + + /DISCARD/ : { + *(.note.GNU-stack) + *(.data .data.* .gnu.linkonce.d.* .sdata*) + *(.bss .sbss .dynbss .dynsbss) + } +} + +/* + * We must supply the ELF program headers explicitly to get just one + * PT_LOAD segment, and set the flags explicitly to make segments read-only. + */ +PHDRS +{ + text PT_LOAD FLAGS(5) FILEHDR PHDRS; /* PF_R|PF_X */ + dynamic PT_DYNAMIC FLAGS(4); /* PF_R */ + note PT_NOTE FLAGS(4); /* PF_R */ + eh_frame_hdr PT_GNU_EH_FRAME; +} + +/* + * This controls what symbols we export from the DSO. + */ +VERSION +{ + LINUX_4.10 { + global: + __kernel_rt_sigreturn; + __kernel_gettimeofday; + __kernel_clock_gettime; + __kernel_clock_getres; + local: *; + }; +} + +/* + * Make the sigreturn code visible to the kernel. + */ +VDSO_sigtramp_ilp32 = __kernel_rt_sigreturn; diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 9d44902..71bee92 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -37,8 +37,13 @@ #include #include -extern char vdso_start, vdso_end; -static unsigned long vdso_pages __ro_after_init; +extern char vdso_lp64_start, vdso_lp64_end; +static unsigned long vdso_lp64_pages __ro_after_init; + +#ifdef CONFIG_ARM64_ILP32 +extern char vdso_ilp32_start, vdso_ilp32_end; +static unsigned long vdso_ilp32_pages __ro_after_init; +#endif /* * The vDSO data page. @@ -110,7 +115,17 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) } #endif /* CONFIG_AARCH32_EL0 */ -static struct vm_special_mapping vdso_spec[2] __ro_after_init = { +static struct vm_special_mapping vdso_lp64_spec[2] __ro_after_init = { + { + .name = "[vvar]", + }, + { + .name = "[vdso]", + }, +}; + +#ifdef CONFIG_ARM64_ILP32 +static struct vm_special_mapping vdso_ilp32_spec[2] __ro_after_init = { { .name = "[vvar]", }, @@ -118,21 +133,27 @@ static struct vm_special_mapping vdso_spec[2] __ro_after_init = { .name = "[vdso]", }, }; +#endif -static int __init vdso_init(void) +static int __init vdso_init(char *vdso_start, char *vdso_end, + unsigned long *vdso_pagesp, + struct vm_special_mapping *vdso_spec) { int i; + unsigned long vdso_pages; struct page **vdso_pagelist; unsigned long pfn; - if (memcmp(&vdso_start, "\177ELF", 4)) { + if (memcmp(vdso_start, "\177ELF", 4)) { pr_err("vDSO is not a valid ELF object!\n"); return -EINVAL; } - vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT; + vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT; + *vdso_pagesp = vdso_pages; pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n", - vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data); + vdso_pages + 1, vdso_pages, + vdso_start, 1L, vdso_data); /* Allocate the vDSO pagelist, plus a page for the data. */ vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *), @@ -145,7 +166,7 @@ static int __init vdso_init(void) /* Grab the vDSO code pages. */ - pfn = sym_to_pfn(&vdso_start); + pfn = sym_to_pfn(vdso_start); for (i = 0; i < vdso_pages; i++) vdso_pagelist[i + 1] = pfn_to_page(pfn + i); @@ -155,7 +176,22 @@ static int __init vdso_init(void) return 0; } -arch_initcall(vdso_init); + +static int __init vdso_lp64_init(void) +{ + return vdso_init(&vdso_lp64_start, &vdso_lp64_end, + &vdso_lp64_pages, vdso_lp64_spec); +} +arch_initcall(vdso_lp64_init); + +#ifdef CONFIG_ARM64_ILP32 +static int __init vdso_ilp32_init(void) +{ + return vdso_init(&vdso_ilp32_start, &vdso_ilp32_end, + &vdso_ilp32_pages, vdso_ilp32_spec); +} +arch_initcall(vdso_ilp32_init); +#endif int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) @@ -163,8 +199,17 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, struct mm_struct *mm = current->mm; unsigned long vdso_base, vdso_text_len, vdso_mapping_len; void *ret; + unsigned long pages = vdso_lp64_pages; + struct vm_special_mapping *vdso_spec = vdso_lp64_spec; + +#ifdef CONFIG_ARM64_ILP32 + if (is_ilp32_compat_task()) { + pages = vdso_ilp32_pages; + vdso_spec = vdso_ilp32_spec; + } +#endif - vdso_text_len = vdso_pages << PAGE_SHIFT; + vdso_text_len = pages << PAGE_SHIFT; /* Be sure to map the data page */ vdso_mapping_len = vdso_text_len + PAGE_SIZE; diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S index e00b467..062a33d 100644 --- a/arch/arm64/kernel/vdso/gettimeofday.S +++ b/arch/arm64/kernel/vdso/gettimeofday.S @@ -25,6 +25,16 @@ #define NSEC_PER_SEC_LO16 0xca00 #define NSEC_PER_SEC_HI16 0x3b9a +#ifdef __LP64__ +#define PTR_REG(n) x##n +#define OFFSET(n) n +#define DELOUSE(n) +#else +#define PTR_REG(n) w##n +#define OFFSET(n) COMPAT_##n +#define DELOUSE(n) mov w##n, w##n +#endif + vdso_data .req x6 seqcnt .req w7 w_tmp .req w8 @@ -119,7 +129,7 @@ x_tmp .req x8 .if \shift == 1 lsr x11, x11, x12 .endif - stp x10, x11, [x1, #TSPEC_TV_SEC] + stp PTR_REG(10), PTR_REG(11), [x1, #OFFSET(TSPEC_TV_SEC)] mov x0, xzr ret .endm @@ -136,6 +146,8 @@ x_tmp .req x8 /* int __kernel_gettimeofday(struct timeval *tv, struct timezone *tz); */ ENTRY(__kernel_gettimeofday) .cfi_startproc + DELOUSE(0) + DELOUSE(1) adr vdso_data, _vdso_data /* If tv is NULL, skip to the timezone code. */ cbz x0, 2f @@ -160,7 +172,7 @@ ENTRY(__kernel_gettimeofday) mov x13, #1000 lsl x13, x13, x12 udiv x11, x11, x13 - stp x10, x11, [x0, #TVAL_TV_SEC] + stp PTR_REG(10), PTR_REG(11), [x0, #OFFSET(TVAL_TV_SEC)] 2: /* If tz is NULL, return 0. */ cbz x1, 3f @@ -182,6 +194,7 @@ ENDPROC(__kernel_gettimeofday) /* int __kernel_clock_gettime(clockid_t clock_id, struct timespec *tp); */ ENTRY(__kernel_clock_gettime) .cfi_startproc + DELOUSE(1) cmp w0, #JUMPSLOT_MAX b.hi syscall adr vdso_data, _vdso_data @@ -297,6 +310,7 @@ ENDPROC(__kernel_clock_gettime) /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */ ENTRY(__kernel_clock_getres) .cfi_startproc + DELOUSE(1) cmp w0, #CLOCK_REALTIME ccmp w0, #CLOCK_MONOTONIC, #0x4, ne ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne @@ -311,7 +325,7 @@ ENTRY(__kernel_clock_getres) ldr x2, 6f 2: cbz w1, 3f - stp xzr, x2, [x1] + stp PTR_REG(zr), PTR_REG(2), [x1] 3: /* res == NULL. */ mov w0, wzr diff --git a/arch/arm64/kernel/vdso/vdso.S b/arch/arm64/kernel/vdso/vdso.S index 82379a7..a40ae24 100644 --- a/arch/arm64/kernel/vdso/vdso.S +++ b/arch/arm64/kernel/vdso/vdso.S @@ -21,12 +21,12 @@ #include #include - .globl vdso_start, vdso_end + .globl vdso_lp64_start, vdso_lp64_end .section .rodata .balign PAGE_SIZE -vdso_start: +vdso_lp64_start: .incbin "arch/arm64/kernel/vdso/vdso.so" .balign PAGE_SIZE -vdso_end: +vdso_lp64_end: .previous From patchwork Wed Mar 1 19:19:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 94744 Delivered-To: patch@linaro.org Received: by 10.140.20.113 with SMTP id 104csp1958832qgi; Wed, 1 Mar 2017 11:26:43 -0800 (PST) X-Received: by 10.84.128.8 with SMTP id 8mr12740116pla.24.1488396403738; Wed, 01 Mar 2017 11:26:43 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r13si5359271pgn.422.2017.03.01.11.26.43; Wed, 01 Mar 2017 11:26:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@CAVIUMNETWORKS.onmicrosoft.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426AbdCAT0W (ORCPT + 25 others); Wed, 1 Mar 2017 14:26:22 -0500 Received: from mail-co1nam03on0049.outbound.protection.outlook.com ([104.47.40.49]:29984 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752233AbdCATZz (ORCPT ); Wed, 1 Mar 2017 14:25:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-caviumnetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QACty4lnXDXoWdryqfYzHXb+V0aeds9v8RXT/rWhZbM=; b=RUd7XeKMb3+WSB9BCqnH3A69J60C4JWOoo9uuXsc+eemnNRkkfjRgohhgkFTzdlWMFcKJIQemFGcos8NBh1qoS8jDw+ZFRciJPW2LZCCZqRsnlDKnjzk0x4eh1etzbpEI/KJxDGA5/rvCo5Er++x8iCNBchXX65vgst5qTdavus= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost (27.97.135.110) by CY1PR07MB2245.namprd07.prod.outlook.com (10.164.112.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 19:23:37 +0000 From: Yury Norov To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Arnd Bergmann , Catalin Marinas Cc: Yury Norov , Andrew Pinski , Andrew Pinski , Adam Borowski , Chris Metcalf , Steve Ellcey , Maxim Kuvyrkov , Ramana Radhakrishnan , Florian Weimer , Bamvor Zhangjian , Andreas Schwab , Chris Metcalf , Heiko Carstens , schwidefsky@de.ibm.com, broonie@kernel.org, Joseph Myers , christoph.muellner@theobroma-systems.com, szabolcs.nagy@arm.com, klimov.linux@gmail.com, Nathan_Lynch@mentor.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, geert@linux-m68k.org, philipp.tomsich@theobroma-systems.com, manuel.montezelo@gmail.com, linyongting@huawei.com, davem@davemloft.net, zhouchengming1@huawei.com, Andrew Pinski Subject: [PATCH 20/20] arm64:ilp32: add ARM64_ILP32 to Kconfig Date: Thu, 2 Mar 2017 00:49:28 +0530 Message-Id: <1488395968-14313-21-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> References: <1488395968-14313-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [27.97.135.110] X-ClientProxiedBy: AM4PR02CA0021.eurprd02.prod.outlook.com (10.165.239.159) To CY1PR07MB2245.namprd07.prod.outlook.com (10.164.112.147) X-MS-Office365-Filtering-Correlation-Id: fb831399-4415-4fcb-d302-08d460d87694 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2245; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 3:5/Ygea4sq8gjK152rdBR/jYuPzjciWZw/pd/pSrej4xup0yuqk+j5oc85eBJVpTYmp31ozmrflwE4jVoJgeWI+PBZf7vr3Yfhm5yc4XcTLtqx3YaiDZqvR9G9lpkXUFyEiharnQciJCh6kz2Xbk9FzLypU+bQ0YVuyTZty+ad9/g7r1wh4MN+pLqgxF9boCuItysVfUAZRbbLz8qikKI3Afmdiyhjp+qaOas7M41hoLbVe+1OMPQ3nLfhZ0YHQQYra7w5wwcsPrdfVi5QFZdFA==; 25:wkAkdRPMRGg1vPoCI//9QL3wBliBjRFO5BmwZG7YIeopsAZnRP6IvwbEAn9ja8wSGenXI5P4OycAKAgNSeWUJIm1GjwpFBaEVss9kVVsAYv1MPo99sAZxzns9A8+BAmrIYDHyXOgQT20UKOQFg/4BSjArgh/Pk6THL96kPhYS/z9FgsPuWOcfXYOjh6SOSavuqEJC+LLxTzOgM1vzqW4vpkXyURYUgxZxu6o8frKYL4oYjEsoPO+r5c8W8vM3htfkWY9gbQ0EyAstk9oCwodB8j4EhmHmqtUL2oMzfaRQUhoFx9wETIN6WOchUsmTuBkgoNjAmRelRqpczKgunoSFU3oRoW8oiKhzJNkryHQlhq5P+3vRzS3qf7GED050+hOkGcubJv6hfLa4OeXBeVGGv7n/BwngYogXUcl/56/dum3ZhOUgrTXVhOTXCNqbPzY98N4ChqQPxY3k9QQEnzXDg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 31:aPSjAr6NKfORcyW6mqxucDWzvkFAoTiJpJVnkDNCRnAQwQgJ7I+WfJF97T+3wW1ZIQcV1JKQsb9lhBVn9gD7jwYa6ntEd4w5s1IfGvkahhUmfS7TelfDcYziwjFmBPa6IFIp0xLuzOjysJ7OziiOc93N5SGi4mr/9TEDcnuHD3ax+kmRqeJjssMzjFd5RtcGe2401GdTJoo6MEPfAuOtaMUK7SIN6SZhDNiOdkSc+qis61hBxLouiaQF22M+3r05; 20:mLEps8vfN0er+SMwVdCfQO7w9FtrpNfeSduZaK+lyxjYKqetXgVIWbM62a8xHRZrITI3Lqi2gz2fABjPnHOWkSWZtN85sOn26ufuUcc62434MXyf6eCNi7lTYJQsjyCgw9KPABtYXhAO0Krz+1BBhhJiI8DRo0/yTTvyJ8g4TurTaEKMUHjMI5lyjR+blZIQIexYjofMPLtrcib3VaqxPDvnhSqyiiEm7/hAq6+MS+TWXKvdMQFac7UwbP9FqqW+g+lAA2oL/ZLBEwAuA0fesQSdLvM5VlVGelSOaXBqU47EDKxQBJzFwYQTN4medzwbc1aKTX1wBwGMO839EwMeSNCktV9NK1r9y0hDL+jm7Uaep1n7LWCpEZsoY+pt7nzQ9FI9f1Wk4A3Buf7oduRusAycQPv1gBwSM5NH/PH+Jkk/wYUVcFWEt1Wz0fwh19XJJC4LvmgvPjAc4vBssZFtV5V+rrkneJu4kjSw8Yp+DgpQ1IDHcb9giGoq+ZKeVA9qGCajCCsAD+TZ2E8VZG5QqgvBZY7rH3J5J5SmvzxmXZyAxMULb3o1d2r9TCdhd9TmezEbUqDZ7Xew1DqDdsPtEIGl4X8l3zQGmhaN932xlQM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(278428928389397); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:CY1PR07MB2245; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2245; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 4:d70+5jEPWVLhkeRmcq4tGwU/K33EMQcpGqk+1bYellyndqVP+M/D+vwadkGlS1Vfin/vGEbqxylvVzdZ8rgf2qqKC41RZGwBUypMouwD/i7XYFXGYomDqqkn6J039JYvP0ex8sBk0EabUzQa/nCB+JZUkx6zWIv3TI/oK3CLmMal9IdSNAhQ2R5FCYT1+CnidvWx+La3aRNOKq2DlRhc2vhZ92i66wFIIzxbQcGWh4FJgdqCoIugaleGuhHuh9h0/zCFv5xPhnLluttlZ/sHUrV4p9pEA0u8mRgI6/rYl5OiAbz8rjmZhOfapzBbXQcCTw4dcAKrPxGaecSNI7zHzAZD8/2oJ0Wg+I9rTfoNafPcq1MjFEs047Pbtet/4NBeAKIE6+L3bim5o4bXZc78EDUu72sm6yfb0Z/32EC122Cq//mJGIpbzlTT+ur79IC52J4qWhThdVcmG00jIi3pP0RYVfu+iUY59N7lPnBys+Fm2r/yXPPBmhmvxnyG0tR30YLndfSiHQ+3MN+fd5tkBMGvCpg1sDKPWmY3pwjzaWy5GQfmkrNrgT8afIPfKttsQsyAuQyNHjKZGK+tkvWScTaqsMQD0H9sQ1QKjH//VXA/bOOjBeNdY4oYuEleXJRCCm0Nf4kdPBnlYzaSNnmGIA== X-Forefront-PRVS: 0233768B38 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(39450400003)(76176999)(5009440100003)(50226002)(33646002)(66066001)(2906002)(2950100002)(81166006)(47776003)(50986999)(8676002)(53936002)(76506005)(4326008)(305945005)(7736002)(7416002)(25786008)(5660300001)(6116002)(6496005)(6486002)(3846002)(5003940100001)(189998001)(48376002)(50466002)(6666003)(36756003)(38730400002)(107886003)(42186005)(92566002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2245; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 23:TvStpBWecVgX+7eKIAax23F5ueQ5iM/P/uwtS7FYUZb7Tb9i+0PkbW4ulJzl5m9EEEPo8TPDcMGvozk0pD5XE+A9j6s1dpJM8dYMaayBsD5QuzNAFeU5ssKrmFgLwQNICEwf47Mx1NW3//FphyImEsXkvVtz+9pH6R6+H8TEW2YVEGSyo/dz+stkg8MCPAlCHyd8+Re5ZeB3z97kn41kmsTOKX3qAAWwSGkOGjb6pQk8M5lL230Iv3ZR0ix+aNbEanIBLCeTLkz4ke2fEASKqyQr4DLZfqVLXpbsQlmtZ46OyXJaFwGaYNOI5HPdPTtc3c6yC6EXgnRnj0DqMWwSA1CfmbJAljI7xxmO12QTVPks0qopU7PfoyuSR3ofJNKHTUA+3FEqn/S9Y4kT2V+EFZqistMzQukNQk+Gosjecp5nhX7AtYBxEAO0QxU5p4Cs+gesf9gkC1r0tJVkmU9YWSDoOeI4LO1M5/NhypC5854yvyfLfvWQAT8u7ckZIhJ27PJnPEyqP4/8nOKlfTY9ABaDCba42boEwpkwCM1lhUcpbsVINu0HRk6pBaE3r25nycUZyoslMbQwvTlgLYXC+vWAFGKaQfIUN9nAVQ0CG7BXAJlQ8XMVlQIZdesWJdSh+3pZrefDo+vc0gf6lhlXqlfsgYfyVJxjZHgpVs9mKGrjYzvcXj7M95zQNFpeAF4ffXaXALDvAQiaLfhyIHd2py+Lm0CadZzTLiinjgrsCvc9I52lbSznuwfvjiquVxzVBviWMnaX+ctTZzGyl+58LDjMTnSvfmabv/ZVzEdnn4+z9QT0yS/NBWsbds6hnTGU2jc0Fti6NdasUrsv6Xvp4eIcocosNxbwA+svi0oXR2QSOh3RSjIoHaCp0K2D4OyoVPS7e8+zC4wHTcInCUpbuzlOF+RBTsawnqPKziiJZTL1Mjf/PFOBanIi50XnyeKaLq/I40AhGIBdp9S8I7wVbhPOJ+ICFyLNvRanRxxgAno= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 6:Kk4j8IjPwXFt3pme9s+x0JHY2EoeZTtcxYghnGvmpW7HGogK20lIVwzTlZIY+Whuo38Mu3Boq01GCBoQ7Bt2hr0ZujUSDNS0NQG25eZAMYqPzZL0sJgz2LMb299XH/EbQOHW3BJRaRw/YJgzr+/3PrpZtPP4UM5P0FETQq2h0yuL9JdSWd91u4a16k46pKkYfkpJQSiNNUkFVTwVv0LOJ9IcdOgDjIruyfRLsr35CEQmlfyP8+fTP64HIXraRVD+E4qd4gAVWu/0CkkA3EacBjsZ9FyLSt66FCHJUS4xXXE7G/Fg9DK6TT7dqH3+amjFtLJRlKXwtd9WkJ20L4G6BLRPfFSR7/zE16Ewi28GibpPj37gauq/V17/2sO6CwTTeRsit5hUdx9ucL7cy0YHKg==; 5:JQwfduGJCgDJNTvPuassch08nx2hjik6OCgeRaF9rWquwwuvFbWPKtgKsIBRVr4LPJeJJsIN9KAmIQ4TFT7bmPuRsZvR4Ql6B8mgCnKnmuRQrTS1GOw7my87HsIHXhQG8SUOTpzTm1goAV8831X5NYoGpRYxslfdvQA9Js+VPGA=; 24:W4WQPFtdQyShg9z1HsJU/r15ZsyxVPwWj/GNkz51alcfgfYTYSQMBJxenykwOuRe0yCPJBX5TapMYU68m3SdBWpt7v39Jj89GBYrhq8VJpQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2245; 7:b1XxrBQ15lahGIL5YuAoE4FDHBC82SwIyDMzJrR/YKQR1ra3AHgls7itZYWeVBwUwPNbN1DFsrmxRoT8qzybkXSEjFPjY72Bnbix+k2tfZ/ej3A4iO+ltyPz04K5UMTqvJAq/FYxmCZvndHZ+74PuWmsd5nYwPSdYYLj7x9DWt1W0r+GNDLjxmUZ3P1i7h+USXjsNXHLY9WtQjHQUcESJoa45fBKRYjs1MHfIx4aPdAdsQ+N+NdUjoHCmg0zBDqTlh3jRJl3M/ZM8RmnrLidlhjZGNVa2ABuQB8BEbYrdsRShJ+kUwLDpvZbz3nNNRoAmw2JryZrSP1sMqMNRX8hig== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 19:23:37.6624 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2245 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Pinski This patch adds the config option for ILP32. 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/Kconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d059063..887f391 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1043,7 +1043,7 @@ source "fs/Kconfig.binfmt" config COMPAT bool - depends on AARCH32_EL0 + depends on AARCH32_EL0 || ARM64_ILP32 config AARCH32_EL0 bool "Kernel support for 32-bit EL0" @@ -1065,6 +1065,14 @@ config AARCH32_EL0 If you want to execute 32-bit userspace applications, say Y. +config ARM64_ILP32 + bool "Kernel support for ILP32" + select COMPAT + help + This option enables support for AArch64 ILP32 user space. ILP32 + is an ABI where long and pointers are 32bits but it uses the AARCH64 + instruction set. + config SYSVIPC_COMPAT def_bool y depends on COMPAT && SYSVIPC