mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
runtime: get a better g0 stack bound in needm
Currently, when C calls into Go the first time, we grab an M using needm, which sets m.g0's stack bounds using the SP. We don't know how big the stack is, so we simply assume 32K. Previously, when the Go function returns to C, we drop the M, and the next time C calls into Go, we put a new stack bound on the g0 based on the current SP. After CL 392854, we don't drop the M, and the next time C calls into Go, we reuse the same g0, without recomputing the stack bounds. If the C code uses quite a bit of stack space before calling into Go, the SP may be well below the 32K stack bound we assumed, so the runtime thinks the g0 stack overflows. This CL makes needm get a more accurate stack bound from pthread. (In some platforms this may still be a guess as we don't know exactly where we are in the C stack), but it is probably better than simply assuming 32K. For #59294. Change-Id: Ie52a8f931e0648d8753e4c1dbe45468b8748b527 Reviewed-on: https://go-review.googlesource.com/c/go/+/479915 Run-TryBot: Cherry Mui <cherryyz@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
parent
c5ccff405e
commit
443eb9757c
10 changed files with 182 additions and 7 deletions
|
|
@ -1889,8 +1889,11 @@ func allocm(pp *p, fn func(), id int64) *m {
|
|||
// 1. when the callback is done with the m in non-pthread platforms,
|
||||
// 2. or when the C thread exiting on pthread platforms.
|
||||
//
|
||||
// The signal argument indicates whether we're called from a signal
|
||||
// handler.
|
||||
//
|
||||
//go:nosplit
|
||||
func needm() {
|
||||
func needm(signal bool) {
|
||||
if (iscgo || GOOS == "windows") && !cgoHasExtraM {
|
||||
// Can happen if C/C++ code calls Go from a global ctor.
|
||||
// Can also happen on Windows if a global ctor uses a
|
||||
|
|
@ -1939,14 +1942,23 @@ func needm() {
|
|||
osSetupTLS(mp)
|
||||
|
||||
// Install g (= m->g0) and set the stack bounds
|
||||
// to match the current stack. We don't actually know
|
||||
// to match the current stack. If we don't actually know
|
||||
// how big the stack is, like we don't know how big any
|
||||
// scheduling stack is, but we assume there's at least 32 kB,
|
||||
// which is more than enough for us.
|
||||
// scheduling stack is, but we assume there's at least 32 kB.
|
||||
// If we can get a more accurate stack bound from pthread,
|
||||
// use that.
|
||||
setg(mp.g0)
|
||||
gp := getg()
|
||||
gp.stack.hi = getcallersp() + 1024
|
||||
gp.stack.lo = getcallersp() - 32*1024
|
||||
if !signal && _cgo_getstackbound != nil {
|
||||
// Don't adjust if called from the signal handler.
|
||||
// We are on the signal stack, not the pthread stack.
|
||||
// (We could get the stack bounds from sigaltstack, but
|
||||
// we're getting out of the signal handler very soon
|
||||
// anyway. Not worth it.)
|
||||
asmcgocall(_cgo_getstackbound, unsafe.Pointer(gp))
|
||||
}
|
||||
gp.stackguard0 = gp.stack.lo + _StackGuard
|
||||
|
||||
// Should mark we are already in Go now.
|
||||
|
|
@ -1967,7 +1979,7 @@ func needm() {
|
|||
//
|
||||
//go:nosplit
|
||||
func needAndBindM() {
|
||||
needm()
|
||||
needm(false)
|
||||
|
||||
if _cgo_pthread_key_created != nil && *(*uintptr)(_cgo_pthread_key_created) != 0 {
|
||||
cgoBindM()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue