Skip to contentSkip to conversation

Fix vDSO clock_getres()

PATCH Applied Vincenzo Frascino 5 participants 16 messages Apr 16, 2019 – May 22, 2019 2 messages not in the archive

Subsystems (6)
PowerPC Kselftest arm64 s390 +2 more subsystems

v2 of 6 Applied Latest is v6 →

lore
Share & tools
lore

Vincenzo Frascino

author maintainer
#0 lore raw

v2 cover Fix vDSO clock_getres()

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.

A possible fix is to change the vdso implementation of clock_getres, keeping a copy of hrtimer_resolution in vdso data and using that directly [1].

This patchset implements the proposed fix for arm64, powerpc, s390, nds32 and adds a test to verify that the syscall and the vdso library implementation of clock_getres return the same values.

Even if these patches are unified by the same topic, there is no dependency between them, hence they can be merged singularly by each arch maintainer.

[1] https://marc.info/?l=linux-arm-kernel&m=155110381930196&w=2

Changes:
--------
v2:
- Rebased on 5.1-rc5.
- Addressed review comments.

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Vincent Chen <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Arnd Bergmann <[email protected]>

Vincenzo Frascino (5):
arm64: Fix vDSO clock_getres()
powerpc: Fix vDSO clock_getres()
s390: Fix vDSO clock_getres()
nds32: Fix vDSO clock_getres()
kselftest: Extend vDSO selftest to clock_getres

 arch/arm64/include/asm/vdso_datapage.h        |   1 +
 arch/arm64/kernel/asm-offsets.c               |   2 +-
 arch/arm64/kernel/vdso.c                      |   2 +
 arch/arm64/kernel/vdso/gettimeofday.S         |  22 ++--
 arch/nds32/include/asm/vdso_datapage.h        |   1 +
 arch/nds32/kernel/vdso.c                      |   1 +
 arch/nds32/kernel/vdso/gettimeofday.c         |   4 +-
 arch/powerpc/include/asm/vdso_datapage.h      |   2 +
 arch/powerpc/kernel/asm-offsets.c             |   2 +-
 arch/powerpc/kernel/time.c                    |   1 +
 arch/powerpc/kernel/vdso32/gettimeofday.S     |   7 +-
 arch/powerpc/kernel/vdso64/gettimeofday.S     |   7 +-
 arch/s390/include/asm/vdso.h                  |   1 +
 arch/s390/kernel/asm-offsets.c                |   2 +-
 arch/s390/kernel/time.c                       |   1 +
 arch/s390/kernel/vdso32/clock_getres.S        |  12 +-
 arch/s390/kernel/vdso64/clock_getres.S        |  10 +-
 tools/testing/selftests/vDSO/Makefile         |   2 +
 .../selftests/vDSO/vdso_clock_getres.c        | 108 ++++++++++++++++++
 19 files changed, 159 insertions(+), 29 deletions(-)
 create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH v2 1/5 arm64: Fix vDSO clock_getres()

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 arm64 vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
---
 arch/arm64/include/asm/vdso_datapage.h |  1 +
 arch/arm64/kernel/asm-offsets.c        |  2 +-
 arch/arm64/kernel/vdso.c               |  2 ++
 arch/arm64/kernel/vdso/gettimeofday.S  | 22 +++++++++++-----------
 4 files changed, 15 insertions(+), 12 deletions(-)
arch/arm64/include/asm/vdso_datapage.h +1 -0
index 2b9a63771eda..f89263c8e11a 100644
@@ -38,6 +38,7 @@ struct vdso_data {
 	__u32 tz_minuteswest;	/* Whacky timezone stuff */
 	__u32 tz_dsttime;
 	__u32 use_syscall;
+	__u32 hrtimer_res;
 };
 
 #endif /* !__ASSEMBLY__ */
arch/arm64/kernel/asm-offsets.c +1 -1
index 7f40dcbdd51d..e10e2a5d9ddc 100644
@@ -94,7 +94,7 @@ int main(void)
   DEFINE(CLOCK_REALTIME,	CLOCK_REALTIME);
   DEFINE(CLOCK_MONOTONIC,	CLOCK_MONOTONIC);
   DEFINE(CLOCK_MONOTONIC_RAW,	CLOCK_MONOTONIC_RAW);
-  DEFINE(CLOCK_REALTIME_RES,	MONOTONIC_RES_NSEC);
+  DEFINE(CLOCK_REALTIME_RES,	offsetof(struct vdso_data, hrtimer_res));
   DEFINE(CLOCK_REALTIME_COARSE,	CLOCK_REALTIME_COARSE);
   DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);
   DEFINE(CLOCK_COARSE_RES,	LOW_RES_NSEC);
arch/arm64/kernel/vdso.c +2 -0
index 2d419006ad43..5f5759d51c33 100644
@@ -245,6 +245,8 @@ void update_vsyscall(struct timekeeper *tk)
 		vdso_data->cs_shift		= tk->tkr_mono.shift;
 	}
 
+	vdso_data->hrtimer_res		= hrtimer_resolution;
+
 	smp_wmb();
 	++vdso_data->tb_seq_count;
 }
arch/arm64/kernel/vdso/gettimeofday.S +11 -11
index c39872a7b03c..e2e9dfe9ba4a 100644
@@ -296,32 +296,32 @@ ENDPROC(__kernel_clock_gettime)
 /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */
 ENTRY(__kernel_clock_getres)
 	.cfi_startproc
+	adr	vdso_data, _vdso_data
 	cmp	w0, #CLOCK_REALTIME
 	ccmp	w0, #CLOCK_MONOTONIC, #0x4, ne
 	ccmp	w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
-	b.ne	1f
+	b.ne	2f
 
-	ldr	x2, 5f
-	b	2f
-1:
+1:	/* Get hrtimer_res */
+	ldr	x2, [vdso_data, #CLOCK_REALTIME_RES]
+	b	3f
+2:
 	cmp	w0, #CLOCK_REALTIME_COARSE
 	ccmp	w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne
-	b.ne	4f
+	b.ne	5f
 	ldr	x2, 6f
-2:
-	cbz	x1, 3f
+3:
+	cbz	x1, 4f
 	stp	xzr, x2, [x1]
 
-3:	/* res == NULL. */
+4:	/* res == NULL. */
 	mov	w0, wzr
 	ret
 
-4:	/* Syscall fallback. */
+5:	/* Syscall fallback. */
 	mov	x8, #__NR_clock_getres
 	svc	#0
 	ret
-5:
-	.quad	CLOCK_REALTIME_RES
 6:
 	.quad	CLOCK_COARSE_RES
 	.cfi_endproc
Signature · 1 line
2.21.0
maintainer Reviewed-by on v2 1/5
#2 lore raw

Re: [PATCH v2 1/5] arm64: Fix vDSO clock_getres()

arch/arm64/kernel/vdso.c void update_vsyscall(struct timekeeper *tk) · line 248

Quoted 9 lines · Vincenzo Frascino
arch/arm64/kernel/vdso.c +1 -0
index 2d419006ad43..5f5759d51c33 100644
@@ -245,6 +245,8 @@ void update_vsyscall(struct timekeeper *tk)
 		vdso_data->cs_shift		= tk->tkr_mono.shift;
 	}
 
+	vdso_data->hrtimer_res		= hrtimer_resolution;

This should be a WRITE_ONCE(), just in case.

Quoted 14 lines
arch/arm64/kernel/vdso.c +1 -0
+
 	smp_wmb();
 	++vdso_data->tb_seq_count;
 }
arch/arm64/kernel/vdso/gettimeofday.S +1 -0
index c39872a7b03c..e2e9dfe9ba4a 100644
@@ -296,32 +296,32 @@ ENDPROC(__kernel_clock_gettime)
 /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */
 ENTRY(__kernel_clock_getres)
 	.cfi_startproc
+	adr	vdso_data, _vdso_data
 	cmp	w0, #CLOCK_REALTIME

arch/arm64/kernel/vdso/gettimeofday.S ENDPROC(__kernel_clock_gettime) · line 306

Quoted 10 lines
arch/arm64/kernel/vdso/gettimeofday.S +3 -4
 	ccmp	w0, #CLOCK_MONOTONIC, #0x4, ne
 	ccmp	w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
-	b.ne	1f
+	b.ne	2f
 
