From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422663AbcFQX4F (ORCPT ); Fri, 17 Jun 2016 19:56:05 -0400 Received: from mail-bn1bon0097.outbound.protection.outlook.com ([157.56.111.97]:28192 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753222AbcFQXz6 (ORCPT ); Fri, 17 Jun 2016 19:55:58 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH 18/19] arm64:ilp32: add vdso-ilp32 and use for signal return Date: Sat, 18 Jun 2016 02:54:27 +0300 Message-ID: <1466207668-10549-19-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466207668-10549-1-git-send-email-ynorov@caviumnetworks.com> References: <1466207668-10549-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [50.233.148.158] X-ClientProxiedBy: BLUPR18CA0032.namprd18.prod.outlook.com (10.162.230.42) To SN1PR07MB2254.namprd07.prod.outlook.com (10.164.47.148) X-MS-Office365-Filtering-Correlation-Id: 59614d0c-a869-4a88-d4bc-08d3970aebdb X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;2:rUNW8/K6Nf5Vury9LU7WVvoshrwMfkEhGxHjKksUvIYiOgSZueE6c8RGs6Xt6NvNWDv2D2An2h9WBOmw1i6HI286nkd4HcLryNSOg7sLs+2HHN7Ne9LtiDbpyn/va0higL7KMmCZnLevEnsQroOHqS+qKKX+MHPybAek5ji0GucwDx5bwpNZ8tEQX1Ny7ooH;3:dvnxKtQvsu9sX2TCwgPlRKji2y9eEJSCOX9XhXXt2Q/Tx9/6/xREuawAefP1clmZ5HyIem5UheRHD3pyYRmIk99tf/iibZsl7VnWH1vcQIe91hIV+es8oCTfQOHIOTKZ;25:4ApP89iNKdFmVIWGl5GhKMVZ1AJeRBuEVdd+C/LO7XHwdnFsLhDF6Wh3Hr36LWc1ytx2dLOB6YV5lNb/ViEbsMgqeNe1wS52dQszwQw6BLxPG4S4sYGZnAvCVJ4wIA6YcvoZFDlU1zwogFsY2mGqKDuE76zLSc8x4ZMX9RqZbrAv4cRH0uHPTxIegwfHglt41SDKBtBMtSWD1Yo+DvWLXFpSf0kMM+7I7pvbxHqNZsUxkLGfepiqq+dM1xRogphFbCDRLfAEw4PMAXxtuS61MQ1uXN5m5VfJLiDuZ/BXkYfLnz5thG4dLLSe8BkvdG2rVgx89IgUXchPr3GkqcO+h1ok1h8WQAUrjRuypivAER45VaOpRfpJY/KiDM1FIMrxg4wOqb0C2wspsbhBLQPhTBTrdjKiBKeq/6FfEu95ZGk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;20:zloLf1/NngYeJLRjBWhBHFCQ//Ub2rby11fu5ELvYsFOwD9XOxXf+6jHrzX/b8+vtyxAeUkokGoIaJUtTjVP2oFFQKAWF2iZ2uu3u4rYuS+RsBc89rc+VS3lpeMFqO5HPFJX1Ee+S/YzJU6j56RL17ajlMTlFAakRzvRel7etmoFVVATD8g1+1hecqKQZ/11JwM4SIPAENz57nADaibS1NvC8djbBm2uXevvBrQnepi4OBwaxLH/JVvYaSvaCpjcq5A8HQSKAJtK24YxkGDTEy5Ex29PWRnMnV9bO9XAytSZzpNTCWGKMoGOPI4T8yc5n/Jm3lnbDuiqyDp/3l2q9iJKL7Sn5ucc3781rxqbo5Kj4lMG9OvxKLJQg79tcVAd4mqntcBVvyKEOBEVaxm2jg5MRzFXrZYnwHZyinoqWRW18LxQqrNu9l8dDaQZFbKwq6445lpl82lNIUDNcP735/Jl81YAvzyu/zor4oGZhNZUYQznvH/73uD5yuNhEVj58eWxpzKBTVfucTydLAm4KkBP0ooIpX9icuEaAorOGobw01++p5kW0okz6EvrInpo3fJKxjItxgoaV+nfvB1xRdjBSjGQTLFcoIr7eHCBo2I= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(180628864354917)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:SN1PR07MB2254;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2254; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;4:AACkCDu6UjdugDICnEdua4BiIUdvBpWI8DeVnfFaKzQVJdUZQtBg4nh4TYaeyf8eKblWOvr5EiRdUlu1e/OGc6uU1g7BPt8k5x+w4vavGcRf+s7Jt3smJzTSZx+H3ZV3ekOoyg+y21EFcTWh0dpj/3qtjpGrBRgsLzl5CXaJPEmgvL1Gs0g8gBCX0nOiwwmkdnrEZWrBdBlWxBJ+XRrauBq1ty2ZrNi3X1uCCi4JB6dSX0G5gD3jm0QuqWfZ/0icIVvziNvPNp0x4MPQvn45yi9xUXd2oOavlb8MogMh98xAzEOnEAdubyeqkMeNnFsjzWWJ8Pcb02ibf8mIydzHYMG5YrbSnrx9vKgTSL053ps0lrZduR1EVGg7nYPl++ekyjfUuz7HBK1hCczVQbCD09ZSN7s+PemLFutq8k+eEWl+JbYWhMVIUGjMn5E+Lrm6x2DsTGWBl0hZTJUGkT997JFndFBSJse/iSCfDdIU3kI= X-Forefront-PRVS: 09760A0505 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(229853001)(66066001)(5004730100002)(2950100001)(575784001)(92566002)(3846002)(586003)(6116002)(50986999)(2201001)(68736007)(76176999)(50466002)(5003940100001)(50226002)(76506005)(48376002)(2906002)(189998001)(7846002)(42186005)(106356001)(5001770100001)(97736004)(15975445007)(105586002)(19580405001)(19580395003)(47776003)(36756003)(33646002)(101416001)(4326007)(77096005)(81156014)(81166006)(8676002)(2004002)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR07MB2254;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;CAT:NONE;LANG:en;CAT:NONE; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR07MB2254;23:9mKLuax+MmdXMI+OR9a06CZd46/zVV4IQBrm1bMEq?= =?us-ascii?Q?qBJwNL5H/0yk9TKE6LOAarspgPVefGWKBxi4JT6TzSLJDglWK8yopj/fgVD6?= =?us-ascii?Q?5bN+xY2SLv3S6zU1n7i9br9F5CAxFvTQoQnsYZyTwMmkf79SCIF8q4G64ahe?= =?us-ascii?Q?1Rjc3ZJPHTpXfkJhxro7byMYt9S4CDe3TQpHaGiOF3a4m0LUt+htmS49v1Fb?= =?us-ascii?Q?5JM6ztlZo4rng/21ePu4KUPjp6XLfJnGjU1OkUI6Ze10dGRXFGncMY9maEIt?= =?us-ascii?Q?O5vS1ZNSNWHKOc2MMWwO4nlK070SLcPm8nW9Gh1lXwyqMaJX17ve9QKlxSf5?= =?us-ascii?Q?4Dt13gsNMlMZCbsw18WTC6CLrFxWyZ7tU4gh/chQR1RGdhNX/Qd+OhIBQIfI?= =?us-ascii?Q?edrKloM40eYhYAO6CqCvhMj9OVifZTh3v2gHGP0xcqQBwIpi/yYEWC5UEIo1?= =?us-ascii?Q?5abrqvcQ8o4eR1KM07tf6CVKVw+vFahlKpA84iVh94+dkPRzpOlUCUuR/mvE?= =?us-ascii?Q?mKs5G22TDYFA0iPBJ2RfDrJnvJsyKVSOw6Cdi0mjoTtW8ugVy9+Hptvt9HSV?= =?us-ascii?Q?0SC4UXeNFBi+YaLsF1wognElD/mYhnbqfLsCs7+xi1Lg5buiWBoDS58PWJ8Q?= =?us-ascii?Q?nKcg44gpWTyafgVOgpK6DKtmahG2ipTJwG5HjxP6083dBuWhyOxNsCyOc09H?= =?us-ascii?Q?YQ26Wd8qdPe1fLsB9RNJ0O0qmukJZKx/lPKZZ+gT1Z887kf6UahHY5pK7Gqw?= =?us-ascii?Q?9uIJnFce5kyv3tXZdP3oF9cZmt4TzKDbTP3NSAAVZtLHnlhS8eQbgBKgJ6Ym?= =?us-ascii?Q?fmnY6QHcCs4AcrQb+74ZsmdPy8duVTWj/l/oKAM3Frwai/Jc03n0ACkx2W9z?= =?us-ascii?Q?K8ba9HsjzVS6rMjy31YERTntla9UVISwiIK8wGI+7wyg7DHbJVg64Dfyq/SQ?= =?us-ascii?Q?ExZaIoKanxa7t7n6C/R1XyBypUCwiRiUmL17pJhDwGqrMXRFQ4RBXcZzN0/6?= =?us-ascii?Q?OVEcYpT+7lNUVl+9X0N6swI/OLC9qSyDFvNs2GLkfFgNrCK0LIKE35lL1kmj?= =?us-ascii?Q?14XORLHthwTqv337fY1vljm9WaXX1V26tSJ5gIIbJvOPSupAHyddTcVwfdKp?= =?us-ascii?Q?KMzuZQAHaQGjF8lrcdq/iHOAZsWmPp+63eVf4fudShQHw5g0kcXnSyaZi8jW?= =?us-ascii?Q?Z/zJvQULXaSBrU=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2254;6:71+/SthEn6/CUPuVQg3vDTiBRd6yXQnFwOC2FcT39kFd3NP9D0dNHwK3EZ7l/TBlEK71bgEbD3hwPOJoXabH0jcQg7aPOrF2m1MmjovBWmWk3iNbmRgl2isq17ia29ey/i0oQYD/9i0kDULi/b2ynz/j0ouwOzhgeDYR6YStXCRKewhj+MOsAu3dtfUgWwSs0iPOO3wkGHDwe3KOEqhCsDtDru3pXjkg9/8RINdxrufOr6Ey/anQF+vV0o1XPsGPGpbhKVL2gG3DalpoK0m57qZJLgysffbUP8wOw81Xr7Q=;5:HuZgComEiZLCUxyVNV8Pe0ZdYtAzqsuI+miSQAxX0Xq4yzpMhHD1LUKmjd8zpJ5HdTZVZ+pL9b34wgpUvn6DgeZzCTnYS00NuiPiwCcuzi3vTq3AWvHhtuJD6+5t0BOgbFnRQdJkQ5jaT/6EZ0fMWw==;24:+to0BgxRthKvJKUShmbSpJ9ChUMtQ415vCoN1jKtVeWV0Bb1epx10DDwks58MxjxzPkDJ5ZtTqIlAhGcnh6jbB2nA6bNgl4EZ2j8cMRZy6A=;7:3c1OJNNoAIUCBiT6W/nam7Kn6AWNZm2Z8y/P/n3Iyoi+K1kMtFdKg90AebMYSBmiRVTiUZurJ01B1Bz4mYHeePsaBG4T+pyCqRVWPSCa4bOep8ldAEa+msOTC3FGn3rdEiGNUIiUMb84i6Y0nC8ZZRPkfBoYaxrrYvWaB1Piqv6YYDMtpFJo4xNMTPi5JlZ/z8Hv6QBVKwFo+ulx0BSfkw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2016 23:55:54.8933 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2254 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 601255ae3c98fdeeee3a8bb4696425e4f868b4f1 Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov --- arch/arm64/include/asm/vdso.h | 6 ++ arch/arm64/kernel/Makefile | 7 ++ 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 | 61 ++++++++++++++--- arch/arm64/kernel/vdso/gettimeofday.S | 20 +++++- 10 files changed, 294 insertions(+), 13 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 ae8aacb..15fc0b2 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -51,6 +51,7 @@ arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o obj-y += $(arm64-obj-y) vdso/ +obj-$(CONFIG_ARM64_ILP32) += vdso-ilp32/ obj-m += $(arm64-obj-m) head-y := head.o extra-y += $(head-y) vmlinux.lds @@ -58,3 +59,9 @@ 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 06090db..0eb55fe 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -102,6 +102,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 241bfeb..7142b12 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..1dde31f --- /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.6 { + 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 2a0de6f..e48ea34 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -40,6 +40,12 @@ extern char vdso_start, vdso_end; static unsigned long vdso_pages; static struct page **vdso_pagelist; +#ifdef CONFIG_ARM64_ILP32 +extern char vdso_ilp32_start, vdso_ilp32_end; +static unsigned long vdso_ilp32_pages; +static struct page **vdso_ilp32_pagelist; +#endif + /* * The vDSO data page. */ @@ -110,24 +116,29 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) } #endif /* CONFIG_AARCH32_EL0 */ -static struct vm_special_mapping vdso_spec[2]; - -static int __init vdso_init(void) +static int __init vdso_init_common(char *vdso_start, char *vdso_end, + unsigned long *vdso_pagesp, + struct page ***vdso_pagelistp, + 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 *), GFP_KERNEL); + *vdso_pagelistp = vdso_pagelist; if (vdso_pagelist == NULL) return -ENOMEM; @@ -136,7 +147,7 @@ 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); /* Populate the special mapping structures */ vdso_spec[0] = (struct vm_special_mapping) { @@ -151,16 +162,46 @@ static int __init vdso_init(void) return 0; } + +static struct vm_special_mapping vdso_spec[2]; + +static int __init vdso_init(void) +{ + return vdso_init_common(&vdso_start, &vdso_end, + &vdso_pages, &vdso_pagelist, + vdso_spec); +} arch_initcall(vdso_init); +#ifdef CONFIG_ARM64_ILP32 +static struct vm_special_mapping vdso_ilp32_spec[2]; + +static int __init vdso_ilp32_init(void) +{ + return vdso_init_common(&vdso_ilp32_start, &vdso_ilp32_end, + &vdso_ilp32_pages, &vdso_ilp32_pagelist, + vdso_ilp32_spec); +} +arch_initcall(vdso_ilp32_init); +#endif + int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) { struct mm_struct *mm = current->mm; unsigned long vdso_base, vdso_text_len, vdso_mapping_len; void *ret; + unsigned long pages = vdso_pages; + struct vm_special_mapping *spec = vdso_spec; + +#ifdef CONFIG_ARM64_ILP32 + if (is_ilp32_compat_task()) { + pages = vdso_ilp32_pages; + 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; @@ -173,7 +214,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, } ret = _install_special_mapping(mm, vdso_base, PAGE_SIZE, VM_READ|VM_MAYREAD, - &vdso_spec[0]); + &spec[0]); if (IS_ERR(ret)) goto up_fail; @@ -182,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, ret = _install_special_mapping(mm, vdso_base, vdso_text_len, VM_READ|VM_EXEC| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, - &vdso_spec[1]); + &spec[1]); if (IS_ERR(ret)) goto up_fail; diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S index efa79e8..a2d8a70 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 use_syscall .req w7 seqcnt .req w8 @@ -51,6 +61,8 @@ seqcnt .req w8 /* int __kernel_gettimeofday(struct timeval *tv, struct timezone *tz); */ ENTRY(__kernel_gettimeofday) .cfi_startproc + DELOUSE(0) + DELOUSE(1) mov x2, x30 .cfi_register x30, x2 @@ -68,7 +80,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 @@ -88,6 +100,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, #CLOCK_REALTIME ccmp w0, #CLOCK_MONOTONIC, #0x4, ne b.ne 2f @@ -159,7 +172,7 @@ ENTRY(__kernel_clock_gettime) 6: /* Store to the user timespec. */ lsr x11, x11, x12 - stp x10, x11, [x1, #TSPEC_TV_SEC] + stp PTR_REG(10), PTR_REG(11), [x1, #OFFSET(TSPEC_TV_SEC)] mov x0, xzr ret 7: @@ -174,6 +187,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 b.ne 1f @@ -187,7 +201,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 -- 2.7.4