summaryrefslogtreecommitdiff
path: root/arch/riscv
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-08-04 23:37:48 +0300
committerThomas Gleixner <tglx@linutronix.de>2020-08-06 11:57:30 +0300
commit4c5a116ada953b86125ab7c70a57c57463a55a55 (patch)
tree3c160c281da5e710dfa196cf9243caacf18462bc /arch/riscv
parent2324d50d051ec0f14a548e78554fb02513d6dcef (diff)
downloadlinux-4c5a116ada953b86125ab7c70a57c57463a55a55.tar.xz
vdso/treewide: Add vdso_data pointer argument to __arch_get_hw_counter()
MIPS already uses and S390 will need the vdso data pointer in __arch_get_hw_counter(). This works nicely as long as the architecture does not support time namespaces in the VDSO. With time namespaces enabled the regular accessor to the vdso data pointer __arch_get_vdso_data() will return the namespace specific VDSO data page for tasks which are part of a non-root time namespace. This would cause the architectures which need the vdso data pointer in __arch_get_hw_counter() to access the wrong vdso data page. Add a vdso_data pointer argument to __arch_get_hw_counter() and hand it in from the call sites in the core code. For architectures which do not need the data pointer in their counter accessor function the compiler will just optimize it out. Fix up all existing architecture implementations and make MIPS utilize the pointer instead of invoking the accessor function. No functional change and no change in the resulting object code (except MIPS). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/draft-87wo2ekuzn.fsf@nanos.tec.linutronix.de
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/include/asm/vdso/gettimeofday.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/vdso/gettimeofday.h b/arch/riscv/include/asm/vdso/gettimeofday.h
index 3099362d9f26..f839f16e0d2a 100644
--- a/arch/riscv/include/asm/vdso/gettimeofday.h
+++ b/arch/riscv/include/asm/vdso/gettimeofday.h
@@ -60,7 +60,8 @@ int clock_getres_fallback(clockid_t _clkid, struct __kernel_timespec *_ts)
return ret;
}
-static __always_inline u64 __arch_get_hw_counter(s32 clock_mode)
+static __always_inline u64 __arch_get_hw_counter(s32 clock_mode,
+ const struct vdso_data *vd)
{
/*
* The purpose of csr_read(CSR_TIME) is to trap the system into