From: Vincenzo Frascino <vincenzo.frascino@arm.com> To: Paul Burton <paul.burton@mips.com>, Thomas Gleixner <tglx@linutronix.de> Cc: "linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>, LAK <linux-arm-kernel@lists.infradead.org>, LKML <linux-kernel@vger.kernel.org>, "linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>, "linux-kselftest@vger.kernel.org" <linux-kselftest@vger.kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Ralf Baechle <ralf@linux-mips.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Mark Salyzyn <salyzyn@android.com>, Peter Collingbourne <pcc@google.com>, Shuah Khan <shuah@kernel.org>, Dmitry Safonov <0x7f454c46@gmail.com>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, Huw Davies <huw@codeweavers.com>, Shijith Thotton <sthotton@marvell.com>, Andre Przywara <andre.przywara@arm.com>, Dmitry Safonov <dima@arista.com>, Andrei Vagin <avagin@openvz.org>, Linus Torvalds <torvalds@linux-foundation.org>, Andy Lutomirski <luto@kernel.org>, Michael Kelley <mikelley@microsoft.com>, Sasha Levin <sashal@kernel.org> Subject: Re: [PATCH v7 00/25] Unify vDSOs across more architectures Date: Tue, 25 Jun 2019 00:16:55 +0100 Message-ID: <3ae7f595-0a15-0584-198e-b32fe3e3ea57@arm.com> (raw) In-Reply-To: <20190624184157.mu6n74a7qqa4z5z5@pburton-laptop> [-- Attachment #1: Type: text/plain, Size: 20347 bytes --] Hi Paul, thank you for your review. On 6/24/19 7:41 PM, Paul Burton wrote: > Hello, > > On Mon, Jun 24, 2019 at 02:34:24AM +0200, Thomas Gleixner wrote: >> I did not merge the ARM and MIPS parts as they lack any form of >> acknowlegment from their maintainers. Please talk to those folks. If they >> ack/review the changes then I can pick them up and they go into 5.3 or they >> have to go in a later cycle. Nevertheless it was well worth the trouble to >> have those conversions done to confirm that the new common library fits a >> bunch of different architectures. > > Apologies for not being more proactive on the MIPS front here; life & > work are extra busy at the moment... But thanks Vincenzo for including > MIPS in the work here. > No problem. > Unfortunately after applying the 3 MIPS patches (19-21) atop the current > tip.git timers/vdso branch at ecf9db3d1f1a ("x86/vdso: Give the > [ph]vclock_page declarations real types") I see build failures for the > o32 compat VDSO, shown below. This is using the gcc 8.1.0 mips-linux > toolchain from here: > > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-mips-linux.tar.xz > > Configuration is 64r6el_defconfig. The following helps remove the > implicit declaration warnings (and eww to including C files via CFLAGS), > but it still doesn't build: > > diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile > index 95df49402a53..aa38049bdb24 100644 > --- a/arch/mips/vdso/Makefile > +++ b/arch/mips/vdso/Makefile > @@ -36,6 +36,8 @@ aflags-vdso := $(ccflags-vdso) \ > > ifneq ($(c-gettimeofday-y),) > CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) > +CFLAGS_vgettimeofday-o32.o = -include $(c-gettimeofday-y) > +CFLAGS_vgettimeofday-n32.o = -include $(c-gettimeofday-y) > endif > > CFLAGS_REMOVE_vgettimeofday.o = -pg > > So the MIPS bits here need more work. > I admit, the one proposed was a nice challenge and it took me a while to understand the differences in between the O32, N32 and N64 binaries and what was causing the reported issue. In the end I concluded that all the errors seen here depend on the fact that I tested my vdso implementation on MIPS32el only (as stated in the cover letter) and that when I tried to compile a 32BIT binary on a 64BIT configuration I did it wrongly for two reasons, for N32 and O32 binaries: - we need to undefine CONFIG_64BIT and define CONFIG_32BIT - we need to define CONFIG_GENERIC_ATOMIC64 I have a fix for this (patch in attachment), but I do not have the hardware to test it. If you could provide some feedback would be appreciated (really want to see MIPS merged with the other archs in 5.3 :) ). > Thanks, > Paul > > CC arch/mips/vdso/vgettimeofday-o32.o > In file included from ./include/linux/bitops.h:19, > from ./include/linux/kernel.h:12, > from ./include/linux/list.h:9, > from ./include/linux/preempt.h:11, > from ./include/linux/spinlock.h:51, > from ./include/linux/seqlock.h:36, > from ./include/linux/time.h:6, > from arch/mips/vdso/vgettimeofday.c:10: > ./arch/mips/include/asm/bitops.h: In function '__fls': > ./arch/mips/include/asm/bitops.h:518:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << 32))) { > ^~ > ./arch/mips/include/asm/bitops.h:520:8: warning: left shift count >= width of type [-Wshift-count-overflow] > word <<= 32; > ^~~ > ./arch/mips/include/asm/bitops.h:523:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << (BITS_PER_LONG-16)))) { > ^~ > ./arch/mips/include/asm/bitops.h:527:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << (BITS_PER_LONG-8)))) { > ^~ > ./arch/mips/include/asm/bitops.h:531:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << (BITS_PER_LONG-4)))) { > ^~ > ./arch/mips/include/asm/bitops.h:535:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << (BITS_PER_LONG-2)))) { > ^~ > ./arch/mips/include/asm/bitops.h:539:21: warning: left shift count >= width of type [-Wshift-count-overflow] > if (!(word & (~0ul << (BITS_PER_LONG-1)))) > ^~ > In file included from ./arch/mips/include/asm/mmiowb.h:5, > from ./include/linux/spinlock.h:60, > from ./include/linux/seqlock.h:36, > from ./include/linux/time.h:6, > from arch/mips/vdso/vgettimeofday.c:10: > ./arch/mips/include/asm/io.h: In function 'phys_to_virt': > ./arch/mips/include/asm/io.h:136:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] > return (void *)(address + PAGE_OFFSET - PHYS_OFFSET); > ^ > In file included from ./include/linux/bitops.h:5, > from ./include/linux/kernel.h:12, > from ./include/linux/list.h:9, > from ./include/linux/preempt.h:11, > from ./include/linux/spinlock.h:51, > from ./include/linux/seqlock.h:36, > from ./include/linux/time.h:6, > from arch/mips/vdso/vgettimeofday.c:10: > ./arch/mips/include/asm/mips-cm.h: In function 'mips_cm_max_vp_width': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:152:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MAJOR GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:156:22: note: in expansion of macro 'CM_GCR_REV_MAJOR' > (((major) << __ffs(CM_GCR_REV_MAJOR)) | \ > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:161:23: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3 CM_ENCODE_REV(8, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:367:28: note: in expansion of macro 'CM_REV_CM3' > if (mips_cm_revision() >= CM_REV_CM3) > ^~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:153:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MINOR GENMASK(7, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:157:22: note: in expansion of macro 'CM_GCR_REV_MINOR' > ((minor) << __ffs(CM_GCR_REV_MINOR))) > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:161:23: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3 CM_ENCODE_REV(8, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:367:28: note: in expansion of macro 'CM_REV_CM3' > if (mips_cm_revision() >= CM_REV_CM3) > ^~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:239:36: note: in expansion of macro 'GENMASK' > #define CM_GCR_SYS_CONFIG2_MAXVPW GENMASK(3, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:368:35: note: in expansion of macro 'CM_GCR_SYS_CONFIG2_MAXVPW' > return read_gcr_sys_config2() & CM_GCR_SYS_CONFIG2_MAXVPW; > ^~~~~~~~~~~~~~~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:293:33: note: in expansion of macro 'GENMASK' > #define CM_GCR_Cx_CONFIG_PVPE GENMASK(9, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:376:32: note: in expansion of macro 'CM_GCR_Cx_CONFIG_PVPE' > cfg = read_gcr_cl_config() & CM_GCR_Cx_CONFIG_PVPE; > ^~~~~~~~~~~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:293:33: note: in expansion of macro 'GENMASK' > #define CM_GCR_Cx_CONFIG_PVPE GENMASK(9, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:377:24: note: in expansion of macro 'CM_GCR_Cx_CONFIG_PVPE' > return (cfg >> __ffs(CM_GCR_Cx_CONFIG_PVPE)) + 1; > ^~~~~~~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h: In function 'mips_cps_numclusters': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:152:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MAJOR GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:156:22: note: in expansion of macro 'CM_GCR_REV_MAJOR' > (((major) << __ffs(CM_GCR_REV_MAJOR)) | \ > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:117:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) > ^~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:153:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MINOR GENMASK(7, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:157:22: note: in expansion of macro 'CM_GCR_REV_MINOR' > ((minor) << __ffs(CM_GCR_REV_MINOR))) > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:117:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) > ^~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:133:37: note: in expansion of macro 'GENMASK' > #define CM_GCR_CONFIG_NUM_CLUSTERS GENMASK(29, 23) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:120:37: note: in expansion of macro 'CM_GCR_CONFIG_NUM_CLUSTERS' > num_clusters = read_gcr_config() & CM_GCR_CONFIG_NUM_CLUSTERS; > ^~~~~~~~~~~~~~~~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:133:37: note: in expansion of macro 'GENMASK' > #define CM_GCR_CONFIG_NUM_CLUSTERS GENMASK(29, 23) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:121:25: note: in expansion of macro 'CM_GCR_CONFIG_NUM_CLUSTERS' > num_clusters >>= __ffs(CM_GCR_CONFIG_NUM_CLUSTERS); > ^~~~~~~~~~~~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h: In function 'mips_cps_cluster_config': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:152:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MAJOR GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:156:22: note: in expansion of macro 'CM_GCR_REV_MAJOR' > (((major) << __ffs(CM_GCR_REV_MAJOR)) | \ > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:137:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) { > ^~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:153:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MINOR GENMASK(7, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:157:22: note: in expansion of macro 'CM_GCR_REV_MINOR' > ((minor) << __ffs(CM_GCR_REV_MINOR))) > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:137:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) { > ^~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h: In function 'mips_cps_numcores': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:135:32: note: in expansion of macro 'GENMASK' > #define CM_GCR_CONFIG_PCORES GENMASK(7, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:172:50: note: in expansion of macro 'CM_GCR_CONFIG_PCORES' > return (mips_cps_cluster_config(cluster) + 1) & CM_GCR_CONFIG_PCORES; > ^~~~~~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h: In function 'mips_cps_numiocu': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:134:33: note: in expansion of macro 'GENMASK' > #define CM_GCR_CONFIG_NUMIOCU GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:189:48: note: in expansion of macro 'CM_GCR_CONFIG_NUMIOCU' > num_iocu = mips_cps_cluster_config(cluster) & CM_GCR_CONFIG_NUMIOCU; > ^~~~~~~~~~~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:134:33: note: in expansion of macro 'GENMASK' > #define CM_GCR_CONFIG_NUMIOCU GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:190:21: note: in expansion of macro 'CM_GCR_CONFIG_NUMIOCU' > num_iocu >>= __ffs(CM_GCR_CONFIG_NUMIOCU); > ^~~~~~~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h: In function 'mips_cps_numvps': > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:152:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MAJOR GENMASK(15, 8) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:156:22: note: in expansion of macro 'CM_GCR_REV_MAJOR' > (((major) << __ffs(CM_GCR_REV_MAJOR)) | \ > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:216:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) { > ^~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:153:28: note: in expansion of macro 'GENMASK' > #define CM_GCR_REV_MINOR GENMASK(7, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cm.h:157:22: note: in expansion of macro 'CM_GCR_REV_MINOR' > ((minor) << __ffs(CM_GCR_REV_MINOR))) > ^~~~~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cm.h:162:25: note: in expansion of macro 'CM_ENCODE_REV' > #define CM_REV_CM3_5 CM_ENCODE_REV(9, 0) > ^~~~~~~~~~~~~ > ./arch/mips/include/asm/mips-cps.h:216:27: note: in expansion of macro 'CM_REV_CM3_5' > if (mips_cm_revision() < CM_REV_CM3_5) { > ^~~~~~~~~~~~ > ./include/linux/bits.h:20:39: warning: right shift count >= width of type [-Wshift-count-overflow] > (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) > ^~ > ./arch/mips/include/asm/mips-cm.h:293:33: note: in expansion of macro 'GENMASK' > #define CM_GCR_Cx_CONFIG_PVPE GENMASK(9, 0) > ^~~~~~~ > ./arch/mips/include/asm/mips-cps.h:233:21: note: in expansion of macro 'CM_GCR_Cx_CONFIG_PVPE' > return (cfg + 1) & CM_GCR_Cx_CONFIG_PVPE; > ^~~~~~~~~~~~~~~~~~~~~ > arch/mips/vdso/vgettimeofday.c: In function '__vdso_clock_gettime': > arch/mips/vdso/vgettimeofday.c:17:9: error: implicit declaration of function '__cvdso_clock_gettime32'; did you mean '__vdso_clock_gettime'? [-Werror=implicit-function-declaration] > return __cvdso_clock_gettime32(clock, ts); > ^~~~~~~~~~~~~~~~~~~~~~~ > __vdso_clock_gettime > arch/mips/vdso/vgettimeofday.c: In function '__vdso_gettimeofday': > arch/mips/vdso/vgettimeofday.c:23:9: error: implicit declaration of function '__cvdso_gettimeofday'; did you mean '__vdso_gettimeofday'? [-Werror=implicit-function-declaration] > return __cvdso_gettimeofday(tv, tz); > ^~~~~~~~~~~~~~~~~~~~ > __vdso_gettimeofday > arch/mips/vdso/vgettimeofday.c: In function '__vdso_clock_getres': > arch/mips/vdso/vgettimeofday.c:29:9: error: implicit declaration of function '__cvdso_clock_getres_time32'; did you mean '__vdso_clock_gettime'? [-Werror=implicit-function-declaration] > return __cvdso_clock_getres_time32(clock_id, res); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > __vdso_clock_gettime > arch/mips/vdso/vgettimeofday.c: In function '__vdso_clock_gettime64': > arch/mips/vdso/vgettimeofday.c:35:9: error: implicit declaration of function '__cvdso_clock_gettime'; did you mean '__vdso_clock_gettime'? [-Werror=implicit-function-declaration] > return __cvdso_clock_gettime(clock, ts); > ^~~~~~~~~~~~~~~~~~~~~ > __vdso_clock_gettime > cc1: some warnings being treated as errors > make[1]: *** [arch/mips/vdso/Makefile:148: arch/mips/vdso/vgettimeofday-o32.o] Error 1 > make: *** [Makefile:1746: arch/mips/vdso/vgettimeofday-o32.o] Error 2 > -- Regards, Vincenzo [-- Attachment #2: 0001-mips-Fix-o32-and-n32-vDSO-compilation.patch --] [-- Type: text/x-patch, Size: 2153 bytes --] From 7bf2f8fe3b412e922f7d6d193763bee94b5b76c5 Mon Sep 17 00:00:00 2001 From: Vincenzo Frascino <vincenzo.frascino@arm.com> Date: Mon, 24 Jun 2019 23:46:57 +0100 Subject: [PATCH] mips: Fix o32 and n32 vDSO compilation The Unified vDSO implementation does not compile correctly for n32 and o32 type of binaries on mips64 because the environment is not set correctly. Restore the correct behaviour addressing the configuration issues for the generation of these types of binaries. [ To be squashed with the "[PATCH v7 19/25] mips: Add support for generic vDSO" ] Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- arch/mips/vdso/Makefile | 6 ++++++ arch/mips/vdso/config-n32-o32-env.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 arch/mips/vdso/config-n32-o32-env.c diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 95df49402a53..47316964150c 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -36,6 +36,12 @@ aflags-vdso := $(ccflags-vdso) \ ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) + +# config-n32-o32-env.c prepares the environment to build a 32bit vDSO +# library on a 64bit kernel. +# Note: Needs to be included before than the generic library. +CFLAGS_vgettimeofday-o32.o = -include config-n32-o32-env.c -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday-n32.o = -include config-n32-o32-env.c -include $(c-gettimeofday-y) endif CFLAGS_REMOVE_vgettimeofday.o = -pg diff --git a/arch/mips/vdso/config-n32-o32-env.c b/arch/mips/vdso/config-n32-o32-env.c new file mode 100644 index 000000000000..da4994b2b3e5 --- /dev/null +++ b/arch/mips/vdso/config-n32-o32-env.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Configuration file for O32 and N32 binaries. + * Note: To be included before lib/vdso/gettimeofday.c + */ +#if defined(CONFIG_MIPS32_O32) || defined(CONFIG_MIPS32_N32) +/* + * In case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel + * configuration. + */ +#undef CONFIG_64BIT + +#define CONFIG_32BIT 1 +#define CONFIG_GENERIC_ATOMIC64 1 + +#endif + -- 2.22.0
next prev parent reply index Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-21 9:52 Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 01/25] kernel: Standardize vdso_datapage Vincenzo Frascino 2019-06-24 13:56 ` Catalin Marinas 2019-06-21 9:52 ` [PATCH v7 02/25] kernel: Define gettimeofday vdso common code Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 03/25] kernel: Unify update_vsyscall implementation Vincenzo Frascino 2019-06-21 10:49 ` Huw Davies 2019-06-21 9:52 ` [PATCH v7 04/25] arm64: Substitute gettimeofday with C implementation Vincenzo Frascino 2019-06-24 13:36 ` Will Deacon 2019-06-24 13:59 ` Vincenzo Frascino 2019-06-25 16:18 ` [PATCH 1/3] lib/vdso: Delay mask application in do_hres() Vincenzo Frascino 2019-06-25 16:18 ` [PATCH 2/3] arm64: Fix __arch_get_hw_counter() implementation Vincenzo Frascino 2019-06-25 16:18 ` [PATCH 3/3] arm64: compat: " Vincenzo Frascino 2019-06-25 17:02 ` [PATCH 1/3] lib/vdso: Delay mask application in do_hres() Thomas Gleixner 2019-06-25 18:27 ` Thomas Gleixner 2019-06-25 20:15 ` Andy Lutomirski 2019-06-25 22:24 ` Thomas Gleixner 2019-06-26 6:38 ` Thomas Gleixner 2019-06-26 9:25 ` Vincenzo Frascino 2019-06-26 10:02 ` lib/vdso: Make delta calculation work correctly Thomas Gleixner 2019-06-26 11:08 ` Vincenzo Frascino 2019-06-24 13:58 ` [PATCH v7 04/25] arm64: Substitute gettimeofday with C implementation Catalin Marinas 2019-06-25 15:33 ` Dave Martin 2019-06-26 13:27 ` Vincenzo Frascino 2019-06-26 16:14 ` Dave Martin 2019-06-26 19:01 ` Vincenzo Frascino 2019-06-27 10:01 ` Dave Martin 2019-06-27 10:57 ` Vincenzo Frascino 2019-06-27 11:27 ` Dave Martin 2019-06-27 11:59 ` Vincenzo Frascino 2019-06-27 14:38 ` Dave Martin 2019-06-27 15:34 ` Vincenzo Frascino 2019-06-25 17:43 ` [PATCH] arm64: vdso: Fix compilation with clang < 8 Vincenzo Frascino 2019-06-26 11:36 ` [PATCH v2] arm64: vdso: Fix compilation with clang older then 8 Vincenzo Frascino [not found] ` <CGME20190628130921eucas1p239935b0771032c331911eacc1a69dd2e@eucas1p2.samsung.com> 2019-06-28 13:09 ` [PATCH v7 04/25] arm64: Substitute gettimeofday with C implementation Marek Szyprowski 2019-06-28 14:32 ` Vincenzo Frascino 2019-06-28 16:50 ` Sylwester Nawrocki 2019-06-29 6:58 ` Vincenzo Frascino 2019-07-08 12:57 ` Sylwester Nawrocki 2019-07-08 13:09 ` Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 05/25] arm64: Build vDSO with -ffixed-x18 Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 06/25] arm64: compat: Add missing syscall numbers Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 07/25] arm64: compat: Expose signal related structures Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 08/25] arm64: compat: Generate asm offsets for signals Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 09/25] lib: vdso: Add compat support Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 10/25] arm64: compat: Add vDSO Vincenzo Frascino 2019-06-24 14:00 ` Catalin Marinas 2019-07-10 4:02 ` John Stultz 2019-07-10 6:12 ` Thomas Gleixner 2019-07-10 9:48 ` Vincenzo Frascino 2019-07-10 8:27 ` Will Deacon 2019-07-10 8:58 ` Thomas Gleixner 2019-07-10 9:12 ` Will Deacon 2019-07-10 9:47 ` Vincenzo Frascino 2019-07-10 13:41 ` Vincenzo Frascino 2019-07-10 13:04 ` [PATCH] arm64: vdso: Fix ABI regression in compat vdso Vincenzo Frascino 2019-07-10 13:25 ` Will Deacon 2019-07-10 13:42 ` Vincenzo Frascino 2019-07-10 14:01 ` [PATCH v2] " Vincenzo Frascino 2019-07-10 15:44 ` John Stultz 2019-07-10 15:53 ` Vincenzo Frascino 2019-07-11 9:45 ` Will Deacon 2019-07-11 10:34 ` Thomas Gleixner 2019-07-11 11:32 ` Will Deacon 2019-06-21 9:52 ` [PATCH v7 11/25] arm64: Refactor vDSO code Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 12/25] arm64: compat: vDSO setup for compat layer Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 13/25] arm64: elf: vDSO code page discovery Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 14/25] arm64: compat: Get sigreturn trampolines from vDSO Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 15/25] arm64: Add vDSO compat support Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 16/25] arm: Add support for generic vDSO Vincenzo Frascino 2019-12-04 13:51 ` [PATCH v7 16/25] arm: Add support for generic vDSO (causing crash) Guenter Roeck 2019-12-04 13:58 ` Vincenzo Frascino 2019-12-04 16:16 ` Guenter Roeck 2019-12-04 17:15 ` Vincenzo Frascino 2019-12-04 19:39 ` Guenter Roeck 2019-12-05 9:42 ` Philippe Mathieu-Daudé 2019-12-05 10:00 ` Vincenzo Frascino 2019-12-05 11:02 ` Arnd Bergmann 2019-12-05 14:56 ` Philippe Mathieu-Daudé 2019-06-21 9:52 ` [PATCH v7 17/25] arm: Add clock_getres entry point Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 18/25] arm: Add clock_gettime64 " Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 19/25] mips: Add support for generic vDSO Vincenzo Frascino 2019-07-26 5:15 ` Paul Burton 2019-07-26 16:29 ` [PATCH 0/2] mips: vdso: Fix Makefile Vincenzo Frascino 2019-07-26 16:29 ` [PATCH 1/2] mips: vdso: Fix source path Vincenzo Frascino 2019-07-26 16:29 ` [PATCH 2/2] mips: vdso: Fix flip/flop vdso building bug Vincenzo Frascino 2019-07-28 22:20 ` [PATCH 0/2] mips: vdso: Fix Makefile Paul Burton 2019-06-21 9:52 ` [PATCH v7 20/25] mips: Add clock_getres entry point Vincenzo Frascino 2019-07-26 5:15 ` Paul Burton 2019-06-21 9:52 ` [PATCH v7 21/25] mips: Add clock_gettime64 " Vincenzo Frascino 2019-07-26 5:15 ` Paul Burton 2019-06-21 9:52 ` [PATCH v7 22/25] x86: Add support for generic vDSO Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 23/25] x86: Add clock_getres entry point Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 24/25] x86: Add clock_gettime64 " Vincenzo Frascino 2019-06-21 9:52 ` [PATCH v7 25/25] kselftest: Extend vDSO selftest Vincenzo Frascino 2019-06-24 0:34 ` [PATCH v7 00/25] Unify vDSOs across more architectures Thomas Gleixner 2019-06-24 1:15 ` Andy Lutomirski 2019-06-24 7:42 ` Thomas Gleixner 2019-06-24 13:21 ` Vincenzo Frascino 2019-06-24 14:18 ` Thomas Gleixner 2019-06-24 14:23 ` Russell King - ARM Linux admin 2019-06-24 14:49 ` Catalin Marinas 2019-06-24 16:20 ` Vincenzo Frascino 2019-10-25 11:42 ` Geert Uytterhoeven 2019-06-24 18:41 ` Paul Burton 2019-06-24 23:16 ` Vincenzo Frascino [this message] 2019-06-25 17:11 ` Paul Burton 2019-06-25 17:17 ` Vincenzo Frascino 2019-06-24 12:50 ` Andre Przywara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3ae7f595-0a15-0584-198e-b32fe3e3ea57@arm.com \ --to=vincenzo.frascino@arm.com \ --cc=0x7f454c46@gmail.com \ --cc=andre.przywara@arm.com \ --cc=arnd@arndb.de \ --cc=avagin@openvz.org \ --cc=catalin.marinas@arm.com \ --cc=daniel.lezcano@linaro.org \ --cc=dima@arista.com \ --cc=huw@codeweavers.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=linux@rasmusvillemoes.dk \ --cc=luto@kernel.org \ --cc=mikelley@microsoft.com \ --cc=paul.burton@mips.com \ --cc=pcc@google.com \ --cc=ralf@linux-mips.org \ --cc=salyzyn@android.com \ --cc=sashal@kernel.org \ --cc=shuah@kernel.org \ --cc=sthotton@marvell.com \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-MIPS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \ linux-mips@vger.kernel.org public-inbox-index linux-mips Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips AGPL code for this site: git clone https://public-inbox.org/public-inbox.git