-	ldr	x2, 5f
-	b	2f
-1:
+1:	/* Get hrtimer_res */
+	ldr	x2, [vdso_data, #CLOCK_REALTIME_RES]

And here we need an "ldr w2, ..." since hrtimer_res is u32.

With the above (which Will can fix up):

Applied
#3 lore raw

Re: [PATCH v2 1/5] arm64: Fix vDSO clock_getres()

Quoted 40 lines · Catalin Marinas

arch/arm64/kernel/vdso.c void update_vsyscall(struct timekeeper *tk) · line 248

Quoted 9 lines · Vincenzo Frascino
arch/arm64/kernel/vdso.c +1 -0
index 2d419006ad43..5f5759d51c33 100644
@@ -245,6 +245,8 @@ void update_vsyscall(struct timekeeper *tk)
 		vdso_data->cs_shift		= tk->tkr_mono.shift;
 	}
 
+	vdso_data->hrtimer_res		= hrtimer_resolution;

This should be a WRITE_ONCE(), just in case.

Quoted 14 lines
arch/arm64/kernel/vdso.c +1 -0
+
 	smp_wmb();
 	++vdso_data->tb_seq_count;
 }
arch/arm64/kernel/vdso/gettimeofday.S +1 -0
index c39872a7b03c..e2e9dfe9ba4a 100644
@@ -296,32 +296,32 @@ ENDPROC(__kernel_clock_gettime)
 /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */
 ENTRY(__kernel_clock_getres)
 	.cfi_startproc
+	adr	vdso_data, _vdso_data
 	cmp	w0, #CLOCK_REALTIME

arch/arm64/kernel/vdso/gettimeofday.S ENDPROC(__kernel_clock_gettime) · line 306

Quoted 10 lines
arch/arm64/kernel/vdso/gettimeofday.S +3 -4
 	ccmp	w0, #CLOCK_MONOTONIC, #0x4, ne
 	ccmp	w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
-	b.ne	1f
+	b.ne	2f
 
-	ldr	x2, 5f
-	b	2f
-1:
+1:	/* Get hrtimer_res */
+	ldr	x2, [vdso_data, #CLOCK_REALTIME_RES]

And here we need an "ldr w2, ..." since hrtimer_res is u32.

Quoted 3 lines

With the above (which Will can fix up):

Applied, with the above and a few extra cleanups.

Will

author maintainer
#4 lore raw

PATCH v2 2/5 powerpc: Fix vDSO clock_getres()

In reply to Vincenzo Frascino

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.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
---
 arch/powerpc/include/asm/vdso_datapage.h  | 2 ++
 arch/powerpc/kernel/asm-offsets.c         | 2 +-
 arch/powerpc/kernel/time.c                | 1 +
 arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++--
 arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++--
 5 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +2 -0
index bbc06bd72b1f..4333b9a473dc 100644
@@ -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
index 86a61e5f8285..52e4b98a8492 100644
@@ -383,6 +383,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_REALTIME_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);
@@ -413,7 +414,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
index bc0503ef9c9c..62c04a6746d8 100644
@@ -955,6 +955,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
index afd516b572f8..2b5f9e83c610 100644
@@ -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
+	lwz	r5,CLOCK_REALTIME_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
index 1f324c28705b..f07730f73d5e 100644
@@ -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_REALTIME_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
Signature · 1 line
2.21.0
Reviewed-by on v2 2/5
#5 lore raw

Re: [PATCH v2 2/5] powerpc: Fix vDSO clock_getres()

Le 16/04/2019 à 18:14, Vincenzo Frascino a écrit :

Quoted 9 lines

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.

Quoted 7 lines

Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Quoted 95 lines
---
  arch/powerpc/include/asm/vdso_datapage.h  | 2 ++
  arch/powerpc/kernel/asm-offsets.c         | 2 +-
  arch/powerpc/kernel/time.c                | 1 +
  arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++--
  arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++--
  5 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +2 -0
index bbc06bd72b1f..4333b9a473dc 100644
@@ -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
index 86a61e5f8285..52e4b98a8492 100644
@@ -383,6 +383,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_REALTIME_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);
@@ -413,7 +414,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
index bc0503ef9c9c..62c04a6746d8 100644
@@ -955,6 +955,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
index afd516b572f8..2b5f9e83c610 100644
@@ -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
+	lwz	r5,CLOCK_REALTIME_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 +4 -0
index 1f324c28705b..f07730f73d5e 100644
@@ -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_REALTIME_RES(r3)

arch/powerpc/kernel/vdso64/gettimeofday.S V_FUNCTION_BEGIN(__kernel_clock_getres) · line 204

