Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79bee5a3 authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Greg Kroah-Hartman
Browse files

powerpc: Fix vDSO clock_getres() 



[ Upstream commit 552263456215ada7ee8700ce022d12b0cffe4802 ]

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: a7f290da ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
[chleroy: changed CLOCK_REALTIME_RES to CLOCK_HRTIMER_RES]
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 12d1ed19

arch/powerpc/include/asm/vdso_datapage.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct vdso_data { 
	__s32 wtom_clock_nsec;			/* Wall to monotonic clock nsec */

	__s64 wtom_clock_sec;			/* Wall to monotonic clock sec */

	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_32[SYSCALL_MAP_SIZE]; /* map of syscalls */

};
@@ -107,6 +108,7 @@ struct vdso_data { 
	__s32 wtom_clock_nsec;

	struct timespec stamp_xtime;	/* xtime as at tb_orig_stamp */

	__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 dcache_block_size;	/* L1 d-cache block size     */

	__u32 icache_block_size;	/* L1 i-cache block size     */

arch/powerpc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ int main(void) 
	OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec);

	OFFSET(STAMP_XTIME, vdso_data, stamp_xtime);

	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_DCACHE_BLOCKSZ, vdso_data, dcache_block_size);

	OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size);
@@ -409,7 +410,6 @@ int main(void) 
	DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE);

	DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE);

	DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);

	DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);



#ifdef CONFIG_BUG

	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));

arch/powerpc/kernel/time.c

+1 −0
Original line number Diff line number Diff line
@@ -929,6 +929,7 @@ void update_vsyscall(struct timekeeper *tk) 
	vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec;

	vdso_data->stamp_xtime = xt;

	vdso_data->stamp_sec_fraction = frac_sec;

	vdso_data->hrtimer_res = hrtimer_resolution;

	smp_wmb();

	++(vdso_data->tb_update_count);

}

arch/powerpc/kernel/vdso32/gettimeofday.S

+5 −2
Original line number Diff line number Diff line
@@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) 
	cror	cr0*4+eq,cr0*4+eq,cr1*4+eq

	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

	cmpli	cr0,r4,0

	crclr	cr0*4+so

	beqlr

	lis	r5,CLOCK_REALTIME_RES@h

	ori	r5,r5,CLOCK_REALTIME_RES@l

	stw	r3,TSPC32_TV_SEC(r4)

	stw	r5,TSPC32_TV_NSEC(r4)

	blr

arch/powerpc/kernel/vdso64/gettimeofday.S

+5 −2
Original line number Diff line number Diff line
@@ -190,12 +190,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) 
	cror	cr0*4+eq,cr0*4+eq,cr1*4+eq

	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

	cmpldi	cr0,r4,0

	crclr	cr0*4+so

	beqlr

	lis	r5,CLOCK_REALTIME_RES@h

	ori	r5,r5,CLOCK_REALTIME_RES@l

	std	r3,TSPC64_TV_SEC(r4)

	std	r5,TSPC64_TV_NSEC(r4)

	blr