mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-18 22:14:16 +00:00 
			
		
		
		
	 cffaefd15a
			
		
	
	
		cffaefd15a
		
	
	
	
	
		
			
			Both the vdso rework and the CONFIG_PAGE_SHIFT changes were merged during
the v6.9 merge window, so it is now possible to use CONFIG_PAGE_SHIFT
instead of including asm/page.h in the vdso.
This avoids the workaround for arm64 - commit 8b3843ae36 ("vdso/datapage:
Quick fix - use asm/page-def.h for ARM64") and addresses a build warning
for powerpc64:
In file included from <built-in>:4:
In file included from /home/arnd/arm-soc/arm-soc/lib/vdso/gettimeofday.c:5:
In file included from ../include/vdso/datapage.h:25:
arch/powerpc/include/asm/page.h:230:9: error: result of comparison of constant 13835058055282163712 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
  230 |         return __pa(kaddr) >> PAGE_SHIFT;
      |                ^~~~~~~~~~~
arch/powerpc/include/asm/page.h:217:37: note: expanded from macro '__pa'
  217 |         VIRTUAL_WARN_ON((unsigned long)(x) < PAGE_OFFSET);              \
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
arch/powerpc/include/asm/page.h:202:73: note: expanded from macro 'VIRTUAL_WARN_ON'
  202 | #define VIRTUAL_WARN_ON(x)      WARN_ON(IS_ENABLED(CONFIG_DEBUG_VIRTUAL) && (x))
      |                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
arch/powerpc/include/asm/bug.h:88:25: note: expanded from macro 'WARN_ON'
   88 |         int __ret_warn_on = !!(x);                              \
      |                                ^
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Link: https://lore.kernel.org/r/20240320180228.136371-1-arnd@kernel.org
		
	
			
		
			
				
	
	
		
			159 lines
		
	
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			159 lines
		
	
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* SPDX-License-Identifier: GPL-2.0 */
 | |
| #ifndef _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
 | |
| #define _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
 | |
| 
 | |
| #ifndef __ASSEMBLY__
 | |
| 
 | |
| #include <asm/vdso/timebase.h>
 | |
| #include <asm/barrier.h>
 | |
| #include <asm/unistd.h>
 | |
| #include <uapi/linux/time.h>
 | |
| 
 | |
| #define VDSO_HAS_CLOCK_GETRES		1
 | |
| 
 | |
| #define VDSO_HAS_TIME			1
 | |
| 
 | |
| static __always_inline int do_syscall_2(const unsigned long _r0, const unsigned long _r3,
 | |
| 					const unsigned long _r4)
 | |
| {
 | |
| 	register long r0 asm("r0") = _r0;
 | |
| 	register unsigned long r3 asm("r3") = _r3;
 | |
| 	register unsigned long r4 asm("r4") = _r4;
 | |
| 	register int ret asm ("r3");
 | |
| 
 | |
| 	asm volatile(
 | |
| 		"       sc\n"
 | |
| 		"	bns+	1f\n"
 | |
| 		"	neg	%0, %0\n"
 | |
| 		"1:\n"
 | |
| 	: "=r" (ret), "+r" (r4), "+r" (r0)
 | |
| 	: "r" (r3)
 | |
| 	: "memory", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "cr0", "ctr");
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static __always_inline
 | |
| int gettimeofday_fallback(struct __kernel_old_timeval *_tv, struct timezone *_tz)
 | |
| {
 | |
| 	return do_syscall_2(__NR_gettimeofday, (unsigned long)_tv, (unsigned long)_tz);
 | |
| }
 | |
| 
 | |
| #ifdef __powerpc64__
 | |
| 
 | |
| static __always_inline
 | |
| int clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_gettime, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| 
 | |
| static __always_inline
 | |
| int clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_getres, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| 
 | |
| #else
 | |
| 
 | |
| #define BUILD_VDSO32		1
 | |
| 
 | |
| static __always_inline
 | |
| int clock_gettime_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_gettime64, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| 
 | |
| static __always_inline
 | |
| int clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_getres_time64, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| 
 | |
| static __always_inline
 | |
| int clock_gettime32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_gettime, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| 
 | |
| static __always_inline
 | |
| int clock_getres32_fallback(clockid_t _clkid, struct old_timespec32 *_ts)
 | |
| {
 | |
| 	return do_syscall_2(__NR_clock_getres, _clkid, (unsigned long)_ts);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static __always_inline u64 __arch_get_hw_counter(s32 clock_mode,
 | |
| 						 const struct vdso_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)
 | |
| {
 | |
| 	return (void *)vd + (1U << CONFIG_PAGE_SHIFT);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static inline bool vdso_clocksource_ok(const struct vdso_data *vd)
 | |
| {
 | |
| 	return true;
 | |
| }
 | |
| #define vdso_clocksource_ok vdso_clocksource_ok
 | |
| 
 | |
| /*
 | |
|  * powerpc specific delta calculation.
 | |
|  *
 | |
|  * This variant removes the masking of the subtraction because the
 | |
|  * clocksource mask of all VDSO capable clocksources on powerpc is U64_MAX
 | |
|  * which would result in a pointless operation. The compiler cannot
 | |
|  * optimize it away as the mask comes from the vdso data and is not compile
 | |
|  * time constant.
 | |
|  */
 | |
| static __always_inline u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult)
 | |
| {
 | |
| 	return (cycles - last) * mult;
 | |
| }
 | |
| #define vdso_calc_delta vdso_calc_delta
 | |
| 
 | |
| #ifndef __powerpc64__
 | |
| static __always_inline u64 vdso_shift_ns(u64 ns, unsigned long shift)
 | |
| {
 | |
| 	u32 hi = ns >> 32;
 | |
| 	u32 lo = ns;
 | |
| 
 | |
| 	lo >>= shift;
 | |
| 	lo |= hi << (32 - shift);
 | |
| 	hi >>= shift;
 | |
| 
 | |
| 	if (likely(hi == 0))
 | |
| 		return lo;
 | |
| 
 | |
| 	return ((u64)hi << 32) | lo;
 | |
| }
 | |
| #define vdso_shift_ns vdso_shift_ns
 | |
| #endif
 | |
| 
 | |
| #ifdef __powerpc64__
 | |
| int __c_kernel_clock_gettime(clockid_t clock, struct __kernel_timespec *ts,
 | |
| 			     const struct vdso_data *vd);
 | |
| int __c_kernel_clock_getres(clockid_t clock_id, struct __kernel_timespec *res,
 | |
| 			    const struct vdso_data *vd);
 | |
| #else
 | |
| int __c_kernel_clock_gettime(clockid_t clock, struct old_timespec32 *ts,
 | |
| 			     const struct vdso_data *vd);
 | |
| int __c_kernel_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts,
 | |
| 			       const struct vdso_data *vd);
 | |
| int __c_kernel_clock_getres(clockid_t clock_id, struct old_timespec32 *res,
 | |
| 			    const struct vdso_data *vd);
 | |
| #endif
 | |
| int __c_kernel_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz,
 | |
| 			    const struct vdso_data *vd);
 | |
| __kernel_old_time_t __c_kernel_time(__kernel_old_time_t *time,
 | |
| 				    const struct vdso_data *vd);
 | |
| #endif /* __ASSEMBLY__ */
 | |
| 
 | |
| #endif /* _ASM_POWERPC_VDSO_GETTIMEOFDAY_H */
 |