Quoted 10 lines
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -2
+	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

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#8 lore raw

Re: [PATCH v2 2/5] powerpc: Fix vDSO clock_getres()

Le 21/05/2019 à 18:46, Christophe Leroy a écrit :

Quoted 9 lines

Le 21/05/2019 à 18:08, Vincenzo Frascino a écrit :

Quoted 4 lines

Hi Christophe,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I can do to help with upstraming it.

As far as I can see you series still has status 'new' in patchwork so I guess Michael didn't have time to look at it (https://patchwork.ozlabs.org/patch/1086410/)

Maybe you should also provide a Fixes: tag. What about:

Fixes a7f290dad32e ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel")

Christophe

Quoted 140 lines
Quoted 3 lines

Please let me know.

You series involves several arches, how do you plan to handle it ? Do you expect each arch maintainer to take each patch independentely, or do you expect acks from arch maintainers in order to merge the entire series in a given tree (which one ?)

Christophe

Quoted 130 lines

Thanks,
Vincenzo

Quoted 124 lines · Christophe Leroy

Le 16/04/2019 à 18:14, Vincenzo Frascino a écrit :

Quoted 9 lines

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.

Quoted 7 lines

Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Quoted 102 lines

---
   arch/powerpc/include/asm/vdso_datapage.h  | 2 ++ arch/powerpc/kernel/asm-offsets.c         | 2 +- arch/powerpc/kernel/time.c                | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++--

   5 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +0 -0
index bbc06bd72b1f..4333b9a473dc 100644
@@ -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 */ };

arch/powerpc/include/asm/vdso_datapage.h +0 -0
@@ -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
index 86a61e5f8285..52e4b98a8492 100644
@@ -383,6 +383,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_REALTIME_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);
@@ -413,7 +414,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
index bc0503ef9c9c..62c04a6746d8 100644
@@ -955,6 +955,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 +0 -0
index afd516b572f8..2b5f9e83c610 100644
@@ -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
+    lwz    r5,CLOCK_REALTIME_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 +0 -0
index 1f324c28705b..f07730f73d5e 100644
@@ -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_REALTIME_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

#9 lore raw

Re: [PATCH v2 2/5] powerpc: Fix vDSO clock_getres()

In reply to a message not in the archive

Le 21/05/2019 à 18:08, Vincenzo Frascino a écrit :

Quoted 4 lines

Hi Christophe,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I can do to help with upstraming it.

As far as I can see you series still has status 'new' in patchwork so I guess Michael didn't have time to look at it (https://patchwork.ozlabs.org/patch/1086410/)

Quoted 2 lines

Please let me know.

You series involves several arches, how do you plan to handle it ? Do you expect each arch maintainer to take each patch independentely, or do you expect acks from arch maintainers in order to merge the entire series in a given tree (which one ?)

Christophe

Quoted 133 lines

Thanks,
Vincenzo

Quoted 127 lines · Christophe Leroy

Le 16/04/2019 à 18:14, Vincenzo Frascino a écrit :

Quoted 9 lines

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.

Quoted 7 lines

Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Quoted 105 lines
---
   arch/powerpc/include/asm/vdso_datapage.h  | 2 ++
   arch/powerpc/kernel/asm-offsets.c         | 2 +-
   arch/powerpc/kernel/time.c                | 1 +
   arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++--
   arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++--
   5 files changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/vdso_datapage.h +2 -0
index bbc06bd72b1f..4333b9a473dc 100644
@@ -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
index 86a61e5f8285..52e4b98a8492 100644
@@ -383,6 +383,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_REALTIME_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);
@@ -413,7 +414,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
index bc0503ef9c9c..62c04a6746d8 100644
@@ -955,6 +955,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
index afd516b572f8..2b5f9e83c610 100644
@@ -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
+	lwz	r5,CLOCK_REALTIME_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
index 1f324c28705b..f07730f73d5e 100644
@@ -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_REALTIME_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
author maintainer
#10 lore raw

PATCH v2 3/5 s390: Fix vDSO clock_getres()

In reply to Vincenzo Frascino

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 s390 vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

---
 arch/s390/include/asm/vdso.h           |  1 +
 arch/s390/kernel/asm-offsets.c         |  2 +-
 arch/s390/kernel/time.c                |  1 +
 arch/s390/kernel/vdso32/clock_getres.S | 12 +++++++-----
 arch/s390/kernel/vdso64/clock_getres.S | 10 +++++-----
 5 files changed, 15 insertions(+), 11 deletions(-)
arch/s390/include/asm/vdso.h +1 -0
index 169d7604eb80..f3ba84fa9bd1 100644
@@ -36,6 +36,7 @@ struct vdso_data {
 	__u32 tk_shift;			/* Shift used for xtime_nsec	0x60 */
 	__u32 ts_dir;			/* TOD steering direction	0x64 */
 	__u64 ts_end;			/* TOD steering end		0x68 */
+	__u32 hrtimer_res;		/* hrtimer resolution		0x70 */
 };
 
 struct vdso_per_cpu_data {
arch/s390/kernel/asm-offsets.c +1 -1
index 164bec175628..36db4a9ee703 100644
@@ -75,6 +75,7 @@ int main(void)
 	OFFSET(__VDSO_TK_SHIFT, vdso_data, tk_shift);
 	OFFSET(__VDSO_TS_DIR, vdso_data, ts_dir);
 	OFFSET(__VDSO_TS_END, vdso_data, ts_end);
+	OFFSET(__VDSO_CLOCK_REALTIME_RES, vdso_data, hrtimer_res);
 	OFFSET(__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base);
 	OFFSET(__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);
 	OFFSET(__VDSO_CPU_NR, vdso_per_cpu_data, cpu_nr);
@@ -86,7 +87,6 @@ int main(void)
 	DEFINE(__CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE);
 	DEFINE(__CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE);
 	DEFINE(__CLOCK_THREAD_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID);
-	DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
 	DEFINE(__CLOCK_COARSE_RES, LOW_RES_NSEC);
 	BLANK();
 	/* idle data offsets */
arch/s390/kernel/time.c +1 -0
index e8766beee5ad..8ea9db599d38 100644
@@ -310,6 +310,7 @@ void update_vsyscall(struct timekeeper *tk)
 
 	vdso_data->tk_mult = tk->tkr_mono.mult;
 	vdso_data->tk_shift = tk->tkr_mono.shift;
+	vdso_data->hrtimer_res = hrtimer_resolution;
 	smp_wmb();
 	++vdso_data->tb_update_count;
 }
arch/s390/kernel/vdso32/clock_getres.S +7 -5
index eaf9cf1417f6..fecd7684c645 100644
@@ -18,20 +18,22 @@
 __kernel_clock_getres:
 	CFI_STARTPROC
 	basr	%r1,0
-	la	%r1,4f-.(%r1)
+10:	al	%r1,4f-10b(%r1)
+	l	%r0,__VDSO_CLOCK_REALTIME_RES(%r1)
 	chi	%r2,__CLOCK_REALTIME
 	je	0f
 	chi	%r2,__CLOCK_MONOTONIC
 	je	0f
-	la	%r1,5f-4f(%r1)
+	basr	%r1,0
+	la	%r1,5f-.(%r1)
+	l	%r0,0(%r1)
 	chi	%r2,__CLOCK_REALTIME_COARSE
 	je	0f
 	chi	%r2,__CLOCK_MONOTONIC_COARSE
 	jne	3f
 0:	ltr	%r3,%r3
 	jz	2f				/* res == NULL */
-1:	l	%r0,0(%r1)
-	xc	0(4,%r3),0(%r3)			/* set tp->tv_sec to zero */
+1:	xc	0(4,%r3),0(%r3)			/* set tp->tv_sec to zero */
 	st	%r0,4(%r3)			/* store tp->tv_usec */
 2:	lhi	%r2,0
 	br	%r14
@@ -39,6 +41,6 @@ __kernel_clock_getres:
 	svc	0
 	br	%r14
 	CFI_ENDPROC
-4:	.long	__CLOCK_REALTIME_RES
+4:	.long	_vdso_data - 10b
 5:	.long	__CLOCK_COARSE_RES
 	.size	__kernel_clock_getres,.-__kernel_clock_getres
arch/s390/kernel/vdso64/clock_getres.S +5 -5
index 081435398e0a..022b58c980db 100644
@@ -17,12 +17,14 @@
 	.type  __kernel_clock_getres,@function
 __kernel_clock_getres:
 	CFI_STARTPROC
