Merge branch 'golang:master' into feature/VMkernel-support

0xAlcidius · web-flow · commit fbd54f53504a · 2025-04-11T23:31:52.000+02:00
diff --git a/src/os/root_test.go b/src/os/root_test.go
@@ -457,6 +457,9 @@ func TestRootChtimes(t *testing.T) {
 				case "js", "plan9":
 					times.atime = times.atime.Truncate(1 * time.Second)
 					times.mtime = times.mtime.Truncate(1 * time.Second)
+				case "illumos":
+					times.atime = times.atime.Truncate(1 * time.Microsecond)
+					times.mtime = times.mtime.Truncate(1 * time.Microsecond)
 				}
 
 				err := root.Chtimes(test.open, times.atime, times.mtime)
diff --git a/src/runtime/asan.go b/src/runtime/asan.go
@@ -26,6 +26,7 @@ func ASanWrite(addr unsafe.Pointer, len int) {
 
 // Private interface for the runtime.
 const asanenabled = true
+const asanenabledBit = 1
 
 // asan{read,write} are nosplit because they may be called between
 // fork and exec, when the stack must not grow. See issue #50391.
diff --git a/src/runtime/asan0.go b/src/runtime/asan0.go
@@ -13,6 +13,7 @@ import (
 )
 
 const asanenabled = false
+const asanenabledBit = 0
 
 // Because asanenabled is false, none of these functions should be called.
 
diff --git a/src/runtime/lock_spinbit.go b/src/runtime/lock_spinbit.go
@@ -90,7 +90,7 @@ type mWaitList struct {
 
 // lockVerifyMSize confirms that we can recreate the low bits of the M pointer.
 func lockVerifyMSize() {
-	size := roundupsize(unsafe.Sizeof(m{}), false) + mallocHeaderSize
+	size := roundupsize(unsafe.Sizeof(mPadded{}), false) + mallocHeaderSize
 	if size&mutexMMask != 0 {
 		print("M structure uses sizeclass ", size, "/", hex(size), " bytes; ",
 			"incompatible with mutex flag mask ", hex(mutexMMask), "\n")
diff --git a/src/runtime/proc.go b/src/runtime/proc.go
@@ -2256,7 +2256,7 @@ func allocm(pp *p, fn func(), id int64) *m {
 		unlock(&sched.lock)
 	}
 
-	mp := new(m)
+	mp := &new(mPadded).m
 	mp.mstartfn = fn
 	mcommoninit(mp, id)
 
diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go
@@ -619,13 +619,18 @@ type m struct {
 	// Up to 10 locks held by this m, maintained by the lock ranking code.
 	locksHeldLen int
 	locksHeld    [10]heldLockInfo
+}
+
+const mRedZoneSize = (16 << 3) * asanenabledBit // redZoneSize(2048)
+
+type mPadded struct {
+	m
 
 	// Size the runtime.m structure so it fits in the 2048-byte size class, and
 	// not in the next-smallest (1792-byte) size class. That leaves the 11 low
 	// bits of muintptr values available for flags, as required for
 	// GOEXPERIMENT=spinbitmutex.
-	_ [goexperiment.SpinbitMutexInt * 64 * goarch.PtrSize / 8]byte
-	_ [goexperiment.SpinbitMutexInt * 700 * (2 - goarch.PtrSize/4)]byte
+	_ [goexperiment.SpinbitMutexInt * (2048 - mallocHeaderSize - mRedZoneSize - unsafe.Sizeof(m{}))]byte
 }
 
 type p struct {

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,9 @@ func TestRootChtimes(t *testing.T) {`
`457`	`457`	`case "js", "plan9":`
`458`	`458`	`times.atime = times.atime.Truncate(1 * time.Second)`
`459`	`459`	`times.mtime = times.mtime.Truncate(1 * time.Second)`
	`460`	`+ case "illumos":`
	`461`	`+ times.atime = times.atime.Truncate(1 * time.Microsecond)`
	`462`	`+ times.mtime = times.mtime.Truncate(1 * time.Microsecond)`
`460`	`463`	`}`
`461`	`464`
`462`	`465`	`err := root.Chtimes(test.open, times.atime, times.mtime)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const asanenabled = false`
	`16`	`+const asanenabledBit = 0`
`16`	`17`
`17`	`18`	`// Because asanenabled is false, none of these functions should be called.`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -2256,7 +2256,7 @@ func allocm(pp p, fn func(), id int64) m {`
`2256`	`2256`	`unlock(&sched.lock)`
`2257`	`2257`	`}`
`2258`	`2258`
`2259`		`- mp := new(m)`
	`2259`	`+ mp := &new(mPadded).m`
`2260`	`2260`	`mp.mstartfn = fn`
`2261`	`2261`	`mcommoninit(mp, id)`
`2262`	`2262`