From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964855AbcDEWNx (ORCPT ); Tue, 5 Apr 2016 18:13:53 -0400 Received: from mail-bn1on0066.outbound.protection.outlook.com ([157.56.110.66]:31104 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964806AbcDEWNT (ORCPT ); Tue, 5 Apr 2016 18:13:19 -0400 Authentication-Results: arndb.de; dkim=none (message not signed) header.d=none;arndb.de; dmarc=none action=none header.from=caviumnetworks.com; From: Yury Norov To: , , , CC: , , , , , , , , , , , , , , , , Philipp Tomsich Subject: [PATCH 24/25] arm64:ilp32: add vdso-ilp32 and use for signal return Date: Wed, 6 Apr 2016 01:08:46 +0300 Message-ID: <1459894127-17698-25-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459894127-17698-1-git-send-email-ynorov@caviumnetworks.com> References: <1459894127-17698-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [95.143.213.121] X-ClientProxiedBy: AM2PR03CA0007.eurprd03.prod.outlook.com (10.160.207.17) To CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) X-MS-Office365-Filtering-Correlation-Id: 4bb42e3a-ded6-43be-5d88-08d35d9f7b93 X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;2:TylLWToCDMIuBnnz/GQjZIAsR5PMjMzepgXEhBy2cM+prIy79BVyzwBaZz7VuttHegRpeRGOHns5iZPy/duufTy4axZa331oxY1yPuzYRfgL5rudjtDHScx0jBWFxmZs108fS3TVIFx5lcQ310bi5eQo20UlVJvVt21GkeM2XgV4ljAzb7qB7XJoUSyylH8T;3:H5B87+JtmTHf2iB9sd2Ktcd0g0nEzuB0V71lMPQs3t112U1bnSSQb+Zov/E4l3hCp1gktPL4aVeLRWo/KfP9whYmAziB9BTKAAJ0ymeYz6wEzIum9cZmT+V+QkeSmm/i;25:Z7uvj0PkQw8/72MYxYyZYs976wpF3IlxsTMjvb/yWePJQhHYZDGujmMNdZbJQy65nnR7TAFFMINRfn1jEXL0m7OOI3mwLCVRd+yzRxi/r5HzoQdQL/x6nsh0CL4cqcu8j4hLxK8M8UQwsKHTl2iRDhabaBON2rWdH1YOwLjModWzvvEaHXrgYf6pp3XByh5PdWfvqq0HNzJOZAFwXGyISEcfV2Xx35e41WJglK19XOyyHGRbhuaC14Pz1+cAWAFMEu1r2YR1/zeCPCgUHEsIdWol4dRnP2vV1+l7ajP4fHQCkoDpYRM0hPja2X/BtlqtvE4uifd2ei6DFAN0mO1prwGeH7n3ALO2kujIjWiNERc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;20:NKLrl3BS4BxqXXBXzOKXgLxui/r0UedS6jUJup9NmWmBzjdtM2tfFRjJSAUnJp2FXhbeKXkIWZ5hZ63N4DeTE+W/82+IH9VY2isvELwLPF0Ki8NfjBwQ4BBmNMNNXQ0nvEB8YlY065EqYCJn+VBAgBnqQywJhgvlD+m8z3tPiM9RPmFPq/gM16jsFWzLpMG8NOLzypzLKafGpP4dFZas1Y1THH3iJKb+M7TXhnrdUCniCx0ic1YEmQCN/w4TgGFGkFYLa8OEoaelrH3Y+alrOOM9p2GB1BIw9YjijQlynpz+hM0fdvDdmhQMTv32LaejCgSyr3Q+mOxZXIXGuzZFZzZTEyvK7/nYpWFcZ9gOtl4DzEYnzJsq7gpciwpCOwvYVZDx31gt1fmsYZlWu/WNzBflrpgNXAb0zGF6WIhssTf56fOOVf2oKWsvZ2XL7al2tg0R65oJlnNqshRIXjheld2dHPMTSvdBr7/IEYURbuMzWAatjqLZGa1DSdPOxzgVtct6MYR21f1xyfFSIQemaGi24BvXgvwdG62hUEGljg4mqyqpSN6G2ezFkm75ifVrHmik+aJo7WWUVNAo6OV9sk8cm1N5pIPuiSmfUXvUmeI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046);SRVR:CO2PR07MB619;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;4:dpkyk+0oFWBC0OMojUJ1FiFoYh2tEN+ZfSCDD5mRuYRXZ/39hB/jzP6GvV7wl5VF0Dx9GKf6+OX/41YLYmbjTE+M5JCCQ2VO4YGThzSYi/Be64/9GG9oGPz0Z2NrgtiUUZ4V9xzTu07VDEQLVrQo3FCFaJe1CdSDN4zrNRZlaPEeyOqh5/vs6c2biNcf7cGNiVUPrJLMuSo2RTMQGs+mQ99yTUcfY6eRDH/pRfj6pFTZ2w0zUJ6ZsiD1IeZDBpPvMzXXCgzqi1E8LnrqPL6RuqMF1r2mefg7I6nkCAUGxLcxJRNkMZ3QZ++1R4qSDaCEhxAWLoUyOjfU7ZTefk8HX6cAdxEbpVHZ2iRYqT3QrwwRBXNjS1yVdZj8nAyklT/3 X-Forefront-PRVS: 0903DD1D85 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(4326007)(15975445007)(586003)(5001770100001)(1096002)(50986999)(2950100001)(76176999)(5008740100001)(2201001)(2906002)(6116002)(77096005)(229853001)(3846002)(5004730100002)(33646002)(5003940100001)(36756003)(48376002)(42186005)(189998001)(81166005)(76506005)(66066001)(47776003)(50226001)(50466002)(19580405001)(19580395003)(92566002)(2004002)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:CO2PR07MB619;H:localhost;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO2PR07MB619;23:8RmnwXF8M5/UAWBIzEdDDVrrHJ9SXPQTk6+PY7TR7F?= =?us-ascii?Q?utCfaltk9gWzyHt8waHdGNB26aVbRvrrv73wzfQ24VycJr+Yz7c+FT0FRh0l?= =?us-ascii?Q?ToaB7D6FoBi7aHaRKsnj0zSE46kRIndzrhuBOFuYj0zEDXFxbYNhEPc+VZGu?= =?us-ascii?Q?Xg6Vm/V0YbMD+xdvGOZBq8LdIARi6vJli6HYaNptCWPebtNq54uQJqdedcmr?= =?us-ascii?Q?PAleJHSCbhjEBCwy2d4oszY7SucJvINuDuf1fJznYdG3pH3jnsOd63q1awNb?= =?us-ascii?Q?mxspIpTddftvrcYmLQIPHdqHoJIRUwDFxN4m0A/nETUdGUMQoMCndW9Rhk6/?= =?us-ascii?Q?P3M2Cj+w8407V03TV3zg/6gn1eyTvo16yI/RqZ1wsh+p4VqHW2YcIRqHXOAi?= =?us-ascii?Q?PbXhAOQZVX45Ig4SGE3/DL+nsraWZULyfGxJ4Ym7e9rR4F0pdhqv/mYhs825?= =?us-ascii?Q?bCfPwZQTbW3mkQvNb/ijIBFBDyzHDUbCpONao2MFtrNYu8D4NDWPiti9ulLf?= =?us-ascii?Q?6x0oWbDghpdAERqaCZT4bTe2+hn+T1ugADh6GJ9UhxXR0iWuxukgPLlRh7yI?= =?us-ascii?Q?tAIyoFHvRWJHj4Zek4YCu9VC7ugQwZDJONblbUE3Rdney0gdeqbmQgO0xaW0?= =?us-ascii?Q?S0KymQb2BJ62ujS2FqjpvxboXXH6k1n2nArE8YK25Iixoxa2Tdw+A/5qbW+E?= =?us-ascii?Q?3/dOTUW5jD4oOfvSsqYi7jmTvTHSP+Eyrhe5bHkxrEd0S51DmG5sT86az/uy?= =?us-ascii?Q?CKplFx4ooXrxzAbmorHIm+uF53GjJPZz9xJq22U38KkOBKR1GCjNWnW1cTcu?= =?us-ascii?Q?nf/wEiD7ggDC29f89n7ecdmZ+Il4w9PQz8J9RY51k63O+pwreIeKBy0TEKVh?= =?us-ascii?Q?Ohe6HKdYYsXBqJy6pAzGjv1nm6Yau/3w9NDNunIc675eR4S+Rhb3O/bmluAE?= =?us-ascii?Q?mS6H39qIGkxXqCzvGdiKtPTVl1FmUONEKNursnO3NkzyKw+OKhwgr0KVdgTb?= =?us-ascii?Q?w=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB619;5:VERQ7HcBolWZSyxveVnrq94JUTFSJoQphZQ/Xmdpa/XSXBW/ZiwyTyRDH7dK7mAMFWwp/SZchW9Ny+fB78nc5lq1wnS5KW8cGV3topbwsDSsfi1c5XgxenhRcBI7iC80tJs+pylD9f4Zel0P1liHKQ==;24:HjtUT3yYe45r/+i/gapfEqXBC+cDFAnszM0wyVlbjOlms+MV1ddFlPBHve8iNzNXBAvdSD3oT7IIiazEY1c1XKIG/qYLz+QSVJo36VWMFMw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2016 22:13:13.9122 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB619 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 | 5 ++ arch/arm64/kernel/signal.c | 2 + arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 72 ++++++++++++++++++++ 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 ++++++++++++++--- 8 files changed, 266 insertions(+), 10 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 09e4373..b43ff12 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -50,6 +50,7 @@ arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.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 @@ -57,3 +58,7 @@ 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 + +# 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 diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 45bcd96..933cdcf 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -264,6 +264,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..c8f5472 --- /dev/null +++ b/arch/arm64/kernel/vdso-ilp32/Makefile @@ -0,0 +1,72 @@ +# +# 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) + +$(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..ddc63fd --- /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_2.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 26352a6..521a8e4 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. */ @@ -109,24 +115,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; @@ -135,7 +146,7 @@ static int __init vdso_init(void) /* Grab the vDSO code pages. */ for (i = 0; i < vdso_pages; i++) - vdso_pagelist[i + 1] = virt_to_page(&vdso_start + i * PAGE_SIZE); + vdso_pagelist[i + 1] = virt_to_page(vdso_start + i * PAGE_SIZE); /* Populate the special mapping structures */ vdso_spec[0] = (struct vm_special_mapping) { @@ -150,16 +161,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; @@ -171,7 +212,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; @@ -180,7 +221,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; -- 2.5.0