-	larl	%r1,4f
+	larl	%r1,3f
+	lg	%r0,0(%r1)
 	cghi	%r2,__CLOCK_REALTIME_COARSE
 	je	0f
 	cghi	%r2,__CLOCK_MONOTONIC_COARSE
 	je	0f
-	larl	%r1,3f
+	larl	%r1,_vdso_data
+	l	%r0,__VDSO_CLOCK_REALTIME_RES(%r1)
 	cghi	%r2,__CLOCK_REALTIME
 	je	0f
 	cghi	%r2,__CLOCK_MONOTONIC
@@ -36,7 +38,6 @@ __kernel_clock_getres:
 	jz	2f
 0:	ltgr	%r3,%r3
 	jz	1f				/* res == NULL */
-	lg	%r0,0(%r1)
 	xc	0(8,%r3),0(%r3)			/* set tp->tv_sec to zero */
 	stg	%r0,8(%r3)			/* store tp->tv_usec */
 1:	lghi	%r2,0
@@ -45,6 +46,5 @@ __kernel_clock_getres:
 	svc	0
 	br	%r14
 	CFI_ENDPROC
-3:	.quad	__CLOCK_REALTIME_RES
-4:	.quad	__CLOCK_COARSE_RES
+3:	.quad	__CLOCK_COARSE_RES
 	.size	__kernel_clock_getres,.-__kernel_clock_getres
Signature · 1 line
2.21.0
author maintainer
#11 lore raw

PATCH v2 4/5 nds32: Fix vDSO clock_getres()

In reply to Vincenzo Frascino

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 nds32 vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly.

Cc Greentime Hu <[email protected]>
Cc Vincent Chen <[email protected]>
---
 arch/nds32/include/asm/vdso_datapage.h | 1 +
 arch/nds32/kernel/vdso.c               | 1 +
 arch/nds32/kernel/vdso/gettimeofday.c  | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)
arch/nds32/include/asm/vdso_datapage.h +1 -0
index 79db5a12ca5e..34d80548297f 100644
@@ -20,6 +20,7 @@ struct vdso_data {
 	u32 xtime_clock_sec;	/* CLOCK_REALTIME - seconds */
 	u32 cs_mult;		/* clocksource multiplier */
 	u32 cs_shift;		/* Cycle to nanosecond divisor (power of two) */
+	u32 hrtimer_res;	/* hrtimer resolution */
 
 	u64 cs_cycle_last;	/* last cycle value */
 	u64 cs_mask;		/* clocksource mask */
arch/nds32/kernel/vdso.c +1 -0
index 016f15891f6d..90bcae6f8554 100644
@@ -220,6 +220,7 @@ void update_vsyscall(struct timekeeper *tk)
 	vdso_data->xtime_coarse_sec = tk->xtime_sec;
 	vdso_data->xtime_coarse_nsec = tk->tkr_mono.xtime_nsec >>
 	    tk->tkr_mono.shift;
+	vdso_data->hrtimer_res = hrtimer_resolution;
 	vdso_write_end(vdso_data);
 }
 
