Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 23 Jun 2019 16:53:11 -0700
From:   tip-bot for Vincenzo Frascino <tipbot@zytor.com>
Message-ID: <tip-1e3f17f55aec6510f88ff65dcbaae13435af0ba6@git.kernel.org>
Cc:     andre.przywara@arm.com, vincenzo.frascino@arm.com,
        sthotton@marvell.com, huw@codeweavers.com, arnd@arndb.de,
        linux@rasmusvillemoes.dk, salyzyn@android.com,
        0x7f454c46@gmail.com, mingo@kernel.org, shuah@kernel.org,
        hpa@zytor.com, paul.burton@mips.com, linux-kernel@vger.kernel.org,
        linux@armlinux.org.uk, ralf@linux-mips.org, tglx@linutronix.de,
        will.deacon@arm.com, pcc@google.com, daniel.lezcano@linaro.org,
        catalin.marinas@arm.com
Reply-To: mingo@kernel.org, 0x7f454c46@gmail.com, hpa@zytor.com,
          shuah@kernel.org, arnd@arndb.de, sthotton@marvell.com,
          huw@codeweavers.com, vincenzo.frascino@arm.com,
          andre.przywara@arm.com, salyzyn@android.com,
          linux@rasmusvillemoes.dk, daniel.lezcano@linaro.org,
          pcc@google.com, catalin.marinas@arm.com, ralf@linux-mips.org,
          linux@armlinux.org.uk, linux-kernel@vger.kernel.org,
          paul.burton@mips.com, will.deacon@arm.com, tglx@linutronix.de
In-Reply-To: <20190621095252.32307-14-vincenzo.frascino@arm.com>
References: <20190621095252.32307-14-vincenzo.frascino@arm.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:timers/vdso] arm64: elf: VDSO code page discovery
Git-Commit-ID: 1e3f17f55aec6510f88ff65dcbaae13435af0ba6
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  1e3f17f55aec6510f88ff65dcbaae13435af0ba6
Gitweb:     https://git.kernel.org/tip/1e3f17f55aec6510f88ff65dcbaae13435af0ba6
Author:     Vincenzo Frascino <vincenzo.frascino@arm.com>
AuthorDate: Fri, 21 Jun 2019 10:52:40 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 22 Jun 2019 21:21:09 +0200

arm64: elf: VDSO code page discovery

Like in normal vDSOs, when compat vDSOs are enabled the auxiliary
vector symbol AT_SYSINFO_EHDR needs to point to the address of the
vDSO code, to allow the dynamic linker to find it.

Add the necessary code to the elf arm64 module to make this possible.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Shijith Thotton <sthotton@marvell.com>
Tested-by: Andre Przywara <andre.przywara@arm.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@vger.kernel.org
Cc: linux-kselftest@vger.kernel.org
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Mark Salyzyn <salyzyn@android.com>
Cc: Peter Collingbourne <pcc@google.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Huw Davies <huw@codeweavers.com>
Link: https://lkml.kernel.org/r/20190621095252.32307-14-vincenzo.frascino@arm.com

---
 arch/arm64/include/asm/elf.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 325d9515c0f8..3c7037c6ba9b 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -202,7 +202,21 @@ typedef compat_elf_greg_t		compat_elf_gregset_t[COMPAT_ELF_NGREG];
 ({									\
 	set_thread_flag(TIF_32BIT);					\
  })
+#ifdef CONFIG_GENERIC_COMPAT_VDSO
+#define COMPAT_ARCH_DLINFO						\
+do {									\
+	/*								\
+	 * Note that we use Elf64_Off instead of elf_addr_t because	\
+	 * elf_addr_t in compat is defined as Elf32_Addr and casting	\
+	 * current->mm->context.vdso to it triggers a cast warning of	\
+	 * cast from pointer to integer of different size.		\
+	 */								\
+	NEW_AUX_ENT(AT_SYSINFO_EHDR,					\
+			(Elf64_Off)current->mm->context.vdso);		\
+} while (0)
+#else
 #define COMPAT_ARCH_DLINFO
+#endif
 extern int aarch32_setup_additional_pages(struct linux_binprm *bprm,
 					  int uses_interp);
 #define compat_arch_setup_additional_pages \