Skip to content

Commit

Permalink
runtime: take stack barrier lock during copystack
Browse files Browse the repository at this point in the history
Commit bbd1a1c prevented SIGPROF from scanning stacks that were being
copied, but it didn't prevent a stack copy (specifically a stack
shrink) from happening while SIGPROF is scanning the stack. As a
result, a stack copy may adjust stack barriers while SIGPROF is in the
middle of scanning a stack, causing SIGPROF to panic when it detects
an inconsistent stack barrier.

Fix this by taking the stack barrier lock while adjusting the stack.
In addition to preventing SIGPROF from scanning this stack, this will
block until any in-progress SIGPROF is done scanning the stack.

For 1.5.2.

Fixes #13362.
Updates #12932.

Change-Id: I422219c363054410dfa56381f7b917e04690e5dd
Reviewed-on: https://go-review.googlesource.com/17191
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
aclements authored and rsc committed Nov 24, 2015
1 parent ab4c929 commit ecf388f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/runtime/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,10 @@ func copystack(gp *g, newsize uintptr) {
print("copystack gp=", gp, " [", hex(old.lo), " ", hex(old.hi-used), " ", hex(old.hi), "]/", gp.stackAlloc, " -> [", hex(new.lo), " ", hex(new.hi-used), " ", hex(new.hi), "]/", newsize, "\n")
}

// Disallow sigprof scans of this stack and block if there's
// one in progress.
gcLockStackBarriers(gp)

// adjust pointers in the to-be-copied frames
var adjinfo adjustinfo
adjinfo.old = old
Expand Down Expand Up @@ -751,6 +755,8 @@ func copystack(gp *g, newsize uintptr) {
gp.stkbar = newstkbar
gp.stktopsp += adjinfo.delta

gcUnlockStackBarriers(gp)

// free old stack
if stackPoisonCopy != 0 {
fillstack(old, 0xfc)
Expand Down

0 comments on commit ecf388f

Please sign in to comment.