This is an archive of the discontinued LLVM Phabricator instance.

Differential D98121

[sanitizer] Change NanoTime to use clock_gettime on non-glibc
ClosedPublic

Authored by MaskRay on Mar 6 2021, 11:26 AM.

Details

Reviewers
danalbert
vitalybuka
Commits
rGaeaf705d5eb5: [sanitizer] Change NanoTime to use clock_gettime on non-glibc
Summary

This avoids the __NR_gettimeofday syscall number, which does not exist on 32-bit musl (it has __NR_gettimeofday_time32).

This switched Android to clock_gettime as well, which should work according to the old code before D96925.

Tested on Alpine Linux x86-64 (musl) and FreeBSD x86-64.

Diff Detail

Event Timeline

MaskRay created this revision.Mar 6 2021, 11:26 AM
Herald added a subscriber: krytarowski. · View Herald TranscriptMar 6 2021, 11:26 AM
MaskRay updated this revision to Diff 328805.Mar 6 2021, 12:16 PM
MaskRay retitled this revision from [sanitizer] Make NanoTime work with musl to [sanitizer] Change NanoTime to use clock_gettime on non-glibc.
MaskRay edited the summary of this revision. (Show Details)

.

Herald added subscribers: pengfei, fedor.sergeev, arichardson, emaste. · View Herald TranscriptMar 6 2021, 12:16 PM
MaskRay published this revision for review.Mar 6 2021, 12:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 6 2021, 12:17 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
MaskRay added reviewers: danalbert, vitalybuka.Mar 6 2021, 12:17 PM
MaskRay edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B92497: Diff 328793.Mar 6 2021, 7:39 PM
Harbormaster completed remote builds in B92509: Diff 328805.Mar 6 2021, 9:14 PM
krytarowski added a comment.Mar 7 2021, 3:36 PM

Looks ok for NetBSD.

vitalybuka accepted this revision.Mar 10 2021, 10:34 PM
This revision is now accepted and ready to land.Mar 10 2021, 10:34 PM
Closed by commit rGaeaf705d5eb5: [sanitizer] Change NanoTime to use clock_gettime on non-glibc (authored by MaskRay). · Explain WhyMar 10 2021, 11:03 PM
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rGaeaf705d5eb5: [sanitizer] Change NanoTime to use clock_gettime on non-glibc.

Revision Contents

PathSize
compiler-rt/
lib/
sanitizer_common/
20 lines
4 lines

Diff 329854

compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

Show First 20 Lines • Show All 483 Lines • ▼ Show 20 Lines#elif SANITIZER_FREEBSD
return internal_syscall(SYSCALL(thr_kill2), pid, tid, sig); return internal_syscall(SYSCALL(thr_kill2), pid, tid, sig);
#elif SANITIZER_SOLARIS #elif SANITIZER_SOLARIS
(void)pid; (void)pid;
return thr_kill(tid, sig); return thr_kill(tid, sig);
#endif #endif
} }
#endif #endif
#if !SANITIZER_SOLARIS && !SANITIZER_NETBSD #if SANITIZER_GLIBC
u64 NanoTime() { u64 NanoTime() {
#if SANITIZER_FREEBSD
timeval tv;
#else
kernel_timeval tv; kernel_timeval tv;
#endif
internal_memset(&tv, 0, sizeof(tv)); internal_memset(&tv, 0, sizeof(tv));
internal_syscall(SYSCALL(gettimeofday), &tv, 0); internal_syscall(SYSCALL(gettimeofday), &tv, 0);
return (u64)tv.tv_sec * 1000*1000*1000 + tv.tv_usec * 1000; return (u64)tv.tv_sec * 1000 * 1000 * 1000 + tv.tv_usec * 1000;
} }
#endif // !SANITIZER_SOLARIS && !SANITIZER_NETBSD // Used by real_clock_gettime.
#if SANITIZER_GLIBC
uptr internal_clock_gettime(__sanitizer_clockid_t clk_id, void *tp) { uptr internal_clock_gettime(__sanitizer_clockid_t clk_id, void *tp) {
return internal_syscall(SYSCALL(clock_gettime), clk_id, tp); return internal_syscall(SYSCALL(clock_gettime), clk_id, tp);
} }
#endif // SANITIZER_GLIBC #elif !SANITIZER_SOLARIS && !SANITIZER_NETBSD
u64 NanoTime() {
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return (u64)ts.tv_sec * 1000 * 1000 * 1000 + ts.tv_nsec;
}
#endif
// Like getenv, but reads env directly from /proc (on Linux) or parses the // Like getenv, but reads env directly from /proc (on Linux) or parses the
// 'environ' array (on some others) and does not use libc. This function // 'environ' array (on some others) and does not use libc. This function
// should be called first inside __asan_init. // should be called first inside __asan_init.
const char *GetEnv(const char *name) { const char *GetEnv(const char *name) {
#if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_SOLARIS #if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_SOLARIS
if (::environ != 0) { if (::environ != 0) {
uptr NameLen = internal_strlen(name); uptr NameLen = internal_strlen(name);
▲ Show 20 Lines • Show All 1,769 Lines • Show Last 20 Lines

compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp

Show First 20 Lines • Show All 823 Lines • ▼ Show 20 Lines if (CanUseVDSO()) {
else else
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
} else { } else {
internal_clock_gettime(CLOCK_MONOTONIC, &ts); internal_clock_gettime(CLOCK_MONOTONIC, &ts);
} }
return (u64)ts.tv_sec * (1000ULL * 1000 * 1000) + ts.tv_nsec; return (u64)ts.tv_sec * (1000ULL * 1000 * 1000) + ts.tv_nsec;
} }
#else #else
// Non-Linux & Go always use the regular function. // Non-glibc & Go always use the regular function.
u64 MonotonicNanoTime() { u64 MonotonicNanoTime() {
timespec ts; timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
return (u64)ts.tv_sec * (1000ULL * 1000 * 1000) + ts.tv_nsec; return (u64)ts.tv_sec * (1000ULL * 1000 * 1000) + ts.tv_nsec;
} }
#endif // SANITIZER_LINUX && !SANITIZER_GO #endif // SANITIZER_GLIBC && !SANITIZER_GO
void ReExec() { void ReExec() {
const char *pathname = "/proc/self/exe"; const char *pathname = "/proc/self/exe";
#if SANITIZER_NETBSD #if SANITIZER_NETBSD
static const int name[] = { static const int name[] = {
CTL_KERN, CTL_KERN,
KERN_PROC_ARGS, KERN_PROC_ARGS,
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines