Commit cf124696 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

csky/vdso: Remove gettimeofday() and friends from VDSO 



The time-related VDSO functionality was introduced in 2021 in
commit 87f3248c ("csky: Reconstruct VDSO framework") and
commit 0d3b051a ("csky: Add VDSO with GENERIC_GETTIMEOFDAY, GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO").

However the corresponding aux-vector entry AT_SYSINFO_EHDR was never
wired up, making these functions impossible to test or use.

The VDSO itself is kept as it also provides rt_sigreturn which is
exposed differently to userspace.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-1-b64f0842d512@linutronix.de
parent d4a65302

arch/csky/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ config CSKY 
	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select GENERIC_VDSO_32

	select GENERIC_GETTIMEOFDAY

	select GX6605S_TIMER if CPU_CK610

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_AUDITSYSCALL
@@ -80,7 +77,6 @@ config CSKY 
	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_GENERIC_VDSO

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_ERROR_INJECTION

arch/csky/include/asm/vdso/clocksource.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __ASM_VDSO_CSKY_CLOCKSOURCE_H

#define __ASM_VDSO_CSKY_CLOCKSOURCE_H



#define VDSO_ARCH_CLOCKMODES	\

	VDSO_CLOCKMODE_ARCHTIMER



#endif /* __ASM_VDSO_CSKY_CLOCKSOURCE_H */

arch/csky/include/asm/vdso/gettimeofday.h

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __ASM_VDSO_CSKY_GETTIMEOFDAY_H

#define __ASM_VDSO_CSKY_GETTIMEOFDAY_H



#ifndef __ASSEMBLY__



#include <asm/barrier.h>

#include <asm/unistd.h>

#include <abi/regdef.h>

#include <uapi/linux/time.h>



#define VDSO_HAS_CLOCK_GETRES	1



static __always_inline

int gettimeofday_fallback(struct __kernel_old_timeval *_tv,

			  struct timezone *_tz)

{

	register struct __kernel_old_timeval *tv asm("a0") = _tv;

	register struct timezone *tz asm("a1") = _tz;

	register long ret asm("a0");

	register long nr asm(syscallid) = __NR_gettimeofday;



	asm volatile ("trap 0\n"

		      : "=r" (ret)

		      : "r"(tv), "r"(tz), "r"(nr)

		      : "memory");



	return ret;

}



static __always_inline

long clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)

{

	register clockid_t clkid asm("a0") = _clkid;

	register struct __kernel_timespec *ts asm("a1") = _ts;

	register long ret asm("a0");

	register long nr asm(syscallid) = __NR_clock_gettime64;



	asm volatile ("trap 0\n"

		      : "=r" (ret)

		      : "r"(clkid), "r"(ts), "r"(nr)

		      : "memory");



	return ret;

}



static __always_inline

long clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)

{

	register clockid_t clkid asm("a0") = _clkid;

	register struct old_timespec32 *ts asm("a1") = _ts;

	register long ret asm("a0");

	register long nr asm(syscallid) = __NR_clock_gettime;



	asm volatile ("trap 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)

{

	register clockid_t clkid asm("a0") = _clkid;

	register struct __kernel_timespec *ts asm("a1") = _ts;

	register long ret asm("a0");

	register long nr asm(syscallid) = __NR_clock_getres_time64;



	asm volatile ("trap 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 clockid_t clkid asm("a0") = _clkid;

	register struct old_timespec32 *ts asm("a1") = _ts;

	register long ret asm("a0");

	register long nr asm(syscallid) = __NR_clock_getres;



	asm volatile ("trap 0\n"

		      : "=r" (ret)

		      : "r"(clkid), "r"(ts), "r"(nr)

		      : "memory");



	return ret;

}



uint64_t csky_pmu_read_cc(void);

static __always_inline u64 __arch_get_hw_counter(s32 clock_mode,

						 const struct vdso_data *vd)

{

#ifdef CONFIG_CSKY_PMU_V1

	return csky_pmu_read_cc();

#else

	return 0;

#endif

}



static __always_inline const struct vdso_data *__arch_get_vdso_data(void)

{

	return _vdso_data;

}



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_VDSO_CSKY_GETTIMEOFDAY_H */

arch/csky/include/asm/vdso/processor.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



#ifndef __ASM_VDSO_CSKY_PROCESSOR_H

#define __ASM_VDSO_CSKY_PROCESSOR_H



#ifndef __ASSEMBLY__



#define cpu_relax()	barrier()



#endif /* __ASSEMBLY__ */



#endif /* __ASM_VDSO_CSKY_PROCESSOR_H */

arch/csky/include/asm/vdso/vsyscall.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __ASM_VDSO_CSKY_VSYSCALL_H

#define __ASM_VDSO_CSKY_VSYSCALL_H



#ifndef __ASSEMBLY__



#include <vdso/datapage.h>



extern struct vdso_data *vdso_data;



static __always_inline struct vdso_data *__csky_get_k_vdso_data(void)

{

	return vdso_data;

}

#define __arch_get_k_vdso_data __csky_get_k_vdso_data



#include <asm-generic/vdso/vsyscall.h>



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_VDSO_CSKY_VSYSCALL_H */