From: Mauri de Souza Meneguzzo Date: Thu, 25 Jan 2024 23:11:02 +0000 (+0000) Subject: runtime: crash stack support for loong64 X-Git-Tag: go1.23rc1~1361 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f719d5cffdb8298eff7a5ef533fe95290e8c869c;p=gostls13.git runtime: crash stack support for loong64 Change-Id: Icc2641b888440cc27444b5dfb2b8ff286e6a595d GitHub-Last-Rev: f5772e32e9190ab1eed94fcf2c9e58d6bc0d74d6 GitHub-Pull-Request: golang/go#63923 Reviewed-on: https://go-review.googlesource.com/c/go/+/539536 Reviewed-by: abner chenc Run-TryBot: Joel Sing Reviewed-by: Michael Knyszek Reviewed-by: Cherry Mui TryBot-Result: Gopher Robot --- diff --git a/src/runtime/asm.s b/src/runtime/asm.s index 74ae8789ab..4833fae5e9 100644 --- a/src/runtime/asm.s +++ b/src/runtime/asm.s @@ -15,6 +15,7 @@ TEXT ·mapinitnoop(SB),NOSPLIT,$0-0 #ifndef GOARCH_amd64 #ifndef GOARCH_arm64 +#ifndef GOARCH_loong64 #ifndef GOARCH_mips64 #ifndef GOARCH_mips64le #ifndef GOARCH_ppc64 @@ -34,3 +35,4 @@ TEXT ·switchToCrashStack0(SB),NOSPLIT,$0-0 #endif #endif #endif +#endif diff --git a/src/runtime/asm_loong64.s b/src/runtime/asm_loong64.s index 586bd23ed4..7c5ecb8a01 100644 --- a/src/runtime/asm_loong64.s +++ b/src/runtime/asm_loong64.s @@ -213,6 +213,29 @@ noswitch: ADDV $8, R3 JMP (R4) +// func switchToCrashStack0(fn func()) +TEXT runtime·switchToCrashStack0(SB), NOSPLIT, $0-8 + MOVV fn+0(FP), REGCTXT // context register + MOVV g_m(g), R4 // curm + + // set g to gcrash + MOVV $runtime·gcrash(SB), g // g = &gcrash + JAL runtime·save_g(SB) + MOVV R4, g_m(g) // g.m = curm + MOVV g, m_g0(R4) // curm.g0 = g + + // switch to crashstack + MOVV (g_stack+stack_hi)(g), R4 + ADDV $(-4*8), R4, R3 + + // call target function + MOVV 0(REGCTXT), R6 + JAL (R6) + + // should never return + JAL runtime·abort(SB) + UNDEF + /* * support for morestack */ @@ -226,6 +249,13 @@ noswitch: // calling the scheduler calling newm calling gc), so we must // record an argument size. For that purpose, it has no arguments. TEXT runtime·morestack(SB),NOSPLIT|NOFRAME,$0-0 + // Called from f. + // Set g->sched to context in f. + MOVV R3, (g_sched+gobuf_sp)(g) + MOVV R1, (g_sched+gobuf_pc)(g) + MOVV R31, (g_sched+gobuf_lr)(g) + MOVV REGCTXT, (g_sched+gobuf_ctxt)(g) + // Cannot grow scheduler stack (m->g0). MOVV g_m(g), R7 MOVV m_g0(R7), R8 @@ -239,13 +269,6 @@ TEXT runtime·morestack(SB),NOSPLIT|NOFRAME,$0-0 JAL runtime·badmorestackgsignal(SB) JAL runtime·abort(SB) - // Called from f. - // Set g->sched to context in f. - MOVV R3, (g_sched+gobuf_sp)(g) - MOVV R1, (g_sched+gobuf_pc)(g) - MOVV R31, (g_sched+gobuf_lr)(g) - MOVV REGCTXT, (g_sched+gobuf_ctxt)(g) - // Called from f. // Set m->morebuf to f's caller. MOVV R31, (m_morebuf+gobuf_pc)(R7) // f's caller's PC diff --git a/src/runtime/proc.go b/src/runtime/proc.go index b3caeb9a7c..c1b3ce20d5 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -579,7 +579,7 @@ func switchToCrashStack(fn func()) { // Disable crash stack on Windows for now. Apparently, throwing an exception // on a non-system-allocated crash stack causes EXCEPTION_STACK_OVERFLOW and // hangs the process (see issue 63938). -const crashStackImplemented = (GOARCH == "amd64" || GOARCH == "arm64" || GOARCH == "mips64" || GOARCH == "mips64le" || GOARCH == "ppc64" || GOARCH == "ppc64le" || GOARCH == "riscv64" || GOARCH == "s390x" || GOARCH == "wasm") && GOOS != "windows" +const crashStackImplemented = (GOARCH == "amd64" || GOARCH == "arm64" || GOARCH == "loong64" || GOARCH == "mips64" || GOARCH == "mips64le" || GOARCH == "ppc64" || GOARCH == "ppc64le" || GOARCH == "riscv64" || GOARCH == "s390x" || GOARCH == "wasm") && GOOS != "windows" //go:noescape func switchToCrashStack0(fn func()) // in assembly