powerpc: Fix vDSO clock_getres()
[ Upstream commit5.4-rM2-2.2.x-imx-squashed5522634562
] clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly. Fixes:a7f290dad3
("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel") Cc: stable@vger.kernel.org Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> Acked-by: Shuah Khan <skhan@linuxfoundation.org> [chleroy: changed CLOCK_REALTIME_RES to CLOCK_HRTIMER_RES] Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
002d1cac5a
commit
78d375ace0
|
@ -82,6 +82,7 @@ struct vdso_data {
|
||||||
__s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */
|
__s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */
|
||||||
__s64 wtom_clock_sec; /* Wall to monotonic clock sec */
|
__s64 wtom_clock_sec; /* Wall to monotonic clock sec */
|
||||||
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
||||||
|
__u32 hrtimer_res; /* hrtimer resolution */
|
||||||
__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
||||||
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
||||||
};
|
};
|
||||||
|
@ -103,6 +104,7 @@ struct vdso_data {
|
||||||
__s32 wtom_clock_nsec;
|
__s32 wtom_clock_nsec;
|
||||||
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */
|
||||||
__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */
|
__u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */
|
||||||
|
__u32 hrtimer_res; /* hrtimer resolution */
|
||||||
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */
|
||||||
__u32 dcache_block_size; /* L1 d-cache block size */
|
__u32 dcache_block_size; /* L1 d-cache block size */
|
||||||
__u32 icache_block_size; /* L1 i-cache block size */
|
__u32 icache_block_size; /* L1 i-cache block size */
|
||||||
|
|
|
@ -387,6 +387,7 @@ int main(void)
|
||||||
OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec);
|
OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec);
|
||||||
OFFSET(STAMP_XTIME, vdso_data, stamp_xtime);
|
OFFSET(STAMP_XTIME, vdso_data, stamp_xtime);
|
||||||
OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction);
|
OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction);
|
||||||
|
OFFSET(CLOCK_HRTIMER_RES, vdso_data, hrtimer_res);
|
||||||
OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size);
|
OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size);
|
||||||
OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size);
|
OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size);
|
||||||
OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size);
|
OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size);
|
||||||
|
@ -417,7 +418,6 @@ int main(void)
|
||||||
DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE);
|
DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE);
|
||||||
DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE);
|
DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE);
|
||||||
DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
|
DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
|
||||||
DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
|
|
||||||
|
|
||||||
#ifdef CONFIG_BUG
|
#ifdef CONFIG_BUG
|
||||||
DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
|
DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
|
||||||
|
|
|
@ -959,6 +959,7 @@ void update_vsyscall(struct timekeeper *tk)
|
||||||
vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec;
|
vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec;
|
||||||
vdso_data->stamp_xtime = xt;
|
vdso_data->stamp_xtime = xt;
|
||||||
vdso_data->stamp_sec_fraction = frac_sec;
|
vdso_data->stamp_sec_fraction = frac_sec;
|
||||||
|
vdso_data->hrtimer_res = hrtimer_resolution;
|
||||||
smp_wmb();
|
smp_wmb();
|
||||||
++(vdso_data->tb_update_count);
|
++(vdso_data->tb_update_count);
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,12 +156,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres)
|
||||||
cror cr0*4+eq,cr0*4+eq,cr1*4+eq
|
cror cr0*4+eq,cr0*4+eq,cr1*4+eq
|
||||||
bne cr0,99f
|
bne cr0,99f
|
||||||
|
|
||||||
|
mflr r12
|
||||||
|
.cfi_register lr,r12
|
||||||
|
bl __get_datapage@local /* get data page */
|
||||||
|
lwz r5, CLOCK_HRTIMER_RES(r3)
|
||||||
|
mtlr r12
|
||||||
li r3,0
|
li r3,0
|
||||||
cmpli cr0,r4,0
|
cmpli cr0,r4,0
|
||||||
crclr cr0*4+so
|
crclr cr0*4+so
|
||||||
beqlr
|
beqlr
|
||||||
lis r5,CLOCK_REALTIME_RES@h
|
|
||||||
ori r5,r5,CLOCK_REALTIME_RES@l
|
|
||||||
stw r3,TSPC32_TV_SEC(r4)
|
stw r3,TSPC32_TV_SEC(r4)
|
||||||
stw r5,TSPC32_TV_NSEC(r4)
|
stw r5,TSPC32_TV_NSEC(r4)
|
||||||
blr
|
blr
|
||||||
|
|
|
@ -186,12 +186,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres)
|
||||||
cror cr0*4+eq,cr0*4+eq,cr1*4+eq
|
cror cr0*4+eq,cr0*4+eq,cr1*4+eq
|
||||||
bne cr0,99f
|
bne cr0,99f
|
||||||
|
|
||||||
|
mflr r12
|
||||||
|
.cfi_register lr,r12
|
||||||
|
bl V_LOCAL_FUNC(__get_datapage)
|
||||||
|
lwz r5, CLOCK_HRTIMER_RES(r3)
|
||||||
|
mtlr r12
|
||||||
li r3,0
|
li r3,0
|
||||||
cmpldi cr0,r4,0
|
cmpldi cr0,r4,0
|
||||||
crclr cr0*4+so
|
crclr cr0*4+so
|
||||||
beqlr
|
beqlr
|
||||||
lis r5,CLOCK_REALTIME_RES@h
|
|
||||||
ori r5,r5,CLOCK_REALTIME_RES@l
|
|
||||||
std r3,TSPC64_TV_SEC(r4)
|
std r3,TSPC64_TV_SEC(r4)
|
||||||
std r5,TSPC64_TV_NSEC(r4)
|
std r5,TSPC64_TV_NSEC(r4)
|
||||||
blr
|
blr
|
||||||
|
|
Loading…
Reference in New Issue