diff options
| author | Vladimir Stefanovic <vladimir.stefanovic@imgtec.com> | 2017-05-04 16:45:29 +0200 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2017-07-26 13:29:59 +0000 |
| commit | 835dfef939879b284d4c0f4e1726491f27e4f1ee (patch) | |
| tree | d163be310654d08362c9f7b620bf8e4c46d0dca2 /src/runtime/pprof | |
| parent | df91b8044dbe790c69c16058330f545be069cc1f (diff) | |
| download | go-835dfef939879b284d4c0f4e1726491f27e4f1ee.tar.xz | |
runtime/pprof: prevent a deadlock that SIGPROF might create on mips{,le}
64bit atomics on mips/mipsle are implemented using spinlocks. If SIGPROF
is received while the program is in the critical section, it will try to
write the sample using the same spinlock, creating a deadloop.
Prevent it by creating a counter of SIGPROFs during atomic64 and
postpone writing the sample(s) until called from elsewhere, with
pc set to _LostSIGPROFDuringAtomic64.
Added a test case, per Cherry's suggestion. Works around #20146.
Change-Id: Icff504180bae4ee83d78b19c0d9d6a80097087f9
Reviewed-on: https://go-review.googlesource.com/42652
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/runtime/pprof')
| -rw-r--r-- | src/runtime/pprof/pprof_test.go | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go index 22fea0a52f..992d2abb6a 100644 --- a/src/runtime/pprof/pprof_test.go +++ b/src/runtime/pprof/pprof_test.go @@ -12,6 +12,7 @@ import ( "fmt" "internal/testenv" "io" + "io/ioutil" "math/big" "os" "os/exec" @@ -20,6 +21,7 @@ import ( "runtime/pprof/internal/profile" "strings" "sync" + "sync/atomic" "testing" "time" ) @@ -713,3 +715,32 @@ func TestCPUProfileLabel(t *testing.T) { }) }) } + +// Check that there is no deadlock when the program receives SIGPROF while in +// 64bit atomics' critical section. Used to happen on mips{,le}. See #20146. +func TestAtomicLoadStore64(t *testing.T) { + f, err := ioutil.TempFile("", "profatomic") + if err != nil { + t.Fatalf("TempFile: %v", err) + } + defer os.Remove(f.Name()) + defer f.Close() + + if err := StartCPUProfile(f); err != nil { + t.Fatal(err) + } + defer StopCPUProfile() + + var flag uint64 + done := make(chan bool, 1) + + go func() { + for atomic.LoadUint64(&flag) == 0 { + runtime.Gosched() + } + done <- true + }() + time.Sleep(50 * time.Millisecond) + atomic.StoreUint64(&flag, 1) + <-done +} |
