Add AArch64 support for RSEQ.

google · Oct 12, 2020 · ca67797 · ca67797
1 parent 9ae8c87
commit ca67797
Show file tree

Hide file tree

Showing 5 changed files with 489 additions and 2 deletions.
diff --git a/tcmalloc/internal/BUILD b/tcmalloc/internal/BUILD
@@ -246,6 +246,7 @@ cc_library(
     textual_hdrs = [
         "percpu_rseq_ppc.S",
         "percpu_rseq_x86_64.S",
+        "percpu_rseq_aarch64.S",
     ],
     visibility = [
         "//tcmalloc:__subpackages__",

diff --git a/tcmalloc/internal/linux_syscall_support.h b/tcmalloc/internal/linux_syscall_support.h
@@ -56,7 +56,7 @@ static_assert(sizeof(kernel_rseq_cs) == (4 * sizeof(unsigned long long)),
 #if defined(__x86_64__)
 #define __NR_rseq 334
 #elif defined(__aarch64__)
-#define __NR_rseq 398
+#define __NR_rseq 293
 #elif defined(__PPC__)
 #define __NR_rseq 387
 #endif

diff --git a/tcmalloc/internal/percpu.h b/tcmalloc/internal/percpu.h
@@ -19,7 +19,8 @@
 
 // TCMALLOC_PERCPU_RSEQ_SUPPORTED_PLATFORM defines whether or not we have an
 // implementation for the target OS and architecture.
-#if defined(__linux__) && (defined(__x86_64__) || defined(__PPC64__))
+#if defined(__linux__) && \
+    (defined(__x86_64__) || defined(__PPC64__) || defined (__aarch64__))
 #define TCMALLOC_PERCPU_RSEQ_SUPPORTED_PLATFORM 1
 #else
 #define TCMALLOC_PERCPU_RSEQ_SUPPORTED_PLATFORM 0
@@ -31,6 +32,8 @@
 #define TCMALLOC_PERCPU_RSEQ_SIGNATURE 0x53053053
 #elif defined(__ppc__)
 #define TCMALLOC_PERCPU_RSEQ_SIGNATURE 0x0FE5000B
+#elif defined(__aarch64__)
+#define TCMALLOC_PERCPU_RSEQ_SIGNATURE 0xd428bc00
 #else
 // Rather than error, allow us to build, but with an invalid signature.
 #define TCMALLOC_PERCPU_RSEQ_SIGNATURE 0x0