From patchwork Fri Oct 21 20:33:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 9390121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8482460762 for ; Fri, 21 Oct 2016 20:46:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73DE72A037 for ; Fri, 21 Oct 2016 20:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 673692A049; Fri, 21 Oct 2016 20:46:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4DD9B2A037 for ; Fri, 21 Oct 2016 20:46:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bxggJ-0004pu-W5; Fri, 21 Oct 2016 20:44:48 +0000 Received: from mail-bn3nam01on0046.outbound.protection.outlook.com ([104.47.33.46] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bxgYq-00057q-9U for linux-arm-kernel@lists.infradead.org; Fri, 21 Oct 2016 20:37:35 +0000 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=DNDrhKzPBZfMbB9MEGHGFEQXWVqDMTqcW7/4liClWMw=; b=jSFOwl17anBkEGD4TfV60g6W8T0wwW+mQlJCkKd78D45tENh33opaBpP1WrrVZB3DTRChstBc5a/PMTizLsbfKxiwcNQFmwPAc3LzmSe+GcT23dtvB2sOl2Xf+8/zl4YpjRclUkpJldTd7X0/7BUhjyvc8gVMRUxN2dMZDNftCM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; Received: from localhost (95.143.213.121) 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.669.16; Fri, 21 Oct 2016 20:36:41 +0000 From: Yury Norov To: , , , , , Subject: [PATCH 17/18] arm64:ilp32: add vdso-ilp32 and use for signal return Date: Fri, 21 Oct 2016 23:33:16 +0300 Message-ID: <1477081997-4770-18-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> References: <1477081997-4770-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: AM3PR03CA015.eurprd03.prod.outlook.com (10.141.191.143) To SN1PR07MB2253.namprd07.prod.outlook.com (10.164.47.147) X-MS-Office365-Filtering-Correlation-Id: 4d8c0594-8ea4-4447-0915-08d3f9f1f6e8 X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 2:h3Z4iWoj1lG5sFkSA88XSttcIUy0RJuHAyxr2Tq6RNvtwXwZDn89eWXIR7jCAd5RB8kHAncCdHm84PhYTJov8gDsOdVHXo0TsriPTIwMD25o5l/xLx6kuq2s1gxZ1dUp1h04ZcbFYaWoDU0peV/lu222JJDHrNCU0hkJuKPa+EukCL7nJK8A4XdHTbitPiU1V9TgDJ3RGEIpIEFcepZmzA==; 3:uXIcWxzFB+3Tg5TieLmdOv32CgBIUifXdelCKJa87XvLKzka9HPRYPltbhMxrSYgfj1LqBgTxSxdczrL8wSwbIZ8HrW7x40EdlJb+5wQSYl7KIE3g2Fwwe1v4RGB0jbKNWv+PKgUQ0Z/5R/LMMOKwQ==; 25:B64OI3BFrAlp8VHQYhO0OiNhoeZTVNKcOCWEvK4Rn92e7JjrILRjXz4jqVqqdi3vgKakr2Ska1d7LTLCeBBWl9v6zJIpXdjebIi8/+A7WkrGdjbXzLGhzAEzgghgyLD2bQ3i1AcSc1776Hb7NtNSbC9xVX8+9QjS5zhCJmlsdRPhBvd0b1eJHtNx4WZ5AGawoXzKihOfIEi8wgbmv5c1xQPo4tN894FFC9OPEuGvRDOdqHT2GBXFyO0j0RL6ta9BDUuQ4EUpS2TIu+yn5jig4Z+J5CerzTMCtRR+gh119WofnlDhcZENqwvBDan0ty0JaVc0POTYbhCzoN6qs1NY+36j5zHikjX4GzucPwa+HMIyIAUXngDuV/usk9n8jspns73LLEWUN86cpU7EVcaGYspCkUIzsVYW+NEa4hMpZEQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 31:uBPJgO89Y2yEiY8DkxwAMq7NsUtPeKRxnf3nEMRIV1wMcFFKkypPE3gZZtHtM7ugsYjz05MCTa4lTAb/ZUJxbOR8AtcwPv4+8bMIbPkWZ7ulV8B/Cr4RCtFMISSwBr8gj2QdeCkRFQbMOVjGPVAu7nixtNfUp+P81V3hZjF5pKyTFEpFRqvDX5U/Jupoj2+kPP8wGCvn0kvZ3Y+q71vNI1p+KAd8RgHNjgHwCeLO+v7h1h4yHOdGjkYboZQfNiVRtVirUMXyqQdi7YnEo7fpQw==; 20:gMPtQILfRdhItsYzXOmqQBCM/Vx321GM14gnayl/pmlPB38n6ApqSXy5wg5pe1w3eoLt51kmspBC9Z9GhwM6j574UDCMO9SyieeYGjAeb5nXzTSbHMo4Yjmss1GvMkKPTyC9sR821F1+tyScMjrhOT3cZACS46i0DF75mHzaTos5OMNIDBAFzuiP1cwHYq80YLtd/x6puKBNfNLru/sVh92kGRs70CN/MQ+w4boX5/6gyruxl/ScbC3obJwJLrQqYoVdUmG5h2TYeY+b1T6BJGEOTR6GJdecgAdwPS6QCKRMzLfMUocj2qlTZenuq+MSIeF543QWQtwoy5JnWZVHGYGKHDLAkzIVSqJOFZ5/X6r/P3/PVaCEwxpWXIOCuxR1C0V07iLaHuRlGFYbixCESLsYx2qcsITDrORgPEzRaox2tbH7OqRz1abWb9j5bGV90HvGKecz/TpxAp2iL9Cw9NIxYGi3xJOdNh5gsacLvSdUGR8qwPJYzfJNB1RXcY9N3uxiG42GUEMBz6NYmkiGIf9VaaQqk2MI5XeJpdiTLUlkKzroWl01A9TBORLpA78ua4/5NF5ygF/CFMb2xx8pPLqgqYVQLIe3+DzQQHTIqA8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:SN1PR07MB2253; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2253; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 4:eMBW9gE5UbSf9VAlweppRBdUwQ/YXD0YwApea+K3hXiOo3GMhxRmPRLm7VKd5KGBu0msdWG+TXGc6nLAksX6nBs8SwWgL9J894qpix7ek1bTD1YXhkSxLtgW2vRHznpCGfLmOc6ZXC3QTYCwyF8PjR8Atu1JnUv61/9oPEsNc3bB4oT2YtHnqHj8w3d1yfuljOj7f+6NDrQ2lHbkCc7TMaDPVSWUnYGkApFfu+nqroDYZFU90qGCLAg8v5vXZmSk/ieVTQSGQfhdx+vD6hO36gjIo+Zo9xRAopB6zpRsaeakmZ6UH5U1RVgMNGIJwkisyQoCCeYmSBP7NnGoj1lhEwLirY3/Ys3UET6yfXOLMqTMHlgVrzTey6RsQxgKxrZNOCmaGO12Snu4R2hxt5TO3WCIE2Y3/witakbPcIGNilZMP5SekuZStA0+DuYhnVf/BY2ZAeHNp6CbNPlJafQXli19RErxs22NB8byDLrFOpgpUmmP19ShAjwcerpddZ/H X-Forefront-PRVS: 01026E1310 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(50466002)(105586002)(6116002)(5660300001)(33646002)(586003)(3846002)(47776003)(81166006)(92566002)(81156014)(15975445007)(97736004)(2950100002)(7736002)(5001770100001)(305945005)(6666003)(2906002)(4326007)(8676002)(36756003)(19580395003)(77096005)(7846002)(5003940100001)(7416002)(66066001)(229853001)(50986999)(189998001)(42186005)(101416001)(19580405001)(2201001)(68736007)(48376002)(76506005)(106356001)(76176999)(50226002)(2004002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2253; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR07MB2253; 23:S7nKU2mlgdrHid6HlK/PF145gVH+M8jujWNiF/3sy?= =?us-ascii?Q?5uZ1arKQwITuLpDLI20hk6hmmHU1DbJIa8NaH1sXbRi8cgx6Xz6Oz3+Eofyo?= =?us-ascii?Q?FoayjuyhYWsRB1iTNC+c+QxyqFJXrtnuQSjjYRKPgoRTJZPSmJor7sE1h3/F?= =?us-ascii?Q?BXfGpHbKk36gONpHXYXDtS+bns2O2Fr668IRg8t0V536wCeXRKLgv0gvejXN?= =?us-ascii?Q?Q01uHvp7Lp2CBLGPvHvJWdKP+ExAUw0Ff0774u3OdenXbDyB/dWWThnnOLEG?= =?us-ascii?Q?I02smrhCcx4LHJbGM7imqHyAo0UyFKjahyWX0u375fVo6xNOkWJRVEsg/vtO?= =?us-ascii?Q?YSwPbdu7YqYS0pxUybZT/gjVrfExUhiyKfkdHHusQVJV60p5R0KWgX/OGDry?= =?us-ascii?Q?VdHxgZA9Grp1eDrD2i/bRdAFUb1ozXqrJH/btvDfRHjlTSwEi7BAz1BgoSRI?= =?us-ascii?Q?IXluduEuNRu8NZTMcn7PYfI5oD3Egmw5Dvs9pVp2Ogqtd+qRQAPaGhNvesM7?= =?us-ascii?Q?CwNnzdCbVZC0K5JcCD0fecktuJM7grpbibTA9sJ7MOlMhLi/gl7L/MoXVw6N?= =?us-ascii?Q?JAvxng2+up5+T5QiJYkXrs+n8aBSPTpq0J1IMBYXQAA5VzKsQlqDi6ERACx0?= =?us-ascii?Q?H2X/F6J7YErLZglV3tbFQh1R/a1/P73+n5Rd6Eis49eHYaY2yKNUTXPSeV7p?= =?us-ascii?Q?uBDegt2HIRz6CMtB6NT2JzsH+eLRo4f3V/Qpvw+/o/sCzmIKibWmTcjPtzK1?= =?us-ascii?Q?ujHC3rnbBUmmFKLxVel7DToyB/+xgeUdUDMpDX1SL3LoVgTRbCe1sSnfhdRx?= =?us-ascii?Q?NyETfadtQk6cugv3XACUO0rMSA+Uq5YeuwAig2mTy4BWd5Iw0AmbQTYlavFB?= =?us-ascii?Q?zu9g7MagI3gpoLtlsA6B4XMwJM/ZDc5RZJvcFqiOsqnmzdTm66PS6le8Dc0Q?= =?us-ascii?Q?B7reVf+COrtT+4SovV9yCqwXLQa84vabzXCfVWV7wJrG59aBIg+xr+WV2BGx?= =?us-ascii?Q?mESFK5wF/Xrl0Uzi6x3aY/kLBlYCIRzYpSCZ0PkCvW6r0V+jq7IuvRZma4Jh?= =?us-ascii?Q?wuQGVTsS40Jatg8tIQ86L8qE2i8dhyEjtrnYbt5L3SVh9rLkC6EOgE9wHXL2?= =?us-ascii?Q?e0IH93Xg1MReCQC/dF1ZPgpgJfcmCMxttCyyF+2QaX8O7LCtuqtHadcX7gQG?= =?us-ascii?Q?3Z528TP4lh7I888I8Lq4nq3IXbXNn1KJfNaOIMp9FlyYquP5+M1VIjK/w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2253; 6:S4YbSvuLkAgHDc4EL9j+Dq7/6y5n01xcucNPBjfF+6YB0xNQ6nH/xcdMNuaIbT4RYY0aOTyKL0OBjs/GvsA4ORSi1HDaKZ0hiXc+bh5rkwqVsU3Ea+4Kt2RVL2lU8m2h4Hrglj5O5IPeGvyudzEk4TDGLN4v2WcBhsMxpOrCN7DLPSF4Vm1s82OeHD3UyiFTqs0Qn/pTQnHvc76RhmAo3sB3E4XHvYYfde7xGa8WwNQvmn77YLKTwOUuhVYuwN1v/A7UsTTbsGvSVLk8HFKQeyuX/Jy5AEy9bT2RHwzYDY26eH6Pfi4DVuNIHpj/+kWQ; 5:pfzoLxvXO5skLJ9buSBQ7z805avBBcd1cXu1c6c8c9K5fu9HdiyGJe1OsZmiJxHgK+id8ryiFAeIk/ePtbF6N2yVIaf4t9JGbr2VBW4GG03qHCiRaIvBpH2KRHYNFRlfut5TK7RiuDLwNER/X0q7ANklWo9Nweqse6Z+srzedRM=; 24:9Tn2to7v2nzhCc5geQoOrmJrNOdltnJiIC/DVnFtZhgES+s/ZExcuKZ3ONczmSzNBTLy2IycPfOyywbBerMfldUYN2/CkoH2pGq244NJ8os=; 7:eq/BXcdrNdvP+uphHT/X1EtXNdVDDDNEFgEfrQH17cbmP6ECwXM3b7X2xOrmSXAIGX6RZ5OYgEdp0hZ9hUD8NWspTeeCcQVudwUTa8OY9JFE07+tmQ61s6jAjzUZjrejXOlP3/zpIC2Dy2gqvDJccd9RFU60MUl1xTX/bYrjEzGbCenlu/9XFxEwBprLUM9YzGaqYrDRrVW9mEXVQ1yCIVKg9fVf35+Nz5YI0mogDuw51FdHhwsxhW+W/K6Eq+IUxgEJQjxJ+xhTfElWjHHrfcRwonElBzvoBiSaIvo4tKOhxq3JAMzXxdWJJ4ZtTD7JpieoWE2geh4cJjOiR/lKAwzI6u3IFJ5DVReyNxT47z8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2016 20:36:41.0565 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2253 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161021_133705_251556_6E2E7236 X-CRM114-Status: GOOD ( 12.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: szabolcs.nagy@arm.com, heiko.carstens@de.ibm.com, cmetcalf@ezchip.com, ynorov@caviumnetworks.com, philipp.tomsich@theobroma-systems.com, joseph@codesourcery.com, zhouchengming1@huawei.com, Prasun.Kapoor@caviumnetworks.com, agraf@suse.de, geert@linux-m68k.org, kilobyte@angband.pl, manuel.montezelo@gmail.com, pinskia@gmail.com, linyongting@huawei.com, klimov.linux@gmail.com, broonie@kernel.org, bamvor.zhangjian@huawei.com, Bamvor Zhang Jian , maxim.kuvyrkov@linaro.org, Nathan_Lynch@mentor.com, schwidefsky@de.ibm.com, davem@davemloft.net, christoph.muellner@theobroma-systems.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 move 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 Zhang Jian --- 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 | 66 ++++++++++++++++--- arch/arm64/kernel/vdso/gettimeofday.S | 20 +++++- arch/arm64/kernel/vdso/vdso.S | 6 +- 11 files changed, 306 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 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 af400fb..43e680a 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -55,6 +55,17 @@ 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 + +# 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 d8d7086..8f844b9 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -119,6 +119,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 1b130f4..72f68f0 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..3b564ca --- /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.9 { + 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 7f822cd..3f884e1 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,20 +133,26 @@ 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; - 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 *), @@ -144,14 +165,30 @@ static int __init vdso_init(void) /* Grab the vDSO code pages. */ for (i = 0; i < vdso_pages; i++) - vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(&vdso_start)) + i); + vdso_pagelist[i + 1] = + pfn_to_page(PHYS_PFN(__pa(vdso_start)) + i); vdso_spec[0].pages = &vdso_pagelist[0]; vdso_spec[1].pages = &vdso_pagelist[1]; 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) @@ -159,8 +196,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