Skip to contentSkip to conversation

vdso: Complete the conversion to 32bit syscalls

PATCH Applied Vincenzo Frascino 6 participants 41 messages Aug 30, 2019 – Jan 16, 2020

Subsystems (7)
Arm (32-bit) x86 Kselftest MIPS +3 more subsystems
lore
Share & tools
lore

Vincenzo Frascino

author maintainer
#0 lore raw

v2 cover vdso: Complete the conversion to 32bit syscalls

This patch series is a follow up to "lib/vdso, x86/vdso: Fix fallout from generic VDSO conversion" [1].

The main purpose is to complete the 32bit vDSOs conversion to use the legacy 32bit syscalls as a fallback. With the conversion of all the architectures present in -next complete, this patch series removes as well the conditional choice in between 32 and 64 bit for 32bit vDSOs.

This series has been rebased on linux-next/master.

[1] https://lkml.org/lkml/2019/7/28/86

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Paul Burton <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Dmitry Safonov <[email protected]>
Cc Andy Lutomirski <[email protected]>

Vincenzo Frascino (8):
arm64: compat: vdso: Expose BUILD_VDSO32
lib: vdso: Build 32 bit specific functions in the right context
mips: compat: vdso: Use legacy syscalls as fallback
lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK
lib: vdso: Remove checks on return value for 32 bit vDSO
arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK
mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK
x86: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

 .../include/asm/vdso/compat_gettimeofday.h    |  2 +-
 arch/mips/include/asm/vdso/gettimeofday.h     | 43 +++++++++++++++++++
 arch/mips/vdso/config-n32-o32-env.c           |  1 +
 arch/x86/include/asm/vdso/gettimeofday.h      |  2 -
 lib/vdso/gettimeofday.c                       | 30 ++++++-------
 5 files changed, 57 insertions(+), 21 deletions(-)
Signature · 1 line
2.23.0
author maintainer
#1 lore raw

PATCH v2 1/8 arm64: compat: vdso: Expose BUILD_VDSO32

clock_gettime32 and clock_getres_time32 should be compiled only with the 32 bit vdso library.

Expose BUILD_VDSO32 when arm64 compat is compiled, to provide an indication to the generic library to include these symbols.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +1 -0
index c50ee1b7d5cd..fe7afe0f1a3d 100644
@@ -17,6 +17,7 @@
 #define VDSO_HAS_CLOCK_GETRES		1
 
 #define VDSO_HAS_32BIT_FALLBACK		1
+#define BUILD_VDSO32			1
 
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
Signature · 1 line
2.23.0
author maintainer
#2 lore raw

Re: [PATCH v2 1/8] arm64: compat: vdso: Expose BUILD_VDSO32

Hi Catalin and Will,

Quoted 20 lines · Vincenzo Frascino

clock_gettime32 and clock_getres_time32 should be compiled only with the 32 bit vdso library.

Expose BUILD_VDSO32 when arm64 compat is compiled, to provide an indication to the generic library to include these symbols.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +0 -0
index c50ee1b7d5cd..fe7afe0f1a3d 100644

arch/arm64/include/asm/vdso/compat_gettimeofday.h line 23

Quoted 7 lines
arch/arm64/include/asm/vdso/compat_gettimeofday.h +1 -0
@@ -17,6 +17,7 @@
 #define VDSO_HAS_CLOCK_GETRES		1
 
 #define VDSO_HAS_32BIT_FALLBACK		1
+#define BUILD_VDSO32			1
 
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,

This patch is independent from the rest and touches only arch code. Can it go in via the arm64 tree?

Signature · 2 lines
Regards,
Vincenzo
maintainer
#3 lore raw

Re: [PATCH v2 1/8] arm64: compat: vdso: Expose BUILD_VDSO32

Quoted 25 lines · Vincenzo Frascino
Quoted 24 lines · Vincenzo Frascino

clock_gettime32 and clock_getres_time32 should be compiled only with the 32 bit vdso library.

Expose BUILD_VDSO32 when arm64 compat is compiled, to provide an indication to the generic library to include these symbols.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +1 -0
index c50ee1b7d5cd..fe7afe0f1a3d 100644
@@ -17,6 +17,7 @@
 #define VDSO_HAS_CLOCK_GETRES		1
 
 #define VDSO_HAS_32BIT_FALLBACK		1
+#define BUILD_VDSO32			1
 
Quoted 6 lines

arch/arm64/include/asm/vdso/compat_gettimeofday.h line 23

Quoted 3 lines
arch/arm64/include/asm/vdso/compat_gettimeofday.h +0 -0
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,

This patch is independent from the rest and touches only arch code. Can it go in via the arm64 tree?

Why not take it via -tip along with patch 6? Otherwise we'll get a silly conflict. I'd assumed this series was going in as one thing.

Will

#4 lore raw

[tip: timers/core] arm64: compat: vdso: Expose BUILD_VDSO32

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     4845c25326cf1db48e010a0fb162da4dfb07665a
Gitweb:        https://git.kernel.org/tip/4845c25326cf1db48e010a0fb162da4dfb07665a
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:55 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:04 +01:00

arm64: compat: vdso: Expose BUILD_VDSO32

clock_gettime32 and clock_getres_time32 should be compiled only with the 32 bit vdso library.

Expose BUILD_VDSO32 when arm64 compat is compiled, to provide an indication to the generic library to include these symbols.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +1 -0
index c50ee1b..fe7afe0 100644
@@ -17,6 +17,7 @@
 #define VDSO_HAS_CLOCK_GETRES		1
 
 #define VDSO_HAS_32BIT_FALLBACK		1
+#define BUILD_VDSO32			1
 
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
#5 lore raw

[tip: timers/core] arm64: compat: vdso: Expose BUILD_VDSO32

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     3b5584afeef05319ade0fbf5f634a64fd3e5772b
Gitweb:        https://git.kernel.org/tip/3b5584afeef05319ade0fbf5f634a64fd3e5772b
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:55 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:43 +01:00

