runtime: switch openbsd/arm64 to pthreads

This switches openbsd/arm64 to thread creation via pthreads, rather than doing
direct system calls.

Update #36435

Change-Id: I7cf60fa954f92628e05f15d2732833a2fbdccdb9
Reviewed-on: https://go-review.googlesource.com/c/go/+/250182
Trust: Joel Sing <joel@sing.id.au>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/runtime/defs_openbsd_arm64.go b/src/runtime/defs_openbsd_arm64.go
index 628f4bc5a5679b6084b2a91b68a0afe3ad80fb65..63ea8dfecc041af66ddcf4c5a6727aedd60b95fd 100644 (file)
--- a/src/runtime/defs_openbsd_arm64.go
+++ b/src/runtime/defs_openbsd_arm64.go
@@ -31,6 +31,8 @@ const (
        _SA_RESTART = 0x2
        _SA_ONSTACK = 0x1
 
+       _PTHREAD_CREATE_DETACHED = 0x1
+
        _SIGHUP    = 0x1
        _SIGINT    = 0x2
        _SIGQUIT   = 0x3
@@ -157,3 +159,10 @@ type keventt struct {
        data   int64
        udata  *byte
 }
+
+type pthread uintptr
+type pthreadattr uintptr
+type pthreadcond uintptr
+type pthreadcondattr uintptr
+type pthreadmutex uintptr
+type pthreadmutexattr uintptr

diff --git a/src/runtime/os_openbsd_libc.go b/src/runtime/os_openbsd_libc.go
index 60735644f0b9c210540469adfa5c24071d9482fd..2edb0358b07de9ac88f4ccc4c053b4e38b5a8bc3 100644 (file)
--- a/src/runtime/os_openbsd_libc.go
+++ b/src/runtime/os_openbsd_libc.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build openbsd,amd64
+// +build openbsd,amd64 openbsd,arm64
 
 package runtime
 

diff --git a/src/runtime/os_openbsd_syscall.go b/src/runtime/os_openbsd_syscall.go
index e91a97ca8ec96ee57eaad2c52ce4041107f314dd..16ff2b8e2555c0d47d7180c0b781b4a23d6c0a8f 100644 (file)
--- a/src/runtime/os_openbsd_syscall.go
+++ b/src/runtime/os_openbsd_syscall.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build openbsd,!amd64
+// +build openbsd,!arm64
 
 package runtime
 

diff --git a/src/runtime/proc.go b/src/runtime/proc.go
index 26cf7c73354c8ef0b0285f83e1aad80ae9c1c9e7..30033712aad91b1d3556d74367846ab26bc01aed 100644 (file)
--- a/src/runtime/proc.go
+++ b/src/runtime/proc.go
@@ -1224,7 +1224,7 @@ func mStackIsSystemAllocated() bool {
                return true
        case "openbsd":
                switch GOARCH {
-               case "amd64":
+               case "amd64", "arm64":
                        return true
                }
        }

diff --git a/src/runtime/sys_libc.go b/src/runtime/sys_libc.go
index c97a97d77b7eb46dda1d4e30bd57f18fd31d96ba..996c0321050d807fe7b067a40259802a8669f29a 100644 (file)
--- a/src/runtime/sys_libc.go
+++ b/src/runtime/sys_libc.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin openbsd,amd64
+// +build darwin openbsd,amd64 openbsd,arm64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd.go b/src/runtime/sys_openbsd.go
index 4dfab7d7b09c910db1a793a8109187fd481ae0e6..56de00aad529a6b73e73f0deac54da21a5064e7a 100644 (file)
--- a/src/runtime/sys_openbsd.go
+++ b/src/runtime/sys_openbsd.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build openbsd,amd64
+// +build openbsd,amd64 openbsd,arm64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd_arm64.s b/src/runtime/sys_openbsd_arm64.s
index 621b1b1a42580af16b79e4366e936b8b89ceb14c..90646bbe852a53ee7cd4de2b32583953e23e41b6 100644 (file)
--- a/src/runtime/sys_openbsd_arm64.s
+++ b/src/runtime/sys_openbsd_arm64.s
@@ -3,7 +3,9 @@
 // license that can be found in the LICENSE file.
 //
 // System calls and other sys.stuff for arm64, OpenBSD
-// /usr/src/sys/kern/syscalls.master for syscall numbers.
+// System calls are implemented in libc/libpthread, this file
+// contains trampolines that convert from Go to C calling convention.
+// Some direct system call implementations currently remain.
 //
 
 #include "go_asm.h"
@@ -24,6 +26,180 @@
        NOOP;           \
        NOOP
 
+// mstart_stub is the first function executed on a new thread started by pthread_create.
+// It just does some low-level setup and then calls mstart.
+// Note: called with the C calling convention.
+TEXT runtime·mstart_stub(SB),NOSPLIT,$160
+       // R0 points to the m.
+       // We are already on m's g0 stack.
+
+       // Save callee-save registers.
+       MOVD    R19, 8(RSP)
+       MOVD    R20, 16(RSP)
+       MOVD    R21, 24(RSP)
+       MOVD    R22, 32(RSP)
+       MOVD    R23, 40(RSP)
+       MOVD    R24, 48(RSP)
+       MOVD    R25, 56(RSP)
+       MOVD    R26, 64(RSP)
+       MOVD    R27, 72(RSP)
+       MOVD    g, 80(RSP)
+       MOVD    R29, 88(RSP)
+       FMOVD   F8, 96(RSP)
+       FMOVD   F9, 104(RSP)
+       FMOVD   F10, 112(RSP)
+       FMOVD   F11, 120(RSP)
+       FMOVD   F12, 128(RSP)
+       FMOVD   F13, 136(RSP)
+       FMOVD   F14, 144(RSP)
+       FMOVD   F15, 152(RSP)
+
+       MOVD    m_g0(R0), g
+       BL      runtime·save_g(SB)
+
+       BL      runtime·mstart(SB)
+
+       // Restore callee-save registers.
+       MOVD    8(RSP), R19
+       MOVD    16(RSP), R20
+       MOVD    24(RSP), R21
+       MOVD    32(RSP), R22
+       MOVD    40(RSP), R23
+       MOVD    48(RSP), R24
+       MOVD    56(RSP), R25
+       MOVD    64(RSP), R26
+       MOVD    72(RSP), R27
+       MOVD    80(RSP), g
+       MOVD    88(RSP), R29
+       FMOVD   96(RSP), F8
+       FMOVD   104(RSP), F9
+       FMOVD   112(RSP), F10
+       FMOVD   120(RSP), F11
+       FMOVD   128(RSP), F12
+       FMOVD   136(RSP), F13
+       FMOVD   144(RSP), F14
+       FMOVD   152(RSP), F15
+
+       // Go is all done with this OS thread.
+       // Tell pthread everything is ok (we never join with this thread, so
+       // the value here doesn't really matter).
+       MOVD    $0, R0
+
+       RET
+
+TEXT runtime·sigfwd(SB),NOSPLIT,$0-32
+       MOVW    sig+8(FP), R0
+       MOVD    info+16(FP), R1
+       MOVD    ctx+24(FP), R2
+       MOVD    fn+0(FP), R11
+       BL      (R11)                   // Alignment for ELF ABI?
+       RET
+
+TEXT runtime·sigtramp(SB),NOSPLIT,$192
+       // Save callee-save registers in the case of signal forwarding.
+       // Please refer to https://golang.org/issue/31827 .
+       MOVD    R19, 8*4(RSP)
+       MOVD    R20, 8*5(RSP)
+       MOVD    R21, 8*6(RSP)
+       MOVD    R22, 8*7(RSP)
+       MOVD    R23, 8*8(RSP)
+       MOVD    R24, 8*9(RSP)
+       MOVD    R25, 8*10(RSP)
+       MOVD    R26, 8*11(RSP)
+       MOVD    R27, 8*12(RSP)
+       MOVD    g, 8*13(RSP)
+       MOVD    R29, 8*14(RSP)
+       FMOVD   F8, 8*15(RSP)
+       FMOVD   F9, 8*16(RSP)
+       FMOVD   F10, 8*17(RSP)
+       FMOVD   F11, 8*18(RSP)
+       FMOVD   F12, 8*19(RSP)
+       FMOVD   F13, 8*20(RSP)
+       FMOVD   F14, 8*21(RSP)
+       FMOVD   F15, 8*22(RSP)
+
+       // If called from an external code context, g will not be set.
+       // Save R0, since runtime·load_g will clobber it.
+       MOVW    R0, 8(RSP)              // signum
+       BL      runtime·load_g(SB)
+
+       MOVD    R1, 16(RSP)
+       MOVD    R2, 24(RSP)
+       BL      runtime·sigtrampgo(SB)
+
+       // Restore callee-save registers.
+       MOVD    8*4(RSP), R19
+       MOVD    8*5(RSP), R20
+       MOVD    8*6(RSP), R21
+       MOVD    8*7(RSP), R22
+       MOVD    8*8(RSP), R23
+       MOVD    8*9(RSP), R24
+       MOVD    8*10(RSP), R25
+       MOVD    8*11(RSP), R26
+       MOVD    8*12(RSP), R27
+       MOVD    8*13(RSP), g
+       MOVD    8*14(RSP), R29
+       FMOVD   8*15(RSP), F8
+       FMOVD   8*16(RSP), F9
+       FMOVD   8*17(RSP), F10
+       FMOVD   8*18(RSP), F11
+       FMOVD   8*19(RSP), F12
+       FMOVD   8*20(RSP), F13
+       FMOVD   8*21(RSP), F14
+       FMOVD   8*22(RSP), F15
+
+       RET
+
+//
+// These trampolines help convert from Go calling convention to C calling convention.
+// They should be called with asmcgocall.
+// A pointer to the arguments is passed in R0.
+// A single int32 result is returned in R0.
+// (For more results, make an args/results structure.)
+TEXT runtime·pthread_attr_init_trampoline(SB),NOSPLIT,$0
+       MOVD    0(R0), R0               // arg 1 - attr
+       CALL    libc_pthread_attr_init(SB)
+       RET
+
+TEXT runtime·pthread_attr_destroy_trampoline(SB),NOSPLIT,$0
+       MOVD    0(R0), R0               // arg 1 - attr
+       CALL    libc_pthread_attr_destroy(SB)
+       RET
+
+TEXT runtime·pthread_attr_getstacksize_trampoline(SB),NOSPLIT,$0
+       MOVD    8(R0), R1               // arg 2 - size
+       MOVD    0(R0), R0               // arg 1 - attr
+       CALL    libc_pthread_attr_getstacksize(SB)
+       RET
+
+TEXT runtime·pthread_attr_setdetachstate_trampoline(SB),NOSPLIT,$0
+       MOVD    8(R0), R1               // arg 2 - state
+       MOVD    0(R0), R0               // arg 1 - attr
+       CALL    libc_pthread_attr_setdetachstate(SB)
+       RET
+
+TEXT runtime·pthread_create_trampoline(SB),NOSPLIT,$0
+       MOVD    0(R0), R1               // arg 2 - attr
+       MOVD    8(R0), R2               // arg 3 - start
+       MOVD    16(R0), R3              // arg 4 - arg
+       SUB     $16, RSP
+       MOVD    RSP, R0                 // arg 1 - &threadid (discard)
+       CALL    libc_pthread_create(SB)
+       ADD     $16, RSP
+       RET
+
+TEXT runtime·pthread_self_trampoline(SB),NOSPLIT,$0
+       MOVD    R0, R19                 // pointer to args
+       CALL    libc_pthread_self(SB)
+       MOVD    R0, 0(R19)              // return value
+       RET
+
+TEXT runtime·pthread_kill_trampoline(SB),NOSPLIT,$0
+       MOVW    8(R0), R1               // arg 2 - sig
+       MOVD    0(R0), R0               // arg 1 - thread
+       CALL    libc_pthread_kill(SB)
+       RET
+
 // Exit the entire program (like C exit)
 TEXT runtime·exit(SB),NOSPLIT|NOFRAME,$0
        MOVW    code+0(FP), R0          // arg 1 - status
@@ -248,109 +424,6 @@ TEXT runtime·obsdsigprocmask(SB),NOSPLIT,$0
        MOVW    R0, ret+8(FP)
        RET
 
-TEXT runtime·sigfwd(SB),NOSPLIT,$0-32
-       MOVW    sig+8(FP), R0
-       MOVD    info+16(FP), R1
-       MOVD    ctx+24(FP), R2
-       MOVD    fn+0(FP), R11
-       BL      (R11)                   // Alignment for ELF ABI?
-       RET
-
-TEXT runtime·sigtramp(SB),NOSPLIT,$192
-       // Save callee-save registers in the case of signal forwarding.
-       // Please refer to https://golang.org/issue/31827 .
-       MOVD    R19, 8*4(RSP)
-       MOVD    R20, 8*5(RSP)
-       MOVD    R21, 8*6(RSP)
-       MOVD    R22, 8*7(RSP)
-       MOVD    R23, 8*8(RSP)
-       MOVD    R24, 8*9(RSP)
-       MOVD    R25, 8*10(RSP)
-       MOVD    R26, 8*11(RSP)
-       MOVD    R27, 8*12(RSP)
-       MOVD    g, 8*13(RSP)
-       MOVD    R29, 8*14(RSP)
-       FMOVD   F8, 8*15(RSP)
-       FMOVD   F9, 8*16(RSP)
-       FMOVD   F10, 8*17(RSP)
-       FMOVD   F11, 8*18(RSP)
-       FMOVD   F12, 8*19(RSP)
-       FMOVD   F13, 8*20(RSP)
-       FMOVD   F14, 8*21(RSP)
-       FMOVD   F15, 8*22(RSP)
-
-       // If called from an external code context, g will not be set.
-       // Save R0, since runtime·load_g will clobber it.
-       MOVW    R0, 8(RSP)              // signum
-       MOVB    runtime·iscgo(SB), R0
-       CMP     $0, R0
-       BEQ     2(PC)
-       BL      runtime·load_g(SB)
-
-       MOVD    R1, 16(RSP)
-       MOVD    R2, 24(RSP)
-       BL      runtime·sigtrampgo(SB)
-
-       // Restore callee-save registers.
-       MOVD    8*4(RSP), R19
-       MOVD    8*5(RSP), R20
-       MOVD    8*6(RSP), R21
-       MOVD    8*7(RSP), R22
-       MOVD    8*8(RSP), R23
-       MOVD    8*9(RSP), R24
-       MOVD    8*10(RSP), R25
-       MOVD    8*11(RSP), R26
-       MOVD    8*12(RSP), R27
-       MOVD    8*13(RSP), g
-       MOVD    8*14(RSP), R29
-       FMOVD   8*15(RSP), F8
-       FMOVD   8*16(RSP), F9
-       FMOVD   8*17(RSP), F10
-       FMOVD   8*18(RSP), F11
-       FMOVD   8*19(RSP), F12
-       FMOVD   8*20(RSP), F13
-       FMOVD   8*21(RSP), F14
-       FMOVD   8*22(RSP), F15
-
-       RET
-
-// int32 tfork(void *param, uintptr psize, M *mp, G *gp, void (*fn)(void));
-TEXT runtime·tfork(SB),NOSPLIT,$0
-
-       // Copy mp, gp and fn off parent stack for use by child.
-       MOVD    mm+16(FP), R4
-       MOVD    gg+24(FP), R5
-       MOVD    fn+32(FP), R6
-
-       MOVD    param+0(FP), R0         // arg 1 - param
-       MOVD    psize+8(FP), R1         // arg 2 - psize
-       MOVD    $8, R8                  // sys___tfork
-       INVOKE_SYSCALL
-
-       // Return if syscall failed.
-       BCC     4(PC)
-       NEG     R0,  R0
-       MOVW    R0, ret+40(FP)
-       RET
-
-       // In parent, return.
-       CMP     $0, R0
-       BEQ     3(PC)
-       MOVW    R0, ret+40(FP)
-       RET
-
-       // Initialise m, g.
-       MOVD    R5, g
-       MOVD    R4, g_m(g)
-
-       // Call fn.
-       BL      (R6)
-
-       // fn should never return.
-       MOVD    $2, R8                  // crash if reached
-       MOVD    R8, (R8)
-       RET
-
 TEXT runtime·sigaltstack(SB),NOSPLIT,$0
        MOVD    new+0(FP), R0           // arg 1 - new sigaltstack
        MOVD    old+8(FP), R1           // arg 2 - old sigaltstack

diff --git a/src/runtime/tls_arm64.s b/src/runtime/tls_arm64.s
index 3f02974d5b7e6f1eef82e8cd4f35648f486f6bc8..085012f791f431d5be450b5416adf4b3c0bfff52 100644 (file)
--- a/src/runtime/tls_arm64.s
+++ b/src/runtime/tls_arm64.s
@@ -10,8 +10,10 @@
 
 TEXT runtime·load_g(SB),NOSPLIT,$0
 #ifndef TLS_darwin
+#ifndef GOOS_openbsd
        MOVB    runtime·iscgo(SB), R0
        CBZ     R0, nocgo
+#endif
 #endif
 
        MRS_TPIDR_R0
@@ -27,8 +29,10 @@ nocgo:
 
 TEXT runtime·save_g(SB),NOSPLIT,$0
 #ifndef TLS_darwin
+#ifndef GOOS_openbsd
        MOVB    runtime·iscgo(SB), R0
        CBZ     R0, nocgo
+#endif
 #endif
 
        MRS_TPIDR_R0