[Backport]golang:add race annotations in IncNonDefault

reason:add race annotations in IncNonDefault

Signed-off-by: Vanient <xiadanni1@huawei.com>
(cherry picked from commit 550dafd8720b312651cc44c931484ff205ddd5b6)

backport-0026-release-branch.go1.21-runtime-add-race-annotations-i.patch

@@ -0,0 +1,114 @@
+From 3a0f84cabae57c185cd18564e6371ce2b50181aa Mon Sep 17 00:00:00 2001
+From: David Chase <drchase@google.com>
+Date: Thu, 14 Dec 2023 14:20:12 -0500
+Subject: [PATCH 10/20] [release-branch.go1.21] runtime: add race annotations
+ in IncNonDefault
+
+Conflict:NA
+Reference:https://go-review.googlesource.com/c/go/+/549796
+
+Also use CompareAndSwap to make the code actually less racy.
+
+Added a test which will be meaningful when run under the race
+detector (tested it -race with broken fix in runtime, it failed).
+
+This backport incorporates the correction in CL 551856,
+using racereleasemerge instead of racerelease.
+
+Fixes #64757
+
+Change-Id: I5972e08901d1adc8ba74858edad7eba91be1b0ce
+Reviewed-on: https://go-review.googlesource.com/c/go/+/549796
+Run-TryBot: David Chase <drchase@google.com>
+Reviewed-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+TryBot-Result: Gopher Robot <gobot@golang.org>
+(cherry picked from commit 3313bbb4055f38f53cd43c6c5782a229f445f230)
+Reviewed-on: https://go-review.googlesource.com/c/go/+/550236
+Auto-Submit: Matthew Dempsky <mdempsky@google.com>
+TryBot-Bypass: Matthew Dempsky <mdempsky@google.com>
+Reviewed-by: Michael Knyszek <mknyszek@google.com>
+Reviewed-by: Matthew Dempsky <mdempsky@google.com>
+---
+ src/internal/godebug/godebug_test.go | 31 ++++++++++++++++++++++++++++
+ src/runtime/runtime.go               | 13 ++++++++----
+ 2 files changed, 40 insertions(+), 4 deletions(-)
+
+diff --git a/src/internal/godebug/godebug_test.go b/src/internal/godebug/godebug_test.go
+index 8e46283adab3..65dd256e8e7d 100644
+--- a/src/internal/godebug/godebug_test.go
++++ b/src/internal/godebug/godebug_test.go
+@@ -7,6 +7,7 @@ package godebug_test
+ import (
+ 	"fmt"
+ 	. "internal/godebug"
++	"internal/race"
+ 	"internal/testenv"
+ 	"os"
+ 	"os/exec"
+@@ -70,6 +71,36 @@ func TestMetrics(t *testing.T) {
+ 	}
+ }
+ 
++// TestPanicNilRace checks for a race in the runtime caused by use of runtime
++// atomics (not visible to usual race detection) to install the counter for
++// non-default panic(nil) semantics.  For #64649.
++func TestPanicNilRace(t *testing.T) {
++	if !race.Enabled {
++		t.Skip("Skipping test intended for use with -race.")
++	}
++	if os.Getenv("GODEBUG") != "panicnil=1" {
++		cmd := testenv.CleanCmdEnv(testenv.Command(t, os.Args[0], "-test.run=^TestPanicNilRace$", "-test.v", "-test.parallel=2", "-test.count=1"))
++		cmd.Env = append(cmd.Env, "GODEBUG=panicnil=1")
++		out, err := cmd.CombinedOutput()
++		t.Logf("output:\n%s", out)
++
++		if err != nil {
++			t.Errorf("Was not expecting a crash")
++		}
++		return
++	}
++
++	test := func(t *testing.T) {
++		t.Parallel()
++		defer func() {
++			recover()
++		}()
++		panic(nil)
++	}
++	t.Run("One", test)
++	t.Run("Two", test)
++}
++
+ func TestCmdBisect(t *testing.T) {
+ 	testenv.MustHaveGoBuild(t)
+ 	out, err := exec.Command("go", "run", "cmd/vendor/golang.org/x/tools/cmd/bisect", "GODEBUG=buggy=1#PATTERN", os.Args[0], "-test.run=BisectTestCase").CombinedOutput()
+diff --git a/src/runtime/runtime.go b/src/runtime/runtime.go
+index 0822d0e8054e..15119cf5dfc7 100644
+--- a/src/runtime/runtime.go
++++ b/src/runtime/runtime.go
+@@ -101,12 +101,17 @@ func (g *godebugInc) IncNonDefault() {
+ 		if newInc == nil {
+ 			return
+ 		}
+-		// If other goroutines are racing here, no big deal. One will win,
+-		// and all the inc functions will be using the same underlying
+-		// *godebug.Setting.
+ 		inc = new(func())
+ 		*inc = (*newInc)(g.name)
+-		g.inc.Store(inc)
++		if raceenabled {
++			racereleasemerge(unsafe.Pointer(&g.inc))
++		}
++		if !g.inc.CompareAndSwap(nil, inc) {
++			inc = g.inc.Load()
++		}
++	}
++	if raceenabled {
++		raceacquire(unsafe.Pointer(&g.inc))
+ 	}
+ 	(*inc)()
+ }
+-- 
+2.33.0
+

golang.spec

@@ -66,7 +66,7 @@
 
 Name:           golang
 Version:        1.21.4
-Release:        27
+Release:        28
 Summary:        The Go Programming Language
 License:        BSD and Public Domain
 URL:            https://golang.org/
@@ -146,6 +146,7 @@ Patch6022:	backport-0022-release-branch.go1.21-fix-CVE-2024-34156.patch
 Patch6023:	backport-0023-go-build-constraint-add-parsing-limits.patch
 Patch6024:	backport-0024-release-branch.go1.21-runtime-add-the-disablethp-GOD.patch
 Patch6025:	backport-0025-release-branch.go1.21-runtime-put-ReadMemStats-debug.patch
+Patch6026:	backport-0026-release-branch.go1.21-runtime-add-race-annotations-i.patch
 
 ExclusiveArch:  %{golang_arches}
 
@@ -384,6 +385,12 @@ fi
 %files devel -f go-tests.list -f go-misc.list -f go-src.list
 
 %changelog
+* Fri Dec 06 2024 Vanient <xiadanni1@huawei.com> - 1.21.4-28
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add race annotations in IncNonDefault
+
 * Thu Dec 05 2024 hewenliang <314264452@qq.com> - 1.21.4-27
 - Type:bugfix
 - CVE:NA