]> Cypherpunks repositories - gostls13.git/commit
[release-branch.go1.16] runtime, time: disable preemption in addtimer
authorMichael Pratt <mpratt@google.com>
Wed, 10 Mar 2021 21:06:47 +0000 (16:06 -0500)
committerAlexander Rakoczy <alex@golang.org>
Fri, 12 Mar 2021 20:01:03 +0000 (20:01 +0000)
commit0da04a662a8e46f688bc65bf4fc5440226babe59
tree2c3871fa7ca2d0f16836a2dd6612c85b2a2ccf44
parent3979fb9af9ccfc0b7ccb613dcf256b18c2c295f0
[release-branch.go1.16] runtime, time: disable preemption in addtimer

The timerpMask optimization updates a mask of Ps (potentially)
containing timers in pidleget / pidleput. For correctness, it depends on
the assumption that new timers can only be added to a P's own heap.

addtimer violates this assumption if it is preempted after computing pp.
That G may then run on a different P, but adding a timer to the original
P's heap.

Avoid this by disabling preemption while pp is in use.

Other uses of doaddtimer should be OK:

* moveTimers: always moves to the current P's heap
* modtimer, cleantimers, addAdjustedTimers, runtimer: does not add net
  new timers to the heap while locked

For #44868
Fixes #44869

Change-Id: I4a5d080865e854931d0a3a09a51ca36879101d72
Reviewed-on: https://go-review.googlesource.com/c/go/+/300610
Trust: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
(cherry picked from commit aa26687e457d825fc9c580e8c029b768e0e70d38)
Reviewed-on: https://go-review.googlesource.com/c/go/+/300611
src/runtime/time.go
src/time/sleep_test.go