arch/nds32/kernel/vdso/gettimeofday.c +3 -1
index 038721af40e3..b02581891c33 100644
@@ -208,6 +208,8 @@ static notrace int clock_getres_fallback(clockid_t _clk_id,
 
 notrace int __vdso_clock_getres(clockid_t clk_id, struct timespec *res)
 {
+	struct vdso_data *vdata = __get_datapage();
+
 	if (res == NULL)
 		return 0;
 	switch (clk_id) {
@@ -215,7 +217,7 @@ notrace int __vdso_clock_getres(clockid_t clk_id, struct timespec *res)
 	case CLOCK_MONOTONIC:
 	case CLOCK_MONOTONIC_RAW:
 		res->tv_sec = 0;
-		res->tv_nsec = CLOCK_REALTIME_RES;
+		res->tv_nsec = vdata->hrtimer_res;
 		break;
 	case CLOCK_REALTIME_COARSE:
 	case CLOCK_MONOTONIC_COARSE:
Signature · 1 line
2.21.0
author maintainer
#12 lore raw

PATCH v2 5/5 kselftest: Extend vDSO selftest to clock_getres

In reply to Vincenzo Frascino

The current version of the multiarch vDSO selftest verifies only gettimeofday.

Extend the vDSO selftest to clock_getres, to verify that the syscall and the vDSO library function return the same information.

The extension has been used to verify the hrtimer_resoltion fix.

---
 tools/testing/selftests/vDSO/Makefile         |   2 +
 .../selftests/vDSO/vdso_clock_getres.c        | 108 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c
tools/testing/selftests/vDSO/Makefile +2 -0
index 9e03d61f52fd..d5c5bfdf1ac1 100644
@@ -5,6 +5,7 @@ uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
 
 TEST_GEN_PROGS := $(OUTPUT)/vdso_test
+TEST_GEN_PROGS += $(OUTPUT)/vdso_clock_getres
 ifeq ($(ARCH),x86)
 TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
 endif
@@ -18,6 +19,7 @@ endif
 
 all: $(TEST_GEN_PROGS)
 $(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
+$(OUTPUT)/vdso_clock_getres: vdso_clock_getres.c
 $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
 	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
 		vdso_standalone_test_x86.c parse_vdso.c \
tools/testing/selftests/vDSO/vdso_clock_getres.c new file +108 -0

108 lines not on this page · raw message

Signature · 1 line
2.21.0
#13 lore raw

Re: [PATCH v2 5/5] kselftest: Extend vDSO selftest to clock_getres

Quoted 8 lines · Vincenzo Frascino

The current version of the multiarch vDSO selftest verifies only gettimeofday.

Extend the vDSO selftest to clock_getres, to verify that the syscall and the vDSO library function return the same information.

The extension has been used to verify the hrtimer_resoltion fix.

Quoted 7 lines
---
 tools/testing/selftests/vDSO/Makefile         |   2 +
 .../selftests/vDSO/vdso_clock_getres.c        | 108 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c

Assuming this will go via Shuah's tree.

Will

#14 lore raw

PATCH v2 5/5 kselftest: Extend vDSO selftest to clock_getres

In reply to Vincenzo Frascino

Hi Shuah,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I can do to help with upstraming it.

Please let me know.

Thanks,
Vincenzo

Quoted 151 lines · Vincenzo Frascino

The current version of the multiarch vDSO selftest verifies only gettimeofday.

Extend the vDSO selftest to clock_getres, to verify that the syscall and the vDSO library function return the same information.

The extension has been used to verify the hrtimer_resoltion fix.

Cc Shuah Khan <shuah at kernel.org>
Signed-off-by Vincenzo Frascino <vincenzo.frascino at arm.com>
---
 tools/testing/selftests/vDSO/Makefile         |   2 +
 .../selftests/vDSO/vdso_clock_getres.c        | 108 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c
tools/testing/selftests/vDSO/Makefile +2 -0
index 9e03d61f52fd..d5c5bfdf1ac1 100644
@@ -5,6 +5,7 @@ uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
 
 TEST_GEN_PROGS := $(OUTPUT)/vdso_test
+TEST_GEN_PROGS += $(OUTPUT)/vdso_clock_getres
 ifeq ($(ARCH),x86)
 TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86
 endif
@@ -18,6 +19,7 @@ endif
 
 all: $(TEST_GEN_PROGS)
 $(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c
+$(OUTPUT)/vdso_clock_getres: vdso_clock_getres.c
 $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
 	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
 		vdso_standalone_test_x86.c parse_vdso.c \
tools/testing/selftests/vDSO/vdso_clock_getres.c new file +108 -0
new file mode 100644
index 000000000000..b1b9652972eb
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * vdso_clock_getres.c: Sample code to test clock_getres.
+ * Copyright (c) 2019 Arm Ltd.
+ *
+ * Compile with:
+ * gcc -std=gnu99 vdso_clock_getres.c
+ *
+ * Tested on ARM, ARM64, MIPS32, x86 (32-bit and 64-bit),
+ * Power (32-bit and 64-bit), S390x (32-bit and 64-bit).
+ * Might work on other architectures.
+ */
+
+#define _GNU_SOURCE
+#include <elf.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/auxv.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#include "../kselftest.h"
+
+static long syscall_clock_getres(clockid_t _clkid, struct timespec *_ts)
+{
+	long ret;
+
+	ret = syscall(SYS_clock_getres, _clkid, _ts);
+
+	return ret;
+}
+
+const char *vdso_clock_name[12] = {
+	"CLOCK_REALTIME",
+	"CLOCK_MONOTONIC",
+	"CLOCK_PROCESS_CPUTIME_ID",
+	"CLOCK_THREAD_CPUTIME_ID",
+	"CLOCK_MONOTONIC_RAW",
+	"CLOCK_REALTIME_COARSE",
+	"CLOCK_MONOTONIC_COARSE",
+	"CLOCK_BOOTTIME",
+	"CLOCK_REALTIME_ALARM",
+	"CLOCK_BOOTTIME_ALARM",
+	"CLOCK_SGI_CYCLE",
+	"CLOCK_TAI",
+};
+
+/*
+ * Macro to call clock_getres in vdso and by system call
+ * with different values for clock_id.
+ */
+#define vdso_test_clock(clock_id)				\
+do {								\
+	struct timespec x, y;					\
+	printf("clock_id: %s", vdso_clock_name[clock_id]);	\
+	clock_getres(clock_id, &x);				\
+	syscall_clock_getres(clock_id, &y);			\
+	if ((x.tv_sec != y.tv_sec) || (x.tv_sec != y.tv_sec)) {	\
+		printf(" [FAIL]\n");				\
+		return KSFT_SKIP;				\
+	} else {						\
+		printf(" [PASS]\n");				\
+	}							\
+} while (0)
+
+int main(int argc, char **argv)
+{
+
+#if _POSIX_TIMERS > 0
+
+#ifdef CLOCK_REALTIME
+	vdso_test_clock(CLOCK_REALTIME);
+#endif
+
+#ifdef CLOCK_BOOTTIME
+	vdso_test_clock(CLOCK_BOOTTIME);
+#endif
+
+#ifdef CLOCK_TAI
+	vdso_test_clock(CLOCK_TAI);
+#endif
+
+#ifdef CLOCK_REALTIME_COARSE
+	vdso_test_clock(CLOCK_REALTIME_COARSE);
+#endif
+
+#ifdef CLOCK_MONOTONIC
+	vdso_test_clock(CLOCK_MONOTONIC);
+#endif
+
+#ifdef CLOCK_MONOTONIC_RAW
+	vdso_test_clock(CLOCK_MONOTONIC_RAW);
+#endif
+
+#ifdef CLOCK_MONOTONIC_COARSE
+	vdso_test_clock(CLOCK_MONOTONIC_COARSE);
+#endif
+
+#endif
+
+	return 0;
+}
Signature · 2 lines
Regards,
Vincenzo
#15 lore raw

PATCH v2 5/5 kselftest: Extend vDSO selftest to clock_getres

Quoted 5 lines · Vincenzo Frascino

Hi Shuah,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I can do to help with upstraming it.

Thanks for the ping.

Sorry about this. I saw that this part of a series and thought it depends on other patches and should go through another tree.

Totally missed that Will suggested that I take it though selftests.

My bad. I will get this in - I hope there are no dependencies with other trees.

thanks,
-- Shuah

#16 lore raw

PATCH v2 5/5 kselftest: Extend vDSO selftest to clock_getres

Quoted 13 lines · shuah
Quoted 6 lines · Vincenzo Frascino

Hi Shuah,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I
can do to help with upstraming it.

Thanks for the ping.

Sorry about this. I saw that this part of a series and thought it depends on other patches and should go through another tree.

Quoted 9 lines

Totally missed that Will suggested that I take it though selftests.

My bad. I will get this in - I hope there are no dependencies with other trees.

thanks,
-- Shuah

Can you take a look at the macro in this patch. It has checkpatch warn:

WARNING: Macros with flow control statements should be avoided

thanks,
-- Shuah

#17 lore raw

PATCH v2 5/5 kselftest: Extend vDSO selftest to clock_getres

Hi Shuah,

Quoted 24 lines · shuah
Quoted 13 lines · shuah
Quoted 6 lines · Vincenzo Frascino

Hi Shuah,

I did not see this patch in 5.2-rc1 and I was wondering if there is anything I
can do to help with upstraming it.

Thanks for the ping.

Sorry about this. I saw that this part of a series and thought it depends on other patches and should go through another tree.

Quoted 9 lines

Totally missed that Will suggested that I take it though selftests.

My bad. I will get this in - I hope there are no dependencies with other trees.

thanks,
-- Shuah

Quoted 6 lines

Can you take a look at the macro in this patch. It has checkpatch warn:

WARNING: Macros with flow control statements should be avoided

Ok, I will fix this in v3.

Quoted 3 lines

thanks,
-- Shuah

Signature · 2 lines
Regards,
Vincenzo