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

Commit 5d66da3d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Make the vDSO functions set error code (#2) 



The vDSO functions should have the same calling convention as a syscall.
Unfortunately, they currently don't set the cr0.so bit which is used to
indicate an error. This patch makes them clear this bit unconditionally
since all functions currently succeed. The syscall fallback done by some
of them will eventually override this if the syscall fails.

This also changes the symbol version of all vdso exports to make sure
glibc can differenciate between old and fixed calls for existing ones
like __kernel_gettimeofday.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d3ed6583

arch/powerpc/kernel/vdso32/cacheflush.S

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) 
	subf	r8,r6,r4		/* compute length */

	add	r8,r8,r5		/* ensure we get enough */

	srwi.	r8,r8,7			/* compute line count */

	crclr	cr0*4+so

	beqlr				/* nothing to do? */

	mtctr	r8

	mr	r3,r6
@@ -58,6 +59,7 @@ V_FUNCTION_END(__kernel_sync_dicache) 
 */

V_FUNCTION_BEGIN(__kernel_sync_dicache_p5)

  .cfi_startproc

	crclr	cr0*4+so

	sync

	isync

	li	r3,0

arch/powerpc/kernel/vdso32/datapage.S

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) 
  .cfi_startproc

	mflr	r12

  .cfi_register lr,r12



	mr	r4,r3

	bl	__get_datapage@local

	mtlr	r12
@@ -63,6 +62,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) 
	beqlr

	li	r0,__NR_syscalls

	stw	r0,0(r4)

	crclr	cr0*4+so

	blr

  .cfi_endproc

V_FUNCTION_END(__kernel_get_syscall_map)
@@ -80,6 +80,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) 
	lwz	r4,(CFG_TB_TICKS_PER_SEC + 4)(r3)

	lwz	r3,CFG_TB_TICKS_PER_SEC(r3)

	mtlr	r12

	crclr	cr0*4+so

	blr

  .cfi_endproc

V_FUNCTION_END(__kernel_get_tbfreq)

arch/powerpc/kernel/vdso32/gettimeofday.S

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday) 
	stw	r5,TZONE_TZ_DSTTIME(r11)



1:	mtlr	r12

	crclr	cr0*4+so

	li	r3,0

	blr
@@ -117,6 +118,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) 
	mulli	r5,r5,1000

	stw	r5,TSPC32_TV_NSEC(r11)

	mtlr	r12

	crclr	cr0*4+so

	li	r3,0

	blr
@@ -185,6 +187,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) 
	stw	r4,TSPC32_TV_NSEC(r11)



	mtlr	r12

	crclr	cr0*4+so

	li	r3,0

	blr
@@ -219,6 +222,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) 


	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

arch/powerpc/kernel/vdso64/cacheflush.S

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) 
	subf	r8,r6,r4		/* compute length */

	add	r8,r8,r5		/* ensure we get enough */

	srwi.	r8,r8,7			/* compute line count */

	crclr	cr0*4+so

	beqlr				/* nothing to do? */

	mtctr	r8

	mr	r3,r6
@@ -58,6 +59,7 @@ V_FUNCTION_END(__kernel_sync_dicache) 
 */

V_FUNCTION_BEGIN(__kernel_sync_dicache_p5)

  .cfi_startproc

	crclr	cr0*4+so

	sync

	isync

	li	r3,0

arch/powerpc/kernel/vdso64/datapage.S

+2 −1
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) 
  .cfi_startproc

	mflr	r12

  .cfi_register lr,r12



	mr	r4,r3

	bl	V_LOCAL_FUNC(__get_datapage)

	mtlr	r12

	addi	r3,r3,CFG_SYSCALL_MAP64

	cmpli	cr0,r4,0

	crclr	cr0*4+so

	beqlr

	li	r0,__NR_syscalls

	stw	r0,0(r4)
@@ -80,6 +80,7 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) 
	bl	V_LOCAL_FUNC(__get_datapage)

	ld	r3,CFG_TB_TICKS_PER_SEC(r3)

	mtlr	r12

	crclr	cr0*4+so

	blr

  .cfi_endproc

V_FUNCTION_END(__kernel_get_tbfreq)