linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	linux-arm-kernel@lists.infradead.org, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] ARM: vdso: Set BUILD_VDSO32 and provide 32bit fallbacks
Date: Tue, 14 Jan 2020 13:02:24 -0000	[thread overview]
Message-ID: <157900694409.396.3651284834298683513.tip-bot2@tip-bot2> (raw)
In-Reply-To: <87tv4zq9dc.fsf@nanos.tec.linutronix.de>

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 <tglx@linutronix.de>
AuthorDate:    Tue, 14 Jan 2020 09:41:09 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
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.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/87tv4zq9dc.fsf@nanos.tec.linutronix.de
---
 arch/arm/include/asm/vdso/gettimeofday.h | 36 +++++++++++++++++++++++-
 arch/arm/vdso/Makefile                   |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h
index 0ad2429..fe6e1f6 100644
--- a/arch/arm/include/asm/vdso/gettimeofday.h
+++ b/arch/arm/include/asm/vdso/gettimeofday.h
@@ -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
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
index 0fda344..1babb39 100644
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@ -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 \

  parent reply	other threads:[~2020-01-14 13:03 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-30 13:58 [PATCH v2 0/8] vdso: Complete the conversion to 32bit syscalls Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 1/8] arm64: compat: vdso: Expose BUILD_VDSO32 Vincenzo Frascino
2019-09-03 14:36   ` Vincenzo Frascino
2019-09-03 14:38     ` Will Deacon
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 2/8] lib: vdso: Build 32 bit specific functions in the right context Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-13 22:28   ` [PATCH v2 2/8] lib: vdso: " Thomas Gleixner
2020-01-14  9:33     ` Thomas Gleixner
2020-01-14 10:15       ` Vincenzo Frascino
2020-01-14 10:37         ` Thomas Gleixner
2020-01-14 10:41           ` Vincenzo Frascino
2020-01-14 11:15           ` Vincenzo Frascino
2020-01-14 13:02     ` tip-bot2 for Thomas Gleixner [this message]
2020-01-14 13:02   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-16 19:43   ` [PATCH] MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel Thomas Gleixner
2020-01-16 20:11     ` Paul Burton
2020-01-16 20:28     ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-30 13:58 ` [PATCH v2 3/8] mips: compat: vdso: Use legacy syscalls as fallback Vincenzo Frascino
2019-09-03 13:52   ` Paul Burton
2019-09-03 14:20     ` Vincenzo Frascino
2019-09-03 21:00   ` Paul Burton
2019-08-30 13:58 ` [PATCH v2 4/8] lib: vdso: Remove VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:58 ` [PATCH v2 5/8] lib: vdso: Remove checks on return value for 32 bit vDSO Vincenzo Frascino
2019-08-30 14:16   ` Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 6/8] arm64: compat: vdso: Remove unused VDSO_HAS_32BIT_FALLBACK Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 7/8] mips: " Vincenzo Frascino
2019-09-03 14:46   ` Paul Burton
2019-09-03 14:51     ` Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino
2019-08-30 13:59 ` [PATCH v2 8/8] x86: " Vincenzo Frascino
2020-01-13 19:09   ` [tip: timers/core] x86/vdso: " tip-bot2 for Vincenzo Frascino
2020-01-14 13:02   ` tip-bot2 for Vincenzo Frascino

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=157900694409.396.3651284834298683513.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=vincenzo.frascino@arm.com \
    --cc=x86@kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).