Commit 0c37ec2a authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

[PATCH] powerpc: vdso fixes (take #2)

This fixes various errors in the new functions added in the vDSO's,
I've now verified all functions on both 32 and 64 bits vDSOs. It also
fix a sign extension bug getting the initial time of day at boot that
could cause the monotonic clock value to be completely on bogus for
64 bits applications (with either the vDSO or the syscall) on
powermacs.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 50092b23
...@@ -270,13 +270,15 @@ int main(void) ...@@ -270,13 +270,15 @@ int main(void)
DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec)); DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec));
DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec)); DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec));
DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec)); DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec));
DEFINE(TSPC64_TV_SEC, offsetof(struct timespec, tv_sec));
DEFINE(TSPC64_TV_NSEC, offsetof(struct timespec, tv_nsec));
DEFINE(TSPC32_TV_SEC, offsetof(struct compat_timespec, tv_sec)); DEFINE(TSPC32_TV_SEC, offsetof(struct compat_timespec, tv_sec));
DEFINE(TSPC32_TV_NSEC, offsetof(struct compat_timespec, tv_nsec)); DEFINE(TSPC32_TV_NSEC, offsetof(struct compat_timespec, tv_nsec));
#else #else
DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec)); DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec));
DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec)); DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec));
DEFINE(TSPEC32_TV_SEC, offsetof(struct timespec, tv_sec)); DEFINE(TSPC32_TV_SEC, offsetof(struct timespec, tv_sec));
DEFINE(TSPEC32_TV_NSEC, offsetof(struct timespec, tv_nsec)); DEFINE(TSPC32_TV_NSEC, offsetof(struct timespec, tv_nsec));
#endif #endif
/* timeval/timezone offsets for use by vdso */ /* timeval/timezone offsets for use by vdso */
DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest)); DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));
......
...@@ -77,8 +77,9 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) ...@@ -77,8 +77,9 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq)
mflr r12 mflr r12
.cfi_register lr,r12 .cfi_register lr,r12
bl __get_datapage@local bl __get_datapage@local
lwz r3,CFG_TB_TICKS_PER_SEC(r3)
lwz r4,(CFG_TB_TICKS_PER_SEC + 4)(r3) lwz r4,(CFG_TB_TICKS_PER_SEC + 4)(r3)
lwz r3,CFG_TB_TICKS_PER_SEC(r3)
mtlr r12 mtlr r12
blr
.cfi_endproc .cfi_endproc
V_FUNCTION_END(__kernel_get_tbfreq) V_FUNCTION_END(__kernel_get_tbfreq)
...@@ -83,7 +83,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -83,7 +83,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
/* Check for supported clock IDs */ /* Check for supported clock IDs */
cmpli cr0,r3,CLOCK_REALTIME cmpli cr0,r3,CLOCK_REALTIME
cmpli cr1,r3,CLOCK_MONOTONIC cmpli cr1,r3,CLOCK_MONOTONIC
cror cr0,cr0,cr1 cror cr0*4+eq,cr0*4+eq,cr1*4+eq
bne cr0,99f bne cr0,99f
mflr r12 /* r12 saves lr */ mflr r12 /* r12 saves lr */
...@@ -91,7 +91,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -91,7 +91,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
mr r10,r3 /* r10 saves id */ mr r10,r3 /* r10 saves id */
mr r11,r4 /* r11 saves tp */ mr r11,r4 /* r11 saves tp */
bl __get_datapage@local /* get data page */ bl __get_datapage@local /* get data page */
mr r9, r3 /* datapage ptr in r9 */ mr r9,r3 /* datapage ptr in r9 */
beq cr1,50f /* if monotonic -> jump there */ beq cr1,50f /* if monotonic -> jump there */
/* /*
...@@ -173,10 +173,14 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -173,10 +173,14 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
add r4,r4,r7 add r4,r4,r7
lis r5,NSEC_PER_SEC@h lis r5,NSEC_PER_SEC@h
ori r5,r5,NSEC_PER_SEC@l ori r5,r5,NSEC_PER_SEC@l
cmpli cr0,r4,r5 cmpl cr0,r4,r5
cmpli cr1,r4,0
blt 1f blt 1f
subf r4,r5,r4 subf r4,r5,r4
addi r3,r3,1 addi r3,r3,1
1: bge cr1,1f
addi r3,r3,-1
add r4,r4,r5
1: stw r3,TSPC32_TV_SEC(r11) 1: stw r3,TSPC32_TV_SEC(r11)
stw r4,TSPC32_TV_NSEC(r11) stw r4,TSPC32_TV_NSEC(r11)
...@@ -210,7 +214,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) ...@@ -210,7 +214,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres)
/* Check for supported clock IDs */ /* Check for supported clock IDs */
cmpwi cr0,r3,CLOCK_REALTIME cmpwi cr0,r3,CLOCK_REALTIME
cmpwi cr1,r3,CLOCK_MONOTONIC cmpwi cr1,r3,CLOCK_MONOTONIC
cror cr0,cr0,cr1 cror cr0*4+eq,cr0*4+eq,cr1*4+eq
bne cr0,99f bne cr0,99f
li r3,0 li r3,0
......
...@@ -80,5 +80,6 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq) ...@@ -80,5 +80,6 @@ V_FUNCTION_BEGIN(__kernel_get_tbfreq)
bl V_LOCAL_FUNC(__get_datapage) bl V_LOCAL_FUNC(__get_datapage)
ld r3,CFG_TB_TICKS_PER_SEC(r3) ld r3,CFG_TB_TICKS_PER_SEC(r3)
mtlr r12 mtlr r12
blr
.cfi_endproc .cfi_endproc
V_FUNCTION_END(__kernel_get_tbfreq) V_FUNCTION_END(__kernel_get_tbfreq)
/*
/*
* Userland implementation of gettimeofday() for 64 bits processes in a * Userland implementation of gettimeofday() for 64 bits processes in a
* ppc64 kernel for use in the vDSO * ppc64 kernel for use in the vDSO
* *
...@@ -68,7 +69,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -68,7 +69,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
/* Check for supported clock IDs */ /* Check for supported clock IDs */
cmpwi cr0,r3,CLOCK_REALTIME cmpwi cr0,r3,CLOCK_REALTIME
cmpwi cr1,r3,CLOCK_MONOTONIC cmpwi cr1,r3,CLOCK_MONOTONIC
cror cr0,cr0,cr1 cror cr0*4+eq,cr0*4+eq,cr1*4+eq
bne cr0,99f bne cr0,99f
mflr r12 /* r12 saves lr */ mflr r12 /* r12 saves lr */
...@@ -84,16 +85,17 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -84,16 +85,17 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */
lis r7,0x3b9a /* r7 = 1000000000 = NSEC_PER_SEC */ lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */
ori r7,r7,0xca00 ori r7,r7,16960
rldicl r5,r4,44,20 /* r5 = sec = xsec / XSEC_PER_SEC */ rldicl r5,r4,44,20 /* r5 = sec = xsec / XSEC_PER_SEC */
rldicr r6,r5,20,43 /* r6 = sec * XSEC_PER_SEC */ rldicr r6,r5,20,43 /* r6 = sec * XSEC_PER_SEC */
std r5,TSPC64_TV_SEC(r11) /* store sec in tv */ std r5,TSPC64_TV_SEC(r11) /* store sec in tv */
subf r0,r6,r4 /* r0 = xsec = (xsec - r6) */ subf r0,r6,r4 /* r0 = xsec = (xsec - r6) */
mulld r0,r0,r7 /* nsec = (xsec * NSEC_PER_SEC) / mulld r0,r0,r7 /* usec = (xsec * USEC_PER_SEC) /
* XSEC_PER_SEC * XSEC_PER_SEC
*/ */
rldicl r0,r0,44,20 rldicl r0,r0,44,20
mulli r0,r0,1000 /* nsec = usec * 1000 */
std r0,TSPC64_TV_NSEC(r11) /* store nsec in tp */ std r0,TSPC64_TV_NSEC(r11) /* store nsec in tp */
mtlr r12 mtlr r12
...@@ -106,15 +108,16 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -106,15 +108,16 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
50: bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ 50: bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */
lis r7,0x3b9a /* r7 = 1000000000 = NSEC_PER_SEC */ lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */
ori r7,r7,0xca00 ori r7,r7,16960
rldicl r5,r4,44,20 /* r5 = sec = xsec / XSEC_PER_SEC */ rldicl r5,r4,44,20 /* r5 = sec = xsec / XSEC_PER_SEC */
rldicr r6,r5,20,43 /* r6 = sec * XSEC_PER_SEC */ rldicr r6,r5,20,43 /* r6 = sec * XSEC_PER_SEC */
subf r0,r6,r4 /* r0 = xsec = (xsec - r6) */ subf r0,r6,r4 /* r0 = xsec = (xsec - r6) */
mulld r0,r0,r7 /* nsec = (xsec * NSEC_PER_SEC) / mulld r0,r0,r7 /* usec = (xsec * USEC_PER_SEC) /
* XSEC_PER_SEC * XSEC_PER_SEC
*/ */
rldicl r6,r0,44,20 rldicl r6,r0,44,20
mulli r6,r6,1000 /* nsec = usec * 1000 */
/* now we must fixup using wall to monotonic. We need to snapshot /* now we must fixup using wall to monotonic. We need to snapshot
* that value and do the counter trick again. Fortunately, we still * that value and do the counter trick again. Fortunately, we still
...@@ -123,8 +126,8 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -123,8 +126,8 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
* can be used * can be used
*/ */
lwz r4,WTOM_CLOCK_SEC(r9) lwa r4,WTOM_CLOCK_SEC(r3)
lwz r7,WTOM_CLOCK_NSEC(r9) lwa r7,WTOM_CLOCK_NSEC(r3)
/* We now have our result in r4,r7. We create a fake dependency /* We now have our result in r4,r7. We create a fake dependency
* on that result and re-check the counter * on that result and re-check the counter
...@@ -144,10 +147,14 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) ...@@ -144,10 +147,14 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime)
add r7,r7,r6 add r7,r7,r6
lis r9,NSEC_PER_SEC@h lis r9,NSEC_PER_SEC@h
ori r9,r9,NSEC_PER_SEC@l ori r9,r9,NSEC_PER_SEC@l
cmpli cr0,r7,r9 cmpl cr0,r7,r9
cmpli cr1,r7,0
blt 1f blt 1f
subf r7,r9,r7 subf r7,r9,r7
addi r4,r4,1 addi r4,r4,1
1: bge cr1,1f
addi r4,r4,-1
add r7,r7,r9
1: std r4,TSPC64_TV_SEC(r11) 1: std r4,TSPC64_TV_SEC(r11)
std r7,TSPC64_TV_NSEC(r11) std r7,TSPC64_TV_NSEC(r11)
...@@ -181,7 +188,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) ...@@ -181,7 +188,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres)
/* Check for supported clock IDs */ /* Check for supported clock IDs */
cmpwi cr0,r3,CLOCK_REALTIME cmpwi cr0,r3,CLOCK_REALTIME
cmpwi cr1,r3,CLOCK_MONOTONIC cmpwi cr1,r3,CLOCK_MONOTONIC
cror cr0,cr0,cr1 cror cr0*4+eq,cr0*4+eq,cr1*4+eq
bne cr0,99f bne cr0,99f
li r3,0 li r3,0
......
...@@ -102,7 +102,7 @@ static unsigned long from_rtc_time(struct rtc_time *tm) ...@@ -102,7 +102,7 @@ static unsigned long from_rtc_time(struct rtc_time *tm)
static unsigned long cuda_get_time(void) static unsigned long cuda_get_time(void)
{ {
struct adb_request req; struct adb_request req;
unsigned long now; unsigned int now;
if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0) if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0)
return 0; return 0;
...@@ -113,7 +113,7 @@ static unsigned long cuda_get_time(void) ...@@ -113,7 +113,7 @@ static unsigned long cuda_get_time(void)
req.reply_len); req.reply_len);
now = (req.reply[3] << 24) + (req.reply[4] << 16) now = (req.reply[3] << 24) + (req.reply[4] << 16)
+ (req.reply[5] << 8) + req.reply[6]; + (req.reply[5] << 8) + req.reply[6];
return now - RTC_OFFSET; return ((unsigned long)now) - RTC_OFFSET;
} }
#define cuda_get_rtc_time(tm) to_rtc_time(cuda_get_time(), (tm)) #define cuda_get_rtc_time(tm) to_rtc_time(cuda_get_time(), (tm))
...@@ -146,7 +146,7 @@ static int cuda_set_rtc_time(struct rtc_time *tm) ...@@ -146,7 +146,7 @@ static int cuda_set_rtc_time(struct rtc_time *tm)
static unsigned long pmu_get_time(void) static unsigned long pmu_get_time(void)
{ {
struct adb_request req; struct adb_request req;
unsigned long now; unsigned int now;
if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0) if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
return 0; return 0;
...@@ -156,7 +156,7 @@ static unsigned long pmu_get_time(void) ...@@ -156,7 +156,7 @@ static unsigned long pmu_get_time(void)
req.reply_len); req.reply_len);
now = (req.reply[0] << 24) + (req.reply[1] << 16) now = (req.reply[0] << 24) + (req.reply[1] << 16)
+ (req.reply[2] << 8) + req.reply[3]; + (req.reply[2] << 8) + req.reply[3];
return now - RTC_OFFSET; return ((unsigned long)now) - RTC_OFFSET;
} }
#define pmu_get_rtc_time(tm) to_rtc_time(pmu_get_time(), (tm)) #define pmu_get_rtc_time(tm) to_rtc_time(pmu_get_time(), (tm))
......
...@@ -73,7 +73,7 @@ struct vdso_data { ...@@ -73,7 +73,7 @@ struct vdso_data {
/* those additional ones don't have to be located anywhere /* those additional ones don't have to be located anywhere
* special as they were not part of the original systemcfg * special as they were not part of the original systemcfg
*/ */
__s64 wtom_clock_sec; /* Wall to monotonic clock */ __s32 wtom_clock_sec; /* Wall to monotonic clock */
__s32 wtom_clock_nsec; __s32 wtom_clock_nsec;
__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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment