diff options
author | Michael Anthony Knyszek <mknyszek@google.com> | 2021-04-07 19:58:01 +0000 |
---|---|---|
committer | Michael Knyszek <mknyszek@google.com> | 2021-04-08 16:37:24 +0000 |
commit | 31d2556273795ae10709d3bc157ec5d3f0e070a2 (patch) | |
tree | cdc1e039271c09774b0cd57ae37755bb6dfd1a77 /src/runtime/runtime2.go | |
parent | 283b02063b470a0f5df7ba99c9fc801d020763ab (diff) | |
download | go-31d2556273795ae10709d3bc157ec5d3f0e070a2.tar.gz go-31d2556273795ae10709d3bc157ec5d3f0e070a2.zip |
runtime: set up read-only dummy TLS space for needm on Windows
On Windows, TLS is uninitialized for C threads calling into Go code.
In this path, before calling into user Go code, we call into needm which
runs without an m, but whose purpose is to pick one up. While in Go
code, we may occasionally restore the G register from TLS for a number
of reasons. Rather than try to flag all these cases, given that needm
(and its callees) are already somewhat special, just set up a dummy TLS
space for it that's read-only. If it ever actually tries to write to
this space (it shouldn't), it will fail loudly. Otherwise, code that
restores the G register will simply load a zero value, but that's OK
since needm is careful never to require the G at any point, because it
doesn't yet have a valid G. Furthermore, by the time needm returns, it
will have set up TLS properly for a Windows C thread, so there's no need
to do anything extra afterwards.
For #40724.
Change-Id: I34e8095059817e4ee663505e89cda8785b634b98
Reviewed-on: https://go-review.googlesource.com/c/go/+/307872
Trust: Michael Knyszek <mknyszek@google.com>
Run-TryBot: Michael Knyszek <mknyszek@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/runtime/runtime2.go')
-rw-r--r-- | src/runtime/runtime2.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go index e5f948ec86..402d49ac82 100644 --- a/src/runtime/runtime2.go +++ b/src/runtime/runtime2.go @@ -482,17 +482,24 @@ type g struct { gcAssistBytes int64 } +const ( + // tlsSlots is the number of pointer-sized slots reserved for TLS on some platforms, + // like Windows. + tlsSlots = 6 + tlsSize = tlsSlots * sys.PtrSize +) + type m struct { g0 *g // goroutine with scheduling stack morebuf gobuf // gobuf arg to morestack divmod uint32 // div/mod denominator for arm - known to liblink // Fields not known to debuggers. - procid uint64 // for debuggers, but offset not hard-coded - gsignal *g // signal-handling g - goSigStack gsignalStack // Go-allocated signal handling stack - sigmask sigset // storage for saved signal mask - tls [6]uintptr // thread-local storage (for x86 extern register) + procid uint64 // for debuggers, but offset not hard-coded + gsignal *g // signal-handling g + goSigStack gsignalStack // Go-allocated signal handling stack + sigmask sigset // storage for saved signal mask + tls [tlsSlots]uintptr // thread-local storage (for x86 extern register) mstartfn func() curg *g // current running goroutine caughtsig guintptr // goroutine running during fatal signal |