arm64: compat: vdso: Expose BUILD_VDSO32

clock_gettime32 and clock_getres_time32 should be compiled only with the 32 bit vdso library.

Expose BUILD_VDSO32 when arm64 compat is compiled, to provide an indication to the generic library to include these symbols.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +1 -0
index c50ee1b..fe7afe0 100644
@@ -17,6 +17,7 @@
 #define VDSO_HAS_CLOCK_GETRES		1
 
 #define VDSO_HAS_32BIT_FALLBACK		1
+#define BUILD_VDSO32			1
 
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
author maintainer
#6 lore raw

PATCH v2 2/8 lib: vdso: Build 32 bit specific functions in the right context

In reply to Vincenzo Frascino

clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library.

Exclude these symbols when BUILD_VDSO32 is not defined.

---
 lib/vdso/gettimeofday.c | 4 ++++
 1 file changed, 4 insertions(+)
lib/vdso/gettimeofday.c +4 -0
index e630e7ff57f1..a86e89e6dedc 100644
@@ -117,6 +117,7 @@ __cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -139,6 +140,7 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 
 static __maybe_unused int
 __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
@@ -229,6 +231,7 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -251,4 +254,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 #endif /* VDSO_HAS_CLOCK_GETRES */
Signature · 1 line
2.23.0
#7 lore raw

[tip: timers/core] lib/vdso: Build 32 bit specific functions in the right context

The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     760554e20191c449d4bacd4767129262a4a40fba
Gitweb:        https://git.kernel.org/tip/760554e20191c449d4bacd4767129262a4a40fba
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:56 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:05 +01:00

lib/vdso: Build 32 bit specific functions in the right context

clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library.

Exclude these symbols when BUILD_VDSO32 is not defined.

---
 lib/vdso/gettimeofday.c | 4 ++++
 1 file changed, 4 insertions(+)
lib/vdso/gettimeofday.c +4 -0
index 42bd8ab..8e77071 100644
@@ -117,6 +117,7 @@ __cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -139,6 +140,7 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 
 static __maybe_unused int
 __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
@@ -231,6 +233,7 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -253,4 +256,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 #endif /* VDSO_HAS_CLOCK_GETRES */
#8 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

In reply to Vincenzo Frascino
Quoted 4 lines · Vincenzo Frascino

clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library.

Exclude these symbols when BUILD_VDSO32 is not defined.

This breaks the ARM build with:

arch/arm/vdso/vgettimeofday.c: In function ‘__vdso_clock_gettime’:
arch/arm/vdso/vgettimeofday.c:15:9: error: implicit declaration of function ‘__cvdso_clock_gettime32’; did you mean ‘__cvdso_clock_gettime’? [-Werror=implicit-function-declaration]

  return __cvdso_clock_gettime32(clock, ts);
         ^~~~~~~~~~~~~~~~~~~~~~~
         __cvdso_clock_gettime
arch/arm/vdso/vgettimeofday.c: In function ‘__vdso_clock_getres’:
arch/arm/vdso/vgettimeofday.c:33:9: error: implicit declaration of function ‘__cvdso_clock_getres_time32’; did you mean ‘__cvdso_clock_getres_common’? [-Werror=implicit-function-declaration]
  return __cvdso_clock_getres_time32(clock_id, res);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
         __cvdso_clock_getres_common

cc1: some warnings being treated as errors

The patch below 'fixes' at least the build. Can someone please confirm the correctness?

Thanks,

tglx

8<----------------

arch/arm/vdso/Makefile +1 -1
@@ -14,7 +14,7 @@ targets := $(obj-vdso) vdso.so vdso.so.d
 obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
 
 ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector
-ccflags-y += -DDISABLE_BRANCH_PROFILING
+ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO32
 
 ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8
 ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
#9 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

Quoted 19 lines · Thomas Gleixner
Quoted 4 lines · Vincenzo Frascino

clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library.

Exclude these symbols when BUILD_VDSO32 is not defined.

This breaks the ARM build with:

arch/arm/vdso/vgettimeofday.c: In function ‘__vdso_clock_gettime’:
arch/arm/vdso/vgettimeofday.c:15:9: error: implicit declaration of function ‘__cvdso_clock_gettime32’; did you mean ‘__cvdso_clock_gettime’? [-Werror=implicit-function-declaration]

  return __cvdso_clock_gettime32(clock, ts);
         ^~~~~~~~~~~~~~~~~~~~~~~
         __cvdso_clock_gettime
arch/arm/vdso/vgettimeofday.c: In function ‘__vdso_clock_getres’:
arch/arm/vdso/vgettimeofday.c:33:9: error: implicit declaration of function ‘__cvdso_clock_getres_time32’; did you mean ‘__cvdso_clock_getres_common’? [-Werror=implicit-function-declaration]
  return __cvdso_clock_getres_time32(clock_id, res);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~
         __cvdso_clock_getres_common
Quoted 4 lines

cc1: some warnings being treated as errors

The patch below 'fixes' at least the build. Can someone please confirm the correctness?

Bah, it's not fixing it. That's what you get when you compile the wrong tree...

author maintainer
#10 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

Hi Thomas,

Quoted 2 lines · Thomas Gleixner

Thomas Gleixner <[email protected]> writes:

[...]

Quoted 4 lines

Bah, it's not fixing it. That's what you get when you compile the wrong tree...

I am having a look at it. Thanks.

Signature · 2 lines
Regards,
Vincenzo
#11 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

Quoted 9 lines · Vincenzo Frascino
Quoted 2 lines · Thomas Gleixner

Thomas Gleixner <[email protected]> writes:

[...]

Quoted 3 lines

Bah, it's not fixing it. That's what you get when you compile the wrong tree...

This part is required to cover the BUILD_VDSO32 guard, but then when the fallback thing is removed it fails again because the 32bit fallbacks are missing.

The patch below makes it build again.

Thanks,

tglx

