The generic storage implementation provides the same features as the
custom one. However it can be shared between architectures, making
maintenance easier.

Co-developed-by: Nam Cao <redacted>
Signed-off-by: Nam Cao <redacted>
Signed-off-by: Thomas Weißschuh <redacted>
---
  arch/powerpc/Kconfig                         |   2 +
  arch/powerpc/include/asm/vdso.h              |   1 +
  arch/powerpc/include/asm/vdso/arch_data.h    |  37 +++++++++
  arch/powerpc/include/asm/vdso/getrandom.h    |  11 +--
  arch/powerpc/include/asm/vdso/gettimeofday.h |  36 +++++----
  arch/powerpc/include/asm/vdso/vsyscall.h     |  13 ---
  arch/powerpc/include/asm/vdso_datapage.h     |  44 +---------
  arch/powerpc/kernel/asm-offsets.c            |   1 -
  arch/powerpc/kernel/time.c                   |   2 +-
  arch/powerpc/kernel/vdso.c                   | 115 +++------------------------
  arch/powerpc/kernel/vdso/cacheflush.S        |   2 +-
  arch/powerpc/kernel/vdso/datapage.S          |   4 +-
  arch/powerpc/kernel/vdso/gettimeofday.S      |   4 +-
  arch/powerpc/kernel/vdso/vdso32.lds.S        |   4 +-
  arch/powerpc/kernel/vdso/vdso64.lds.S        |   4 +-
  arch/powerpc/kernel/vdso/vgettimeofday.c     |  14 ++--
  16 files changed, 101 insertions(+), 193 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a0ce777f97063bf858942c60654d8411bcf2a3dc..600fa3b917ee902d016f2a04376950a9dc49074f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig

@@ -156,6 +156,7 @@ config PPC
  	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST
  	select ARCH_HAS_UACCESS_FLUSHCACHE
  	select ARCH_HAS_UBSAN
+	select ARCH_HAS_VDSO_ARCH_DATA
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select ARCH_HAVE_EXTRA_ELF_NOTES        if SPU_BASE
  	select ARCH_KEEP_MEMBLOCK

@@ -206,6 +207,7 @@ config PPC
  	select GENERIC_PTDUMP
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL
+	select GENERIC_VDSO_DATA_STORE
  	select GENERIC_VDSO_TIME_NS
  	select HAS_IOPORT			if PCI
  	select HAVE_ARCH_AUDITSYSCALL

diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
index 8d972bc98b55fe916f23488ca9e2a5918046b9aa..1ca23fbfe087ae90b90c4286335f86d9f8121078 100644
--- a/arch/powerpc/include/asm/vdso.h
+++ b/arch/powerpc/include/asm/vdso.h

@@ -3,6 +3,7 @@
  #define _ASM_POWERPC_VDSO_H
  
  #define VDSO_VERSION_STRING	LINUX_2.6.15
+#define __VDSO_PAGES		4
  
  #ifndef __ASSEMBLY__
  

diff --git a/arch/powerpc/include/asm/vdso/arch_data.h b/arch/powerpc/include/asm/vdso/arch_data.h
new file mode 100644
index 0000000000000000000000000000000000000000..c240a6b875181ac4159f2e80b11f9bf214e22808
--- /dev/null
+++ b/arch/powerpc/include/asm/vdso/arch_data.h

