runtime: recursively disallow write barriers in sighandler

sighandler may run during STW, so write barriers are not allowed.

Change-Id: Icdf46be10ea296fd87e73ab56ebb718c5d3c97ac
Reviewed-on: https://go-review.googlesource.com/17007
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/runtime/os3_plan9.go b/src/runtime/os3_plan9.go
index f660cc72a7606a8f94b1f9354c5f6b4db87c03d8..edd66c59b33c3496f56f376a1ad5c398f7a6de8d 100644 (file)
--- a/src/runtime/os3_plan9.go
+++ b/src/runtime/os3_plan9.go
@@ -10,7 +10,8 @@ import (
 )
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(_ureg *ureg, note *byte, gp *g) int {
        _g_ := getg()
        var t sigTabT

diff --git a/src/runtime/signal_386.go b/src/runtime/signal_386.go
index 90d69ee389acac0051926b29a6936a7c85c7d608..3ea0656e656f71901e35cede548fb65b96b37f44 100644 (file)
--- a/src/runtime/signal_386.go
+++ b/src/runtime/signal_386.go
@@ -30,7 +30,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}

diff --git a/src/runtime/signal_amd64x.go b/src/runtime/signal_amd64x.go
index df317e3835cc06efb10c56fc9eff34b0df18f35d..ad3187337a4cf83aa5c758ef812f3ea0e0180e9a 100644 (file)
--- a/src/runtime/signal_amd64x.go
+++ b/src/runtime/signal_amd64x.go
@@ -39,7 +39,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}

diff --git a/src/runtime/signal_arm.go b/src/runtime/signal_arm.go
index c00e43d0c24e2508631a5161c826e8a2a80cce52..e8d19a454d8c94df093a09951831aadd95fd953b 100644 (file)
--- a/src/runtime/signal_arm.go
+++ b/src/runtime/signal_arm.go
@@ -35,7 +35,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}

diff --git a/src/runtime/signal_arm64.go b/src/runtime/signal_arm64.go
index 96a4cb3dac7e036344698650a24dd44f88393ed5..2966ec0b20be1293dd4262f73c8e67a950e1fdd1 100644 (file)
--- a/src/runtime/signal_arm64.go
+++ b/src/runtime/signal_arm64.go
@@ -51,7 +51,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}

diff --git a/src/runtime/signal_mips64x.go b/src/runtime/signal_mips64x.go
index 51598e8e5a9c54ff3193349306a25a453ce919bb..f30ff6e9e9e57f2f57f2be4604035b359b2f2712 100644 (file)
--- a/src/runtime/signal_mips64x.go
+++ b/src/runtime/signal_mips64x.go
@@ -54,7 +54,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}

diff --git a/src/runtime/signal_ppc64x.go b/src/runtime/signal_ppc64x.go
index 774aa42c7717bd52f55ca627ef78539af8ac9595..e0c5f91e338a4cac5513161e88d9d05aa97ee371 100644 (file)
--- a/src/runtime/signal_ppc64x.go
+++ b/src/runtime/signal_ppc64x.go
@@ -56,7 +56,8 @@ func dumpregs(c *sigctxt) {
 var crashing int32
 
 // May run during STW, so write barriers are not allowed.
-//go:nowritebarrier
+//
+//go:nowritebarrierrec
 func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
        _g_ := getg()
        c := &sigctxt{info, ctxt}