[Sanitizers] intercept clock_getcpuclockid on FreeBSD, intercept pthread_getcpuclockid

[vitalybuka]

can you please add something similar or extend test/sanitizer_common/TestCases/Linux/getcpuclockid.c

[devnexen]

ping :)

[vitalybuka]

Thanks. it's up to you, but I would recommend to extend getcpuclockid.c in this CL and move it in a followup CL as the move has slightly higher chance of being reverted.

[kda]

Looks like this broke buildbot: llvm-avr-linux: https://lab.llvm.org/buildbot#builders/112/builds/9015

log snippet:

1 warning(s) in tests
********************
Unresolved Tests (5):
  SanitizerCommon-asan-x86_64-Linux :: Linux/getcpuclockid.c
  SanitizerCommon-lsan-x86_64-Linux :: Linux/getcpuclockid.c
  SanitizerCommon-msan-x86_64-Linux :: Linux/getcpuclockid.c
  SanitizerCommon-tsan-x86_64-Linux :: Linux/getcpuclockid.c
  SanitizerCommon-ubsan-x86_64-Linux :: Linux/getcpuclockid.c
Testing Time: 1530.73s
  Skipped          :    57
  Unsupported      : 22049
  Passed           : 58799
  Expectedly Failed:   126
  Unresolved       :     5
FAILED: CMakeFiles/check-all 
cd /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1 && /usr/bin/python3.6 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/./bin/llvm-lit -v -j8 --param HWASAN_ENABLE_ALIASES=1 --param USE_Z3_SOLVER=0 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/builtins/TestCases /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/builtins/Unit/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/interception/Unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/lsan/X86_64LsanConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/lsan/X86_64AsanConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/ubsan/Standalone-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/ubsan/AddressSanitizer-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/ubsan/MemorySanitizer-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/ubsan/ThreadSanitizer-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Standalone-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Devirt-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Standalone-thinlto-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Devirt-thinlto-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Standalone-newpm-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Devirt-newpm-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Standalone-thinlto-newpm-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/cfi/Devirt-thinlto-newpm-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/asan-x86_64-Linux /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/lsan-x86_64-Linux /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/msan-x86_64-Linux /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/tsan-x86_64-Linux /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/ubsan-x86_64-Linux /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/sanitizer_common/Unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/fuzzer/unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/fuzzer/X86_64DefaultLinuxConfig/ /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/asan/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/asan/Unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/asan/X86_64LinuxDynamicConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/asan/Unit/dynamic /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/dfsan/X86_64Config /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/msan/X86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/hwasan/X86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/tsan/X86_64Config /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/tsan/Unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/safestack /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/scudo/standalone/unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/scudo/standalone/unit/gwp_asan /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/scudo/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/ubsan_minimal/x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/gwp_asan/unit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/gwp_asan/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/profile/Profile-x86_64 /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/memprof/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/memprof/X86_64LinuxDynamicConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/xray/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/orc/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/projects/compiler-rt/test/crt/X86_64LinuxConfig /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/tools/clang/tools/extra/test /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/tools/clang/tools/extra/clangd/test/../unittests /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/tools/clang/tools/extra/clangd/test /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/tools/clang/test /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/utils/lit /home/buildbot/llvm-avr-linux/llvm-avr-linux/stage1/test
ninja: build stopped: subcommand failed.

[devnexen]

right ... commit mistake there is an useless file here.

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc

INTERCEPTOR(int, clock_getcpuclockid, pid_t pid,
   COMMON_INTERCEPTOR_ENTER(ctx, clock_getcpuclockid, pid, clockid);
   int res = REAL(clock_getcpuclockid)(pid, clockid);
   if (!res && clockid) {
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, clockid, sizeof *clockid);
   }
   return res;
 }
 