8<----------------

arch/arm/include/asm/vdso/gettimeofday.h +36 -0
@@ -52,6 +52,24 @@ static __always_inline long clock_gettim
 	return ret;
 }
 
+static __always_inline long clock_gettime32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("r1") = _ts;
+	register clockid_t clkid asm("r0") = _clkid;
+	register long ret asm ("r0");
+	register long nr asm("r7") = __NR_clock_gettime;
+
+	asm volatile(
+	"	swi #0\n"
+	: "=r" (ret)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "memory");
+
+	return ret;
+}
+
 static __always_inline int clock_getres_fallback(
 					clockid_t _clkid,
 					struct __kernel_timespec *_ts)
@@ -63,6 +81,24 @@ static __always_inline int clock_getres_
 
 	asm volatile(
 	"       swi #0\n"
+	: "=r" (ret)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "memory");
+
+	return ret;
+}
+
+static __always_inline int clock_getres32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("r1") = _ts;
+	register clockid_t clkid asm("r0") = _clkid;
+	register long ret asm ("r0");
+	register long nr asm("r7") = __NR_clock_getres;
+
+	asm volatile(
+	"       swi #0\n"
 	: "=r" (ret)
 	: "r" (clkid), "r" (ts), "r" (nr)
 	: "memory");
author maintainer
#12 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

Hi Thomas,

Quoted 8 lines · Thomas Gleixner
Quoted 7 lines · Vincenzo Frascino
Quoted 2 lines · Thomas Gleixner

Thomas Gleixner <[email protected]> writes:

[...]

Quoted 1 line
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines

Bah, it's not fixing it. That's what you get when you compile the wrong tree...

This part is required to cover the BUILD_VDSO32 guard, but then when the fallback thing is removed it fails again because the 32bit fallbacks are missing.

The patch below makes it build again.

I agree. I am testing it now :) Do you prefer to create the patch or shall I do it once I finish testing?

Signature · 2 lines
Regards,
Vincenzo
author maintainer
#13 lore raw

Re: [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context

In reply to Thomas Gleixner

Hi Thomas,

Quoted 8 lines · Thomas Gleixner
Quoted 7 lines · Vincenzo Frascino
Quoted 2 lines · Thomas Gleixner

Thomas Gleixner <[email protected]> writes:

[...]

Quoted 1 line
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines

Bah, it's not fixing it. That's what you get when you compile the wrong tree...

This part is required to cover the BUILD_VDSO32 guard, but then when the fallback thing is removed it fails again because the 32bit fallbacks are missing.

The patch below makes it build again.

I completed the testing and everything seems fine. For completeness I am reporting the test results below:

clock-gettime-monotonic: syscall: 938 nsec/call
clock-gettime-monotonic:    libc: 278 nsec/call
clock-gettime-monotonic:    vdso: 270 nsec/call
clock-getres-monotonic: syscall: 678 nsec/call
clock-getres-monotonic:    libc: 692 nsec/call
clock-getres-monotonic:    vdso: 33 nsec/call
clock-gettime-monotonic-coarse: syscall: 840 nsec/call
clock-gettime-monotonic-coarse:    libc: 184 nsec/call
clock-gettime-monotonic-coarse:    vdso: 172 nsec/call
clock-getres-monotonic-coarse: syscall: 710 nsec/call
clock-getres-monotonic-coarse:    libc: 733 nsec/call
clock-getres-monotonic-coarse:    vdso: 35 nsec/call
clock-gettime-monotonic-raw: syscall: 894 nsec/call
clock-gettime-monotonic-raw:    libc: 278 nsec/call
clock-gettime-monotonic-raw:    vdso: 270 nsec/call
clock-getres-monotonic-raw: syscall: 669 nsec/call
clock-getres-monotonic-raw:    libc: 696 nsec/call
clock-getres-monotonic-raw:    vdso: 35 nsec/call
clock-gettime-tai: syscall: 933 nsec/call
clock-gettime-tai:    libc: 277 nsec/call
clock-gettime-tai:    vdso: 264 nsec/call
clock-getres-tai: syscall: 674 nsec/call
clock-getres-tai:    libc: 696 nsec/call
clock-getres-tai:    vdso: 33 nsec/call
clock-gettime-boottime: syscall: 934 nsec/call
clock-gettime-boottime:    libc: 278 nsec/call
clock-gettime-boottime:    vdso: 270 nsec/call
clock-getres-boottime: syscall: 677 nsec/call
clock-getres-boottime:    libc: 690 nsec/call
clock-getres-boottime:    vdso: 33 nsec/call
clock-gettime-realtime: syscall: 901 nsec/call
clock-gettime-realtime:    libc: 278 nsec/call
clock-gettime-realtime:    vdso: 272 nsec/call
clock-getres-realtime: syscall: 677 nsec/call
clock-getres-realtime:    libc: 701 nsec/call
clock-getres-realtime:    vdso: 33 nsec/call
clock-gettime-realtime-coarse: syscall: 838 nsec/call
clock-gettime-realtime-coarse:    libc: 184 nsec/call
clock-gettime-realtime-coarse:    vdso: 172 nsec/call
clock-getres-realtime-coarse: syscall: 713 nsec/call
clock-getres-realtime-coarse:    libc: 736 nsec/call
clock-getres-realtime-coarse:    vdso: 35 nsec/call
getcpu: syscall: 620 nsec/call
getcpu:    libc: 648 nsec/call
gettimeofday: syscall: 1022 nsec/call
gettimeofday:    libc: 280 nsec/call
gettimeofday:    vdso: 272 nsec/call
Signature · 2 lines
Regards,
Vincenzo
#14 lore raw

[tip: timers/core] ARM: vdso: Set BUILD_VDSO32 and provide 32bit fallbacks

In reply to Thomas Gleixner
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     715f23b6104aa297feea20d4f200ca81941e23de
Gitweb:        https://git.kernel.org/tip/715f23b6104aa297feea20d4f200ca81941e23de
Author:        Thomas Gleixner <[email protected]>
AuthorDate:    Tue, 14 Jan 2020 09:41:09 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:43 +01:00

ARM: vdso: Set BUILD_VDSO32 and provide 32bit fallbacks

Setting BUILD_VDSO32 is required to expose the legacy 32bit interfaces in the generic VDSO code which are going to be hidden behind an #ifdef BUILD_VDSO32.

The 32bit fallbacks are necessary to remove the existing VDSO_HAS_32BIT_FALLBACK hackery.

---
 arch/arm/include/asm/vdso/gettimeofday.h | 36 +++++++++++++++++++++++-
 arch/arm/vdso/Makefile                   |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
arch/arm/include/asm/vdso/gettimeofday.h +36 -0
index 0ad2429..fe6e1f6 100644
@@ -52,6 +52,24 @@ static __always_inline long clock_gettime_fallback(
 	return ret;
 }
 
+static __always_inline long clock_gettime32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("r1") = _ts;
+	register clockid_t clkid asm("r0") = _clkid;
+	register long ret asm ("r0");
+	register long nr asm("r7") = __NR_clock_gettime;
+
+	asm volatile(
+	"	swi #0\n"
+	: "=r" (ret)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "memory");
+
+	return ret;
+}
+
 static __always_inline int clock_getres_fallback(
 					clockid_t _clkid,
 					struct __kernel_timespec *_ts)
@@ -70,6 +88,24 @@ static __always_inline int clock_getres_fallback(
 	return ret;
 }
 
+static __always_inline int clock_getres32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("r1") = _ts;
+	register clockid_t clkid asm("r0") = _clkid;
+	register long ret asm ("r0");
+	register long nr asm("r7") = __NR_clock_getres;
+
+	asm volatile(
+	"       swi #0\n"
+	: "=r" (ret)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "memory");
+
+	return ret;
+}
+
 static __always_inline u64 __arch_get_hw_counter(int clock_mode)
 {
 #ifdef CONFIG_ARM_ARCH_TIMER
arch/arm/vdso/Makefile +1 -1
index 0fda344..1babb39 100644
@@ -14,7 +14,7 @@ targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.so.raw vdso.lds
 obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
 
 ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector
-ccflags-y += -DDISABLE_BRANCH_PROFILING
+ccflags-y += -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO32
 
 ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8
 ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
#15 lore raw

[tip: timers/core] lib/vdso: Build 32 bit specific functions in the right context

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     bf279849ad59538a1518c667c0795ec1fe9dbd66
Gitweb:        https://git.kernel.org/tip/bf279849ad59538a1518c667c0795ec1fe9dbd66
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:56 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:44 +01:00

lib/vdso: Build 32 bit specific functions in the right context

clock_gettime32 and clock_getres_time32 should be compiled only with a 32 bit vdso library.

Exclude these symbols when BUILD_VDSO32 is not defined.

---
 lib/vdso/gettimeofday.c | 4 ++++
 1 file changed, 4 insertions(+)
lib/vdso/gettimeofday.c +4 -0
index 42bd8ab..8e77071 100644
@@ -117,6 +117,7 @@ __cvdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -139,6 +140,7 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 
 static __maybe_unused int
 __cvdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
@@ -231,6 +233,7 @@ int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
 	return 0;
 }
 
+#ifdef BUILD_VDSO32
 static __maybe_unused int
 __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 {
@@ -253,4 +256,5 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	}
 	return ret;
 }
+#endif /* BUILD_VDSO32 */
 #endif /* VDSO_HAS_CLOCK_GETRES */
#16 lore raw

PATCH 1/1 MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel

In reply to Vincenzo Frascino

The confinement of the 32bit specific VDSO functions missed to define BUILD_VDSO32 when building a 32bit MIPS kernel:

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’

arch/mips/vdso/vgettimeofday.c: In function ‘__vdso_clock_getres’:
arch/mips/vdso/vgettimeofday.c:39:9: error: implicit declaration of function ‘__cvdso_clock_getres_time32’

Force the define for 32bit builds in the VDSO Makefile.

Fixes bf279849ad59 ("lib/vdso: Build 32 bit specific functions in the right context")
---
 arch/mips/vdso/Makefile |    4 ++++
 1 file changed, 4 insertions(+)
arch/mips/vdso/Makefile +4 -0
@@ -18,6 +18,10 @@ ccflags-vdso := \
 	$(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \
 	-D__VDSO__
 
+ifndef CONFIG_64BIT
+ccflags-vdso += -DBUILD_VDSO32
+endif
+
 ifdef CONFIG_CC_IS_CLANG
 ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))
 endif
Acked-by on v1 1/1
#17 lore raw

Re: [PATCH] MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel

Hi Thomas,

Quoted 6 lines · Thomas Gleixner

The confinement of the 32bit specific VDSO functions missed to define BUILD_VDSO32 when building a 32bit MIPS kernel:

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’

Quoted 8 lines

arch/mips/vdso/vgettimeofday.c: In function ‘__vdso_clock_getres’:
arch/mips/vdso/vgettimeofday.c:39:9: error: implicit declaration of function ‘__cvdso_clock_getres_time32’

Force the define for 32bit builds in the VDSO Makefile.

Fixes bf279849ad59 ("lib/vdso: Build 32 bit specific functions in the right context")

Presuming you want to take this through timers/core along with the patch it fixes:

Thanks,
Paul

Quoted 17 lines
---
 arch/mips/vdso/Makefile |    4 ++++
 1 file changed, 4 insertions(+)
arch/mips/vdso/Makefile +4 -0
@@ -18,6 +18,10 @@ ccflags-vdso := \
 	$(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \
 	-D__VDSO__
 
+ifndef CONFIG_64BIT
+ccflags-vdso += -DBUILD_VDSO32
+endif
+
 ifdef CONFIG_CC_IS_CLANG
 ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))
 endif
#18 lore raw

[tip: timers/core] MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel

In reply to Thomas Gleixner
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     99570c3da96a0f7aa11c6ad4981776f3adabf3b5
Gitweb:        https://git.kernel.org/tip/99570c3da96a0f7aa11c6ad4981776f3adabf3b5
Author:        Thomas Gleixner <[email protected]>
AuthorDate:    Thu, 16 Jan 2020 20:43:41 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Thu, 16 Jan 2020 21:24:25 +01:00

MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel

The confinement of the 32bit specific VDSO functions missed to define BUILD_VDSO32 when building a 32bit MIPS kernel:

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

arch/mips/vdso/vgettimeofday.c: In function __vdso_clock_getres:
arch/mips/vdso/vgettimeofday.c:39:9: error: implicit declaration of function __cvdso_clock_getres_time32

Force the define for 32bit builds in the VDSO Makefile.

Fixes bf279849ad59 ("lib/vdso: Build 32 bit specific functions in the right context")
---
 arch/mips/vdso/Makefile | 4 ++++
 1 file changed, 4 insertions(+)
arch/mips/vdso/Makefile +4 -0
index e059389..b2a2e03 100644
@@ -18,6 +18,10 @@ ccflags-vdso := \
 	$(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \
 	-D__VDSO__
 
+ifndef CONFIG_64BIT
+ccflags-vdso += -DBUILD_VDSO32
+endif
+
 ifdef CONFIG_CC_IS_CLANG
 ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))
 endif
author maintainer
#19 lore raw

PATCH v2 3/8 mips: compat: vdso: Use legacy syscalls as fallback

In reply to Vincenzo Frascino

The generic VDSO implementation uses the Y2038 safe clock_gettime64() and clock_getres_time64() syscalls as fallback for 32bit VDSO. This breaks seccomp setups because these syscalls might be not (yet) allowed.

Implement the 32bit variants which use the legacy syscalls and select the variant in the core library.

The 64bit time variants are not removed because they are required for the time64 based vdso accessors.

Cc Paul Burton <[email protected]>
Fixes 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")
---
 arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++
 arch/mips/vdso/config-n32-o32-env.c       |  1 +
 2 files changed, 46 insertions(+)
arch/mips/include/asm/vdso/gettimeofday.h +45 -0
index c59fe08b0347..e78462e8ca2e 100644
@@ -105,6 +105,51 @@ static __always_inline int clock_getres_fallback(
 	return error ? -ret : ret;
 }
 
+#if _MIPS_SIM != _MIPS_SIM_ABI64
+
+#define VDSO_HAS_32BIT_FALLBACK	1
+
+static __always_inline long clock_gettime32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_gettime;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+
+static __always_inline int clock_getres32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_getres;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+#endif
+
 #ifdef CONFIG_CSRC_R4K
 
 static __always_inline u64 read_r4k_count(void)
arch/mips/vdso/config-n32-o32-env.c +1 -0
index 7f8d957abd4a..0011a632aef2 100644
@@ -10,6 +10,7 @@
  */
 #undef CONFIG_64BIT
 
+#define BUILD_VDSO32
 #define CONFIG_32BIT 1
 #define CONFIG_GENERIC_ATOMIC64 1
 #define BUILD_VDSO32_64
Signature · 1 line
2.23.0
Acked-by on v2 3/8
#20 lore raw

Re: [PATCH v2 3/8] mips: compat: vdso: Use legacy syscalls as fallback

Hi Vincenzo,

Quoted 7 lines · Vincenzo Frascino

The generic VDSO implementation uses the Y2038 safe clock_gettime64() and clock_getres_time64() syscalls as fallback for 32bit VDSO. This breaks seccomp setups because these syscalls might be not (yet) allowed.

Implement the 32bit variants which use the legacy syscalls and select the variant in the core library.

Quoted 6 lines

The 64bit time variants are not removed because they are required for the time64 based vdso accessors.

Cc Paul Burton <[email protected]>
Fixes 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")

How would you like this to be applied? I'd be happy to apply this one to mips-next, where commit 24640f233b46 ("mips: Add support for generic vDSO") added the file being modified here. Otherwise:

Thanks,
Paul

Quoted 76 lines
---
 arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++
 arch/mips/vdso/config-n32-o32-env.c       |  1 +
 2 files changed, 46 insertions(+)
arch/mips/include/asm/vdso/gettimeofday.h +45 -0
index c59fe08b0347..e78462e8ca2e 100644
@@ -105,6 +105,51 @@ static __always_inline int clock_getres_fallback(
 	return error ? -ret : ret;
 }
 
+#if _MIPS_SIM != _MIPS_SIM_ABI64
+
+#define VDSO_HAS_32BIT_FALLBACK	1
+
+static __always_inline long clock_gettime32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_gettime;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+
+static __always_inline int clock_getres32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_getres;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+#endif
+
 #ifdef CONFIG_CSRC_R4K
 
 static __always_inline u64 read_r4k_count(void)
arch/mips/vdso/config-n32-o32-env.c +1 -0
index 7f8d957abd4a..0011a632aef2 100644
@@ -10,6 +10,7 @@
  */
 #undef CONFIG_64BIT
 
+#define BUILD_VDSO32
 #define CONFIG_32BIT 1
 #define CONFIG_GENERIC_ATOMIC64 1
 #define BUILD_VDSO32_64
Signature · 1 line
2.23.0
author maintainer
#21 lore raw

Re: [PATCH v2 3/8] mips: compat: vdso: Use legacy syscalls as fallback

Hi Paul,

thank you for your review.

Quoted 17 lines · Paul Burton

Hi Vincenzo,

Quoted 7 lines · Vincenzo Frascino

The generic VDSO implementation uses the Y2038 safe clock_gettime64() and clock_getres_time64() syscalls as fallback for 32bit VDSO. This breaks seccomp setups because these syscalls might be not (yet) allowed.

Implement the 32bit variants which use the legacy syscalls and select the variant in the core library.

Quoted 6 lines

The 64bit time variants are not removed because they are required for the time64 based vdso accessors.

Cc Paul Burton <[email protected]>
Fixes 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")
Quoted 6 lines

How would you like this to be applied? I'd be happy to apply this one to mips-next, where commit 24640f233b46 ("mips: Add support for generic vDSO") added the file being modified here. Otherwise:

Please feel free to apply this to mips-next.

Thanks,
Vincenzo

Quoted 79 lines

Thanks,
Paul

Quoted 76 lines
---
 arch/mips/include/asm/vdso/gettimeofday.h | 45 +++++++++++++++++++++++
 arch/mips/vdso/config-n32-o32-env.c       |  1 +
 2 files changed, 46 insertions(+)
arch/mips/include/asm/vdso/gettimeofday.h +45 -0
index c59fe08b0347..e78462e8ca2e 100644
@@ -105,6 +105,51 @@ static __always_inline int clock_getres_fallback(
 	return error ? -ret : ret;
 }
 
+#if _MIPS_SIM != _MIPS_SIM_ABI64
+
+#define VDSO_HAS_32BIT_FALLBACK	1
+
+static __always_inline long clock_gettime32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_gettime;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+
+static __always_inline int clock_getres32_fallback(
+					clockid_t _clkid,
+					struct old_timespec32 *_ts)
+{
+	register struct old_timespec32 *ts asm("a1") = _ts;
+	register clockid_t clkid asm("a0") = _clkid;
+	register long ret asm("v0");
+	register long nr asm("v0") = __NR_clock_getres;
+	register long error asm("a3");
+
+	asm volatile(
+	"       syscall\n"
+	: "=r" (ret), "=r" (error)
+	: "r" (clkid), "r" (ts), "r" (nr)
+	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+
+	return error ? -ret : ret;
+}
+#endif
+
 #ifdef CONFIG_CSRC_R4K
 
 static __always_inline u64 read_r4k_count(void)
arch/mips/vdso/config-n32-o32-env.c +1 -0
index 7f8d957abd4a..0011a632aef2 100644
@@ -10,6 +10,7 @@
  */
 #undef CONFIG_64BIT
 
+#define BUILD_VDSO32
 #define CONFIG_32BIT 1
 #define CONFIG_GENERIC_ATOMIC64 1
 #define BUILD_VDSO32_64
Signature · 1 line
2.23.0
Applied
#22 lore raw

Re: [PATCH v2 3/8] mips: compat: vdso: Use legacy syscalls as fallback

In reply to Vincenzo Frascino

Hello,

Quoted 9 lines · Vincenzo Frascino

The generic VDSO implementation uses the Y2038 safe clock_gettime64() and clock_getres_time64() syscalls as fallback for 32bit VDSO. This breaks seccomp setups because these syscalls might be not (yet) allowed.

Implement the 32bit variants which use the legacy syscalls and select the variant in the core library.

The 64bit time variants are not removed because they are required for the time64 based vdso accessors.

Applied to mips-next.

Quoted 6 lines

commit 932bb934ed4d
https://git.kernel.org/mips/c/932bb934ed4d

Fixes 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation")

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]

author maintainer
#23 lore raw

PATCH v2 4/8 lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK was introduced to address a regression which caused seccomp to deny access to the applications to clock_gettime64() and clock_getres64() because they are not enabled in the existing filters.

The purpose of VDSO_HAS_32BIT_FALLBACK was to simplify the conditional implementation of __cvdso_clock_get*time32() variants.

Now that all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks the conditional can be removed.

Cc: Thomas Gleixner <[email protected]>
CC: Andy Lutomirski <[email protected]>
References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 10 ----------
 1 file changed, 10 deletions(-)
lib/vdso/gettimeofday.c +0 -10
index a86e89e6dedc..2c4b311c226d 100644
@@ -126,13 +126,8 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_gettime_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_gettime_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;
@@ -240,13 +235,8 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_getres_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_getres_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;
Signature · 1 line
2.23.0
#24 lore raw

[tip: timers/core] lib/vdso: Remove VDSO_HAS_32BIT_FALLBACK

The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     746bc1f8e7efa210881405c52ee3729406fa4e95
Gitweb:        https://git.kernel.org/tip/746bc1f8e7efa210881405c52ee3729406fa4e95
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:58 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:05 +01:00

lib/vdso: Remove VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK was introduced to address a regression which caused seccomp to deny access to the applications to clock_gettime64() and clock_getres64() because they are not enabled in the existing filters.

The purpose of VDSO_HAS_32BIT_FALLBACK was to simplify the conditional implementation of __cvdso_clock_get*time32() variants.

Now that all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks the conditional can be removed.

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 10 ----------
 1 file changed, 10 deletions(-)
lib/vdso/gettimeofday.c +0 -10
index 8e77071..cd3aacf 100644
@@ -126,13 +126,8 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_gettime_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_gettime_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;
@@ -242,13 +237,8 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_getres_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_getres_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret && res)) {
 		res->tv_sec = ts.tv_sec;
#25 lore raw

[tip: timers/core] lib/vdso: Remove VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     b767081c07a400ff1c6f95b87639a9405886e7a6
Gitweb:        https://git.kernel.org/tip/b767081c07a400ff1c6f95b87639a9405886e7a6
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:58 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:44 +01:00

lib/vdso: Remove VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK was introduced to address a regression which caused seccomp to deny access to the applications to clock_gettime64() and clock_getres64() because they are not enabled in the existing filters.

The purpose of VDSO_HAS_32BIT_FALLBACK was to simplify the conditional implementation of __cvdso_clock_get*time32() variants.

Now that all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks the conditional can be removed.

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 10 ----------
 1 file changed, 10 deletions(-)
lib/vdso/gettimeofday.c +0 -10
index 8e77071..cd3aacf 100644
@@ -126,13 +126,8 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_gettime_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_gettime_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret)) {
 		res->tv_sec = ts.tv_sec;
@@ -242,13 +237,8 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 
 	ret = __cvdso_clock_getres_common(clock, &ts);
 
-#ifdef VDSO_HAS_32BIT_FALLBACK
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
-#else
-	if (unlikely(ret))
-		ret = clock_getres_fallback(clock, &ts);
-#endif
 
 	if (likely(!ret && res)) {
 		res->tv_sec = ts.tv_sec;
author maintainer
#26 lore raw

PATCH v2 5/8 lib: vdso: Remove checks on return value for 32 bit vDSO

In reply to Vincenzo Frascino

Since all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks it is not required anymore to check the return value of __cvdso_clock_get*time32_common() before updating the old_timespec fields.

Remove the related checks from the generic vdso library.

Cc: Thomas Gleixner <[email protected]>
CC: Andy Lutomirski <[email protected]>
References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
lib/vdso/gettimeofday.c +8 -8
index 2c4b311c226d..d5bc16748f81 100644
@@ -129,10 +129,10 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
@@ -238,10 +238,10 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
Signature · 1 line
2.23.0
author maintainer
#27 lore raw

Re: [PATCH v2 5/8] lib: vdso: Remove checks on return value for 32 bit vDSO

Quoted 9 lines · Vincenzo Frascino

Since all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks it is not required anymore to check the return value of __cvdso_clock_get*time32_common() before updating the old_timespec fields.

Remove the related checks from the generic vdso library.

Cc Thomas Gleixner <[email protected]>
CC Andy Lutomirski <[email protected]>

Forgot to add to this patch:

Quoted 41 lines

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
lib/vdso/gettimeofday.c +8 -8
index 2c4b311c226d..d5bc16748f81 100644
@@ -129,10 +129,10 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
@@ -238,10 +238,10 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
Signature · 2 lines
Regards,
Vincenzo
#28 lore raw

[tip: timers/core] lib/vdso: Remove checks on return value for 32 bit vDSO

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     9dd92f63f94fab4c04a5880a839abe1f74ee906c
Gitweb:        https://git.kernel.org/tip/9dd92f63f94fab4c04a5880a839abe1f74ee906c
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:59 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:05 +01:00

lib/vdso: Remove checks on return value for 32 bit vDSO

Since all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks it is not required anymore to check the return value of __cvdso_clock_get*time32_common() before updating the old_timespec fields.

Remove the related checks from the generic vdso library.

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
lib/vdso/gettimeofday.c +5 -5
index cd3aacf..b676a98 100644
@@ -129,10 +129,10 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
@@ -240,7 +240,7 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
 
-	if (likely(!ret && res)) {
+	if (likely(res)) {
 		res->tv_sec = ts.tv_sec;
 		res->tv_nsec = ts.tv_nsec;
 	}
#29 lore raw

[tip: timers/core] lib/vdso: Remove checks on return value for 32 bit vDSO

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     a279235ddbe975670afe2267162028ec0a312293
Gitweb:        https://git.kernel.org/tip/a279235ddbe975670afe2267162028ec0a312293
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:58:59 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:45 +01:00

lib/vdso: Remove checks on return value for 32 bit vDSO

Since all the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks it is not required anymore to check the return value of __cvdso_clock_get*time32_common() before updating the old_timespec fields.

Remove the related checks from the generic vdso library.

References: c60a32ea4f45 ("lib/vdso/32: Provide legacy syscall fallbacks")

---
 lib/vdso/gettimeofday.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
lib/vdso/gettimeofday.c +5 -5
index cd3aacf..b676a98 100644
@@ -129,10 +129,10 @@ __cvdso_clock_gettime32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_gettime32_fallback(clock, res);
 
-	if (likely(!ret)) {
-		res->tv_sec = ts.tv_sec;
-		res->tv_nsec = ts.tv_nsec;
-	}
+	/* For ret == 0 */
+	res->tv_sec = ts.tv_sec;
+	res->tv_nsec = ts.tv_nsec;
+
 	return ret;
 }
 #endif /* BUILD_VDSO32 */
@@ -240,7 +240,7 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 	if (unlikely(ret))
 		return clock_getres32_fallback(clock, res);
 
-	if (likely(!ret && res)) {
+	if (likely(res)) {
 		res->tv_sec = ts.tv_sec;
 		res->tv_nsec = ts.tv_nsec;
 	}
author maintainer
#30 lore raw

PATCH v2 6/8 arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from arm64 compat vdso.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +0 -1
index fe7afe0f1a3d..537b1e695365 100644
@@ -16,7 +16,6 @@
 
 #define VDSO_HAS_CLOCK_GETRES		1
 
-#define VDSO_HAS_32BIT_FALLBACK		1
 #define BUILD_VDSO32			1
 
 static __always_inline
Signature · 1 line
2.23.0
#31 lore raw

[tip: timers/core] arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     8a0d48e94299958c13054126b2ed371bbe383286
Gitweb:        https://git.kernel.org/tip/8a0d48e94299958c13054126b2ed371bbe383286
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:00 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:06 +01:00

arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from arm64 compat vdso.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +0 -1
index fe7afe0..537b1e6 100644
@@ -16,7 +16,6 @@
 
 #define VDSO_HAS_CLOCK_GETRES		1
 
-#define VDSO_HAS_32BIT_FALLBACK		1
 #define BUILD_VDSO32			1
 
 static __always_inline
#32 lore raw

[tip: timers/core] arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     972188f3a2dac07a6f000a4418776f446259fc87
Gitweb:        https://git.kernel.org/tip/972188f3a2dac07a6f000a4418776f446259fc87
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:00 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:45 +01:00

arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from arm64 compat vdso.

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +0 -1
index fe7afe0..537b1e6 100644
@@ -16,7 +16,6 @@
 
 #define VDSO_HAS_CLOCK_GETRES		1
 
-#define VDSO_HAS_32BIT_FALLBACK		1
 #define BUILD_VDSO32			1
 
 static __always_inline
author maintainer
#33 lore raw

PATCH v2 7/8 mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from mips vdso.

---
 arch/mips/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/vdso/gettimeofday.h +0 -2
index e78462e8ca2e..5ad2b086626d 100644
@@ -107,8 +107,6 @@ static __always_inline int clock_getres_fallback(
 
 #if _MIPS_SIM != _MIPS_SIM_ABI64
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline long clock_gettime32_fallback(
 					clockid_t _clkid,
 					struct old_timespec32 *_ts)
Signature · 1 line
2.23.0
Acked-by on v2 7/8
#34 lore raw

Re: [PATCH v2 7/8] mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

Hi Vincenzo,

Quoted 8 lines · Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from mips vdso.

Do you want this one in mips-next too, or applied somewhere else along with the rest of the series? If the latter:

Thanks,
Paul

Quoted 20 lines
---
 arch/mips/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/vdso/gettimeofday.h +0 -2
index e78462e8ca2e..5ad2b086626d 100644
@@ -107,8 +107,6 @@ static __always_inline int clock_getres_fallback(
 
 #if _MIPS_SIM != _MIPS_SIM_ABI64
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline long clock_gettime32_fallback(
 					clockid_t _clkid,
 					struct old_timespec32 *_ts)
Signature · 1 line
2.23.0
author maintainer
#35 lore raw

Re: [PATCH v2 7/8] mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

Hi Paul,

Quoted 9 lines · Paul Burton

Hi Vincenzo,

Quoted 6 lines · Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from mips vdso.

Quoted 8 lines
Quoted 2 lines

Do you want this one in mips-next too, or applied somewhere else along with the rest of the series? If the latter:

This patch has a dependency on patch n5 hence can not be applied independently.

Thanks,
Vincenzo

Quoted 23 lines

Thanks,
Paul

Quoted 20 lines
---
 arch/mips/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/vdso/gettimeofday.h +0 -2
index e78462e8ca2e..5ad2b086626d 100644
@@ -107,8 +107,6 @@ static __always_inline int clock_getres_fallback(
 
 #if _MIPS_SIM != _MIPS_SIM_ABI64
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline long clock_gettime32_fallback(
 					clockid_t _clkid,
 					struct old_timespec32 *_ts)
Signature · 1 line
2.23.0
#36 lore raw

[tip: timers/core] mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     7bcf78b6e6891821983bd168380de1df43d42347
Gitweb:        https://git.kernel.org/tip/7bcf78b6e6891821983bd168380de1df43d42347
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:01 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:06 +01:00

mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from mips vdso.

---
 arch/mips/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/vdso/gettimeofday.h +0 -2
index 0ae9b4c..a58687e 100644
@@ -96,8 +96,6 @@ static __always_inline int clock_getres_fallback(
 
 #if _MIPS_SIM != _MIPS_SIM_ABI64
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline long clock_gettime32_fallback(
 					clockid_t _clkid,
 					struct old_timespec32 *_ts)
#37 lore raw

[tip: timers/core] mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     de0209f53aba44d9b57d0739a076dfb2db767584
Gitweb:        https://git.kernel.org/tip/de0209f53aba44d9b57d0739a076dfb2db767584
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:01 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:46 +01:00

mips: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from mips vdso.

---
 arch/mips/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/mips/include/asm/vdso/gettimeofday.h +0 -2
index 0ae9b4c..a58687e 100644
@@ -96,8 +96,6 @@ static __always_inline int clock_getres_fallback(
 
 #if _MIPS_SIM != _MIPS_SIM_ABI64
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline long clock_gettime32_fallback(
 					clockid_t _clkid,
 					struct old_timespec32 *_ts)
author maintainer
#38 lore raw

PATCH v2 8/8 x86: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from x86 vdso.

Cc Thomas Gleixner <[email protected]>
Cc Andy Lutomirski <[email protected]>
---
 arch/x86/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/x86/include/asm/vdso/gettimeofday.h +0 -2
index ba71a63cdac4..6aa8e3eda31d 100644
@@ -96,8 +96,6 @@ long clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 
 #else
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline
 long clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 {
Signature · 1 line
2.23.0
#39 lore raw

[tip: timers/core] x86/vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     3dc69d086be439c143adbfc6ff62704f1be21039
Gitweb:        https://git.kernel.org/tip/3dc69d086be439c143adbfc6ff62704f1be21039
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:02 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Fri, 10 Jan 2020 21:14:06 +01:00

x86/vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from x86 vdso.

---
 arch/x86/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/x86/include/asm/vdso/gettimeofday.h +0 -2
index e9ee139..52c3bcd 100644
@@ -96,8 +96,6 @@ long clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 
 #else
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline
 long clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 {
#40 lore raw

[tip: timers/core] x86/vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

In reply to Vincenzo Frascino
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     0b5c12332db5b71c6db0c102b3e6acc7c7c6a54d
Gitweb:        https://git.kernel.org/tip/0b5c12332db5b71c6db0c102b3e6acc7c7c6a54d
Author:        Vincenzo Frascino <[email protected]>
AuthorDate:    Fri, 30 Aug 2019 14:59:02 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Tue, 14 Jan 2020 12:20:46 +01:00

x86/vdso: Remove unused VDSO_HAS_32BIT_FALLBACK

VDSO_HAS_32BIT_FALLBACK has been removed from the core since the architectures that support the generic vDSO library have been converted to support the 32 bit fallbacks.

Remove unused VDSO_HAS_32BIT_FALLBACK from x86 vdso.

---
 arch/x86/include/asm/vdso/gettimeofday.h | 2 --
 1 file changed, 2 deletions(-)
arch/x86/include/asm/vdso/gettimeofday.h +0 -2
index e9ee139..52c3bcd 100644
@@ -96,8 +96,6 @@ long clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 
 #else
 
-#define VDSO_HAS_32BIT_FALLBACK	1
-
 static __always_inline
 long clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 {