Do not save timers in netstack.

Timers should not be saved and new timers if required, should be created
during restore.

PiperOrigin-RevId: 833505133

Author: nybidari

pkg/tcpip/faketime/faketime.go

@@ -25,8 +25,6 @@ import (
 )
 
 // NullClock implements a clock that never advances.
-//
-// +stateify savable
 type NullClock struct{}
 
 var _ tcpip.Clock = (*NullClock)(nil)
@@ -42,8 +40,6 @@ func (*NullClock) NowMonotonic() tcpip.MonotonicTime {
 }
 
 // nullTimer implements a timer that never fires.
-//
-// +stateify savable
 type nullTimer struct{}
 
 var _ tcpip.Timer = (*nullTimer)(nil)
@@ -96,9 +92,8 @@ func (n *notificationChannels) wait() {
 	}
 }
 
-// +stateify savable
 type manualClockMutex struct {
-	sync.RWMutex `state:"nosave"`
+	sync.RWMutex
 
 	// now is the current (fake) time of the clock.
 	now time.Time
@@ -334,23 +329,19 @@ func (mc *ManualClock) stopTimer(mt *manualTimer) bool {
 	return true
 }
 
-// +stateify savable
 type manualTimerMu struct {
-	sync.Mutex `state:"nosave"`
+	sync.Mutex
 
 	// firesAt is the time when the timer will fire.
 	//
 	// Zero only when the timer is not active.
 	firesAt time.Time
 }
 
-// +stateify savable
 type manualTimer struct {
 	clock *ManualClock
-	// TODO(b/341946753): Restore when netstack is savable.
-	f func() `state:"nosave"`
-
-	mu manualTimerMu
+	f     func()
+	mu    manualTimerMu
 }
 
 var _ tcpip.Timer = (*manualTimer)(nil)

pkg/tcpip/network/internal/ip/duplicate_address_detection.go

@@ -39,7 +39,7 @@ type dadState struct {
 	extendRequest extendRequest
 
 	done  *bool
-	timer tcpip.Timer
+	timer tcpip.Timer `state:"nosave"`
 
 	completionHandlers []stack.DADCompletionHandler
 }

pkg/tcpip/network/internal/ip/generic_multicast_protocol.go

@@ -291,13 +291,13 @@ type GenericMulticastProtocolState struct {
 	robustnessVariable uint8
 	queryInterval      time.Duration
 	mode               protocolMode
-	modeTimer          tcpip.Timer
+	modeTimer          tcpip.Timer `state:"nosave"`
 
-	generalQueryV2Timer tcpip.Timer
+	generalQueryV2Timer tcpip.Timer `state:"nosave"`
 	// TODO(b/341946753): Restore when netstack is savable.
 	generalQueryV2TimerFiresAt time.Time `state:"nosave"`
 
-	stateChangedReportV2Timer    tcpip.Timer
+	stateChangedReportV2Timer    tcpip.Timer `state:"nosave"`
 	stateChangedReportV2TimerSet bool
 }
 

pkg/tcpip/network/internal/multicast/route_table.go

@@ -57,7 +57,7 @@ type RouteTable struct {
 	// cleanupPendingRoutesTimer is a timer that triggers a routine to remove
 	// pending routes that are expired.
 	// +checklocks:pendingMu
-	cleanupPendingRoutesTimer tcpip.Timer
+	cleanupPendingRoutesTimer tcpip.Timer `state:"nosave"`
 	// +checklocks:pendingMu
 	isCleanupRoutineRunning bool
 

pkg/tcpip/network/ipv6/ndp.go

@@ -471,7 +471,7 @@ type timer struct {
 	// done indicates to the timer that the timer was stopped.
 	done *bool
 
-	timer tcpip.Timer
+	timer tcpip.Timer `state:"nosave"`
 }
 
 // +stateify savable

pkg/tcpip/stack/iptables_types.go

@@ -82,7 +82,7 @@ const (
 type IPTables struct {
 	connections ConnTrack
 
-	reaper tcpip.Timer
+	reaper tcpip.Timer `state:"nosave"`
 
 	mu ipTablesRWMutex `state:"nosave"`
 	// v4Tables and v6tables map tableIDs to tables. They hold builtin

pkg/tcpip/stdclock.go

@@ -91,7 +91,6 @@ func (*stdClock) AfterFunc(d time.Duration, f func()) Timer {
 	}
 }
 
-// +stateify savable
 type stdTimer struct {
 	t *time.Timer
 }

pkg/tcpip/timer.go

@@ -59,7 +59,7 @@ import (
 //
 // +stateify savable
 type jobInstance struct {
-	timer Timer
+	timer Timer `state:"nosave"`
 
 	// Used to inform the timer to early return when it gets stopped while the
 	// lock the timer tries to obtain when fired is held (T1 is a goroutine that