-#define INIT_CLOCK_GETCPUCLOCKID                  \
-  COMMON_INTERCEPT_FUNCTION(clock_getcpuclockid);
+INTERCEPTOR(int, pthread_getcpuclockid, uptr thread,
+            __sanitizer_clockid_t *clockid) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, pthread_getcpuclockid, thread, clockid);
+  int res = REAL(pthread_getcpuclockid)(thread, clockid);
+  if (!res && clockid) {
+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, clockid, sizeof *clockid);
+  }
+  return res;
+}
+
+#define INIT_CLOCK_GETCPUCLOCKID                   \
+  COMMON_INTERCEPT_FUNCTION(clock_getcpuclockid);  \
+  COMMON_INTERCEPT_FUNCTION(pthread_getcpuclockid);
 #else
 #define INIT_CLOCK_GETCPUCLOCKID
 #endif
 
 #if SANITIZER_INTERCEPT_GETITIMER
 INTERCEPTOR(int, getitimer, int which, void *curr_value) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, getitimer, which, curr_value);

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

 #define SANITIZER_INTERCEPT_FGETPWENT SI_LINUX_NOT_ANDROID || SI_SOLARIS
 #define SANITIZER_INTERCEPT_GETPWENT_R \
   (SI_FREEBSD || SI_NETBSD || SI_GLIBC || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_FGETPWENT_R (SI_FREEBSD || SI_GLIBC || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_SETPWENT \
   (SI_MAC || SI_LINUX_NOT_ANDROID || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_CLOCK_GETTIME \
   (SI_FREEBSD || SI_NETBSD || SI_LINUX || SI_SOLARIS)
-#define SANITIZER_INTERCEPT_CLOCK_GETCPUCLOCKID SI_LINUX
+#define SANITIZER_INTERCEPT_CLOCK_GETCPUCLOCKID (SI_LINUX || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_GETITIMER SI_POSIX
 #define SANITIZER_INTERCEPT_TIME SI_POSIX
 #define SANITIZER_INTERCEPT_GLOB (SI_GLIBC || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_GLOB64 SI_GLIBC
 #define SANITIZER_INTERCEPT_WAIT SI_POSIX
 #define SANITIZER_INTERCEPT_INET SI_POSIX
 #define SANITIZER_INTERCEPT_PTHREAD_GETSCHEDPARAM SI_POSIX
 #define SANITIZER_INTERCEPT_GETADDRINFO SI_POSIX

compiler-rt/test/sanitizer_common/TestCases/Linux/getcpuclockid.c

-// RUN: %clang %s -Wl,-as-needed -o %t && %run %t
-#include <time.h>
-#include <unistd.h>
-#include <assert.h>
-
-long cpu_ns() {
-  clockid_t clk;
-  struct timespec ts;
-  int res = clock_getcpuclockid(getpid(), &clk);
-  assert(!res);
-  res = clock_gettime(clk, &ts);
-  assert(!res);
-  return ts.tv_nsec;
-}
-
-int main() {
-  long cpuns = cpu_ns();
-  asm volatile ("" :: "r"(cpuns));
-  return 0;
-}

compiler-rt/test/sanitizer_common/TestCases/Posix/getcpuclockid.c

+// RUN: %clang -pthread %s -Wl,-as-needed -o %t && %run %t
+//
+// UNSUPPORTED: darwin, netbsd, solaris
+
+#include <time.h>
+#include <unistd.h>
+#include <assert.h>
+#include <pthread.h>
+
+long cpu_ns() {
+  clockid_t clk;
+  struct timespec ts;
+  int res = clock_getcpuclockid(getpid(), &clk);
+  assert(!res);
+  res = clock_gettime(clk, &ts);
+  assert(!res);
+  return ts.tv_nsec;
+}
+
+long th_cpu_ns() {
+  clockid_t clk;
+  struct timespec ts;
+  int res = pthread_getcpuclockid(pthread_self(), &clk);
+  assert(!res);
+  res = clock_gettime(clk, &ts);
+  assert(!res);
+  return ts.tv_nsec;
+}
+
+int main() {
+  long cpuns = cpu_ns();
+  asm volatile ("" :: "r"(cpuns));
+  cpuns = th_cpu_ns();
+  asm volatile ("" :: "r"(cpuns));
+  return 0;
+}