Skip to content

runtime: add crash stack support for wasm #63956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

runtime: add crash stack support for wasm #63956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c12bc
runtime: add crash stack support for wasm
mauri870 Nov 6, 2023
0f7d267
Merge remote-tracking branch 'origin/master' into feature/crash-stack…
mauri870 Nov 18, 2023
0d7c396
Merge remote-tracking branch 'origin' into feature/crash-stack-wasm
mauri870 Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/runtime/asm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ TEXT ·mapinitnoop<ABIInternal>(SB),NOSPLIT,$0-0
#ifndef GOARCH_ppc64
#ifndef GOARCH_ppc64le
#ifndef GOARCH_riscv64
#ifndef GOARCH_wasm
// stub to appease shared build mode.
TEXT ·switchToCrashStack0<ABIInternal>(SB),NOSPLIT,$0-0
UNDEF
Expand All @@ -30,3 +31,4 @@ TEXT ·switchToCrashStack0<ABIInternal>(SB),NOSPLIT,$0-0
#endif
#endif
#endif
#endif
45 changes: 39 additions & 6 deletions src/runtime/asm_wasm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ TEXT runtime·systemstack(SB), NOSPLIT, $0-8
I64Ne
If
CALLNORESUME runtime·badsystemstack(SB)
CALLNORESUME runtime·abort(SB)
End

// switch:
Expand Down Expand Up @@ -181,6 +182,9 @@ TEXT runtime·systemstack(SB), NOSPLIT, $0-8
TEXT runtime·systemstack_switch(SB), NOSPLIT, $0-0
RET

TEXT runtime·abort(SB),NOSPLIT|NOFRAME,$0-0
UNDEF

// AES hashing not implemented for wasm
TEXT runtime·memhash(SB),NOSPLIT|NOFRAME,$0-32
JMP runtime·memhashFallback(SB)
Expand Down Expand Up @@ -208,6 +212,33 @@ TEXT runtime·procyield(SB), NOSPLIT, $0-0 // FIXME
TEXT runtime·breakpoint(SB), NOSPLIT, $0-0
UNDEF

// func switchToCrashStack0(fn func())
TEXT runtime·switchToCrashStack0(SB), NOSPLIT, $0-8
MOVD fn+0(FP), CTXT // context register
MOVD g_m(g), R2 // curm

// set g to gcrash
MOVD $runtime·gcrash(SB), g // g = &gcrash
MOVD R2, g_m(g) // g.m = curm
MOVD g, m_g0(R2) // curm.g0 = g

// switch to crashstack
I64Load (g_stack+stack_hi)(g)
I64Const $(-4*8)
I64Add
I32WrapI64
Set SP

// call target function
Get CTXT
I32WrapI64
I64Load $0
CALL

// should never return
CALL runtime·abort(SB)
UNDEF

// Called during function prolog when more stack is needed.
//
// The traceback routines see morestack on a g0 as being
Expand All @@ -221,12 +252,19 @@ TEXT runtime·morestack(SB), NOSPLIT, $0-0
// R2 = g0
MOVD m_g0(R1), R2

// Set g->sched to context in f.
NOP SP // tell vet SP changed - stop checking offsets
MOVD 0(SP), g_sched+gobuf_pc(g)
MOVD $8(SP), g_sched+gobuf_sp(g) // f's SP
MOVD CTXT, g_sched+gobuf_ctxt(g)

// Cannot grow scheduler stack (m->g0).
Get g
Get R2
I64Eq
If
CALLNORESUME runtime·badmorestackg0(SB)
CALLNORESUME runtime·abort(SB)
End

// Cannot grow signal stack (m->gsignal).
Expand All @@ -235,20 +273,15 @@ TEXT runtime·morestack(SB), NOSPLIT, $0-0
I64Eq
If
CALLNORESUME runtime·badmorestackgsignal(SB)
CALLNORESUME runtime·abort(SB)
End

// Called from f.
// Set m->morebuf to f's caller.
NOP SP // tell vet SP changed - stop checking offsets
MOVD 8(SP), m_morebuf+gobuf_pc(R1)
MOVD $16(SP), m_morebuf+gobuf_sp(R1) // f's caller's SP
MOVD g, m_morebuf+gobuf_g(R1)

// Set g->sched to context in f.
MOVD 0(SP), g_sched+gobuf_pc(g)
MOVD $8(SP), g_sched+gobuf_sp(g) // f's SP
MOVD CTXT, g_sched+gobuf_ctxt(g)

// Call newstack on m->g0's stack.
MOVD R2, g
MOVD g_sched+gobuf_sp(R2), SP
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/proc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ func switchToCrashStack(fn func()) {
abort()
}

const crashStackImplemented = GOARCH == "amd64" || GOARCH == "arm64" || GOARCH == "mips64" || GOARCH == "mips64le" || GOARCH == "ppc64" || GOARCH == "ppc64le" || GOARCH == "riscv64"
const crashStackImplemented = GOARCH == "amd64" || GOARCH == "arm64" || GOARCH == "mips64" || GOARCH == "mips64le" || GOARCH == "ppc64" || GOARCH == "ppc64le" || GOARCH == "riscv64" || GOARCH == "wasm"

//go:noescape
func switchToCrashStack0(fn func()) // in assembly
Expand Down