@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2002 Peter Bergner <bergner@vnet.ibm.com>, IBM
+ * Copyright (C) 2005 Benjamin Herrenschmidy <benh@kernel.crashing.org>,
+ * 		      IBM Corp.
+ */
+#ifndef _ASM_POWERPC_VDSO_ARCH_DATA_H
+#define _ASM_POWERPC_VDSO_ARCH_DATA_H
+
+#include <linux/unistd.h>
+#include <linux/types.h>
+
+#define SYSCALL_MAP_SIZE      ((NR_syscalls + 31) / 32)
+
+#ifdef CONFIG_PPC64
+
+struct vdso_arch_data {
+	__u64 tb_ticks_per_sec;			/* Timebase tics / sec */
+	__u32 dcache_block_size;		/* L1 d-cache block size     */
+	__u32 icache_block_size;		/* L1 i-cache block size     */
+	__u32 dcache_log_block_size;		/* L1 d-cache log block size */
+	__u32 icache_log_block_size;		/* L1 i-cache log block size */
+	__u32 syscall_map[SYSCALL_MAP_SIZE];	/* Map of syscalls  */
+	__u32 compat_syscall_map[SYSCALL_MAP_SIZE];	/* Map of compat syscalls */
+};
+
+#else /* CONFIG_PPC64 */
+
+struct vdso_arch_data {
+	__u64 tb_ticks_per_sec;		/* Timebase tics / sec */
+	__u32 syscall_map[SYSCALL_MAP_SIZE]; /* Map of syscalls */
+	__u32 compat_syscall_map[0];	/* No compat syscalls on PPC32 */
+};
+
+#endif /* CONFIG_PPC64 */
+
+#endif /* _ASM_POWERPC_VDSO_ARCH_DATA_H */

diff --git a/arch/powerpc/include/asm/vdso/getrandom.h b/arch/powerpc/include/asm/vdso/getrandom.h
index 80ce0709725eb89c1f3b69e0733038b458fbf24f..c82eb0d8237681a7396abfe7d161292636b8cce4 100644
--- a/arch/powerpc/include/asm/vdso/getrandom.h
+++ b/arch/powerpc/include/asm/vdso/getrandom.h

@@ -43,20 +43,21 @@ static __always_inline ssize_t getrandom_syscall(void *buffer, size_t len, unsig
  			    (unsigned long)len, (unsigned long)flags);
  }
  
-static __always_inline struct vdso_rng_data *__arch_get_vdso_rng_data(void)
+static __always_inline const struct vdso_rng_data *__ppc_get_vdso_u_rng_data(void)
  {
-	struct vdso_arch_data *data;
+	struct vdso_rng_data *data;
  
  	asm (
  		"	bcl	20, 31, .+4 ;"
  		"0:	mflr	%0 ;"
-		"	addis	%0, %0, (_vdso_datapage - 0b)@ha ;"
-		"	addi	%0, %0, (_vdso_datapage - 0b)@l  ;"
+		"	addis	%0, %0, (vdso_u_rng_data - 0b)@ha ;"
+		"	addi	%0, %0, (vdso_u_rng_data - 0b)@l  ;"
  		: "=r" (data) : : "lr"
  	);
  
-	return &data->rng_data;
+	return data;
  }
+#define __arch_get_vdso_u_rng_data __ppc_get_vdso_u_rng_data
  
  ssize_t __c_kernel_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state,
  			     size_t opaque_len);

diff --git a/arch/powerpc/include/asm/vdso/gettimeofday.h b/arch/powerpc/include/asm/vdso/gettimeofday.h
index c6390890a60c2fdcb608bf321b2945c3fb372f54..bddd9cde97db197d0d3daba6c2289cb29e6b5a75 100644
--- a/arch/powerpc/include/asm/vdso/gettimeofday.h
+++ b/arch/powerpc/include/asm/vdso/gettimeofday.h

@@ -94,22 +94,29 @@ int clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
  #endif
  
  static __always_inline u64 __arch_get_hw_counter(s32 clock_mode,
-						 const struct vdso_data *vd)
+						 const struct vdso_time_data *vd)
  {
  	return get_tb();
  }
  
-const struct vdso_data *__arch_get_vdso_data(void);
-
  #ifdef CONFIG_TIME_NS
-static __always_inline
-const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)
+static __always_inline const struct vdso_time_data *__ppc_get_vdso_u_timens_data(void)
  {
-	return (void *)vd + (1U << CONFIG_PAGE_SHIFT);
+	struct vdso_time_data *time_data;
+
+	asm(
+		"	bcl	20, 31, .+4\n"
+		"0:	mflr	%0\n"
+		"	addis	%0, %0, (vdso_u_timens_data - 0b)@ha\n"
+		"	addi	%0, %0, (vdso_u_timens_data - 0b)@l\n"
+	: "=r" (time_data) :: "lr");
+
+	return time_data;