go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Annotate checklocks on mutex protected fields 

...to catch lock-related bugs in nogo tests.

This change also disables/enables packet reception before/after
save/restore with a flag that is protected by rcvMu instead of mu.

Updates #6566.

PiperOrigin-RevId: 396946187
This commit is contained in:
Ghanan Gowripalan 2021-09-15 16:09:13 -07:00 committed by gVisor bot
parent 4e99f17178
commit a8ad692fd3
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/tcpip/transport/packet/endpoint.go
View File

@ -68,31 +68,31 @@ type endpoint struct {
netProto tcpip.NetworkProtocolNumber
waiterQueue *waiter.Queue
cooked bool
ops tcpip.SocketOptions
stats tcpip.TransportEndpointStats `state:"nosave"`
// The following fields are used to manage the receive queue and are
// protected by rcvMu.
rcvMu sync.Mutex `state:"nosave"`
rcvList packetList
// The following fields are used to manage the receive queue.
rcvMu sync.Mutex `state:"nosave"`
// +checklocks:rcvMu
rcvList packetList
// +checklocks:rcvMu
rcvBufSize int
rcvClosed bool
// +checklocks:rcvMu
rcvClosed bool
// +checklocks:rcvMu
rcvDisabled bool
// The following fields are protected by mu.
mu sync.RWMutex `state:"nosave"`
closed bool
stats tcpip.TransportEndpointStats `state:"nosave"`
bound bool
mu sync.RWMutex `state:"nosave"`
// +checklocks:mu
closed bool
// +checklocks:mu
bound bool
// +checklocks:mu
boundNIC tcpip.NICID
// lastErrorMu protects lastError.
lastErrorMu sync.Mutex `state:"nosave"`
lastError tcpip.Error
// ops is used to get socket level options.
ops tcpip.SocketOptions
// frozen indicates if the packets should be delivered to the endpoint
// during restore.
frozen bool
// +checklocks:lastErrorMu
lastError tcpip.Error
}
// NewEndpoint returns a new packet endpoint.
@ -414,7 +414,7 @@ func (ep *endpoint) HandlePacket(nicID tcpip.NICID, localAddr tcpip.LinkAddress,
}
rcvBufSize := ep.ops.GetReceiveBufferSize()
if ep.frozen || ep.rcvBufSize >= int(rcvBufSize) {
if ep.rcvDisabled || ep.rcvBufSize >= int(rcvBufSize) {
ep.rcvMu.Unlock()
ep.stack.Stats().DroppedPackets.Increment()
ep.stats.ReceiveErrors.ReceiveBufferOverflow.Increment()
@ -491,18 +491,3 @@ func (*endpoint) SetOwner(tcpip.PacketOwner) {}
func (ep *endpoint) SocketOptions() *tcpip.SocketOptions {
return &ep.ops
}
// freeze prevents any more packets from being delivered to the endpoint.
func (ep *endpoint) freeze() {
ep.mu.Lock()
ep.frozen = true
ep.mu.Unlock()
}
// thaw unfreezes a previously frozen endpoint using endpoint.freeze() allows
// new packets to be delivered again.
func (ep *endpoint) thaw() {
ep.mu.Lock()
ep.frozen = false
ep.mu.Unlock()
}

12
pkg/tcpip/transport/packet/endpoint_state.go
View File

@ -44,12 +44,16 @@ func (p *packet) loadData(data buffer.VectorisedView) {
// beforeSave is invoked by stateify.
func (ep *endpoint) beforeSave() {
ep.freeze()
ep.rcvMu.Lock()
defer ep.rcvMu.Unlock()
ep.rcvDisabled = true
}
// afterLoad is invoked by stateify.
func (ep *endpoint) afterLoad() {
ep.thaw()
ep.mu.Lock()
defer ep.mu.Unlock()
ep.stack = stack.StackFromEnv
ep.ops.InitHandler(ep, ep.stack, tcpip.GetStackSendBufferLimits, tcpip.GetStackReceiveBufferLimits)
@ -57,4 +61,8 @@ func (ep *endpoint) afterLoad() {
if err := ep.stack.RegisterPacketEndpoint(0, ep.netProto, ep); err != nil {
panic(err)
}
ep.rcvMu.Lock()
ep.rcvDisabled = false
ep.rcvMu.Unlock()
}