Merge release-20210315.0-15-gacb4c6288 (automated)

104 files changed, 1644 insertions, 0 deletions

diff --git a/pkg/abi/linux/linux_amd64_state_autogen.go b/pkg/abi/linux/linux_amd64_state_autogen.go
index 3d3dea994..d233a69df 100644
--- a/pkg/abi/linux/linux_amd64_state_autogen.go
+++ b/pkg/abi/linux/linux_amd64_state_autogen.go
@@ -50,6 +50,7 @@ func (p *PtraceRegs) StateFields() []string {
 
 func (p *PtraceRegs) beforeSave() {}
 
+// +checklocksignore
 func (p *PtraceRegs) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.R15)
@@ -83,6 +84,7 @@ func (p *PtraceRegs) StateSave(stateSinkObject state.Sink) {
 
 func (p *PtraceRegs) afterLoad() {}
 
+// +checklocksignore
 func (p *PtraceRegs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.R15)
 	stateSourceObject.Load(1, &p.R14)
diff --git a/pkg/abi/linux/linux_arm64_state_autogen.go b/pkg/abi/linux/linux_arm64_state_autogen.go
index adc1f568e..8b08b2925 100644
--- a/pkg/abi/linux/linux_arm64_state_autogen.go
+++ b/pkg/abi/linux/linux_arm64_state_autogen.go
@@ -26,6 +26,7 @@ func (p *PtraceRegs) StateFields() []string {
 
 func (p *PtraceRegs) beforeSave() {}
 
+// +checklocksignore
 func (p *PtraceRegs) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.Regs)
@@ -36,6 +37,7 @@ func (p *PtraceRegs) StateSave(stateSinkObject state.Sink) {
 
 func (p *PtraceRegs) afterLoad() {}
 
+// +checklocksignore
 func (p *PtraceRegs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.Regs)
 	stateSourceObject.Load(1, &p.Sp)
diff --git a/pkg/abi/linux/linux_state_autogen.go b/pkg/abi/linux/linux_state_autogen.go
index 3791000da..780edd2ee 100644
--- a/pkg/abi/linux/linux_state_autogen.go
+++ b/pkg/abi/linux/linux_state_autogen.go
@@ -21,6 +21,7 @@ func (i *IOEvent) StateFields() []string {
 
 func (i *IOEvent) beforeSave() {}
 
+// +checklocksignore
 func (i *IOEvent) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Data)
@@ -31,6 +32,7 @@ func (i *IOEvent) StateSave(stateSinkObject state.Sink) {
 
 func (i *IOEvent) afterLoad() {}
 
+// +checklocksignore
 func (i *IOEvent) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Data)
 	stateSourceObject.Load(1, &i.Obj)
@@ -53,6 +55,7 @@ func (b *BPFInstruction) StateFields() []string {
 
 func (b *BPFInstruction) beforeSave() {}
 
+// +checklocksignore
 func (b *BPFInstruction) StateSave(stateSinkObject state.Sink) {
 	b.beforeSave()
 	stateSinkObject.Save(0, &b.OpCode)
@@ -63,6 +66,7 @@ func (b *BPFInstruction) StateSave(stateSinkObject state.Sink) {
 
 func (b *BPFInstruction) afterLoad() {}
 
+// +checklocksignore
 func (b *BPFInstruction) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &b.OpCode)
 	stateSourceObject.Load(1, &b.JumpIfTrue)
@@ -84,6 +88,7 @@ func (c *ControlMessageIPPacketInfo) StateFields() []string {
 
 func (c *ControlMessageIPPacketInfo) beforeSave() {}
 
+// +checklocksignore
 func (c *ControlMessageIPPacketInfo) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.NIC)
@@ -93,6 +98,7 @@ func (c *ControlMessageIPPacketInfo) StateSave(stateSinkObject state.Sink) {
 
 func (c *ControlMessageIPPacketInfo) afterLoad() {}
 
+// +checklocksignore
 func (c *ControlMessageIPPacketInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.NIC)
 	stateSourceObject.Load(1, &c.LocalAddr)
@@ -118,6 +124,7 @@ func (t *KernelTermios) StateFields() []string {
 
 func (t *KernelTermios) beforeSave() {}
 
+// +checklocksignore
 func (t *KernelTermios) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.InputFlags)
@@ -132,6 +139,7 @@ func (t *KernelTermios) StateSave(stateSinkObject state.Sink) {
 
 func (t *KernelTermios) afterLoad() {}
 
+// +checklocksignore
 func (t *KernelTermios) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.InputFlags)
 	stateSourceObject.Load(1, &t.OutputFlags)
@@ -156,6 +164,7 @@ func (w *WindowSize) StateFields() []string {
 
 func (w *WindowSize) beforeSave() {}
 
+// +checklocksignore
 func (w *WindowSize) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.Rows)
@@ -164,6 +173,7 @@ func (w *WindowSize) StateSave(stateSinkObject state.Sink) {
 
 func (w *WindowSize) afterLoad() {}
 
+// +checklocksignore
 func (w *WindowSize) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.Rows)
 	stateSourceObject.Load(1, &w.Cols)
diff --git a/pkg/bpf/bpf_state_autogen.go b/pkg/bpf/bpf_state_autogen.go
index db56bbeb5..3a020fe29 100644
--- a/pkg/bpf/bpf_state_autogen.go
+++ b/pkg/bpf/bpf_state_autogen.go
@@ -18,6 +18,7 @@ func (p *Program) StateFields() []string {
 
 func (p *Program) beforeSave() {}
 
+// +checklocksignore
 func (p *Program) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.instructions)
@@ -25,6 +26,7 @@ func (p *Program) StateSave(stateSinkObject state.Sink) {
 
 func (p *Program) afterLoad() {}
 
+// +checklocksignore
 func (p *Program) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.instructions)
 }
diff --git a/pkg/cpuid/cpuid_arm64_state_autogen.go b/pkg/cpuid/cpuid_arm64_state_autogen.go
index d5911799d..50e317963 100644
--- a/pkg/cpuid/cpuid_arm64_state_autogen.go
+++ b/pkg/cpuid/cpuid_arm64_state_autogen.go
@@ -25,6 +25,7 @@ func (fs *FeatureSet) StateFields() []string {
 
 func (fs *FeatureSet) beforeSave() {}
 
+// +checklocksignore
 func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Set)
@@ -37,6 +38,7 @@ func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
 
 func (fs *FeatureSet) afterLoad() {}
 
+// +checklocksignore
 func (fs *FeatureSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Set)
 	stateSourceObject.Load(1, &fs.CPUImplementer)
diff --git a/pkg/cpuid/cpuid_x86_state_autogen.go b/pkg/cpuid/cpuid_x86_state_autogen.go
index 023f8d742..9962a29ae 100644
--- a/pkg/cpuid/cpuid_x86_state_autogen.go
+++ b/pkg/cpuid/cpuid_x86_state_autogen.go
@@ -28,6 +28,7 @@ func (c *Cache) StateFields() []string {
 
 func (c *Cache) beforeSave() {}
 
+// +checklocksignore
 func (c *Cache) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.Level)
@@ -43,6 +44,7 @@ func (c *Cache) StateSave(stateSinkObject state.Sink) {
 
 func (c *Cache) afterLoad() {}
 
+// +checklocksignore
 func (c *Cache) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.Level)
 	stateSourceObject.Load(1, &c.Type)
@@ -76,6 +78,7 @@ func (fs *FeatureSet) StateFields() []string {
 
 func (fs *FeatureSet) beforeSave() {}
 
+// +checklocksignore
 func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Set)
@@ -92,6 +95,7 @@ func (fs *FeatureSet) StateSave(stateSinkObject state.Sink) {
 
 func (fs *FeatureSet) afterLoad() {}
 
+// +checklocksignore
 func (fs *FeatureSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Set)
 	stateSourceObject.Load(1, &fs.VendorID)
diff --git a/pkg/ilist/ilist_state_autogen.go b/pkg/ilist/ilist_state_autogen.go
index 378b7a895..d329cb299 100644
--- a/pkg/ilist/ilist_state_autogen.go
+++ b/pkg/ilist/ilist_state_autogen.go
@@ -19,6 +19,7 @@ func (l *List) StateFields() []string {
 
 func (l *List) beforeSave() {}
 
+// +checklocksignore
 func (l *List) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *List) StateSave(stateSinkObject state.Sink) {
 
 func (l *List) afterLoad() {}
 
+// +checklocksignore
 func (l *List) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *Entry) StateFields() []string {
 
 func (e *Entry) beforeSave() {}
 
+// +checklocksignore
 func (e *Entry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *Entry) StateSave(stateSinkObject state.Sink) {
 
 func (e *Entry) afterLoad() {}
 
+// +checklocksignore
 func (e *Entry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/refs/refs_state_autogen.go b/pkg/refs/refs_state_autogen.go
index ab4c21b09..53d22d315 100644
--- a/pkg/refs/refs_state_autogen.go
+++ b/pkg/refs/refs_state_autogen.go
@@ -19,6 +19,7 @@ func (w *WeakRef) StateFields() []string {
 
 func (w *WeakRef) beforeSave() {}
 
+// +checklocksignore
 func (w *WeakRef) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	var objValue savedReference = w.saveObj()
@@ -28,6 +29,7 @@ func (w *WeakRef) StateSave(stateSinkObject state.Sink) {
 
 func (w *WeakRef) afterLoad() {}
 
+// +checklocksignore
 func (w *WeakRef) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &w.user)
 	stateSourceObject.LoadValue(0, new(savedReference), func(y interface{}) { w.loadObj(y.(savedReference)) })
@@ -47,6 +49,7 @@ func (r *AtomicRefCount) StateFields() []string {
 
 func (r *AtomicRefCount) beforeSave() {}
 
+// +checklocksignore
 func (r *AtomicRefCount) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
@@ -56,6 +59,7 @@ func (r *AtomicRefCount) StateSave(stateSinkObject state.Sink) {
 
 func (r *AtomicRefCount) afterLoad() {}
 
+// +checklocksignore
 func (r *AtomicRefCount) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.Load(1, &r.name)
@@ -74,6 +78,7 @@ func (s *savedReference) StateFields() []string {
 
 func (s *savedReference) beforeSave() {}
 
+// +checklocksignore
 func (s *savedReference) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.obj)
@@ -81,6 +86,7 @@ func (s *savedReference) StateSave(stateSinkObject state.Sink) {
 
 func (s *savedReference) afterLoad() {}
 
+// +checklocksignore
 func (s *savedReference) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.obj)
 }
@@ -98,6 +104,7 @@ func (l *weakRefList) StateFields() []string {
 
 func (l *weakRefList) beforeSave() {}
 
+// +checklocksignore
 func (l *weakRefList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -106,6 +113,7 @@ func (l *weakRefList) StateSave(stateSinkObject state.Sink) {
 
 func (l *weakRefList) afterLoad() {}
 
+// +checklocksignore
 func (l *weakRefList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -124,6 +132,7 @@ func (e *weakRefEntry) StateFields() []string {
 
 func (e *weakRefEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *weakRefEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -132,6 +141,7 @@ func (e *weakRefEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *weakRefEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *weakRefEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/sentry/arch/arch_aarch64_state_autogen.go b/pkg/sentry/arch/arch_aarch64_state_autogen.go
index 817679b05..b3d9425e4 100644
--- a/pkg/sentry/arch/arch_aarch64_state_autogen.go
+++ b/pkg/sentry/arch/arch_aarch64_state_autogen.go
@@ -21,6 +21,7 @@ func (r *Registers) StateFields() []string {
 
 func (r *Registers) beforeSave() {}
 
+// +checklocksignore
 func (r *Registers) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.PtraceRegs)
@@ -29,6 +30,7 @@ func (r *Registers) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registers) afterLoad() {}
 
+// +checklocksignore
 func (r *Registers) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.PtraceRegs)
 	stateSourceObject.Load(1, &r.TPIDR_EL0)
@@ -49,6 +51,7 @@ func (s *State) StateFields() []string {
 
 func (s *State) beforeSave() {}
 
+// +checklocksignore
 func (s *State) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Regs)
@@ -59,6 +62,7 @@ func (s *State) StateSave(stateSinkObject state.Sink) {
 
 func (s *State) afterLoad() {}
 
+// +checklocksignore
 func (s *State) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Regs)
 	stateSourceObject.LoadWait(1, &s.aarch64FPState)
diff --git a/pkg/sentry/arch/arch_amd64_state_autogen.go b/pkg/sentry/arch/arch_amd64_state_autogen.go
index 7fe18338d..d74b4267b 100644
--- a/pkg/sentry/arch/arch_amd64_state_autogen.go
+++ b/pkg/sentry/arch/arch_amd64_state_autogen.go
@@ -23,6 +23,7 @@ func (c *context64) StateFields() []string {
 
 func (c *context64) beforeSave() {}
 
+// +checklocksignore
 func (c *context64) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.State)
@@ -31,6 +32,7 @@ func (c *context64) StateSave(stateSinkObject state.Sink) {
 
 func (c *context64) afterLoad() {}
 
+// +checklocksignore
 func (c *context64) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.State)
 	stateSourceObject.Load(1, &c.sigFPState)
diff --git a/pkg/sentry/arch/arch_arm64_state_autogen.go b/pkg/sentry/arch/arch_arm64_state_autogen.go
index bece3fa9e..4f6fe0744 100644
--- a/pkg/sentry/arch/arch_arm64_state_autogen.go
+++ b/pkg/sentry/arch/arch_arm64_state_autogen.go
@@ -23,6 +23,7 @@ func (c *context64) StateFields() []string {
 
 func (c *context64) beforeSave() {}
 
+// +checklocksignore
 func (c *context64) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.State)
@@ -31,6 +32,7 @@ func (c *context64) StateSave(stateSinkObject state.Sink) {
 
 func (c *context64) afterLoad() {}
 
+// +checklocksignore
 func (c *context64) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.State)
 	stateSourceObject.Load(1, &c.sigFPState)
diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go
index e0a1de627..fd93f89dd 100644
--- a/pkg/sentry/arch/arch_state_autogen.go
+++ b/pkg/sentry/arch/arch_state_autogen.go
@@ -25,6 +25,7 @@ func (m *MmapLayout) StateFields() []string {
 
 func (m *MmapLayout) beforeSave() {}
 
+// +checklocksignore
 func (m *MmapLayout) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.MinAddr)
@@ -37,6 +38,7 @@ func (m *MmapLayout) StateSave(stateSinkObject state.Sink) {
 
 func (m *MmapLayout) afterLoad() {}
 
+// +checklocksignore
 func (m *MmapLayout) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.MinAddr)
 	stateSourceObject.Load(1, &m.MaxAddr)
@@ -59,6 +61,7 @@ func (a *AuxEntry) StateFields() []string {
 
 func (a *AuxEntry) beforeSave() {}
 
+// +checklocksignore
 func (a *AuxEntry) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.Key)
@@ -67,6 +70,7 @@ func (a *AuxEntry) StateSave(stateSinkObject state.Sink) {
 
 func (a *AuxEntry) afterLoad() {}
 
+// +checklocksignore
 func (a *AuxEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.Key)
 	stateSourceObject.Load(1, &a.Value)
@@ -87,6 +91,7 @@ func (s *SignalAct) StateFields() []string {
 
 func (s *SignalAct) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalAct) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Handler)
@@ -97,6 +102,7 @@ func (s *SignalAct) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalAct) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalAct) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Handler)
 	stateSourceObject.Load(1, &s.Flags)
@@ -118,6 +124,7 @@ func (s *SignalStack) StateFields() []string {
 
 func (s *SignalStack) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalStack) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Addr)
@@ -127,6 +134,7 @@ func (s *SignalStack) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalStack) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalStack) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Addr)
 	stateSourceObject.Load(1, &s.Flags)
@@ -148,6 +156,7 @@ func (s *SignalInfo) StateFields() []string {
 
 func (s *SignalInfo) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalInfo) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Signo)
@@ -158,6 +167,7 @@ func (s *SignalInfo) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalInfo) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Signo)
 	stateSourceObject.Load(1, &s.Errno)
diff --git a/pkg/sentry/arch/arch_x86_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
index e584c3f83..403a28c47 100644
--- a/pkg/sentry/arch/arch_x86_impl_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
@@ -22,6 +22,7 @@ func (s *State) StateFields() []string {
 
 func (s *State) beforeSave() {}
 
+// +checklocksignore
 func (s *State) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Regs)
@@ -29,6 +30,7 @@ func (s *State) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &s.FeatureSet)
 }
 
+// +checklocksignore
 func (s *State) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Regs)
 	stateSourceObject.LoadWait(1, &s.x86FPState)
diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go
index 11378624b..7584e42c5 100644
--- a/pkg/sentry/arch/arch_x86_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_state_autogen.go
@@ -21,6 +21,7 @@ func (r *Registers) StateFields() []string {
 
 func (r *Registers) beforeSave() {}
 
+// +checklocksignore
 func (r *Registers) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.PtraceRegs)
@@ -28,6 +29,7 @@ func (r *Registers) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registers) afterLoad() {}
 
+// +checklocksignore
 func (r *Registers) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.PtraceRegs)
 }
diff --git a/pkg/sentry/device/device_state_autogen.go b/pkg/sentry/device/device_state_autogen.go
index 53fcb5d84..b68325291 100644
--- a/pkg/sentry/device/device_state_autogen.go
+++ b/pkg/sentry/device/device_state_autogen.go
@@ -19,6 +19,7 @@ func (r *Registry) StateFields() []string {
 
 func (r *Registry) beforeSave() {}
 
+// +checklocksignore
 func (r *Registry) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.lastAnonDeviceMinor)
@@ -27,6 +28,7 @@ func (r *Registry) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registry) afterLoad() {}
 
+// +checklocksignore
 func (r *Registry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.lastAnonDeviceMinor)
 	stateSourceObject.Load(1, &r.devices)
@@ -45,6 +47,7 @@ func (i *ID) StateFields() []string {
 
 func (i *ID) beforeSave() {}
 
+// +checklocksignore
 func (i *ID) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Major)
@@ -53,6 +56,7 @@ func (i *ID) StateSave(stateSinkObject state.Sink) {
 
 func (i *ID) afterLoad() {}
 
+// +checklocksignore
 func (i *ID) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Major)
 	stateSourceObject.Load(1, &i.Minor)
@@ -71,6 +75,7 @@ func (d *Device) StateFields() []string {
 
 func (d *Device) beforeSave() {}
 
+// +checklocksignore
 func (d *Device) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.ID)
@@ -79,6 +84,7 @@ func (d *Device) StateSave(stateSinkObject state.Sink) {
 
 func (d *Device) afterLoad() {}
 
+// +checklocksignore
 func (d *Device) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.ID)
 	stateSourceObject.Load(1, &d.last)
diff --git a/pkg/sentry/devices/memdev/memdev_state_autogen.go b/pkg/sentry/devices/memdev/memdev_state_autogen.go
index 88de3f2ea..a8faafbbf 100644
--- a/pkg/sentry/devices/memdev/memdev_state_autogen.go
+++ b/pkg/sentry/devices/memdev/memdev_state_autogen.go
@@ -16,12 +16,14 @@ func (f *fullDevice) StateFields() []string {
 
 func (f *fullDevice) beforeSave() {}
 
+// +checklocksignore
 func (f *fullDevice) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *fullDevice) afterLoad() {}
 
+// +checklocksignore
 func (f *fullDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -40,6 +42,7 @@ func (fd *fullFD) StateFields() []string {
 
 func (fd *fullFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *fullFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -50,6 +53,7 @@ func (fd *fullFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *fullFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *fullFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -67,12 +71,14 @@ func (n *nullDevice) StateFields() []string {
 
 func (n *nullDevice) beforeSave() {}
 
+// +checklocksignore
 func (n *nullDevice) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 }
 
 func (n *nullDevice) afterLoad() {}
 
+// +checklocksignore
 func (n *nullDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -91,6 +97,7 @@ func (fd *nullFD) StateFields() []string {
 
 func (fd *nullFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *nullFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -101,6 +108,7 @@ func (fd *nullFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *nullFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *nullFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -118,12 +126,14 @@ func (r *randomDevice) StateFields() []string {
 
 func (r *randomDevice) beforeSave() {}
 
+// +checklocksignore
 func (r *randomDevice) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *randomDevice) afterLoad() {}
 
+// +checklocksignore
 func (r *randomDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -143,6 +153,7 @@ func (fd *randomFD) StateFields() []string {
 
 func (fd *randomFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *randomFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -154,6 +165,7 @@ func (fd *randomFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *randomFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *randomFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -172,12 +184,14 @@ func (z *zeroDevice) StateFields() []string {
 
 func (z *zeroDevice) beforeSave() {}
 
+// +checklocksignore
 func (z *zeroDevice) StateSave(stateSinkObject state.Sink) {
 	z.beforeSave()
 }
 
 func (z *zeroDevice) afterLoad() {}
 
+// +checklocksignore
 func (z *zeroDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -196,6 +210,7 @@ func (fd *zeroFD) StateFields() []string {
 
 func (fd *zeroFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *zeroFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -206,6 +221,7 @@ func (fd *zeroFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *zeroFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *zeroFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/devices/ttydev/ttydev_state_autogen.go b/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
index 3389b37f3..88a1cd0a6 100644
--- a/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
+++ b/pkg/sentry/devices/ttydev/ttydev_state_autogen.go
@@ -16,12 +16,14 @@ func (t *ttyDevice) StateFields() []string {
 
 func (t *ttyDevice) beforeSave() {}
 
+// +checklocksignore
 func (t *ttyDevice) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 }
 
 func (t *ttyDevice) afterLoad() {}
 
+// +checklocksignore
 func (t *ttyDevice) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/devices/tundev/tundev_state_autogen.go b/pkg/sentry/devices/tundev/tundev_state_autogen.go
index 343d5b8e7..ad7c7feb4 100644
--- a/pkg/sentry/devices/tundev/tundev_state_autogen.go
+++ b/pkg/sentry/devices/tundev/tundev_state_autogen.go
@@ -16,12 +16,14 @@ func (t *tunDevice) StateFields() []string {
 
 func (t *tunDevice) beforeSave() {}
 
+// +checklocksignore
 func (t *tunDevice) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 }
 
 func (t *tunDevice) afterLoad() {}
 
+// +checklocksignore
 func (t *tunDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -41,6 +43,7 @@ func (fd *tunFD) StateFields() []string {
 
 func (fd *tunFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *tunFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -52,6 +55,7 @@ func (fd *tunFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *tunFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *tunFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/fs/dev/dev_state_autogen.go b/pkg/sentry/fs/dev/dev_state_autogen.go
index 958ddf698..23945d391 100644
--- a/pkg/sentry/fs/dev/dev_state_autogen.go
+++ b/pkg/sentry/fs/dev/dev_state_autogen.go
@@ -16,12 +16,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -37,6 +39,7 @@ func (f *fullDevice) StateFields() []string {
 
 func (f *fullDevice) beforeSave() {}
 
+// +checklocksignore
 func (f *fullDevice) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.InodeSimpleAttributes)
@@ -44,6 +47,7 @@ func (f *fullDevice) StateSave(stateSinkObject state.Sink) {
 
 func (f *fullDevice) afterLoad() {}
 
+// +checklocksignore
 func (f *fullDevice) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.InodeSimpleAttributes)
 }
@@ -58,12 +62,14 @@ func (f *fullFileOperations) StateFields() []string {
 
 func (f *fullFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (f *fullFileOperations) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *fullFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (f *fullFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -79,6 +85,7 @@ func (n *netTunInodeOperations) StateFields() []string {
 
 func (n *netTunInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (n *netTunInodeOperations) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.InodeSimpleAttributes)
@@ -86,6 +93,7 @@ func (n *netTunInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (n *netTunInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (n *netTunInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.InodeSimpleAttributes)
 }
@@ -102,6 +110,7 @@ func (n *netTunFileOperations) StateFields() []string {
 
 func (n *netTunFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (n *netTunFileOperations) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.device)
@@ -109,6 +118,7 @@ func (n *netTunFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (n *netTunFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (n *netTunFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.device)
 }
@@ -125,6 +135,7 @@ func (n *nullDevice) StateFields() []string {
 
 func (n *nullDevice) beforeSave() {}
 
+// +checklocksignore
 func (n *nullDevice) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.InodeSimpleAttributes)
@@ -132,6 +143,7 @@ func (n *nullDevice) StateSave(stateSinkObject state.Sink) {
 
 func (n *nullDevice) afterLoad() {}
 
+// +checklocksignore
 func (n *nullDevice) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.InodeSimpleAttributes)
 }
@@ -146,12 +158,14 @@ func (n *nullFileOperations) StateFields() []string {
 
 func (n *nullFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (n *nullFileOperations) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 }
 
 func (n *nullFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (n *nullFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -167,6 +181,7 @@ func (zd *zeroDevice) StateFields() []string {
 
 func (zd *zeroDevice) beforeSave() {}
 
+// +checklocksignore
 func (zd *zeroDevice) StateSave(stateSinkObject state.Sink) {
 	zd.beforeSave()
 	stateSinkObject.Save(0, &zd.nullDevice)
@@ -174,6 +189,7 @@ func (zd *zeroDevice) StateSave(stateSinkObject state.Sink) {
 
 func (zd *zeroDevice) afterLoad() {}
 
+// +checklocksignore
 func (zd *zeroDevice) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &zd.nullDevice)
 }
@@ -188,12 +204,14 @@ func (z *zeroFileOperations) StateFields() []string {
 
 func (z *zeroFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (z *zeroFileOperations) StateSave(stateSinkObject state.Sink) {
 	z.beforeSave()
 }
 
 func (z *zeroFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (z *zeroFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -209,6 +227,7 @@ func (r *randomDevice) StateFields() []string {
 
 func (r *randomDevice) beforeSave() {}
 
+// +checklocksignore
 func (r *randomDevice) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.InodeSimpleAttributes)
@@ -216,6 +235,7 @@ func (r *randomDevice) StateSave(stateSinkObject state.Sink) {
 
 func (r *randomDevice) afterLoad() {}
 
+// +checklocksignore
 func (r *randomDevice) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.InodeSimpleAttributes)
 }
@@ -230,12 +250,14 @@ func (r *randomFileOperations) StateFields() []string {
 
 func (r *randomFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (r *randomFileOperations) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *randomFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (r *randomFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -251,6 +273,7 @@ func (t *ttyInodeOperations) StateFields() []string {
 
 func (t *ttyInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (t *ttyInodeOperations) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.InodeSimpleAttributes)
@@ -258,6 +281,7 @@ func (t *ttyInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (t *ttyInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (t *ttyInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.InodeSimpleAttributes)
 }
@@ -272,12 +296,14 @@ func (t *ttyFileOperations) StateFields() []string {
 
 func (t *ttyFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (t *ttyFileOperations) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 }
 
 func (t *ttyFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (t *ttyFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
index f946f2ba5..92dcd2391 100644
--- a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
+++ b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
@@ -19,6 +19,7 @@ func (p *pipeOperations) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (p *pipeOperations) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var flagsValue fs.FileFlags = p.saveFlags()
@@ -27,6 +28,7 @@ func (p *pipeOperations) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &p.readAheadBuffer)
 }
 
+// +checklocksignore
 func (p *pipeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(1, &p.opener)
 	stateSourceObject.Load(2, &p.readAheadBuffer)
diff --git a/pkg/sentry/fs/fs_state_autogen.go b/pkg/sentry/fs/fs_state_autogen.go
index 667495740..a4a67fca2 100644
--- a/pkg/sentry/fs/fs_state_autogen.go
+++ b/pkg/sentry/fs/fs_state_autogen.go
@@ -23,6 +23,7 @@ func (s *StableAttr) StateFields() []string {
 
 func (s *StableAttr) beforeSave() {}
 
+// +checklocksignore
 func (s *StableAttr) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Type)
@@ -35,6 +36,7 @@ func (s *StableAttr) StateSave(stateSinkObject state.Sink) {
 
 func (s *StableAttr) afterLoad() {}
 
+// +checklocksignore
 func (s *StableAttr) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Type)
 	stateSourceObject.Load(1, &s.DeviceID)
@@ -63,6 +65,7 @@ func (ua *UnstableAttr) StateFields() []string {
 
 func (ua *UnstableAttr) beforeSave() {}
 
+// +checklocksignore
 func (ua *UnstableAttr) StateSave(stateSinkObject state.Sink) {
 	ua.beforeSave()
 	stateSinkObject.Save(0, &ua.Size)
@@ -77,6 +80,7 @@ func (ua *UnstableAttr) StateSave(stateSinkObject state.Sink) {
 
 func (ua *UnstableAttr) afterLoad() {}
 
+// +checklocksignore
 func (ua *UnstableAttr) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ua.Size)
 	stateSourceObject.Load(1, &ua.Usage)
@@ -112,6 +116,7 @@ func (a *AttrMask) StateFields() []string {
 
 func (a *AttrMask) beforeSave() {}
 
+// +checklocksignore
 func (a *AttrMask) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.Type)
@@ -131,6 +136,7 @@ func (a *AttrMask) StateSave(stateSinkObject state.Sink) {
 
 func (a *AttrMask) afterLoad() {}
 
+// +checklocksignore
 func (a *AttrMask) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.Type)
 	stateSourceObject.Load(1, &a.DeviceID)
@@ -161,6 +167,7 @@ func (p *PermMask) StateFields() []string {
 
 func (p *PermMask) beforeSave() {}
 
+// +checklocksignore
 func (p *PermMask) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.Read)
@@ -170,6 +177,7 @@ func (p *PermMask) StateSave(stateSinkObject state.Sink) {
 
 func (p *PermMask) afterLoad() {}
 
+// +checklocksignore
 func (p *PermMask) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.Read)
 	stateSourceObject.Load(1, &p.Write)
@@ -193,6 +201,7 @@ func (f *FilePermissions) StateFields() []string {
 
 func (f *FilePermissions) beforeSave() {}
 
+// +checklocksignore
 func (f *FilePermissions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.User)
@@ -205,6 +214,7 @@ func (f *FilePermissions) StateSave(stateSinkObject state.Sink) {
 
 func (f *FilePermissions) afterLoad() {}
 
+// +checklocksignore
 func (f *FilePermissions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.User)
 	stateSourceObject.Load(1, &f.Group)
@@ -227,6 +237,7 @@ func (f *FileOwner) StateFields() []string {
 
 func (f *FileOwner) beforeSave() {}
 
+// +checklocksignore
 func (f *FileOwner) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.UID)
@@ -235,6 +246,7 @@ func (f *FileOwner) StateSave(stateSinkObject state.Sink) {
 
 func (f *FileOwner) afterLoad() {}
 
+// +checklocksignore
 func (f *FileOwner) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.UID)
 	stateSourceObject.Load(1, &f.GID)
@@ -253,6 +265,7 @@ func (d *DentAttr) StateFields() []string {
 
 func (d *DentAttr) beforeSave() {}
 
+// +checklocksignore
 func (d *DentAttr) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.Type)
@@ -261,6 +274,7 @@ func (d *DentAttr) StateSave(stateSinkObject state.Sink) {
 
 func (d *DentAttr) afterLoad() {}
 
+// +checklocksignore
 func (d *DentAttr) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.Type)
 	stateSourceObject.Load(1, &d.InodeID)
@@ -279,6 +293,7 @@ func (s *SortedDentryMap) StateFields() []string {
 
 func (s *SortedDentryMap) beforeSave() {}
 
+// +checklocksignore
 func (s *SortedDentryMap) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.names)
@@ -287,6 +302,7 @@ func (s *SortedDentryMap) StateSave(stateSinkObject state.Sink) {
 
 func (s *SortedDentryMap) afterLoad() {}
 
+// +checklocksignore
 func (s *SortedDentryMap) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.names)
 	stateSourceObject.Load(1, &s.entries)
@@ -309,6 +325,7 @@ func (d *Dirent) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (d *Dirent) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	var childrenValue map[string]*Dirent = d.saveChildren()
@@ -322,6 +339,7 @@ func (d *Dirent) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &d.mounted)
 }
 
+// +checklocksignore
 func (d *Dirent) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.AtomicRefCount)
 	stateSourceObject.Load(1, &d.userVisible)
@@ -347,6 +365,7 @@ func (c *DirentCache) StateFields() []string {
 
 func (c *DirentCache) beforeSave() {}
 
+// +checklocksignore
 func (c *DirentCache) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	if !state.IsZeroValue(&c.currentSize) {
@@ -361,6 +380,7 @@ func (c *DirentCache) StateSave(stateSinkObject state.Sink) {
 
 func (c *DirentCache) afterLoad() {}
 
+// +checklocksignore
 func (c *DirentCache) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.maxSize)
 	stateSourceObject.Load(1, &c.limit)
@@ -378,6 +398,7 @@ func (d *DirentCacheLimiter) StateFields() []string {
 
 func (d *DirentCacheLimiter) beforeSave() {}
 
+// +checklocksignore
 func (d *DirentCacheLimiter) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	if !state.IsZeroValue(&d.count) {
@@ -388,6 +409,7 @@ func (d *DirentCacheLimiter) StateSave(stateSinkObject state.Sink) {
 
 func (d *DirentCacheLimiter) afterLoad() {}
 
+// +checklocksignore
 func (d *DirentCacheLimiter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.max)
 }
@@ -405,6 +427,7 @@ func (l *direntList) StateFields() []string {
 
 func (l *direntList) beforeSave() {}
 
+// +checklocksignore
 func (l *direntList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -413,6 +436,7 @@ func (l *direntList) StateSave(stateSinkObject state.Sink) {
 
 func (l *direntList) afterLoad() {}
 
+// +checklocksignore
 func (l *direntList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -431,6 +455,7 @@ func (e *direntEntry) StateFields() []string {
 
 func (e *direntEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *direntEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -439,6 +464,7 @@ func (e *direntEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *direntEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *direntEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -457,6 +483,7 @@ func (l *eventList) StateFields() []string {
 
 func (l *eventList) beforeSave() {}
 
+// +checklocksignore
 func (l *eventList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -465,6 +492,7 @@ func (l *eventList) StateSave(stateSinkObject state.Sink) {
 
 func (l *eventList) afterLoad() {}
 
+// +checklocksignore
 func (l *eventList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -483,6 +511,7 @@ func (e *eventEntry) StateFields() []string {
 
 func (e *eventEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *eventEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -491,6 +520,7 @@ func (e *eventEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *eventEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *eventEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -512,6 +542,7 @@ func (f *File) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (f *File) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.AtomicRefCount)
@@ -523,6 +554,7 @@ func (f *File) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &f.offset)
 }
 
+// +checklocksignore
 func (f *File) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.AtomicRefCount)
 	stateSourceObject.Load(1, &f.UniqueID)
@@ -548,6 +580,7 @@ func (f *overlayFileOperations) StateFields() []string {
 
 func (f *overlayFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (f *overlayFileOperations) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.upper)
@@ -557,6 +590,7 @@ func (f *overlayFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (f *overlayFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (f *overlayFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.upper)
 	stateSourceObject.Load(1, &f.lower)
@@ -577,6 +611,7 @@ func (omi *overlayMappingIdentity) StateFields() []string {
 
 func (omi *overlayMappingIdentity) beforeSave() {}
 
+// +checklocksignore
 func (omi *overlayMappingIdentity) StateSave(stateSinkObject state.Sink) {
 	omi.beforeSave()
 	stateSinkObject.Save(0, &omi.AtomicRefCount)
@@ -586,6 +621,7 @@ func (omi *overlayMappingIdentity) StateSave(stateSinkObject state.Sink) {
 
 func (omi *overlayMappingIdentity) afterLoad() {}
 
+// +checklocksignore
 func (omi *overlayMappingIdentity) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &omi.AtomicRefCount)
 	stateSourceObject.Load(1, &omi.id)
@@ -607,6 +643,7 @@ func (m *MountSourceFlags) StateFields() []string {
 
 func (m *MountSourceFlags) beforeSave() {}
 
+// +checklocksignore
 func (m *MountSourceFlags) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.ReadOnly)
@@ -617,6 +654,7 @@ func (m *MountSourceFlags) StateSave(stateSinkObject state.Sink) {
 
 func (m *MountSourceFlags) afterLoad() {}
 
+// +checklocksignore
 func (m *MountSourceFlags) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.ReadOnly)
 	stateSourceObject.Load(1, &m.NoAtime)
@@ -649,6 +687,7 @@ func (f *FileFlags) StateFields() []string {
 
 func (f *FileFlags) beforeSave() {}
 
+// +checklocksignore
 func (f *FileFlags) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.Direct)
@@ -669,6 +708,7 @@ func (f *FileFlags) StateSave(stateSinkObject state.Sink) {
 
 func (f *FileFlags) afterLoad() {}
 
+// +checklocksignore
 func (f *FileFlags) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.Direct)
 	stateSourceObject.Load(1, &f.NonBlocking)
@@ -704,6 +744,7 @@ func (i *Inode) StateFields() []string {
 
 func (i *Inode) beforeSave() {}
 
+// +checklocksignore
 func (i *Inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.AtomicRefCount)
@@ -717,6 +758,7 @@ func (i *Inode) StateSave(stateSinkObject state.Sink) {
 
 func (i *Inode) afterLoad() {}
 
+// +checklocksignore
 func (i *Inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.AtomicRefCount)
 	stateSourceObject.Load(1, &i.InodeOperations)
@@ -740,6 +782,7 @@ func (l *LockCtx) StateFields() []string {
 
 func (l *LockCtx) beforeSave() {}
 
+// +checklocksignore
 func (l *LockCtx) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Posix)
@@ -748,6 +791,7 @@ func (l *LockCtx) StateSave(stateSinkObject state.Sink) {
 
 func (l *LockCtx) afterLoad() {}
 
+// +checklocksignore
 func (l *LockCtx) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Posix)
 	stateSourceObject.Load(1, &l.BSD)
@@ -766,6 +810,7 @@ func (w *Watches) StateFields() []string {
 
 func (w *Watches) beforeSave() {}
 
+// +checklocksignore
 func (w *Watches) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.ws)
@@ -774,6 +819,7 @@ func (w *Watches) StateSave(stateSinkObject state.Sink) {
 
 func (w *Watches) afterLoad() {}
 
+// +checklocksignore
 func (w *Watches) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.ws)
 	stateSourceObject.Load(1, &w.unlinked)
@@ -795,6 +841,7 @@ func (i *Inotify) StateFields() []string {
 
 func (i *Inotify) beforeSave() {}
 
+// +checklocksignore
 func (i *Inotify) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.id)
@@ -806,6 +853,7 @@ func (i *Inotify) StateSave(stateSinkObject state.Sink) {
 
 func (i *Inotify) afterLoad() {}
 
+// +checklocksignore
 func (i *Inotify) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.id)
 	stateSourceObject.Load(1, &i.events)
@@ -831,6 +879,7 @@ func (e *Event) StateFields() []string {
 
 func (e *Event) beforeSave() {}
 
+// +checklocksignore
 func (e *Event) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.eventEntry)
@@ -843,6 +892,7 @@ func (e *Event) StateSave(stateSinkObject state.Sink) {
 
 func (e *Event) afterLoad() {}
 
+// +checklocksignore
 func (e *Event) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.eventEntry)
 	stateSourceObject.Load(1, &e.wd)
@@ -869,6 +919,7 @@ func (w *Watch) StateFields() []string {
 
 func (w *Watch) beforeSave() {}
 
+// +checklocksignore
 func (w *Watch) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.owner)
@@ -881,6 +932,7 @@ func (w *Watch) StateSave(stateSinkObject state.Sink) {
 
 func (w *Watch) afterLoad() {}
 
+// +checklocksignore
 func (w *Watch) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.owner)
 	stateSourceObject.Load(1, &w.wd)
@@ -907,6 +959,7 @@ func (msrc *MountSource) StateFields() []string {
 
 func (msrc *MountSource) beforeSave() {}
 
+// +checklocksignore
 func (msrc *MountSource) StateSave(stateSinkObject state.Sink) {
 	msrc.beforeSave()
 	stateSinkObject.Save(0, &msrc.AtomicRefCount)
@@ -919,6 +972,7 @@ func (msrc *MountSource) StateSave(stateSinkObject state.Sink) {
 
 func (msrc *MountSource) afterLoad() {}
 
+// +checklocksignore
 func (msrc *MountSource) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &msrc.AtomicRefCount)
 	stateSourceObject.Load(1, &msrc.MountSourceOperations)
@@ -942,6 +996,7 @@ func (smo *SimpleMountSourceOperations) StateFields() []string {
 
 func (smo *SimpleMountSourceOperations) beforeSave() {}
 
+// +checklocksignore
 func (smo *SimpleMountSourceOperations) StateSave(stateSinkObject state.Sink) {
 	smo.beforeSave()
 	stateSinkObject.Save(0, &smo.keep)
@@ -951,6 +1006,7 @@ func (smo *SimpleMountSourceOperations) StateSave(stateSinkObject state.Sink) {
 
 func (smo *SimpleMountSourceOperations) afterLoad() {}
 
+// +checklocksignore
 func (smo *SimpleMountSourceOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &smo.keep)
 	stateSourceObject.Load(1, &smo.revalidate)
@@ -970,6 +1026,7 @@ func (o *overlayMountSourceOperations) StateFields() []string {
 
 func (o *overlayMountSourceOperations) beforeSave() {}
 
+// +checklocksignore
 func (o *overlayMountSourceOperations) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.upper)
@@ -978,6 +1035,7 @@ func (o *overlayMountSourceOperations) StateSave(stateSinkObject state.Sink) {
 
 func (o *overlayMountSourceOperations) afterLoad() {}
 
+// +checklocksignore
 func (o *overlayMountSourceOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.upper)
 	stateSourceObject.Load(1, &o.lower)
@@ -993,12 +1051,14 @@ func (ofs *overlayFilesystem) StateFields() []string {
 
 func (ofs *overlayFilesystem) beforeSave() {}
 
+// +checklocksignore
 func (ofs *overlayFilesystem) StateSave(stateSinkObject state.Sink) {
 	ofs.beforeSave()
 }
 
 func (ofs *overlayFilesystem) afterLoad() {}
 
+// +checklocksignore
 func (ofs *overlayFilesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1017,6 +1077,7 @@ func (m *Mount) StateFields() []string {
 
 func (m *Mount) beforeSave() {}
 
+// +checklocksignore
 func (m *Mount) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.ID)
@@ -1027,6 +1088,7 @@ func (m *Mount) StateSave(stateSinkObject state.Sink) {
 
 func (m *Mount) afterLoad() {}
 
+// +checklocksignore
 func (m *Mount) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.ID)
 	stateSourceObject.Load(1, &m.ParentID)
@@ -1050,6 +1112,7 @@ func (mns *MountNamespace) StateFields() []string {
 
 func (mns *MountNamespace) beforeSave() {}
 
+// +checklocksignore
 func (mns *MountNamespace) StateSave(stateSinkObject state.Sink) {
 	mns.beforeSave()
 	stateSinkObject.Save(0, &mns.AtomicRefCount)
@@ -1061,6 +1124,7 @@ func (mns *MountNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (mns *MountNamespace) afterLoad() {}
 
+// +checklocksignore
 func (mns *MountNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mns.AtomicRefCount)
 	stateSourceObject.Load(1, &mns.userns)
@@ -1085,6 +1149,7 @@ func (o *overlayEntry) StateFields() []string {
 
 func (o *overlayEntry) beforeSave() {}
 
+// +checklocksignore
 func (o *overlayEntry) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.lowerExists)
@@ -1096,6 +1161,7 @@ func (o *overlayEntry) StateSave(stateSinkObject state.Sink) {
 
 func (o *overlayEntry) afterLoad() {}
 
+// +checklocksignore
 func (o *overlayEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.lowerExists)
 	stateSourceObject.Load(1, &o.lower)
diff --git a/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go b/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
index cb6b2ca81..b7f95bde7 100644
--- a/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
+++ b/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
@@ -18,6 +18,7 @@ func (s *DirtySet) StateFields() []string {
 
 func (s *DirtySet) beforeSave() {}
 
+// +checklocksignore
 func (s *DirtySet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *DirtySegmentDataSlices = s.saveRoot()
@@ -26,6 +27,7 @@ func (s *DirtySet) StateSave(stateSinkObject state.Sink) {
 
 func (s *DirtySet) afterLoad() {}
 
+// +checklocksignore
 func (s *DirtySet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*DirtySegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*DirtySegmentDataSlices)) })
 }
@@ -49,6 +51,7 @@ func (n *Dirtynode) StateFields() []string {
 
 func (n *Dirtynode) beforeSave() {}
 
+// +checklocksignore
 func (n *Dirtynode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -63,6 +66,7 @@ func (n *Dirtynode) StateSave(stateSinkObject state.Sink) {
 
 func (n *Dirtynode) afterLoad() {}
 
+// +checklocksignore
 func (n *Dirtynode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -88,6 +92,7 @@ func (d *DirtySegmentDataSlices) StateFields() []string {
 
 func (d *DirtySegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (d *DirtySegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.Start)
@@ -97,6 +102,7 @@ func (d *DirtySegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (d *DirtySegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (d *DirtySegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.Start)
 	stateSourceObject.Load(1, &d.End)
@@ -115,6 +121,7 @@ func (s *FileRangeSet) StateFields() []string {
 
 func (s *FileRangeSet) beforeSave() {}
 
+// +checklocksignore
 func (s *FileRangeSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *FileRangeSegmentDataSlices = s.saveRoot()
@@ -123,6 +130,7 @@ func (s *FileRangeSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *FileRangeSet) afterLoad() {}
 
+// +checklocksignore
 func (s *FileRangeSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*FileRangeSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*FileRangeSegmentDataSlices)) })
 }
@@ -146,6 +154,7 @@ func (n *FileRangenode) StateFields() []string {
 
 func (n *FileRangenode) beforeSave() {}
 
+// +checklocksignore
 func (n *FileRangenode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -160,6 +169,7 @@ func (n *FileRangenode) StateSave(stateSinkObject state.Sink) {
 
 func (n *FileRangenode) afterLoad() {}
 
+// +checklocksignore
 func (n *FileRangenode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -185,6 +195,7 @@ func (f *FileRangeSegmentDataSlices) StateFields() []string {
 
 func (f *FileRangeSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (f *FileRangeSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.Start)
@@ -194,6 +205,7 @@ func (f *FileRangeSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (f *FileRangeSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (f *FileRangeSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.Start)
 	stateSourceObject.Load(1, &f.End)
@@ -212,6 +224,7 @@ func (s *FrameRefSet) StateFields() []string {
 
 func (s *FrameRefSet) beforeSave() {}
 
+// +checklocksignore
 func (s *FrameRefSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *FrameRefSegmentDataSlices = s.saveRoot()
@@ -220,6 +233,7 @@ func (s *FrameRefSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *FrameRefSet) afterLoad() {}
 
+// +checklocksignore
 func (s *FrameRefSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*FrameRefSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*FrameRefSegmentDataSlices)) })
 }
@@ -243,6 +257,7 @@ func (n *FrameRefnode) StateFields() []string {
 
 func (n *FrameRefnode) beforeSave() {}
 
+// +checklocksignore
 func (n *FrameRefnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -257,6 +272,7 @@ func (n *FrameRefnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *FrameRefnode) afterLoad() {}
 
+// +checklocksignore
 func (n *FrameRefnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -282,6 +298,7 @@ func (f *FrameRefSegmentDataSlices) StateFields() []string {
 
 func (f *FrameRefSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (f *FrameRefSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.Start)
@@ -291,6 +308,7 @@ func (f *FrameRefSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (f *FrameRefSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (f *FrameRefSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.Start)
 	stateSourceObject.Load(1, &f.End)
diff --git a/pkg/sentry/fs/fsutil/fsutil_state_autogen.go b/pkg/sentry/fs/fsutil/fsutil_state_autogen.go
index 439ab9a65..748eb9272 100644
--- a/pkg/sentry/fs/fsutil/fsutil_state_autogen.go
+++ b/pkg/sentry/fs/fsutil/fsutil_state_autogen.go
@@ -18,6 +18,7 @@ func (d *DirtyInfo) StateFields() []string {
 
 func (d *DirtyInfo) beforeSave() {}
 
+// +checklocksignore
 func (d *DirtyInfo) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.Keep)
@@ -25,6 +26,7 @@ func (d *DirtyInfo) StateSave(stateSinkObject state.Sink) {
 
 func (d *DirtyInfo) afterLoad() {}
 
+// +checklocksignore
 func (d *DirtyInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.Keep)
 }
@@ -42,6 +44,7 @@ func (sdfo *StaticDirFileOperations) StateFields() []string {
 
 func (sdfo *StaticDirFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (sdfo *StaticDirFileOperations) StateSave(stateSinkObject state.Sink) {
 	sdfo.beforeSave()
 	stateSinkObject.Save(0, &sdfo.dentryMap)
@@ -50,6 +53,7 @@ func (sdfo *StaticDirFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (sdfo *StaticDirFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (sdfo *StaticDirFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sdfo.dentryMap)
 	stateSourceObject.Load(1, &sdfo.dirCursor)
@@ -65,12 +69,14 @@ func (n *NoReadWriteFile) StateFields() []string {
 
 func (n *NoReadWriteFile) beforeSave() {}
 
+// +checklocksignore
 func (n *NoReadWriteFile) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 }
 
 func (n *NoReadWriteFile) afterLoad() {}
 
+// +checklocksignore
 func (n *NoReadWriteFile) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -86,6 +92,7 @@ func (scr *FileStaticContentReader) StateFields() []string {
 
 func (scr *FileStaticContentReader) beforeSave() {}
 
+// +checklocksignore
 func (scr *FileStaticContentReader) StateSave(stateSinkObject state.Sink) {
 	scr.beforeSave()
 	stateSinkObject.Save(0, &scr.content)
@@ -93,6 +100,7 @@ func (scr *FileStaticContentReader) StateSave(stateSinkObject state.Sink) {
 
 func (scr *FileStaticContentReader) afterLoad() {}
 
+// +checklocksignore
 func (scr *FileStaticContentReader) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &scr.content)
 }
@@ -109,11 +117,13 @@ func (f *HostFileMapper) StateFields() []string {
 
 func (f *HostFileMapper) beforeSave() {}
 
+// +checklocksignore
 func (f *HostFileMapper) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.refs)
 }
 
+// +checklocksignore
 func (f *HostFileMapper) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.refs)
 	stateSourceObject.AfterLoad(f.afterLoad)
@@ -133,6 +143,7 @@ func (h *HostMappable) StateFields() []string {
 
 func (h *HostMappable) beforeSave() {}
 
+// +checklocksignore
 func (h *HostMappable) StateSave(stateSinkObject state.Sink) {
 	h.beforeSave()
 	stateSinkObject.Save(0, &h.hostFileMapper)
@@ -142,6 +153,7 @@ func (h *HostMappable) StateSave(stateSinkObject state.Sink) {
 
 func (h *HostMappable) afterLoad() {}
 
+// +checklocksignore
 func (h *HostMappable) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &h.hostFileMapper)
 	stateSourceObject.Load(1, &h.backingFile)
@@ -160,6 +172,7 @@ func (s *SimpleFileInode) StateFields() []string {
 
 func (s *SimpleFileInode) beforeSave() {}
 
+// +checklocksignore
 func (s *SimpleFileInode) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeSimpleAttributes)
@@ -167,6 +180,7 @@ func (s *SimpleFileInode) StateSave(stateSinkObject state.Sink) {
 
 func (s *SimpleFileInode) afterLoad() {}
 
+// +checklocksignore
 func (s *SimpleFileInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeSimpleAttributes)
 }
@@ -183,6 +197,7 @@ func (n *NoReadWriteFileInode) StateFields() []string {
 
 func (n *NoReadWriteFileInode) beforeSave() {}
 
+// +checklocksignore
 func (n *NoReadWriteFileInode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.InodeSimpleAttributes)
@@ -190,6 +205,7 @@ func (n *NoReadWriteFileInode) StateSave(stateSinkObject state.Sink) {
 
 func (n *NoReadWriteFileInode) afterLoad() {}
 
+// +checklocksignore
 func (n *NoReadWriteFileInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.InodeSimpleAttributes)
 }
@@ -207,6 +223,7 @@ func (i *InodeSimpleAttributes) StateFields() []string {
 
 func (i *InodeSimpleAttributes) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeSimpleAttributes) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fsType)
@@ -215,6 +232,7 @@ func (i *InodeSimpleAttributes) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeSimpleAttributes) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeSimpleAttributes) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.fsType)
 	stateSourceObject.Load(1, &i.unstable)
@@ -232,6 +250,7 @@ func (i *InodeSimpleExtendedAttributes) StateFields() []string {
 
 func (i *InodeSimpleExtendedAttributes) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeSimpleExtendedAttributes) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.xattrs)
@@ -239,6 +258,7 @@ func (i *InodeSimpleExtendedAttributes) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeSimpleExtendedAttributes) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeSimpleExtendedAttributes) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.xattrs)
 }
@@ -255,6 +275,7 @@ func (s *staticFile) StateFields() []string {
 
 func (s *staticFile) beforeSave() {}
 
+// +checklocksignore
 func (s *staticFile) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.FileStaticContentReader)
@@ -262,6 +283,7 @@ func (s *staticFile) StateSave(stateSinkObject state.Sink) {
 
 func (s *staticFile) afterLoad() {}
 
+// +checklocksignore
 func (s *staticFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.FileStaticContentReader)
 }
@@ -278,6 +300,7 @@ func (i *InodeStaticFileGetter) StateFields() []string {
 
 func (i *InodeStaticFileGetter) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeStaticFileGetter) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Contents)
@@ -285,6 +308,7 @@ func (i *InodeStaticFileGetter) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeStaticFileGetter) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeStaticFileGetter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Contents)
 }
@@ -310,6 +334,7 @@ func (c *CachingInodeOperations) StateFields() []string {
 
 func (c *CachingInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (c *CachingInodeOperations) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.backingFile)
@@ -326,6 +351,7 @@ func (c *CachingInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (c *CachingInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (c *CachingInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.backingFile)
 	stateSourceObject.Load(1, &c.mfp)
@@ -352,6 +378,7 @@ func (c *CachingInodeOperationsOptions) StateFields() []string {
 
 func (c *CachingInodeOperationsOptions) beforeSave() {}
 
+// +checklocksignore
 func (c *CachingInodeOperationsOptions) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.ForcePageCache)
@@ -360,6 +387,7 @@ func (c *CachingInodeOperationsOptions) StateSave(stateSinkObject state.Sink) {
 
 func (c *CachingInodeOperationsOptions) afterLoad() {}
 
+// +checklocksignore
 func (c *CachingInodeOperationsOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.ForcePageCache)
 	stateSourceObject.Load(1, &c.LimitHostFDTranslation)
diff --git a/pkg/sentry/fs/gofer/gofer_state_autogen.go b/pkg/sentry/fs/gofer/gofer_state_autogen.go
index d2eb67d58..d22ecc3c2 100644
--- a/pkg/sentry/fs/gofer/gofer_state_autogen.go
+++ b/pkg/sentry/fs/gofer/gofer_state_autogen.go
@@ -19,6 +19,7 @@ func (i *fifo) StateFields() []string {
 
 func (i *fifo) beforeSave() {}
 
+// +checklocksignore
 func (i *fifo) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeOperations)
@@ -27,6 +28,7 @@ func (i *fifo) StateSave(stateSinkObject state.Sink) {
 
 func (i *fifo) afterLoad() {}
 
+// +checklocksignore
 func (i *fifo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeOperations)
 	stateSourceObject.Load(1, &i.fileIops)
@@ -46,6 +48,7 @@ func (f *fileOperations) StateFields() []string {
 
 func (f *fileOperations) beforeSave() {}
 
+// +checklocksignore
 func (f *fileOperations) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.inodeOperations)
@@ -53,6 +56,7 @@ func (f *fileOperations) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &f.flags)
 }
 
+// +checklocksignore
 func (f *fileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &f.inodeOperations)
 	stateSourceObject.Load(1, &f.dirCursor)
@@ -70,12 +74,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -92,6 +98,7 @@ func (i *inodeOperations) StateFields() []string {
 
 func (i *inodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fileState)
@@ -100,6 +107,7 @@ func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (i *inodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &i.fileState)
 	stateSourceObject.Load(1, &i.cachingInodeOps)
@@ -119,6 +127,7 @@ func (i *inodeFileState) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (i *inodeFileState) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	var loadingValue struct{} = i.saveLoading()
@@ -129,6 +138,7 @@ func (i *inodeFileState) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(4, &i.hostMappable)
 }
 
+// +checklocksignore
 func (i *inodeFileState) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &i.s)
 	stateSourceObject.LoadWait(1, &i.sattr)
@@ -152,6 +162,7 @@ func (l *overrideInfo) StateFields() []string {
 
 func (l *overrideInfo) beforeSave() {}
 
+// +checklocksignore
 func (l *overrideInfo) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.dirent)
@@ -161,6 +172,7 @@ func (l *overrideInfo) StateSave(stateSinkObject state.Sink) {
 
 func (l *overrideInfo) afterLoad() {}
 
+// +checklocksignore
 func (l *overrideInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.dirent)
 	stateSourceObject.Load(1, &l.endpoint)
@@ -179,6 +191,7 @@ func (e *overrideMaps) StateFields() []string {
 
 func (e *overrideMaps) beforeSave() {}
 
+// +checklocksignore
 func (e *overrideMaps) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.pathMap)
@@ -186,6 +199,7 @@ func (e *overrideMaps) StateSave(stateSinkObject state.Sink) {
 
 func (e *overrideMaps) afterLoad() {}
 
+// +checklocksignore
 func (e *overrideMaps) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.pathMap)
 }
@@ -211,6 +225,7 @@ func (s *session) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (s *session) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.AtomicRefCount)
@@ -227,6 +242,7 @@ func (s *session) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(11, &s.overrides)
 }
 
+// +checklocksignore
 func (s *session) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.AtomicRefCount)
 	stateSourceObject.LoadWait(1, &s.msize)
diff --git a/pkg/sentry/fs/host/host_state_autogen.go b/pkg/sentry/fs/host/host_state_autogen.go
index baae8fffa..b06247919 100644
--- a/pkg/sentry/fs/host/host_state_autogen.go
+++ b/pkg/sentry/fs/host/host_state_autogen.go
@@ -17,12 +17,14 @@ func (d *descriptor) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (d *descriptor) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.origFD)
 	stateSinkObject.Save(1, &d.wouldBlock)
 }
 
+// +checklocksignore
 func (d *descriptor) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.origFD)
 	stateSourceObject.Load(1, &d.wouldBlock)
@@ -42,6 +44,7 @@ func (f *fileOperations) StateFields() []string {
 
 func (f *fileOperations) beforeSave() {}
 
+// +checklocksignore
 func (f *fileOperations) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.iops)
@@ -50,6 +53,7 @@ func (f *fileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (f *fileOperations) afterLoad() {}
 
+// +checklocksignore
 func (f *fileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &f.iops)
 	stateSourceObject.Load(1, &f.dirCursor)
@@ -65,12 +69,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -87,6 +93,7 @@ func (i *inodeOperations) StateFields() []string {
 
 func (i *inodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fileState)
@@ -95,6 +102,7 @@ func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (i *inodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &i.fileState)
 	stateSourceObject.Load(1, &i.cachingInodeOps)
@@ -114,6 +122,7 @@ func (i *inodeFileState) StateFields() []string {
 
 func (i *inodeFileState) beforeSave() {}
 
+// +checklocksignore
 func (i *inodeFileState) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	if !state.IsZeroValue(&i.queue) {
@@ -124,6 +133,7 @@ func (i *inodeFileState) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &i.savedUAttr)
 }
 
+// +checklocksignore
 func (i *inodeFileState) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &i.descriptor)
 	stateSourceObject.LoadWait(1, &i.sattr)
@@ -145,6 +155,7 @@ func (c *ConnectedEndpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (c *ConnectedEndpoint) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.ref)
@@ -154,6 +165,7 @@ func (c *ConnectedEndpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(4, &c.stype)
 }
 
+// +checklocksignore
 func (c *ConnectedEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.ref)
 	stateSourceObject.Load(1, &c.queue)
@@ -178,6 +190,7 @@ func (t *TTYFileOperations) StateFields() []string {
 
 func (t *TTYFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (t *TTYFileOperations) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.fileOperations)
@@ -188,6 +201,7 @@ func (t *TTYFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (t *TTYFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (t *TTYFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.fileOperations)
 	stateSourceObject.Load(1, &t.session)
diff --git a/pkg/sentry/fs/lock/lock_state_autogen.go b/pkg/sentry/fs/lock/lock_state_autogen.go
index 49db04cfb..a0ad18763 100644
--- a/pkg/sentry/fs/lock/lock_state_autogen.go
+++ b/pkg/sentry/fs/lock/lock_state_autogen.go
@@ -18,6 +18,7 @@ func (o *OwnerInfo) StateFields() []string {
 
 func (o *OwnerInfo) beforeSave() {}
 
+// +checklocksignore
 func (o *OwnerInfo) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.PID)
@@ -25,6 +26,7 @@ func (o *OwnerInfo) StateSave(stateSinkObject state.Sink) {
 
 func (o *OwnerInfo) afterLoad() {}
 
+// +checklocksignore
 func (o *OwnerInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.PID)
 }
@@ -43,6 +45,7 @@ func (l *Lock) StateFields() []string {
 
 func (l *Lock) beforeSave() {}
 
+// +checklocksignore
 func (l *Lock) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Readers)
@@ -52,6 +55,7 @@ func (l *Lock) StateSave(stateSinkObject state.Sink) {
 
 func (l *Lock) afterLoad() {}
 
+// +checklocksignore
 func (l *Lock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Readers)
 	stateSourceObject.Load(1, &l.Writer)
@@ -70,6 +74,7 @@ func (l *Locks) StateFields() []string {
 
 func (l *Locks) beforeSave() {}
 
+// +checklocksignore
 func (l *Locks) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	if !state.IsZeroValue(&l.blockedQueue) {
@@ -80,6 +85,7 @@ func (l *Locks) StateSave(stateSinkObject state.Sink) {
 
 func (l *Locks) afterLoad() {}
 
+// +checklocksignore
 func (l *Locks) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.locks)
 }
@@ -97,6 +103,7 @@ func (r *LockRange) StateFields() []string {
 
 func (r *LockRange) beforeSave() {}
 
+// +checklocksignore
 func (r *LockRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -105,6 +112,7 @@ func (r *LockRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *LockRange) afterLoad() {}
 
+// +checklocksignore
 func (r *LockRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
@@ -122,6 +130,7 @@ func (s *LockSet) StateFields() []string {
 
 func (s *LockSet) beforeSave() {}
 
+// +checklocksignore
 func (s *LockSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *LockSegmentDataSlices = s.saveRoot()
@@ -130,6 +139,7 @@ func (s *LockSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *LockSet) afterLoad() {}
 
+// +checklocksignore
 func (s *LockSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*LockSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*LockSegmentDataSlices)) })
 }
@@ -153,6 +163,7 @@ func (n *Locknode) StateFields() []string {
 
 func (n *Locknode) beforeSave() {}
 
+// +checklocksignore
 func (n *Locknode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -167,6 +178,7 @@ func (n *Locknode) StateSave(stateSinkObject state.Sink) {
 
 func (n *Locknode) afterLoad() {}
 
+// +checklocksignore
 func (n *Locknode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -192,6 +204,7 @@ func (l *LockSegmentDataSlices) StateFields() []string {
 
 func (l *LockSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (l *LockSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Start)
@@ -201,6 +214,7 @@ func (l *LockSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (l *LockSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (l *LockSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Start)
 	stateSourceObject.Load(1, &l.End)
diff --git a/pkg/sentry/fs/proc/proc_state_autogen.go b/pkg/sentry/fs/proc/proc_state_autogen.go
index bbbc29f8a..64f9b1da3 100644
--- a/pkg/sentry/fs/proc/proc_state_autogen.go
+++ b/pkg/sentry/fs/proc/proc_state_autogen.go
@@ -20,6 +20,7 @@ func (i *execArgInode) StateFields() []string {
 
 func (i *execArgInode) beforeSave() {}
 
+// +checklocksignore
 func (i *execArgInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.SimpleFileInode)
@@ -29,6 +30,7 @@ func (i *execArgInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *execArgInode) afterLoad() {}
 
+// +checklocksignore
 func (i *execArgInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.SimpleFileInode)
 	stateSourceObject.Load(1, &i.arg)
@@ -48,6 +50,7 @@ func (f *execArgFile) StateFields() []string {
 
 func (f *execArgFile) beforeSave() {}
 
+// +checklocksignore
 func (f *execArgFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.arg)
@@ -56,6 +59,7 @@ func (f *execArgFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *execArgFile) afterLoad() {}
 
+// +checklocksignore
 func (f *execArgFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.arg)
 	stateSourceObject.Load(1, &f.t)
@@ -74,6 +78,7 @@ func (f *fdDir) StateFields() []string {
 
 func (f *fdDir) beforeSave() {}
 
+// +checklocksignore
 func (f *fdDir) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.Dir)
@@ -82,6 +87,7 @@ func (f *fdDir) StateSave(stateSinkObject state.Sink) {
 
 func (f *fdDir) afterLoad() {}
 
+// +checklocksignore
 func (f *fdDir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.Dir)
 	stateSourceObject.Load(1, &f.t)
@@ -100,6 +106,7 @@ func (f *fdDirFile) StateFields() []string {
 
 func (f *fdDirFile) beforeSave() {}
 
+// +checklocksignore
 func (f *fdDirFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.isInfoFile)
@@ -108,6 +115,7 @@ func (f *fdDirFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *fdDirFile) afterLoad() {}
 
+// +checklocksignore
 func (f *fdDirFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.isInfoFile)
 	stateSourceObject.Load(1, &f.t)
@@ -126,6 +134,7 @@ func (fdid *fdInfoDir) StateFields() []string {
 
 func (fdid *fdInfoDir) beforeSave() {}
 
+// +checklocksignore
 func (fdid *fdInfoDir) StateSave(stateSinkObject state.Sink) {
 	fdid.beforeSave()
 	stateSinkObject.Save(0, &fdid.Dir)
@@ -134,6 +143,7 @@ func (fdid *fdInfoDir) StateSave(stateSinkObject state.Sink) {
 
 func (fdid *fdInfoDir) afterLoad() {}
 
+// +checklocksignore
 func (fdid *fdInfoDir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fdid.Dir)
 	stateSourceObject.Load(1, &fdid.t)
@@ -149,12 +159,14 @@ func (f *filesystemsData) StateFields() []string {
 
 func (f *filesystemsData) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystemsData) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystemsData) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystemsData) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -168,12 +180,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -190,6 +204,7 @@ func (i *taskOwnedInodeOps) StateFields() []string {
 
 func (i *taskOwnedInodeOps) beforeSave() {}
 
+// +checklocksignore
 func (i *taskOwnedInodeOps) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeOperations)
@@ -198,6 +213,7 @@ func (i *taskOwnedInodeOps) StateSave(stateSinkObject state.Sink) {
 
 func (i *taskOwnedInodeOps) afterLoad() {}
 
+// +checklocksignore
 func (i *taskOwnedInodeOps) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeOperations)
 	stateSourceObject.Load(1, &i.t)
@@ -216,6 +232,7 @@ func (s *staticFileInodeOps) StateFields() []string {
 
 func (s *staticFileInodeOps) beforeSave() {}
 
+// +checklocksignore
 func (s *staticFileInodeOps) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeSimpleAttributes)
@@ -224,6 +241,7 @@ func (s *staticFileInodeOps) StateSave(stateSinkObject state.Sink) {
 
 func (s *staticFileInodeOps) afterLoad() {}
 
+// +checklocksignore
 func (s *staticFileInodeOps) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &s.InodeStaticFileGetter)
@@ -239,12 +257,14 @@ func (d *loadavgData) StateFields() []string {
 
 func (d *loadavgData) beforeSave() {}
 
+// +checklocksignore
 func (d *loadavgData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 }
 
 func (d *loadavgData) afterLoad() {}
 
+// +checklocksignore
 func (d *loadavgData) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -260,6 +280,7 @@ func (d *meminfoData) StateFields() []string {
 
 func (d *meminfoData) beforeSave() {}
 
+// +checklocksignore
 func (d *meminfoData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.k)
@@ -267,6 +288,7 @@ func (d *meminfoData) StateSave(stateSinkObject state.Sink) {
 
 func (d *meminfoData) afterLoad() {}
 
+// +checklocksignore
 func (d *meminfoData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.k)
 }
@@ -283,6 +305,7 @@ func (mif *mountInfoFile) StateFields() []string {
 
 func (mif *mountInfoFile) beforeSave() {}
 
+// +checklocksignore
 func (mif *mountInfoFile) StateSave(stateSinkObject state.Sink) {
 	mif.beforeSave()
 	stateSinkObject.Save(0, &mif.t)
@@ -290,6 +313,7 @@ func (mif *mountInfoFile) StateSave(stateSinkObject state.Sink) {
 
 func (mif *mountInfoFile) afterLoad() {}
 
+// +checklocksignore
 func (mif *mountInfoFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mif.t)
 }
@@ -306,6 +330,7 @@ func (mf *mountsFile) StateFields() []string {
 
 func (mf *mountsFile) beforeSave() {}
 
+// +checklocksignore
 func (mf *mountsFile) StateSave(stateSinkObject state.Sink) {
 	mf.beforeSave()
 	stateSinkObject.Save(0, &mf.t)
@@ -313,6 +338,7 @@ func (mf *mountsFile) StateSave(stateSinkObject state.Sink) {
 
 func (mf *mountsFile) afterLoad() {}
 
+// +checklocksignore
 func (mf *mountsFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mf.t)
 }
@@ -329,6 +355,7 @@ func (n *ifinet6) StateFields() []string {
 
 func (n *ifinet6) beforeSave() {}
 
+// +checklocksignore
 func (n *ifinet6) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.s)
@@ -336,6 +363,7 @@ func (n *ifinet6) StateSave(stateSinkObject state.Sink) {
 
 func (n *ifinet6) afterLoad() {}
 
+// +checklocksignore
 func (n *ifinet6) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.s)
 }
@@ -352,6 +380,7 @@ func (n *netDev) StateFields() []string {
 
 func (n *netDev) beforeSave() {}
 
+// +checklocksignore
 func (n *netDev) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.s)
@@ -359,6 +388,7 @@ func (n *netDev) StateSave(stateSinkObject state.Sink) {
 
 func (n *netDev) afterLoad() {}
 
+// +checklocksignore
 func (n *netDev) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.s)
 }
@@ -375,6 +405,7 @@ func (n *netSnmp) StateFields() []string {
 
 func (n *netSnmp) beforeSave() {}
 
+// +checklocksignore
 func (n *netSnmp) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.s)
@@ -382,6 +413,7 @@ func (n *netSnmp) StateSave(stateSinkObject state.Sink) {
 
 func (n *netSnmp) afterLoad() {}
 
+// +checklocksignore
 func (n *netSnmp) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.s)
 }
@@ -398,6 +430,7 @@ func (n *netRoute) StateFields() []string {
 
 func (n *netRoute) beforeSave() {}
 
+// +checklocksignore
 func (n *netRoute) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.s)
@@ -405,6 +438,7 @@ func (n *netRoute) StateSave(stateSinkObject state.Sink) {
 
 func (n *netRoute) afterLoad() {}
 
+// +checklocksignore
 func (n *netRoute) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.s)
 }
@@ -421,6 +455,7 @@ func (n *netUnix) StateFields() []string {
 
 func (n *netUnix) beforeSave() {}
 
+// +checklocksignore
 func (n *netUnix) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.k)
@@ -428,6 +463,7 @@ func (n *netUnix) StateSave(stateSinkObject state.Sink) {
 
 func (n *netUnix) afterLoad() {}
 
+// +checklocksignore
 func (n *netUnix) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.k)
 }
@@ -444,6 +480,7 @@ func (n *netTCP) StateFields() []string {
 
 func (n *netTCP) beforeSave() {}
 
+// +checklocksignore
 func (n *netTCP) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.k)
@@ -451,6 +488,7 @@ func (n *netTCP) StateSave(stateSinkObject state.Sink) {
 
 func (n *netTCP) afterLoad() {}
 
+// +checklocksignore
 func (n *netTCP) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.k)
 }
@@ -467,6 +505,7 @@ func (n *netTCP6) StateFields() []string {
 
 func (n *netTCP6) beforeSave() {}
 
+// +checklocksignore
 func (n *netTCP6) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.k)
@@ -474,6 +513,7 @@ func (n *netTCP6) StateSave(stateSinkObject state.Sink) {
 
 func (n *netTCP6) afterLoad() {}
 
+// +checklocksignore
 func (n *netTCP6) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.k)
 }
@@ -490,6 +530,7 @@ func (n *netUDP) StateFields() []string {
 
 func (n *netUDP) beforeSave() {}
 
+// +checklocksignore
 func (n *netUDP) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.k)
@@ -497,6 +538,7 @@ func (n *netUDP) StateSave(stateSinkObject state.Sink) {
 
 func (n *netUDP) afterLoad() {}
 
+// +checklocksignore
 func (n *netUDP) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.k)
 }
@@ -516,6 +558,7 @@ func (p *proc) StateFields() []string {
 
 func (p *proc) beforeSave() {}
 
+// +checklocksignore
 func (p *proc) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.Dir)
@@ -526,6 +569,7 @@ func (p *proc) StateSave(stateSinkObject state.Sink) {
 
 func (p *proc) afterLoad() {}
 
+// +checklocksignore
 func (p *proc) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.Dir)
 	stateSourceObject.Load(1, &p.k)
@@ -546,6 +590,7 @@ func (s *self) StateFields() []string {
 
 func (s *self) beforeSave() {}
 
+// +checklocksignore
 func (s *self) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Symlink)
@@ -554,6 +599,7 @@ func (s *self) StateSave(stateSinkObject state.Sink) {
 
 func (s *self) afterLoad() {}
 
+// +checklocksignore
 func (s *self) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Symlink)
 	stateSourceObject.Load(1, &s.pidns)
@@ -572,6 +618,7 @@ func (s *threadSelf) StateFields() []string {
 
 func (s *threadSelf) beforeSave() {}
 
+// +checklocksignore
 func (s *threadSelf) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Symlink)
@@ -580,6 +627,7 @@ func (s *threadSelf) StateSave(stateSinkObject state.Sink) {
 
 func (s *threadSelf) afterLoad() {}
 
+// +checklocksignore
 func (s *threadSelf) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Symlink)
 	stateSourceObject.Load(1, &s.pidns)
@@ -597,6 +645,7 @@ func (rpf *rootProcFile) StateFields() []string {
 
 func (rpf *rootProcFile) beforeSave() {}
 
+// +checklocksignore
 func (rpf *rootProcFile) StateSave(stateSinkObject state.Sink) {
 	rpf.beforeSave()
 	stateSinkObject.Save(0, &rpf.iops)
@@ -604,6 +653,7 @@ func (rpf *rootProcFile) StateSave(stateSinkObject state.Sink) {
 
 func (rpf *rootProcFile) afterLoad() {}
 
+// +checklocksignore
 func (rpf *rootProcFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rpf.iops)
 }
@@ -620,6 +670,7 @@ func (s *statData) StateFields() []string {
 
 func (s *statData) beforeSave() {}
 
+// +checklocksignore
 func (s *statData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.k)
@@ -627,6 +678,7 @@ func (s *statData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statData) afterLoad() {}
 
+// +checklocksignore
 func (s *statData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.k)
 }
@@ -643,6 +695,7 @@ func (d *mmapMinAddrData) StateFields() []string {
 
 func (d *mmapMinAddrData) beforeSave() {}
 
+// +checklocksignore
 func (d *mmapMinAddrData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.k)
@@ -650,6 +703,7 @@ func (d *mmapMinAddrData) StateSave(stateSinkObject state.Sink) {
 
 func (d *mmapMinAddrData) afterLoad() {}
 
+// +checklocksignore
 func (d *mmapMinAddrData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.k)
 }
@@ -664,12 +718,14 @@ func (o *overcommitMemory) StateFields() []string {
 
 func (o *overcommitMemory) beforeSave() {}
 
+// +checklocksignore
 func (o *overcommitMemory) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 }
 
 func (o *overcommitMemory) afterLoad() {}
 
+// +checklocksignore
 func (o *overcommitMemory) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -685,6 +741,7 @@ func (h *hostname) StateFields() []string {
 
 func (h *hostname) beforeSave() {}
 
+// +checklocksignore
 func (h *hostname) StateSave(stateSinkObject state.Sink) {
 	h.beforeSave()
 	stateSinkObject.Save(0, &h.SimpleFileInode)
@@ -692,6 +749,7 @@ func (h *hostname) StateSave(stateSinkObject state.Sink) {
 
 func (h *hostname) afterLoad() {}
 
+// +checklocksignore
 func (h *hostname) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &h.SimpleFileInode)
 }
@@ -706,12 +764,14 @@ func (hf *hostnameFile) StateFields() []string {
 
 func (hf *hostnameFile) beforeSave() {}
 
+// +checklocksignore
 func (hf *hostnameFile) StateSave(stateSinkObject state.Sink) {
 	hf.beforeSave()
 }
 
 func (hf *hostnameFile) afterLoad() {}
 
+// +checklocksignore
 func (hf *hostnameFile) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -728,6 +788,7 @@ func (t *tcpMemInode) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (t *tcpMemInode) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.SimpleFileInode)
@@ -736,6 +797,7 @@ func (t *tcpMemInode) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(3, &t.size)
 }
 
+// +checklocksignore
 func (t *tcpMemInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.SimpleFileInode)
 	stateSourceObject.Load(1, &t.dir)
@@ -756,6 +818,7 @@ func (f *tcpMemFile) StateFields() []string {
 
 func (f *tcpMemFile) beforeSave() {}
 
+// +checklocksignore
 func (f *tcpMemFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.tcpMemInode)
@@ -763,6 +826,7 @@ func (f *tcpMemFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *tcpMemFile) afterLoad() {}
 
+// +checklocksignore
 func (f *tcpMemFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.tcpMemInode)
 }
@@ -781,6 +845,7 @@ func (s *tcpSack) StateFields() []string {
 
 func (s *tcpSack) beforeSave() {}
 
+// +checklocksignore
 func (s *tcpSack) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SimpleFileInode)
@@ -788,6 +853,7 @@ func (s *tcpSack) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &s.enabled)
 }
 
+// +checklocksignore
 func (s *tcpSack) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SimpleFileInode)
 	stateSourceObject.LoadWait(1, &s.stack)
@@ -808,6 +874,7 @@ func (f *tcpSackFile) StateFields() []string {
 
 func (f *tcpSackFile) beforeSave() {}
 
+// +checklocksignore
 func (f *tcpSackFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.tcpSack)
@@ -816,6 +883,7 @@ func (f *tcpSackFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *tcpSackFile) afterLoad() {}
 
+// +checklocksignore
 func (f *tcpSackFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.tcpSack)
 	stateSourceObject.LoadWait(1, &f.stack)
@@ -835,6 +903,7 @@ func (r *tcpRecovery) StateFields() []string {
 
 func (r *tcpRecovery) beforeSave() {}
 
+// +checklocksignore
 func (r *tcpRecovery) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.SimpleFileInode)
@@ -844,6 +913,7 @@ func (r *tcpRecovery) StateSave(stateSinkObject state.Sink) {
 
 func (r *tcpRecovery) afterLoad() {}
 
+// +checklocksignore
 func (r *tcpRecovery) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.SimpleFileInode)
 	stateSourceObject.LoadWait(1, &r.stack)
@@ -863,6 +933,7 @@ func (f *tcpRecoveryFile) StateFields() []string {
 
 func (f *tcpRecoveryFile) beforeSave() {}
 
+// +checklocksignore
 func (f *tcpRecoveryFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.tcpRecovery)
@@ -871,6 +942,7 @@ func (f *tcpRecoveryFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *tcpRecoveryFile) afterLoad() {}
 
+// +checklocksignore
 func (f *tcpRecoveryFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.tcpRecovery)
 	stateSourceObject.LoadWait(1, &f.stack)
@@ -890,6 +962,7 @@ func (ipf *ipForwarding) StateFields() []string {
 
 func (ipf *ipForwarding) beforeSave() {}
 
+// +checklocksignore
 func (ipf *ipForwarding) StateSave(stateSinkObject state.Sink) {
 	ipf.beforeSave()
 	stateSinkObject.Save(0, &ipf.SimpleFileInode)
@@ -897,6 +970,7 @@ func (ipf *ipForwarding) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &ipf.enabled)
 }
 
+// +checklocksignore
 func (ipf *ipForwarding) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ipf.SimpleFileInode)
 	stateSourceObject.LoadWait(1, &ipf.stack)
@@ -917,6 +991,7 @@ func (f *ipForwardingFile) StateFields() []string {
 
 func (f *ipForwardingFile) beforeSave() {}
 
+// +checklocksignore
 func (f *ipForwardingFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.ipf)
@@ -925,6 +1000,7 @@ func (f *ipForwardingFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *ipForwardingFile) afterLoad() {}
 
+// +checklocksignore
 func (f *ipForwardingFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.ipf)
 	stateSourceObject.LoadWait(1, &f.stack)
@@ -945,6 +1021,7 @@ func (in *portRangeInode) StateFields() []string {
 
 func (in *portRangeInode) beforeSave() {}
 
+// +checklocksignore
 func (in *portRangeInode) StateSave(stateSinkObject state.Sink) {
 	in.beforeSave()
 	stateSinkObject.Save(0, &in.SimpleFileInode)
@@ -955,6 +1032,7 @@ func (in *portRangeInode) StateSave(stateSinkObject state.Sink) {
 
 func (in *portRangeInode) afterLoad() {}
 
+// +checklocksignore
 func (in *portRangeInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &in.SimpleFileInode)
 	stateSourceObject.LoadWait(1, &in.stack)
@@ -974,6 +1052,7 @@ func (pf *portRangeFile) StateFields() []string {
 
 func (pf *portRangeFile) beforeSave() {}
 
+// +checklocksignore
 func (pf *portRangeFile) StateSave(stateSinkObject state.Sink) {
 	pf.beforeSave()
 	stateSinkObject.Save(0, &pf.inode)
@@ -981,6 +1060,7 @@ func (pf *portRangeFile) StateSave(stateSinkObject state.Sink) {
 
 func (pf *portRangeFile) afterLoad() {}
 
+// +checklocksignore
 func (pf *portRangeFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &pf.inode)
 }
@@ -998,6 +1078,7 @@ func (t *taskDir) StateFields() []string {
 
 func (t *taskDir) beforeSave() {}
 
+// +checklocksignore
 func (t *taskDir) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.Dir)
@@ -1006,6 +1087,7 @@ func (t *taskDir) StateSave(stateSinkObject state.Sink) {
 
 func (t *taskDir) afterLoad() {}
 
+// +checklocksignore
 func (t *taskDir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.Dir)
 	stateSourceObject.Load(1, &t.t)
@@ -1025,6 +1107,7 @@ func (s *subtasks) StateFields() []string {
 
 func (s *subtasks) beforeSave() {}
 
+// +checklocksignore
 func (s *subtasks) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Dir)
@@ -1034,6 +1117,7 @@ func (s *subtasks) StateSave(stateSinkObject state.Sink) {
 
 func (s *subtasks) afterLoad() {}
 
+// +checklocksignore
 func (s *subtasks) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Dir)
 	stateSourceObject.Load(1, &s.t)
@@ -1053,6 +1137,7 @@ func (f *subtasksFile) StateFields() []string {
 
 func (f *subtasksFile) beforeSave() {}
 
+// +checklocksignore
 func (f *subtasksFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.t)
@@ -1061,6 +1146,7 @@ func (f *subtasksFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *subtasksFile) afterLoad() {}
 
+// +checklocksignore
 func (f *subtasksFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.t)
 	stateSourceObject.Load(1, &f.pidns)
@@ -1079,6 +1165,7 @@ func (e *exe) StateFields() []string {
 
 func (e *exe) beforeSave() {}
 
+// +checklocksignore
 func (e *exe) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Symlink)
@@ -1087,6 +1174,7 @@ func (e *exe) StateSave(stateSinkObject state.Sink) {
 
 func (e *exe) afterLoad() {}
 
+// +checklocksignore
 func (e *exe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Symlink)
 	stateSourceObject.Load(1, &e.t)
@@ -1105,6 +1193,7 @@ func (e *cwd) StateFields() []string {
 
 func (e *cwd) beforeSave() {}
 
+// +checklocksignore
 func (e *cwd) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Symlink)
@@ -1113,6 +1202,7 @@ func (e *cwd) StateSave(stateSinkObject state.Sink) {
 
 func (e *cwd) afterLoad() {}
 
+// +checklocksignore
 func (e *cwd) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Symlink)
 	stateSourceObject.Load(1, &e.t)
@@ -1131,6 +1221,7 @@ func (n *namespaceSymlink) StateFields() []string {
 
 func (n *namespaceSymlink) beforeSave() {}
 
+// +checklocksignore
 func (n *namespaceSymlink) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.Symlink)
@@ -1139,6 +1230,7 @@ func (n *namespaceSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (n *namespaceSymlink) afterLoad() {}
 
+// +checklocksignore
 func (n *namespaceSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.Symlink)
 	stateSourceObject.Load(1, &n.t)
@@ -1157,6 +1249,7 @@ func (m *memData) StateFields() []string {
 
 func (m *memData) beforeSave() {}
 
+// +checklocksignore
 func (m *memData) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.SimpleFileInode)
@@ -1165,6 +1258,7 @@ func (m *memData) StateSave(stateSinkObject state.Sink) {
 
 func (m *memData) afterLoad() {}
 
+// +checklocksignore
 func (m *memData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.SimpleFileInode)
 	stateSourceObject.Load(1, &m.t)
@@ -1182,6 +1276,7 @@ func (m *memDataFile) StateFields() []string {
 
 func (m *memDataFile) beforeSave() {}
 
+// +checklocksignore
 func (m *memDataFile) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.t)
@@ -1189,6 +1284,7 @@ func (m *memDataFile) StateSave(stateSinkObject state.Sink) {
 
 func (m *memDataFile) afterLoad() {}
 
+// +checklocksignore
 func (m *memDataFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.t)
 }
@@ -1205,6 +1301,7 @@ func (md *mapsData) StateFields() []string {
 
 func (md *mapsData) beforeSave() {}
 
+// +checklocksignore
 func (md *mapsData) StateSave(stateSinkObject state.Sink) {
 	md.beforeSave()
 	stateSinkObject.Save(0, &md.t)
@@ -1212,6 +1309,7 @@ func (md *mapsData) StateSave(stateSinkObject state.Sink) {
 
 func (md *mapsData) afterLoad() {}
 
+// +checklocksignore
 func (md *mapsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &md.t)
 }
@@ -1228,6 +1326,7 @@ func (sd *smapsData) StateFields() []string {
 
 func (sd *smapsData) beforeSave() {}
 
+// +checklocksignore
 func (sd *smapsData) StateSave(stateSinkObject state.Sink) {
 	sd.beforeSave()
 	stateSinkObject.Save(0, &sd.t)
@@ -1235,6 +1334,7 @@ func (sd *smapsData) StateSave(stateSinkObject state.Sink) {
 
 func (sd *smapsData) afterLoad() {}
 
+// +checklocksignore
 func (sd *smapsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sd.t)
 }
@@ -1253,6 +1353,7 @@ func (s *taskStatData) StateFields() []string {
 
 func (s *taskStatData) beforeSave() {}
 
+// +checklocksignore
 func (s *taskStatData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.t)
@@ -1262,6 +1363,7 @@ func (s *taskStatData) StateSave(stateSinkObject state.Sink) {
 
 func (s *taskStatData) afterLoad() {}
 
+// +checklocksignore
 func (s *taskStatData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.t)
 	stateSourceObject.Load(1, &s.tgstats)
@@ -1280,6 +1382,7 @@ func (s *statmData) StateFields() []string {
 
 func (s *statmData) beforeSave() {}
 
+// +checklocksignore
 func (s *statmData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.t)
@@ -1287,6 +1390,7 @@ func (s *statmData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statmData) afterLoad() {}
 
+// +checklocksignore
 func (s *statmData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.t)
 }
@@ -1304,6 +1408,7 @@ func (s *statusData) StateFields() []string {
 
 func (s *statusData) beforeSave() {}
 
+// +checklocksignore
 func (s *statusData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.t)
@@ -1312,6 +1417,7 @@ func (s *statusData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statusData) afterLoad() {}
 
+// +checklocksignore
 func (s *statusData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.t)
 	stateSourceObject.Load(1, &s.pidns)
@@ -1329,6 +1435,7 @@ func (i *ioData) StateFields() []string {
 
 func (i *ioData) beforeSave() {}
 
+// +checklocksignore
 func (i *ioData) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.ioUsage)
@@ -1336,6 +1443,7 @@ func (i *ioData) StateSave(stateSinkObject state.Sink) {
 
 func (i *ioData) afterLoad() {}
 
+// +checklocksignore
 func (i *ioData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.ioUsage)
 }
@@ -1353,6 +1461,7 @@ func (c *comm) StateFields() []string {
 
 func (c *comm) beforeSave() {}
 
+// +checklocksignore
 func (c *comm) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.SimpleFileInode)
@@ -1361,6 +1470,7 @@ func (c *comm) StateSave(stateSinkObject state.Sink) {
 
 func (c *comm) afterLoad() {}
 
+// +checklocksignore
 func (c *comm) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.SimpleFileInode)
 	stateSourceObject.Load(1, &c.t)
@@ -1378,6 +1488,7 @@ func (f *commFile) StateFields() []string {
 
 func (f *commFile) beforeSave() {}
 
+// +checklocksignore
 func (f *commFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.t)
@@ -1385,6 +1496,7 @@ func (f *commFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *commFile) afterLoad() {}
 
+// +checklocksignore
 func (f *commFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.t)
 }
@@ -1402,6 +1514,7 @@ func (a *auxvec) StateFields() []string {
 
 func (a *auxvec) beforeSave() {}
 
+// +checklocksignore
 func (a *auxvec) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.SimpleFileInode)
@@ -1410,6 +1523,7 @@ func (a *auxvec) StateSave(stateSinkObject state.Sink) {
 
 func (a *auxvec) afterLoad() {}
 
+// +checklocksignore
 func (a *auxvec) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.SimpleFileInode)
 	stateSourceObject.Load(1, &a.t)
@@ -1427,6 +1541,7 @@ func (f *auxvecFile) StateFields() []string {
 
 func (f *auxvecFile) beforeSave() {}
 
+// +checklocksignore
 func (f *auxvecFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.t)
@@ -1434,6 +1549,7 @@ func (f *auxvecFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *auxvecFile) afterLoad() {}
 
+// +checklocksignore
 func (f *auxvecFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.t)
 }
@@ -1451,6 +1567,7 @@ func (o *oomScoreAdj) StateFields() []string {
 
 func (o *oomScoreAdj) beforeSave() {}
 
+// +checklocksignore
 func (o *oomScoreAdj) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.SimpleFileInode)
@@ -1459,6 +1576,7 @@ func (o *oomScoreAdj) StateSave(stateSinkObject state.Sink) {
 
 func (o *oomScoreAdj) afterLoad() {}
 
+// +checklocksignore
 func (o *oomScoreAdj) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.SimpleFileInode)
 	stateSourceObject.Load(1, &o.t)
@@ -1476,6 +1594,7 @@ func (f *oomScoreAdjFile) StateFields() []string {
 
 func (f *oomScoreAdjFile) beforeSave() {}
 
+// +checklocksignore
 func (f *oomScoreAdjFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.t)
@@ -1483,6 +1602,7 @@ func (f *oomScoreAdjFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *oomScoreAdjFile) afterLoad() {}
 
+// +checklocksignore
 func (f *oomScoreAdjFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.t)
 }
@@ -1502,6 +1622,7 @@ func (imio *idMapInodeOperations) StateFields() []string {
 
 func (imio *idMapInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (imio *idMapInodeOperations) StateSave(stateSinkObject state.Sink) {
 	imio.beforeSave()
 	stateSinkObject.Save(0, &imio.InodeSimpleAttributes)
@@ -1512,6 +1633,7 @@ func (imio *idMapInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (imio *idMapInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (imio *idMapInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &imio.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &imio.InodeSimpleExtendedAttributes)
@@ -1531,6 +1653,7 @@ func (imfo *idMapFileOperations) StateFields() []string {
 
 func (imfo *idMapFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (imfo *idMapFileOperations) StateSave(stateSinkObject state.Sink) {
 	imfo.beforeSave()
 	stateSinkObject.Save(0, &imfo.iops)
@@ -1538,6 +1661,7 @@ func (imfo *idMapFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (imfo *idMapFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (imfo *idMapFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &imfo.iops)
 }
@@ -1555,6 +1679,7 @@ func (u *uptime) StateFields() []string {
 
 func (u *uptime) beforeSave() {}
 
+// +checklocksignore
 func (u *uptime) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.SimpleFileInode)
@@ -1563,6 +1688,7 @@ func (u *uptime) StateSave(stateSinkObject state.Sink) {
 
 func (u *uptime) afterLoad() {}
 
+// +checklocksignore
 func (u *uptime) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.SimpleFileInode)
 	stateSourceObject.Load(1, &u.startTime)
@@ -1580,6 +1706,7 @@ func (f *uptimeFile) StateFields() []string {
 
 func (f *uptimeFile) beforeSave() {}
 
+// +checklocksignore
 func (f *uptimeFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.startTime)
@@ -1587,6 +1714,7 @@ func (f *uptimeFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *uptimeFile) afterLoad() {}
 
+// +checklocksignore
 func (f *uptimeFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.startTime)
 }
@@ -1603,6 +1731,7 @@ func (v *versionData) StateFields() []string {
 
 func (v *versionData) beforeSave() {}
 
+// +checklocksignore
 func (v *versionData) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 	stateSinkObject.Save(0, &v.k)
@@ -1610,6 +1739,7 @@ func (v *versionData) StateSave(stateSinkObject state.Sink) {
 
 func (v *versionData) afterLoad() {}
 
+// +checklocksignore
 func (v *versionData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &v.k)
 }
diff --git a/pkg/sentry/fs/proc/seqfile/seqfile_state_autogen.go b/pkg/sentry/fs/proc/seqfile/seqfile_state_autogen.go
index ab08bbaa3..1cd9b313b 100644
--- a/pkg/sentry/fs/proc/seqfile/seqfile_state_autogen.go
+++ b/pkg/sentry/fs/proc/seqfile/seqfile_state_autogen.go
@@ -19,6 +19,7 @@ func (s *SeqData) StateFields() []string {
 
 func (s *SeqData) beforeSave() {}
 
+// +checklocksignore
 func (s *SeqData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Buf)
@@ -27,6 +28,7 @@ func (s *SeqData) StateSave(stateSinkObject state.Sink) {
 
 func (s *SeqData) afterLoad() {}
 
+// +checklocksignore
 func (s *SeqData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Buf)
 	stateSourceObject.Load(1, &s.Handle)
@@ -49,6 +51,7 @@ func (s *SeqFile) StateFields() []string {
 
 func (s *SeqFile) beforeSave() {}
 
+// +checklocksignore
 func (s *SeqFile) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeSimpleExtendedAttributes)
@@ -61,6 +64,7 @@ func (s *SeqFile) StateSave(stateSinkObject state.Sink) {
 
 func (s *SeqFile) afterLoad() {}
 
+// +checklocksignore
 func (s *SeqFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeSimpleExtendedAttributes)
 	stateSourceObject.Load(1, &s.InodeSimpleAttributes)
@@ -82,6 +86,7 @@ func (sfo *seqFileOperations) StateFields() []string {
 
 func (sfo *seqFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (sfo *seqFileOperations) StateSave(stateSinkObject state.Sink) {
 	sfo.beforeSave()
 	stateSinkObject.Save(0, &sfo.seqFile)
@@ -89,6 +94,7 @@ func (sfo *seqFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (sfo *seqFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (sfo *seqFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sfo.seqFile)
 }
diff --git a/pkg/sentry/fs/ramfs/ramfs_state_autogen.go b/pkg/sentry/fs/ramfs/ramfs_state_autogen.go
index 482d5d391..53c836415 100644
--- a/pkg/sentry/fs/ramfs/ramfs_state_autogen.go
+++ b/pkg/sentry/fs/ramfs/ramfs_state_autogen.go
@@ -21,6 +21,7 @@ func (d *Dir) StateFields() []string {
 
 func (d *Dir) beforeSave() {}
 
+// +checklocksignore
 func (d *Dir) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.InodeSimpleAttributes)
@@ -31,6 +32,7 @@ func (d *Dir) StateSave(stateSinkObject state.Sink) {
 
 func (d *Dir) afterLoad() {}
 
+// +checklocksignore
 func (d *Dir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &d.InodeSimpleExtendedAttributes)
@@ -51,6 +53,7 @@ func (dfo *dirFileOperations) StateFields() []string {
 
 func (dfo *dirFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (dfo *dirFileOperations) StateSave(stateSinkObject state.Sink) {
 	dfo.beforeSave()
 	stateSinkObject.Save(0, &dfo.dirCursor)
@@ -59,6 +62,7 @@ func (dfo *dirFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (dfo *dirFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (dfo *dirFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &dfo.dirCursor)
 	stateSourceObject.Load(1, &dfo.dir)
@@ -78,6 +82,7 @@ func (s *Socket) StateFields() []string {
 
 func (s *Socket) beforeSave() {}
 
+// +checklocksignore
 func (s *Socket) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeSimpleAttributes)
@@ -87,6 +92,7 @@ func (s *Socket) StateSave(stateSinkObject state.Sink) {
 
 func (s *Socket) afterLoad() {}
 
+// +checklocksignore
 func (s *Socket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &s.InodeSimpleExtendedAttributes)
@@ -103,12 +109,14 @@ func (s *socketFileOperations) StateFields() []string {
 
 func (s *socketFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *socketFileOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
 func (s *socketFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *socketFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -126,6 +134,7 @@ func (s *Symlink) StateFields() []string {
 
 func (s *Symlink) beforeSave() {}
 
+// +checklocksignore
 func (s *Symlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeSimpleAttributes)
@@ -135,6 +144,7 @@ func (s *Symlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *Symlink) afterLoad() {}
 
+// +checklocksignore
 func (s *Symlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &s.InodeSimpleExtendedAttributes)
@@ -151,12 +161,14 @@ func (s *symlinkFileOperations) StateFields() []string {
 
 func (s *symlinkFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *symlinkFileOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
 func (s *symlinkFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *symlinkFileOperations) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/fs/sys/sys_state_autogen.go b/pkg/sentry/fs/sys/sys_state_autogen.go
index 390f092cb..9c4f22243 100644
--- a/pkg/sentry/fs/sys/sys_state_autogen.go
+++ b/pkg/sentry/fs/sys/sys_state_autogen.go
@@ -19,6 +19,7 @@ func (c *cpunum) StateFields() []string {
 
 func (c *cpunum) beforeSave() {}
 
+// +checklocksignore
 func (c *cpunum) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.InodeSimpleAttributes)
@@ -27,6 +28,7 @@ func (c *cpunum) StateSave(stateSinkObject state.Sink) {
 
 func (c *cpunum) afterLoad() {}
 
+// +checklocksignore
 func (c *cpunum) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &c.InodeStaticFileGetter)
@@ -42,12 +44,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/fs/timerfd/timerfd_state_autogen.go b/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
index 15f2d63f6..822eecdd6 100644
--- a/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
+++ b/pkg/sentry/fs/timerfd/timerfd_state_autogen.go
@@ -19,6 +19,7 @@ func (t *TimerOperations) StateFields() []string {
 
 func (t *TimerOperations) beforeSave() {}
 
+// +checklocksignore
 func (t *TimerOperations) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	if !state.IsZeroValue(&t.events) {
@@ -30,6 +31,7 @@ func (t *TimerOperations) StateSave(stateSinkObject state.Sink) {
 
 func (t *TimerOperations) afterLoad() {}
 
+// +checklocksignore
 func (t *TimerOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.timer)
 	stateSourceObject.Load(1, &t.val)
diff --git a/pkg/sentry/fs/tmpfs/tmpfs_state_autogen.go b/pkg/sentry/fs/tmpfs/tmpfs_state_autogen.go
index 29c25b4d6..ab5f75fea 100644
--- a/pkg/sentry/fs/tmpfs/tmpfs_state_autogen.go
+++ b/pkg/sentry/fs/tmpfs/tmpfs_state_autogen.go
@@ -18,6 +18,7 @@ func (r *regularFileOperations) StateFields() []string {
 
 func (r *regularFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (r *regularFileOperations) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.iops)
@@ -25,6 +26,7 @@ func (r *regularFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (r *regularFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (r *regularFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.iops)
 }
@@ -39,12 +41,14 @@ func (f *Filesystem) StateFields() []string {
 
 func (f *Filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *Filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *Filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *Filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -67,6 +71,7 @@ func (f *fileInodeOperations) StateFields() []string {
 
 func (f *fileInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (f *fileInodeOperations) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.InodeSimpleExtendedAttributes)
@@ -81,6 +86,7 @@ func (f *fileInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (f *fileInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (f *fileInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.InodeSimpleExtendedAttributes)
 	stateSourceObject.Load(1, &f.kernel)
@@ -105,12 +111,14 @@ func (d *Dir) StateFields() []string {
 
 func (d *Dir) beforeSave() {}
 
+// +checklocksignore
 func (d *Dir) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.ramfsDir)
 	stateSinkObject.Save(1, &d.kernel)
 }
 
+// +checklocksignore
 func (d *Dir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.ramfsDir)
 	stateSourceObject.Load(1, &d.kernel)
@@ -129,6 +137,7 @@ func (s *Symlink) StateFields() []string {
 
 func (s *Symlink) beforeSave() {}
 
+// +checklocksignore
 func (s *Symlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Symlink)
@@ -136,6 +145,7 @@ func (s *Symlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *Symlink) afterLoad() {}
 
+// +checklocksignore
 func (s *Symlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Symlink)
 }
@@ -152,6 +162,7 @@ func (s *Socket) StateFields() []string {
 
 func (s *Socket) beforeSave() {}
 
+// +checklocksignore
 func (s *Socket) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Socket)
@@ -159,6 +170,7 @@ func (s *Socket) StateSave(stateSinkObject state.Sink) {
 
 func (s *Socket) afterLoad() {}
 
+// +checklocksignore
 func (s *Socket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Socket)
 }
@@ -175,6 +187,7 @@ func (f *Fifo) StateFields() []string {
 
 func (f *Fifo) beforeSave() {}
 
+// +checklocksignore
 func (f *Fifo) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.InodeOperations)
@@ -182,6 +195,7 @@ func (f *Fifo) StateSave(stateSinkObject state.Sink) {
 
 func (f *Fifo) afterLoad() {}
 
+// +checklocksignore
 func (f *Fifo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.InodeOperations)
 }
diff --git a/pkg/sentry/fs/tty/tty_state_autogen.go b/pkg/sentry/fs/tty/tty_state_autogen.go
index 0d3785768..2fb0a8d27 100644
--- a/pkg/sentry/fs/tty/tty_state_autogen.go
+++ b/pkg/sentry/fs/tty/tty_state_autogen.go
@@ -23,6 +23,7 @@ func (d *dirInodeOperations) StateFields() []string {
 
 func (d *dirInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (d *dirInodeOperations) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.InodeSimpleAttributes)
@@ -35,6 +36,7 @@ func (d *dirInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (d *dirInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (d *dirInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &d.msrc)
@@ -57,6 +59,7 @@ func (df *dirFileOperations) StateFields() []string {
 
 func (df *dirFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (df *dirFileOperations) StateSave(stateSinkObject state.Sink) {
 	df.beforeSave()
 	stateSinkObject.Save(0, &df.di)
@@ -65,6 +68,7 @@ func (df *dirFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (df *dirFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (df *dirFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &df.di)
 	stateSourceObject.Load(1, &df.dirCursor)
@@ -80,12 +84,14 @@ func (f *filesystem) StateFields() []string {
 
 func (f *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystem) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystem) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -99,12 +105,14 @@ func (s *superOperations) StateFields() []string {
 
 func (s *superOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *superOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
 func (s *superOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *superOperations) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -124,6 +132,7 @@ func (l *lineDiscipline) StateFields() []string {
 
 func (l *lineDiscipline) beforeSave() {}
 
+// +checklocksignore
 func (l *lineDiscipline) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	if !state.IsZeroValue(&l.masterWaiter) {
@@ -141,6 +150,7 @@ func (l *lineDiscipline) StateSave(stateSinkObject state.Sink) {
 
 func (l *lineDiscipline) afterLoad() {}
 
+// +checklocksignore
 func (l *lineDiscipline) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.size)
 	stateSourceObject.Load(1, &l.inQueue)
@@ -159,12 +169,14 @@ func (o *outputQueueTransformer) StateFields() []string {
 
 func (o *outputQueueTransformer) beforeSave() {}
 
+// +checklocksignore
 func (o *outputQueueTransformer) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 }
 
 func (o *outputQueueTransformer) afterLoad() {}
 
+// +checklocksignore
 func (o *outputQueueTransformer) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -178,12 +190,14 @@ func (i *inputQueueTransformer) StateFields() []string {
 
 func (i *inputQueueTransformer) beforeSave() {}
 
+// +checklocksignore
 func (i *inputQueueTransformer) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *inputQueueTransformer) afterLoad() {}
 
+// +checklocksignore
 func (i *inputQueueTransformer) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -200,6 +214,7 @@ func (mi *masterInodeOperations) StateFields() []string {
 
 func (mi *masterInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (mi *masterInodeOperations) StateSave(stateSinkObject state.Sink) {
 	mi.beforeSave()
 	stateSinkObject.Save(0, &mi.SimpleFileInode)
@@ -208,6 +223,7 @@ func (mi *masterInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (mi *masterInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (mi *masterInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mi.SimpleFileInode)
 	stateSourceObject.Load(1, &mi.d)
@@ -226,6 +242,7 @@ func (mf *masterFileOperations) StateFields() []string {
 
 func (mf *masterFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (mf *masterFileOperations) StateSave(stateSinkObject state.Sink) {
 	mf.beforeSave()
 	stateSinkObject.Save(0, &mf.d)
@@ -234,6 +251,7 @@ func (mf *masterFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (mf *masterFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (mf *masterFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mf.d)
 	stateSourceObject.Load(1, &mf.t)
@@ -255,6 +273,7 @@ func (q *queue) StateFields() []string {
 
 func (q *queue) beforeSave() {}
 
+// +checklocksignore
 func (q *queue) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.readBuf)
@@ -266,6 +285,7 @@ func (q *queue) StateSave(stateSinkObject state.Sink) {
 
 func (q *queue) afterLoad() {}
 
+// +checklocksignore
 func (q *queue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.readBuf)
 	stateSourceObject.Load(1, &q.waitBuf)
@@ -288,6 +308,7 @@ func (si *replicaInodeOperations) StateFields() []string {
 
 func (si *replicaInodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (si *replicaInodeOperations) StateSave(stateSinkObject state.Sink) {
 	si.beforeSave()
 	stateSinkObject.Save(0, &si.SimpleFileInode)
@@ -297,6 +318,7 @@ func (si *replicaInodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (si *replicaInodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (si *replicaInodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &si.SimpleFileInode)
 	stateSourceObject.Load(1, &si.d)
@@ -315,6 +337,7 @@ func (sf *replicaFileOperations) StateFields() []string {
 
 func (sf *replicaFileOperations) beforeSave() {}
 
+// +checklocksignore
 func (sf *replicaFileOperations) StateSave(stateSinkObject state.Sink) {
 	sf.beforeSave()
 	stateSinkObject.Save(0, &sf.si)
@@ -322,6 +345,7 @@ func (sf *replicaFileOperations) StateSave(stateSinkObject state.Sink) {
 
 func (sf *replicaFileOperations) afterLoad() {}
 
+// +checklocksignore
 func (sf *replicaFileOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sf.si)
 }
@@ -343,6 +367,7 @@ func (tm *Terminal) StateFields() []string {
 
 func (tm *Terminal) beforeSave() {}
 
+// +checklocksignore
 func (tm *Terminal) StateSave(stateSinkObject state.Sink) {
 	tm.beforeSave()
 	stateSinkObject.Save(0, &tm.AtomicRefCount)
@@ -355,6 +380,7 @@ func (tm *Terminal) StateSave(stateSinkObject state.Sink) {
 
 func (tm *Terminal) afterLoad() {}
 
+// +checklocksignore
 func (tm *Terminal) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tm.AtomicRefCount)
 	stateSourceObject.Load(1, &tm.n)
diff --git a/pkg/sentry/fsbridge/fsbridge_state_autogen.go b/pkg/sentry/fsbridge/fsbridge_state_autogen.go
index a5d0364f0..b4b240bfa 100644
--- a/pkg/sentry/fsbridge/fsbridge_state_autogen.go
+++ b/pkg/sentry/fsbridge/fsbridge_state_autogen.go
@@ -18,6 +18,7 @@ func (f *fsFile) StateFields() []string {
 
 func (f *fsFile) beforeSave() {}
 
+// +checklocksignore
 func (f *fsFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.file)
@@ -25,6 +26,7 @@ func (f *fsFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *fsFile) afterLoad() {}
 
+// +checklocksignore
 func (f *fsFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.file)
 }
@@ -43,6 +45,7 @@ func (l *fsLookup) StateFields() []string {
 
 func (l *fsLookup) beforeSave() {}
 
+// +checklocksignore
 func (l *fsLookup) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.mntns)
@@ -52,6 +55,7 @@ func (l *fsLookup) StateSave(stateSinkObject state.Sink) {
 
 func (l *fsLookup) afterLoad() {}
 
+// +checklocksignore
 func (l *fsLookup) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.mntns)
 	stateSourceObject.Load(1, &l.root)
@@ -70,6 +74,7 @@ func (f *VFSFile) StateFields() []string {
 
 func (f *VFSFile) beforeSave() {}
 
+// +checklocksignore
 func (f *VFSFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.file)
@@ -77,6 +82,7 @@ func (f *VFSFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *VFSFile) afterLoad() {}
 
+// +checklocksignore
 func (f *VFSFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.file)
 }
@@ -95,6 +101,7 @@ func (l *vfsLookup) StateFields() []string {
 
 func (l *vfsLookup) beforeSave() {}
 
+// +checklocksignore
 func (l *vfsLookup) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.mntns)
@@ -104,6 +111,7 @@ func (l *vfsLookup) StateSave(stateSinkObject state.Sink) {
 
 func (l *vfsLookup) afterLoad() {}
 
+// +checklocksignore
 func (l *vfsLookup) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.mntns)
 	stateSourceObject.Load(1, &l.root)
diff --git a/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go b/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
index 6383dd133..78e685c7e 100644
--- a/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
+++ b/pkg/sentry/fsimpl/devpts/devpts_state_autogen.go
@@ -20,6 +20,7 @@ func (fstype *FilesystemType) StateFields() []string {
 
 func (fstype *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fstype.beforeSave()
 	stateSinkObject.Save(0, &fstype.initErr)
@@ -29,6 +30,7 @@ func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 
 func (fstype *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fstype.initErr)
 	stateSourceObject.Load(1, &fstype.fs)
@@ -48,6 +50,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -56,6 +59,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -84,6 +88,7 @@ func (i *rootInode) StateFields() []string {
 
 func (i *rootInode) beforeSave() {}
 
+// +checklocksignore
 func (i *rootInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.implStatFS)
@@ -102,6 +107,7 @@ func (i *rootInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *rootInode) afterLoad() {}
 
+// +checklocksignore
 func (i *rootInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.implStatFS)
 	stateSourceObject.Load(1, &i.InodeAlwaysValid)
@@ -127,12 +133,14 @@ func (i *implStatFS) StateFields() []string {
 
 func (i *implStatFS) beforeSave() {}
 
+// +checklocksignore
 func (i *implStatFS) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *implStatFS) afterLoad() {}
 
+// +checklocksignore
 func (i *implStatFS) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -154,6 +162,7 @@ func (l *lineDiscipline) StateFields() []string {
 
 func (l *lineDiscipline) beforeSave() {}
 
+// +checklocksignore
 func (l *lineDiscipline) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.size)
@@ -167,6 +176,7 @@ func (l *lineDiscipline) StateSave(stateSinkObject state.Sink) {
 
 func (l *lineDiscipline) afterLoad() {}
 
+// +checklocksignore
 func (l *lineDiscipline) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.size)
 	stateSourceObject.Load(1, &l.inQueue)
@@ -187,12 +197,14 @@ func (o *outputQueueTransformer) StateFields() []string {
 
 func (o *outputQueueTransformer) beforeSave() {}
 
+// +checklocksignore
 func (o *outputQueueTransformer) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 }
 
 func (o *outputQueueTransformer) afterLoad() {}
 
+// +checklocksignore
 func (o *outputQueueTransformer) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -206,12 +218,14 @@ func (i *inputQueueTransformer) StateFields() []string {
 
 func (i *inputQueueTransformer) beforeSave() {}
 
+// +checklocksignore
 func (i *inputQueueTransformer) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *inputQueueTransformer) afterLoad() {}
 
+// +checklocksignore
 func (i *inputQueueTransformer) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -233,6 +247,7 @@ func (mi *masterInode) StateFields() []string {
 
 func (mi *masterInode) beforeSave() {}
 
+// +checklocksignore
 func (mi *masterInode) StateSave(stateSinkObject state.Sink) {
 	mi.beforeSave()
 	stateSinkObject.Save(0, &mi.implStatFS)
@@ -246,6 +261,7 @@ func (mi *masterInode) StateSave(stateSinkObject state.Sink) {
 
 func (mi *masterInode) afterLoad() {}
 
+// +checklocksignore
 func (mi *masterInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mi.implStatFS)
 	stateSourceObject.Load(1, &mi.InodeAttrs)
@@ -272,6 +288,7 @@ func (mfd *masterFileDescription) StateFields() []string {
 
 func (mfd *masterFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (mfd *masterFileDescription) StateSave(stateSinkObject state.Sink) {
 	mfd.beforeSave()
 	stateSinkObject.Save(0, &mfd.vfsfd)
@@ -283,6 +300,7 @@ func (mfd *masterFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (mfd *masterFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (mfd *masterFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mfd.vfsfd)
 	stateSourceObject.Load(1, &mfd.FileDescriptionDefaultImpl)
@@ -307,6 +325,7 @@ func (q *queue) StateFields() []string {
 
 func (q *queue) beforeSave() {}
 
+// +checklocksignore
 func (q *queue) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.readBuf)
@@ -318,6 +337,7 @@ func (q *queue) StateSave(stateSinkObject state.Sink) {
 
 func (q *queue) afterLoad() {}
 
+// +checklocksignore
 func (q *queue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.readBuf)
 	stateSourceObject.Load(1, &q.waitBuf)
@@ -345,6 +365,7 @@ func (ri *replicaInode) StateFields() []string {
 
 func (ri *replicaInode) beforeSave() {}
 
+// +checklocksignore
 func (ri *replicaInode) StateSave(stateSinkObject state.Sink) {
 	ri.beforeSave()
 	stateSinkObject.Save(0, &ri.implStatFS)
@@ -359,6 +380,7 @@ func (ri *replicaInode) StateSave(stateSinkObject state.Sink) {
 
 func (ri *replicaInode) afterLoad() {}
 
+// +checklocksignore
 func (ri *replicaInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ri.implStatFS)
 	stateSourceObject.Load(1, &ri.InodeAttrs)
@@ -385,6 +407,7 @@ func (rfd *replicaFileDescription) StateFields() []string {
 
 func (rfd *replicaFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (rfd *replicaFileDescription) StateSave(stateSinkObject state.Sink) {
 	rfd.beforeSave()
 	stateSinkObject.Save(0, &rfd.vfsfd)
@@ -395,6 +418,7 @@ func (rfd *replicaFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (rfd *replicaFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (rfd *replicaFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rfd.vfsfd)
 	stateSourceObject.Load(1, &rfd.FileDescriptionDefaultImpl)
@@ -414,11 +438,13 @@ func (r *rootInodeRefs) StateFields() []string {
 
 func (r *rootInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *rootInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *rootInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -439,6 +465,7 @@ func (tm *Terminal) StateFields() []string {
 
 func (tm *Terminal) beforeSave() {}
 
+// +checklocksignore
 func (tm *Terminal) StateSave(stateSinkObject state.Sink) {
 	tm.beforeSave()
 	stateSinkObject.Save(0, &tm.n)
@@ -449,6 +476,7 @@ func (tm *Terminal) StateSave(stateSinkObject state.Sink) {
 
 func (tm *Terminal) afterLoad() {}
 
+// +checklocksignore
 func (tm *Terminal) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tm.n)
 	stateSourceObject.Load(1, &tm.ld)
diff --git a/pkg/sentry/fsimpl/devtmpfs/devtmpfs_state_autogen.go b/pkg/sentry/fsimpl/devtmpfs/devtmpfs_state_autogen.go
index 87f77d00c..900c7d8fe 100644
--- a/pkg/sentry/fsimpl/devtmpfs/devtmpfs_state_autogen.go
+++ b/pkg/sentry/fsimpl/devtmpfs/devtmpfs_state_autogen.go
@@ -20,6 +20,7 @@ func (fst *FilesystemType) StateFields() []string {
 
 func (fst *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fst *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fst.beforeSave()
 	stateSinkObject.Save(0, &fst.initErr)
@@ -27,6 +28,7 @@ func (fst *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &fst.root)
 }
 
+// +checklocksignore
 func (fst *FilesystemType) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fst.initErr)
 	stateSourceObject.Load(1, &fst.fs)
diff --git a/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go b/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go
index 3af030742..93de7f32e 100644
--- a/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go
+++ b/pkg/sentry/fsimpl/eventfd/eventfd_state_autogen.go
@@ -25,6 +25,7 @@ func (efd *EventFileDescription) StateFields() []string {
 
 func (efd *EventFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (efd *EventFileDescription) StateSave(stateSinkObject state.Sink) {
 	efd.beforeSave()
 	stateSinkObject.Save(0, &efd.vfsfd)
@@ -39,6 +40,7 @@ func (efd *EventFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (efd *EventFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (efd *EventFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &efd.vfsfd)
 	stateSourceObject.Load(1, &efd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/fsimpl/fuse/fuse_state_autogen.go b/pkg/sentry/fsimpl/fuse/fuse_state_autogen.go
index 06600959e..f61e010dc 100644
--- a/pkg/sentry/fsimpl/fuse/fuse_state_autogen.go
+++ b/pkg/sentry/fsimpl/fuse/fuse_state_autogen.go
@@ -39,6 +39,7 @@ func (conn *connection) StateFields() []string {
 
 func (conn *connection) beforeSave() {}
 
+// +checklocksignore
 func (conn *connection) StateSave(stateSinkObject state.Sink) {
 	conn.beforeSave()
 	var initializedChanValue bool = conn.saveInitializedChan()
@@ -68,6 +69,7 @@ func (conn *connection) StateSave(stateSinkObject state.Sink) {
 
 func (conn *connection) afterLoad() {}
 
+// +checklocksignore
 func (conn *connection) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &conn.fd)
 	stateSourceObject.Load(1, &conn.attributeVersion)
@@ -103,12 +105,14 @@ func (f *fuseDevice) StateFields() []string {
 
 func (f *fuseDevice) beforeSave() {}
 
+// +checklocksignore
 func (f *fuseDevice) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *fuseDevice) afterLoad() {}
 
+// +checklocksignore
 func (f *fuseDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -137,6 +141,7 @@ func (fd *DeviceFD) StateFields() []string {
 
 func (fd *DeviceFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *DeviceFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	var fullQueueChValue int = fd.saveFullQueueCh()
@@ -158,6 +163,7 @@ func (fd *DeviceFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *DeviceFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *DeviceFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -185,12 +191,14 @@ func (fsType *FilesystemType) StateFields() []string {
 
 func (fsType *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fsType *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fsType.beforeSave()
 }
 
 func (fsType *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fsType *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -213,6 +221,7 @@ func (f *filesystemOptions) StateFields() []string {
 
 func (f *filesystemOptions) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystemOptions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.mopts)
@@ -227,6 +236,7 @@ func (f *filesystemOptions) StateSave(stateSinkObject state.Sink) {
 
 func (f *filesystemOptions) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystemOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.mopts)
 	stateSourceObject.Load(1, &f.uid)
@@ -254,6 +264,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -265,6 +276,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -299,6 +311,7 @@ func (i *inode) StateFields() []string {
 
 func (i *inode) beforeSave() {}
 
+// +checklocksignore
 func (i *inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.inodeRefs)
@@ -320,6 +333,7 @@ func (i *inode) StateSave(stateSinkObject state.Sink) {
 
 func (i *inode) afterLoad() {}
 
+// +checklocksignore
 func (i *inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.inodeRefs)
 	stateSourceObject.Load(1, &i.InodeAlwaysValid)
@@ -350,11 +364,13 @@ func (r *inodeRefs) StateFields() []string {
 
 func (r *inodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *inodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *inodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -373,6 +389,7 @@ func (l *requestList) StateFields() []string {
 
 func (l *requestList) beforeSave() {}
 
+// +checklocksignore
 func (l *requestList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -381,6 +398,7 @@ func (l *requestList) StateSave(stateSinkObject state.Sink) {
 
 func (l *requestList) afterLoad() {}
 
+// +checklocksignore
 func (l *requestList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -399,6 +417,7 @@ func (e *requestEntry) StateFields() []string {
 
 func (e *requestEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *requestEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -407,6 +426,7 @@ func (e *requestEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *requestEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *requestEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -430,6 +450,7 @@ func (r *Request) StateFields() []string {
 
 func (r *Request) beforeSave() {}
 
+// +checklocksignore
 func (r *Request) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.requestEntry)
@@ -443,6 +464,7 @@ func (r *Request) StateSave(stateSinkObject state.Sink) {
 
 func (r *Request) afterLoad() {}
 
+// +checklocksignore
 func (r *Request) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.requestEntry)
 	stateSourceObject.Load(1, &r.id)
@@ -469,6 +491,7 @@ func (f *futureResponse) StateFields() []string {
 
 func (f *futureResponse) beforeSave() {}
 
+// +checklocksignore
 func (f *futureResponse) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.opcode)
@@ -480,6 +503,7 @@ func (f *futureResponse) StateSave(stateSinkObject state.Sink) {
 
 func (f *futureResponse) afterLoad() {}
 
+// +checklocksignore
 func (f *futureResponse) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.opcode)
 	stateSourceObject.Load(1, &f.ch)
@@ -502,6 +526,7 @@ func (r *Response) StateFields() []string {
 
 func (r *Response) beforeSave() {}
 
+// +checklocksignore
 func (r *Response) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.opcode)
@@ -511,6 +536,7 @@ func (r *Response) StateSave(stateSinkObject state.Sink) {
 
 func (r *Response) afterLoad() {}
 
+// +checklocksignore
 func (r *Response) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.opcode)
 	stateSourceObject.Load(1, &r.hdr)
diff --git a/pkg/sentry/fsimpl/gofer/gofer_state_autogen.go b/pkg/sentry/fsimpl/gofer/gofer_state_autogen.go
index 26d0ab4db..11635f249 100644
--- a/pkg/sentry/fsimpl/gofer/gofer_state_autogen.go
+++ b/pkg/sentry/fsimpl/gofer/gofer_state_autogen.go
@@ -19,6 +19,7 @@ func (l *dentryList) StateFields() []string {
 
 func (l *dentryList) beforeSave() {}
 
+// +checklocksignore
 func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 
 func (l *dentryList) afterLoad() {}
 
+// +checklocksignore
 func (l *dentryList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *dentryEntry) StateFields() []string {
 
 func (e *dentryEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *dentryEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -73,6 +77,7 @@ func (fd *directoryFD) StateFields() []string {
 
 func (fd *directoryFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -83,6 +88,7 @@ func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *directoryFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.DirectoryFileDescriptionDefaultImpl)
@@ -100,12 +106,14 @@ func (fstype *FilesystemType) StateFields() []string {
 
 func (fstype *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fstype.beforeSave()
 }
 
 func (fstype *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -134,6 +142,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -154,6 +163,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.mfp)
@@ -194,6 +204,7 @@ func (f *filesystemOptions) StateFields() []string {
 
 func (f *filesystemOptions) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystemOptions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.fd)
@@ -212,6 +223,7 @@ func (f *filesystemOptions) StateSave(stateSinkObject state.Sink) {
 
 func (f *filesystemOptions) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystemOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.fd)
 	stateSourceObject.Load(1, &f.aname)
@@ -249,6 +261,7 @@ func (i *InternalFilesystemOptions) StateFields() []string {
 
 func (i *InternalFilesystemOptions) beforeSave() {}
 
+// +checklocksignore
 func (i *InternalFilesystemOptions) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.UniqueID)
@@ -258,6 +271,7 @@ func (i *InternalFilesystemOptions) StateSave(stateSinkObject state.Sink) {
 
 func (i *InternalFilesystemOptions) afterLoad() {}
 
+// +checklocksignore
 func (i *InternalFilesystemOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.UniqueID)
 	stateSourceObject.Load(1, &i.LeakConnection)
@@ -308,6 +322,7 @@ func (d *dentry) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -347,6 +362,7 @@ func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(34, &d.watches)
 }
 
+// +checklocksignore
 func (d *dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.refs)
@@ -400,6 +416,7 @@ func (fd *fileDescription) StateFields() []string {
 
 func (fd *fileDescription) beforeSave() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -409,6 +426,7 @@ func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (fd *fileDescription) afterLoad() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -428,6 +446,7 @@ func (fd *regularFileFD) StateFields() []string {
 
 func (fd *regularFileFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -436,6 +455,7 @@ func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *regularFileFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.off)
@@ -455,6 +475,7 @@ func (d *dentryPlatformFile) StateFields() []string {
 
 func (d *dentryPlatformFile) beforeSave() {}
 
+// +checklocksignore
 func (d *dentryPlatformFile) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.dentry)
@@ -462,6 +483,7 @@ func (d *dentryPlatformFile) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &d.hostFileMapper)
 }
 
+// +checklocksignore
 func (d *dentryPlatformFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.dentry)
 	stateSourceObject.Load(1, &d.fdRefs)
@@ -482,6 +504,7 @@ func (s *savedDentryRW) StateFields() []string {
 
 func (s *savedDentryRW) beforeSave() {}
 
+// +checklocksignore
 func (s *savedDentryRW) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.read)
@@ -490,6 +513,7 @@ func (s *savedDentryRW) StateSave(stateSinkObject state.Sink) {
 
 func (s *savedDentryRW) afterLoad() {}
 
+// +checklocksignore
 func (s *savedDentryRW) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.read)
 	stateSourceObject.Load(1, &s.write)
@@ -508,6 +532,7 @@ func (e *endpoint) StateFields() []string {
 
 func (e *endpoint) beforeSave() {}
 
+// +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.dentry)
@@ -516,6 +541,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 
 func (e *endpoint) afterLoad() {}
 
+// +checklocksignore
 func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.dentry)
 	stateSourceObject.Load(1, &e.path)
@@ -539,6 +565,7 @@ func (fd *specialFileFD) StateFields() []string {
 
 func (fd *specialFileFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *specialFileFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -550,6 +577,7 @@ func (fd *specialFileFD) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &fd.buf)
 }
 
+// +checklocksignore
 func (fd *specialFileFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.isRegularFile)
diff --git a/pkg/sentry/fsimpl/host/host_state_autogen.go b/pkg/sentry/fsimpl/host/host_state_autogen.go
index 705f8010a..6f73cc7e3 100644
--- a/pkg/sentry/fsimpl/host/host_state_autogen.go
+++ b/pkg/sentry/fsimpl/host/host_state_autogen.go
@@ -18,11 +18,13 @@ func (r *ConnectedEndpointRefs) StateFields() []string {
 
 func (r *ConnectedEndpointRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *ConnectedEndpointRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *ConnectedEndpointRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -54,6 +56,7 @@ func (i *inode) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (i *inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeNoStatFS)
@@ -75,6 +78,7 @@ func (i *inode) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(16, &i.buf)
 }
 
+// +checklocksignore
 func (i *inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeNoStatFS)
 	stateSourceObject.Load(1, &i.InodeNotDirectory)
@@ -106,12 +110,14 @@ func (f *filesystemType) StateFields() []string {
 
 func (f *filesystemType) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystemType) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystemType) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -128,6 +134,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -136,6 +143,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -157,6 +165,7 @@ func (f *fileDescription) StateFields() []string {
 
 func (f *fileDescription) beforeSave() {}
 
+// +checklocksignore
 func (f *fileDescription) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.vfsfd)
@@ -168,6 +177,7 @@ func (f *fileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (f *fileDescription) afterLoad() {}
 
+// +checklocksignore
 func (f *fileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.vfsfd)
 	stateSourceObject.Load(1, &f.FileDescriptionDefaultImpl)
@@ -188,11 +198,13 @@ func (r *inodeRefs) StateFields() []string {
 
 func (r *inodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *inodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *inodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -213,6 +225,7 @@ func (c *ConnectedEndpoint) StateFields() []string {
 
 func (c *ConnectedEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (c *ConnectedEndpoint) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.ConnectedEndpointRefs)
@@ -223,6 +236,7 @@ func (c *ConnectedEndpoint) StateSave(stateSinkObject state.Sink) {
 
 func (c *ConnectedEndpoint) afterLoad() {}
 
+// +checklocksignore
 func (c *ConnectedEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.ConnectedEndpointRefs)
 	stateSourceObject.Load(1, &c.fd)
@@ -245,6 +259,7 @@ func (t *TTYFileDescription) StateFields() []string {
 
 func (t *TTYFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (t *TTYFileDescription) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.fileDescription)
@@ -255,6 +270,7 @@ func (t *TTYFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (t *TTYFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (t *TTYFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.fileDescription)
 	stateSourceObject.Load(1, &t.session)
diff --git a/pkg/sentry/fsimpl/kernfs/kernfs_state_autogen.go b/pkg/sentry/fsimpl/kernfs/kernfs_state_autogen.go
index 7ac76bd5b..5b8d033ec 100644
--- a/pkg/sentry/fsimpl/kernfs/kernfs_state_autogen.go
+++ b/pkg/sentry/fsimpl/kernfs/kernfs_state_autogen.go
@@ -19,6 +19,7 @@ func (l *dentryList) StateFields() []string {
 
 func (l *dentryList) beforeSave() {}
 
+// +checklocksignore
 func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 
 func (l *dentryList) afterLoad() {}
 
+// +checklocksignore
 func (l *dentryList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *dentryEntry) StateFields() []string {
 
 func (e *dentryEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *dentryEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -76,6 +80,7 @@ func (f *DynamicBytesFile) StateFields() []string {
 
 func (f *DynamicBytesFile) beforeSave() {}
 
+// +checklocksignore
 func (f *DynamicBytesFile) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.InodeAttrs)
@@ -89,6 +94,7 @@ func (f *DynamicBytesFile) StateSave(stateSinkObject state.Sink) {
 
 func (f *DynamicBytesFile) afterLoad() {}
 
+// +checklocksignore
 func (f *DynamicBytesFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.InodeAttrs)
 	stateSourceObject.Load(1, &f.InodeNoStatFS)
@@ -115,6 +121,7 @@ func (fd *DynamicBytesFD) StateFields() []string {
 
 func (fd *DynamicBytesFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *DynamicBytesFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.FileDescriptionDefaultImpl)
@@ -126,6 +133,7 @@ func (fd *DynamicBytesFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *DynamicBytesFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *DynamicBytesFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.FileDescriptionDefaultImpl)
 	stateSourceObject.Load(1, &fd.DynamicBytesFileDescriptionImpl)
@@ -154,6 +162,7 @@ func (g *GenericDirectoryFDOptions) StateFields() []string {
 
 func (g *GenericDirectoryFDOptions) beforeSave() {}
 
+// +checklocksignore
 func (g *GenericDirectoryFDOptions) StateSave(stateSinkObject state.Sink) {
 	g.beforeSave()
 	stateSinkObject.Save(0, &g.SeekEnd)
@@ -161,6 +170,7 @@ func (g *GenericDirectoryFDOptions) StateSave(stateSinkObject state.Sink) {
 
 func (g *GenericDirectoryFDOptions) afterLoad() {}
 
+// +checklocksignore
 func (g *GenericDirectoryFDOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &g.SeekEnd)
 }
@@ -183,6 +193,7 @@ func (fd *GenericDirectoryFD) StateFields() []string {
 
 func (fd *GenericDirectoryFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *GenericDirectoryFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.FileDescriptionDefaultImpl)
@@ -196,6 +207,7 @@ func (fd *GenericDirectoryFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *GenericDirectoryFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *GenericDirectoryFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.FileDescriptionDefaultImpl)
 	stateSourceObject.Load(1, &fd.DirectoryFileDescriptionDefaultImpl)
@@ -218,6 +230,7 @@ func (i *InodeNoopRefCount) StateFields() []string {
 
 func (i *InodeNoopRefCount) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeNoopRefCount) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeTemporary)
@@ -225,6 +238,7 @@ func (i *InodeNoopRefCount) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeNoopRefCount) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeNoopRefCount) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeTemporary)
 }
@@ -239,12 +253,14 @@ func (i *InodeDirectoryNoNewChildren) StateFields() []string {
 
 func (i *InodeDirectoryNoNewChildren) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeDirectoryNoNewChildren) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *InodeDirectoryNoNewChildren) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeDirectoryNoNewChildren) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -260,6 +276,7 @@ func (i *InodeNotDirectory) StateFields() []string {
 
 func (i *InodeNotDirectory) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeNotDirectory) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeAlwaysValid)
@@ -267,6 +284,7 @@ func (i *InodeNotDirectory) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeNotDirectory) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeNotDirectory) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeAlwaysValid)
 }
@@ -281,12 +299,14 @@ func (i *InodeNotSymlink) StateFields() []string {
 
 func (i *InodeNotSymlink) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeNotSymlink) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *InodeNotSymlink) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeNotSymlink) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -312,6 +332,7 @@ func (a *InodeAttrs) StateFields() []string {
 
 func (a *InodeAttrs) beforeSave() {}
 
+// +checklocksignore
 func (a *InodeAttrs) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.devMajor)
@@ -329,6 +350,7 @@ func (a *InodeAttrs) StateSave(stateSinkObject state.Sink) {
 
 func (a *InodeAttrs) afterLoad() {}
 
+// +checklocksignore
 func (a *InodeAttrs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.devMajor)
 	stateSourceObject.Load(1, &a.devMinor)
@@ -358,6 +380,7 @@ func (s *slot) StateFields() []string {
 
 func (s *slot) beforeSave() {}
 
+// +checklocksignore
 func (s *slot) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.name)
@@ -368,6 +391,7 @@ func (s *slot) StateSave(stateSinkObject state.Sink) {
 
 func (s *slot) afterLoad() {}
 
+// +checklocksignore
 func (s *slot) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.name)
 	stateSourceObject.Load(1, &s.inode)
@@ -387,6 +411,7 @@ func (o *OrderedChildrenOptions) StateFields() []string {
 
 func (o *OrderedChildrenOptions) beforeSave() {}
 
+// +checklocksignore
 func (o *OrderedChildrenOptions) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.Writable)
@@ -394,6 +419,7 @@ func (o *OrderedChildrenOptions) StateSave(stateSinkObject state.Sink) {
 
 func (o *OrderedChildrenOptions) afterLoad() {}
 
+// +checklocksignore
 func (o *OrderedChildrenOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.Writable)
 }
@@ -412,6 +438,7 @@ func (o *OrderedChildren) StateFields() []string {
 
 func (o *OrderedChildren) beforeSave() {}
 
+// +checklocksignore
 func (o *OrderedChildren) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.writable)
@@ -421,6 +448,7 @@ func (o *OrderedChildren) StateSave(stateSinkObject state.Sink) {
 
 func (o *OrderedChildren) afterLoad() {}
 
+// +checklocksignore
 func (o *OrderedChildren) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.writable)
 	stateSourceObject.Load(1, &o.order)
@@ -439,6 +467,7 @@ func (i *InodeSymlink) StateFields() []string {
 
 func (i *InodeSymlink) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeSymlink) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeNotDirectory)
@@ -446,6 +475,7 @@ func (i *InodeSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (i *InodeSymlink) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeNotDirectory)
 }
@@ -471,6 +501,7 @@ func (s *StaticDirectory) StateFields() []string {
 
 func (s *StaticDirectory) beforeSave() {}
 
+// +checklocksignore
 func (s *StaticDirectory) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeAlwaysValid)
@@ -487,6 +518,7 @@ func (s *StaticDirectory) StateSave(stateSinkObject state.Sink) {
 
 func (s *StaticDirectory) afterLoad() {}
 
+// +checklocksignore
 func (s *StaticDirectory) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeAlwaysValid)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -510,12 +542,14 @@ func (i *InodeAlwaysValid) StateFields() []string {
 
 func (i *InodeAlwaysValid) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeAlwaysValid) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *InodeAlwaysValid) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeAlwaysValid) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -529,12 +563,14 @@ func (i *InodeTemporary) StateFields() []string {
 
 func (i *InodeTemporary) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeTemporary) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *InodeTemporary) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeTemporary) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -548,12 +584,14 @@ func (i *InodeNoStatFS) StateFields() []string {
 
 func (i *InodeNoStatFS) beforeSave() {}
 
+// +checklocksignore
 func (i *InodeNoStatFS) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *InodeNoStatFS) afterLoad() {}
 
+// +checklocksignore
 func (i *InodeNoStatFS) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -575,6 +613,7 @@ func (fs *Filesystem) StateFields() []string {
 
 func (fs *Filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *Filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -588,6 +627,7 @@ func (fs *Filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *Filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *Filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.droppedDentries)
@@ -619,6 +659,7 @@ func (d *Dentry) StateFields() []string {
 
 func (d *Dentry) beforeSave() {}
 
+// +checklocksignore
 func (d *Dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -633,6 +674,7 @@ func (d *Dentry) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(9, &d.inode)
 }
 
+// +checklocksignore
 func (d *Dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.refs)
@@ -661,6 +703,7 @@ func (i *inodePlatformFile) StateFields() []string {
 
 func (i *inodePlatformFile) beforeSave() {}
 
+// +checklocksignore
 func (i *inodePlatformFile) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.hostFD)
@@ -668,6 +711,7 @@ func (i *inodePlatformFile) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &i.fileMapper)
 }
 
+// +checklocksignore
 func (i *inodePlatformFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.hostFD)
 	stateSourceObject.Load(1, &i.fdRefs)
@@ -688,6 +732,7 @@ func (i *CachedMappable) StateFields() []string {
 
 func (i *CachedMappable) beforeSave() {}
 
+// +checklocksignore
 func (i *CachedMappable) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.mappings)
@@ -696,6 +741,7 @@ func (i *CachedMappable) StateSave(stateSinkObject state.Sink) {
 
 func (i *CachedMappable) afterLoad() {}
 
+// +checklocksignore
 func (i *CachedMappable) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.mappings)
 	stateSourceObject.Load(1, &i.pf)
@@ -714,6 +760,7 @@ func (l *slotList) StateFields() []string {
 
 func (l *slotList) beforeSave() {}
 
+// +checklocksignore
 func (l *slotList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -722,6 +769,7 @@ func (l *slotList) StateSave(stateSinkObject state.Sink) {
 
 func (l *slotList) afterLoad() {}
 
+// +checklocksignore
 func (l *slotList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -740,6 +788,7 @@ func (e *slotEntry) StateFields() []string {
 
 func (e *slotEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *slotEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -748,6 +797,7 @@ func (e *slotEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *slotEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *slotEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -765,11 +815,13 @@ func (r *StaticDirectoryRefs) StateFields() []string {
 
 func (r *StaticDirectoryRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *StaticDirectoryRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *StaticDirectoryRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -791,6 +843,7 @@ func (s *StaticSymlink) StateFields() []string {
 
 func (s *StaticSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *StaticSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.InodeAttrs)
@@ -802,6 +855,7 @@ func (s *StaticSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *StaticSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *StaticSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.InodeAttrs)
 	stateSourceObject.Load(1, &s.InodeNoopRefCount)
@@ -828,6 +882,7 @@ func (dir *syntheticDirectory) StateFields() []string {
 
 func (dir *syntheticDirectory) beforeSave() {}
 
+// +checklocksignore
 func (dir *syntheticDirectory) StateSave(stateSinkObject state.Sink) {
 	dir.beforeSave()
 	stateSinkObject.Save(0, &dir.InodeAlwaysValid)
@@ -841,6 +896,7 @@ func (dir *syntheticDirectory) StateSave(stateSinkObject state.Sink) {
 
 func (dir *syntheticDirectory) afterLoad() {}
 
+// +checklocksignore
 func (dir *syntheticDirectory) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &dir.InodeAlwaysValid)
 	stateSourceObject.Load(1, &dir.InodeAttrs)
@@ -863,11 +919,13 @@ func (r *syntheticDirectoryRefs) StateFields() []string {
 
 func (r *syntheticDirectoryRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *syntheticDirectoryRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *syntheticDirectoryRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
diff --git a/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go b/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
index 7c60e23f5..923a2e71a 100644
--- a/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
+++ b/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
@@ -22,6 +22,7 @@ func (fd *directoryFD) StateFields() []string {
 
 func (fd *directoryFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -33,6 +34,7 @@ func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *directoryFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.DirectoryFileDescriptionDefaultImpl)
@@ -51,12 +53,14 @@ func (fstype *FilesystemType) StateFields() []string {
 
 func (fstype *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fstype.beforeSave()
 }
 
 func (fstype *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -73,6 +77,7 @@ func (f *FilesystemOptions) StateFields() []string {
 
 func (f *FilesystemOptions) beforeSave() {}
 
+// +checklocksignore
 func (f *FilesystemOptions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.UpperRoot)
@@ -81,6 +86,7 @@ func (f *FilesystemOptions) StateSave(stateSinkObject state.Sink) {
 
 func (f *FilesystemOptions) afterLoad() {}
 
+// +checklocksignore
 func (f *FilesystemOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.UpperRoot)
 	stateSourceObject.Load(1, &f.LowerRoots)
@@ -101,6 +107,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -111,6 +118,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.opts)
@@ -131,6 +139,7 @@ func (l *layerDevNumber) StateFields() []string {
 
 func (l *layerDevNumber) beforeSave() {}
 
+// +checklocksignore
 func (l *layerDevNumber) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.major)
@@ -139,6 +148,7 @@ func (l *layerDevNumber) StateSave(stateSinkObject state.Sink) {
 
 func (l *layerDevNumber) afterLoad() {}
 
+// +checklocksignore
 func (l *layerDevNumber) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.major)
 	stateSourceObject.Load(1, &l.minor)
@@ -177,6 +187,7 @@ func (d *dentry) StateFields() []string {
 
 func (d *dentry) beforeSave() {}
 
+// +checklocksignore
 func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -203,6 +214,7 @@ func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(21, &d.watches)
 }
 
+// +checklocksignore
 func (d *dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.refs)
@@ -243,6 +255,7 @@ func (fd *fileDescription) StateFields() []string {
 
 func (fd *fileDescription) beforeSave() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -252,6 +265,7 @@ func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (fd *fileDescription) afterLoad() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -274,6 +288,7 @@ func (fd *regularFileFD) StateFields() []string {
 
 func (fd *regularFileFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -285,6 +300,7 @@ func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *regularFileFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.copiedUp)
diff --git a/pkg/sentry/fsimpl/pipefs/pipefs_state_autogen.go b/pkg/sentry/fsimpl/pipefs/pipefs_state_autogen.go
index 474f83cdf..5f9e117c3 100644
--- a/pkg/sentry/fsimpl/pipefs/pipefs_state_autogen.go
+++ b/pkg/sentry/fsimpl/pipefs/pipefs_state_autogen.go
@@ -16,12 +16,14 @@ func (f *filesystemType) StateFields() []string {
 
 func (f *filesystemType) beforeSave() {}
 
+// +checklocksignore
 func (f *filesystemType) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *filesystemType) afterLoad() {}
 
+// +checklocksignore
 func (f *filesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -38,6 +40,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -46,6 +49,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -71,6 +75,7 @@ func (i *inode) StateFields() []string {
 
 func (i *inode) beforeSave() {}
 
+// +checklocksignore
 func (i *inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeNotDirectory)
@@ -86,6 +91,7 @@ func (i *inode) StateSave(stateSinkObject state.Sink) {
 
 func (i *inode) afterLoad() {}
 
+// +checklocksignore
 func (i *inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeNotDirectory)
 	stateSourceObject.Load(1, &i.InodeNotSymlink)
diff --git a/pkg/sentry/fsimpl/proc/proc_state_autogen.go b/pkg/sentry/fsimpl/proc/proc_state_autogen.go
index e1714d1a3..60e3a7485 100644
--- a/pkg/sentry/fsimpl/proc/proc_state_autogen.go
+++ b/pkg/sentry/fsimpl/proc/proc_state_autogen.go
@@ -18,11 +18,13 @@ func (r *fdDirInodeRefs) StateFields() []string {
 
 func (r *fdDirInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *fdDirInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *fdDirInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -40,11 +42,13 @@ func (r *fdInfoDirInodeRefs) StateFields() []string {
 
 func (r *fdInfoDirInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *fdInfoDirInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *fdInfoDirInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -60,12 +64,14 @@ func (ft *FilesystemType) StateFields() []string {
 
 func (ft *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (ft *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	ft.beforeSave()
 }
 
 func (ft *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (ft *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -82,6 +88,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -90,6 +97,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -108,6 +116,7 @@ func (s *staticFile) StateFields() []string {
 
 func (s *staticFile) beforeSave() {}
 
+// +checklocksignore
 func (s *staticFile) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.DynamicBytesFile)
@@ -116,6 +125,7 @@ func (s *staticFile) StateSave(stateSinkObject state.Sink) {
 
 func (s *staticFile) afterLoad() {}
 
+// +checklocksignore
 func (s *staticFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.DynamicBytesFile)
 	stateSourceObject.Load(1, &s.StaticData)
@@ -133,6 +143,7 @@ func (i *InternalData) StateFields() []string {
 
 func (i *InternalData) beforeSave() {}
 
+// +checklocksignore
 func (i *InternalData) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Cgroups)
@@ -140,6 +151,7 @@ func (i *InternalData) StateSave(stateSinkObject state.Sink) {
 
 func (i *InternalData) afterLoad() {}
 
+// +checklocksignore
 func (i *InternalData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Cgroups)
 }
@@ -154,12 +166,14 @@ func (i *implStatFS) StateFields() []string {
 
 func (i *implStatFS) beforeSave() {}
 
+// +checklocksignore
 func (i *implStatFS) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *implStatFS) afterLoad() {}
 
+// +checklocksignore
 func (i *implStatFS) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -187,6 +201,7 @@ func (i *subtasksInode) StateFields() []string {
 
 func (i *subtasksInode) beforeSave() {}
 
+// +checklocksignore
 func (i *subtasksInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.implStatFS)
@@ -206,6 +221,7 @@ func (i *subtasksInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *subtasksInode) afterLoad() {}
 
+// +checklocksignore
 func (i *subtasksInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.implStatFS)
 	stateSourceObject.Load(1, &i.InodeAlwaysValid)
@@ -235,6 +251,7 @@ func (fd *subtasksFD) StateFields() []string {
 
 func (fd *subtasksFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *subtasksFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.GenericDirectoryFD)
@@ -243,6 +260,7 @@ func (fd *subtasksFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *subtasksFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *subtasksFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.GenericDirectoryFD)
 	stateSourceObject.Load(1, &fd.task)
@@ -260,11 +278,13 @@ func (r *subtasksInodeRefs) StateFields() []string {
 
 func (r *subtasksInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *subtasksInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *subtasksInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -290,6 +310,7 @@ func (i *taskInode) StateFields() []string {
 
 func (i *taskInode) beforeSave() {}
 
+// +checklocksignore
 func (i *taskInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.implStatFS)
@@ -305,6 +326,7 @@ func (i *taskInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *taskInode) afterLoad() {}
 
+// +checklocksignore
 func (i *taskInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.implStatFS)
 	stateSourceObject.Load(1, &i.InodeAttrs)
@@ -330,6 +352,7 @@ func (i *taskOwnedInode) StateFields() []string {
 
 func (i *taskOwnedInode) beforeSave() {}
 
+// +checklocksignore
 func (i *taskOwnedInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Inode)
@@ -338,6 +361,7 @@ func (i *taskOwnedInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *taskOwnedInode) afterLoad() {}
 
+// +checklocksignore
 func (i *taskOwnedInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Inode)
 	stateSourceObject.Load(1, &i.owner)
@@ -358,6 +382,7 @@ func (i *fdDir) StateFields() []string {
 
 func (i *fdDir) beforeSave() {}
 
+// +checklocksignore
 func (i *fdDir) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.locks)
@@ -368,6 +393,7 @@ func (i *fdDir) StateSave(stateSinkObject state.Sink) {
 
 func (i *fdDir) afterLoad() {}
 
+// +checklocksignore
 func (i *fdDir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.locks)
 	stateSourceObject.Load(1, &i.fs)
@@ -395,6 +421,7 @@ func (i *fdDirInode) StateFields() []string {
 
 func (i *fdDirInode) beforeSave() {}
 
+// +checklocksignore
 func (i *fdDirInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fdDir)
@@ -410,6 +437,7 @@ func (i *fdDirInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *fdDirInode) afterLoad() {}
 
+// +checklocksignore
 func (i *fdDirInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.fdDir)
 	stateSourceObject.Load(1, &i.fdDirInodeRefs)
@@ -439,6 +467,7 @@ func (s *fdSymlink) StateFields() []string {
 
 func (s *fdSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *fdSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.implStatFS)
@@ -451,6 +480,7 @@ func (s *fdSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *fdSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *fdSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.implStatFS)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -480,6 +510,7 @@ func (i *fdInfoDirInode) StateFields() []string {
 
 func (i *fdInfoDirInode) beforeSave() {}
 
+// +checklocksignore
 func (i *fdInfoDirInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fdDir)
@@ -495,6 +526,7 @@ func (i *fdInfoDirInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *fdInfoDirInode) afterLoad() {}
 
+// +checklocksignore
 func (i *fdInfoDirInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.fdDir)
 	stateSourceObject.Load(1, &i.fdInfoDirInodeRefs)
@@ -521,6 +553,7 @@ func (d *fdInfoData) StateFields() []string {
 
 func (d *fdInfoData) beforeSave() {}
 
+// +checklocksignore
 func (d *fdInfoData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -530,6 +563,7 @@ func (d *fdInfoData) StateSave(stateSinkObject state.Sink) {
 
 func (d *fdInfoData) afterLoad() {}
 
+// +checklocksignore
 func (d *fdInfoData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -549,6 +583,7 @@ func (d *auxvData) StateFields() []string {
 
 func (d *auxvData) beforeSave() {}
 
+// +checklocksignore
 func (d *auxvData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -557,6 +592,7 @@ func (d *auxvData) StateSave(stateSinkObject state.Sink) {
 
 func (d *auxvData) afterLoad() {}
 
+// +checklocksignore
 func (d *auxvData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -576,6 +612,7 @@ func (d *cmdlineData) StateFields() []string {
 
 func (d *cmdlineData) beforeSave() {}
 
+// +checklocksignore
 func (d *cmdlineData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -585,6 +622,7 @@ func (d *cmdlineData) StateSave(stateSinkObject state.Sink) {
 
 func (d *cmdlineData) afterLoad() {}
 
+// +checklocksignore
 func (d *cmdlineData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -604,6 +642,7 @@ func (i *commInode) StateFields() []string {
 
 func (i *commInode) beforeSave() {}
 
+// +checklocksignore
 func (i *commInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.DynamicBytesFile)
@@ -612,6 +651,7 @@ func (i *commInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *commInode) afterLoad() {}
 
+// +checklocksignore
 func (i *commInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.DynamicBytesFile)
 	stateSourceObject.Load(1, &i.task)
@@ -630,6 +670,7 @@ func (d *commData) StateFields() []string {
 
 func (d *commData) beforeSave() {}
 
+// +checklocksignore
 func (d *commData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -638,6 +679,7 @@ func (d *commData) StateSave(stateSinkObject state.Sink) {
 
 func (d *commData) afterLoad() {}
 
+// +checklocksignore
 func (d *commData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -657,6 +699,7 @@ func (d *idMapData) StateFields() []string {
 
 func (d *idMapData) beforeSave() {}
 
+// +checklocksignore
 func (d *idMapData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -666,6 +709,7 @@ func (d *idMapData) StateSave(stateSinkObject state.Sink) {
 
 func (d *idMapData) afterLoad() {}
 
+// +checklocksignore
 func (d *idMapData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -690,6 +734,7 @@ func (f *memInode) StateFields() []string {
 
 func (f *memInode) beforeSave() {}
 
+// +checklocksignore
 func (f *memInode) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.InodeAttrs)
@@ -703,6 +748,7 @@ func (f *memInode) StateSave(stateSinkObject state.Sink) {
 
 func (f *memInode) afterLoad() {}
 
+// +checklocksignore
 func (f *memInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.InodeAttrs)
 	stateSourceObject.Load(1, &f.InodeNoStatFS)
@@ -729,6 +775,7 @@ func (fd *memFD) StateFields() []string {
 
 func (fd *memFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *memFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -740,6 +787,7 @@ func (fd *memFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *memFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *memFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -761,6 +809,7 @@ func (d *mapsData) StateFields() []string {
 
 func (d *mapsData) beforeSave() {}
 
+// +checklocksignore
 func (d *mapsData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -769,6 +818,7 @@ func (d *mapsData) StateSave(stateSinkObject state.Sink) {
 
 func (d *mapsData) afterLoad() {}
 
+// +checklocksignore
 func (d *mapsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -787,6 +837,7 @@ func (d *smapsData) StateFields() []string {
 
 func (d *smapsData) beforeSave() {}
 
+// +checklocksignore
 func (d *smapsData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -795,6 +846,7 @@ func (d *smapsData) StateSave(stateSinkObject state.Sink) {
 
 func (d *smapsData) afterLoad() {}
 
+// +checklocksignore
 func (d *smapsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.task)
@@ -815,6 +867,7 @@ func (s *taskStatData) StateFields() []string {
 
 func (s *taskStatData) beforeSave() {}
 
+// +checklocksignore
 func (s *taskStatData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.DynamicBytesFile)
@@ -825,6 +878,7 @@ func (s *taskStatData) StateSave(stateSinkObject state.Sink) {
 
 func (s *taskStatData) afterLoad() {}
 
+// +checklocksignore
 func (s *taskStatData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.DynamicBytesFile)
 	stateSourceObject.Load(1, &s.task)
@@ -845,6 +899,7 @@ func (s *statmData) StateFields() []string {
 
 func (s *statmData) beforeSave() {}
 
+// +checklocksignore
 func (s *statmData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.DynamicBytesFile)
@@ -853,6 +908,7 @@ func (s *statmData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statmData) afterLoad() {}
 
+// +checklocksignore
 func (s *statmData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.DynamicBytesFile)
 	stateSourceObject.Load(1, &s.task)
@@ -872,6 +928,7 @@ func (s *statusData) StateFields() []string {
 
 func (s *statusData) beforeSave() {}
 
+// +checklocksignore
 func (s *statusData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.DynamicBytesFile)
@@ -881,6 +938,7 @@ func (s *statusData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statusData) afterLoad() {}
 
+// +checklocksignore
 func (s *statusData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.DynamicBytesFile)
 	stateSourceObject.Load(1, &s.task)
@@ -900,6 +958,7 @@ func (i *ioData) StateFields() []string {
 
 func (i *ioData) beforeSave() {}
 
+// +checklocksignore
 func (i *ioData) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.DynamicBytesFile)
@@ -908,6 +967,7 @@ func (i *ioData) StateSave(stateSinkObject state.Sink) {
 
 func (i *ioData) afterLoad() {}
 
+// +checklocksignore
 func (i *ioData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.DynamicBytesFile)
 	stateSourceObject.Load(1, &i.ioUsage)
@@ -926,6 +986,7 @@ func (o *oomScoreAdj) StateFields() []string {
 
 func (o *oomScoreAdj) beforeSave() {}
 
+// +checklocksignore
 func (o *oomScoreAdj) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.DynamicBytesFile)
@@ -934,6 +995,7 @@ func (o *oomScoreAdj) StateSave(stateSinkObject state.Sink) {
 
 func (o *oomScoreAdj) afterLoad() {}
 
+// +checklocksignore
 func (o *oomScoreAdj) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.DynamicBytesFile)
 	stateSourceObject.Load(1, &o.task)
@@ -955,6 +1017,7 @@ func (s *exeSymlink) StateFields() []string {
 
 func (s *exeSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *exeSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.implStatFS)
@@ -966,6 +1029,7 @@ func (s *exeSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *exeSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *exeSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.implStatFS)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -990,6 +1054,7 @@ func (s *cwdSymlink) StateFields() []string {
 
 func (s *cwdSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *cwdSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.implStatFS)
@@ -1001,6 +1066,7 @@ func (s *cwdSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *cwdSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *cwdSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.implStatFS)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -1022,6 +1088,7 @@ func (i *mountInfoData) StateFields() []string {
 
 func (i *mountInfoData) beforeSave() {}
 
+// +checklocksignore
 func (i *mountInfoData) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.DynamicBytesFile)
@@ -1030,6 +1097,7 @@ func (i *mountInfoData) StateSave(stateSinkObject state.Sink) {
 
 func (i *mountInfoData) afterLoad() {}
 
+// +checklocksignore
 func (i *mountInfoData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.DynamicBytesFile)
 	stateSourceObject.Load(1, &i.task)
@@ -1048,6 +1116,7 @@ func (i *mountsData) StateFields() []string {
 
 func (i *mountsData) beforeSave() {}
 
+// +checklocksignore
 func (i *mountsData) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.DynamicBytesFile)
@@ -1056,6 +1125,7 @@ func (i *mountsData) StateSave(stateSinkObject state.Sink) {
 
 func (i *mountsData) afterLoad() {}
 
+// +checklocksignore
 func (i *mountsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.DynamicBytesFile)
 	stateSourceObject.Load(1, &i.task)
@@ -1074,6 +1144,7 @@ func (s *namespaceSymlink) StateFields() []string {
 
 func (s *namespaceSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *namespaceSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.StaticSymlink)
@@ -1082,6 +1153,7 @@ func (s *namespaceSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *namespaceSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *namespaceSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.StaticSymlink)
 	stateSourceObject.Load(1, &s.task)
@@ -1104,6 +1176,7 @@ func (i *namespaceInode) StateFields() []string {
 
 func (i *namespaceInode) beforeSave() {}
 
+// +checklocksignore
 func (i *namespaceInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.implStatFS)
@@ -1116,6 +1189,7 @@ func (i *namespaceInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *namespaceInode) afterLoad() {}
 
+// +checklocksignore
 func (i *namespaceInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.implStatFS)
 	stateSourceObject.Load(1, &i.InodeAttrs)
@@ -1140,6 +1214,7 @@ func (fd *namespaceFD) StateFields() []string {
 
 func (fd *namespaceFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *namespaceFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.FileDescriptionDefaultImpl)
@@ -1150,6 +1225,7 @@ func (fd *namespaceFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *namespaceFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *namespaceFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.FileDescriptionDefaultImpl)
 	stateSourceObject.Load(1, &fd.LockFD)
@@ -1169,11 +1245,13 @@ func (r *taskInodeRefs) StateFields() []string {
 
 func (r *taskInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *taskInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *taskInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -1192,6 +1270,7 @@ func (n *ifinet6) StateFields() []string {
 
 func (n *ifinet6) beforeSave() {}
 
+// +checklocksignore
 func (n *ifinet6) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.DynamicBytesFile)
@@ -1200,6 +1279,7 @@ func (n *ifinet6) StateSave(stateSinkObject state.Sink) {
 
 func (n *ifinet6) afterLoad() {}
 
+// +checklocksignore
 func (n *ifinet6) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.DynamicBytesFile)
 	stateSourceObject.Load(1, &n.stack)
@@ -1218,6 +1298,7 @@ func (n *netDevData) StateFields() []string {
 
 func (n *netDevData) beforeSave() {}
 
+// +checklocksignore
 func (n *netDevData) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.DynamicBytesFile)
@@ -1226,6 +1307,7 @@ func (n *netDevData) StateSave(stateSinkObject state.Sink) {
 
 func (n *netDevData) afterLoad() {}
 
+// +checklocksignore
 func (n *netDevData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.DynamicBytesFile)
 	stateSourceObject.Load(1, &n.stack)
@@ -1244,6 +1326,7 @@ func (n *netUnixData) StateFields() []string {
 
 func (n *netUnixData) beforeSave() {}
 
+// +checklocksignore
 func (n *netUnixData) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.DynamicBytesFile)
@@ -1252,6 +1335,7 @@ func (n *netUnixData) StateSave(stateSinkObject state.Sink) {
 
 func (n *netUnixData) afterLoad() {}
 
+// +checklocksignore
 func (n *netUnixData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.DynamicBytesFile)
 	stateSourceObject.Load(1, &n.kernel)
@@ -1270,6 +1354,7 @@ func (d *netTCPData) StateFields() []string {
 
 func (d *netTCPData) beforeSave() {}
 
+// +checklocksignore
 func (d *netTCPData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1278,6 +1363,7 @@ func (d *netTCPData) StateSave(stateSinkObject state.Sink) {
 
 func (d *netTCPData) afterLoad() {}
 
+// +checklocksignore
 func (d *netTCPData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.kernel)
@@ -1296,6 +1382,7 @@ func (d *netTCP6Data) StateFields() []string {
 
 func (d *netTCP6Data) beforeSave() {}
 
+// +checklocksignore
 func (d *netTCP6Data) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1304,6 +1391,7 @@ func (d *netTCP6Data) StateSave(stateSinkObject state.Sink) {
 
 func (d *netTCP6Data) afterLoad() {}
 
+// +checklocksignore
 func (d *netTCP6Data) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.kernel)
@@ -1322,6 +1410,7 @@ func (d *netUDPData) StateFields() []string {
 
 func (d *netUDPData) beforeSave() {}
 
+// +checklocksignore
 func (d *netUDPData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1330,6 +1419,7 @@ func (d *netUDPData) StateSave(stateSinkObject state.Sink) {
 
 func (d *netUDPData) afterLoad() {}
 
+// +checklocksignore
 func (d *netUDPData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.kernel)
@@ -1348,6 +1438,7 @@ func (d *netSnmpData) StateFields() []string {
 
 func (d *netSnmpData) beforeSave() {}
 
+// +checklocksignore
 func (d *netSnmpData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1356,6 +1447,7 @@ func (d *netSnmpData) StateSave(stateSinkObject state.Sink) {
 
 func (d *netSnmpData) afterLoad() {}
 
+// +checklocksignore
 func (d *netSnmpData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.stack)
@@ -1374,6 +1466,7 @@ func (s *snmpLine) StateFields() []string {
 
 func (s *snmpLine) beforeSave() {}
 
+// +checklocksignore
 func (s *snmpLine) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.prefix)
@@ -1382,6 +1475,7 @@ func (s *snmpLine) StateSave(stateSinkObject state.Sink) {
 
 func (s *snmpLine) afterLoad() {}
 
+// +checklocksignore
 func (s *snmpLine) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.prefix)
 	stateSourceObject.Load(1, &s.header)
@@ -1400,6 +1494,7 @@ func (d *netRouteData) StateFields() []string {
 
 func (d *netRouteData) beforeSave() {}
 
+// +checklocksignore
 func (d *netRouteData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1408,6 +1503,7 @@ func (d *netRouteData) StateSave(stateSinkObject state.Sink) {
 
 func (d *netRouteData) afterLoad() {}
 
+// +checklocksignore
 func (d *netRouteData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.stack)
@@ -1426,6 +1522,7 @@ func (d *netStatData) StateFields() []string {
 
 func (d *netStatData) beforeSave() {}
 
+// +checklocksignore
 func (d *netStatData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1434,6 +1531,7 @@ func (d *netStatData) StateSave(stateSinkObject state.Sink) {
 
 func (d *netStatData) afterLoad() {}
 
+// +checklocksignore
 func (d *netStatData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.stack)
@@ -1462,6 +1560,7 @@ func (i *tasksInode) StateFields() []string {
 
 func (i *tasksInode) beforeSave() {}
 
+// +checklocksignore
 func (i *tasksInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.implStatFS)
@@ -1480,6 +1579,7 @@ func (i *tasksInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *tasksInode) afterLoad() {}
 
+// +checklocksignore
 func (i *tasksInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.implStatFS)
 	stateSourceObject.Load(1, &i.InodeAlwaysValid)
@@ -1508,6 +1608,7 @@ func (s *staticFileSetStat) StateFields() []string {
 
 func (s *staticFileSetStat) beforeSave() {}
 
+// +checklocksignore
 func (s *staticFileSetStat) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.dynamicBytesFileSetAttr)
@@ -1516,6 +1617,7 @@ func (s *staticFileSetStat) StateSave(stateSinkObject state.Sink) {
 
 func (s *staticFileSetStat) afterLoad() {}
 
+// +checklocksignore
 func (s *staticFileSetStat) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.dynamicBytesFileSetAttr)
 	stateSourceObject.Load(1, &s.StaticData)
@@ -1537,6 +1639,7 @@ func (s *selfSymlink) StateFields() []string {
 
 func (s *selfSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *selfSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.implStatFS)
@@ -1548,6 +1651,7 @@ func (s *selfSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *selfSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *selfSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.implStatFS)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -1572,6 +1676,7 @@ func (s *threadSelfSymlink) StateFields() []string {
 
 func (s *threadSelfSymlink) beforeSave() {}
 
+// +checklocksignore
 func (s *threadSelfSymlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.implStatFS)
@@ -1583,6 +1688,7 @@ func (s *threadSelfSymlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *threadSelfSymlink) afterLoad() {}
 
+// +checklocksignore
 func (s *threadSelfSymlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.implStatFS)
 	stateSourceObject.Load(1, &s.InodeAttrs)
@@ -1603,6 +1709,7 @@ func (d *dynamicBytesFileSetAttr) StateFields() []string {
 
 func (d *dynamicBytesFileSetAttr) beforeSave() {}
 
+// +checklocksignore
 func (d *dynamicBytesFileSetAttr) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1610,6 +1717,7 @@ func (d *dynamicBytesFileSetAttr) StateSave(stateSinkObject state.Sink) {
 
 func (d *dynamicBytesFileSetAttr) afterLoad() {}
 
+// +checklocksignore
 func (d *dynamicBytesFileSetAttr) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 }
@@ -1635,6 +1743,7 @@ func (c *cpuStats) StateFields() []string {
 
 func (c *cpuStats) beforeSave() {}
 
+// +checklocksignore
 func (c *cpuStats) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.user)
@@ -1651,6 +1760,7 @@ func (c *cpuStats) StateSave(stateSinkObject state.Sink) {
 
 func (c *cpuStats) afterLoad() {}
 
+// +checklocksignore
 func (c *cpuStats) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.user)
 	stateSourceObject.Load(1, &c.nice)
@@ -1676,6 +1786,7 @@ func (s *statData) StateFields() []string {
 
 func (s *statData) beforeSave() {}
 
+// +checklocksignore
 func (s *statData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.dynamicBytesFileSetAttr)
@@ -1683,6 +1794,7 @@ func (s *statData) StateSave(stateSinkObject state.Sink) {
 
 func (s *statData) afterLoad() {}
 
+// +checklocksignore
 func (s *statData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.dynamicBytesFileSetAttr)
 }
@@ -1699,6 +1811,7 @@ func (l *loadavgData) StateFields() []string {
 
 func (l *loadavgData) beforeSave() {}
 
+// +checklocksignore
 func (l *loadavgData) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.dynamicBytesFileSetAttr)
@@ -1706,6 +1819,7 @@ func (l *loadavgData) StateSave(stateSinkObject state.Sink) {
 
 func (l *loadavgData) afterLoad() {}
 
+// +checklocksignore
 func (l *loadavgData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.dynamicBytesFileSetAttr)
 }
@@ -1722,6 +1836,7 @@ func (m *meminfoData) StateFields() []string {
 
 func (m *meminfoData) beforeSave() {}
 
+// +checklocksignore
 func (m *meminfoData) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.dynamicBytesFileSetAttr)
@@ -1729,6 +1844,7 @@ func (m *meminfoData) StateSave(stateSinkObject state.Sink) {
 
 func (m *meminfoData) afterLoad() {}
 
+// +checklocksignore
 func (m *meminfoData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.dynamicBytesFileSetAttr)
 }
@@ -1745,6 +1861,7 @@ func (u *uptimeData) StateFields() []string {
 
 func (u *uptimeData) beforeSave() {}
 
+// +checklocksignore
 func (u *uptimeData) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.dynamicBytesFileSetAttr)
@@ -1752,6 +1869,7 @@ func (u *uptimeData) StateSave(stateSinkObject state.Sink) {
 
 func (u *uptimeData) afterLoad() {}
 
+// +checklocksignore
 func (u *uptimeData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.dynamicBytesFileSetAttr)
 }
@@ -1768,6 +1886,7 @@ func (v *versionData) StateFields() []string {
 
 func (v *versionData) beforeSave() {}
 
+// +checklocksignore
 func (v *versionData) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 	stateSinkObject.Save(0, &v.dynamicBytesFileSetAttr)
@@ -1775,6 +1894,7 @@ func (v *versionData) StateSave(stateSinkObject state.Sink) {
 
 func (v *versionData) afterLoad() {}
 
+// +checklocksignore
 func (v *versionData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &v.dynamicBytesFileSetAttr)
 }
@@ -1791,6 +1911,7 @@ func (d *filesystemsData) StateFields() []string {
 
 func (d *filesystemsData) beforeSave() {}
 
+// +checklocksignore
 func (d *filesystemsData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1798,6 +1919,7 @@ func (d *filesystemsData) StateSave(stateSinkObject state.Sink) {
 
 func (d *filesystemsData) afterLoad() {}
 
+// +checklocksignore
 func (d *filesystemsData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 }
@@ -1814,11 +1936,13 @@ func (r *tasksInodeRefs) StateFields() []string {
 
 func (r *tasksInodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *tasksInodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *tasksInodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -1845,6 +1969,7 @@ func (d *mmapMinAddrData) StateFields() []string {
 
 func (d *mmapMinAddrData) beforeSave() {}
 
+// +checklocksignore
 func (d *mmapMinAddrData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1853,6 +1978,7 @@ func (d *mmapMinAddrData) StateSave(stateSinkObject state.Sink) {
 
 func (d *mmapMinAddrData) afterLoad() {}
 
+// +checklocksignore
 func (d *mmapMinAddrData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.k)
@@ -1870,6 +1996,7 @@ func (h *hostnameData) StateFields() []string {
 
 func (h *hostnameData) beforeSave() {}
 
+// +checklocksignore
 func (h *hostnameData) StateSave(stateSinkObject state.Sink) {
 	h.beforeSave()
 	stateSinkObject.Save(0, &h.DynamicBytesFile)
@@ -1877,6 +2004,7 @@ func (h *hostnameData) StateSave(stateSinkObject state.Sink) {
 
 func (h *hostnameData) afterLoad() {}
 
+// +checklocksignore
 func (h *hostnameData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &h.DynamicBytesFile)
 }
@@ -1895,6 +2023,7 @@ func (d *tcpSackData) StateFields() []string {
 
 func (d *tcpSackData) beforeSave() {}
 
+// +checklocksignore
 func (d *tcpSackData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1904,6 +2033,7 @@ func (d *tcpSackData) StateSave(stateSinkObject state.Sink) {
 
 func (d *tcpSackData) afterLoad() {}
 
+// +checklocksignore
 func (d *tcpSackData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.LoadWait(1, &d.stack)
@@ -1923,6 +2053,7 @@ func (d *tcpRecoveryData) StateFields() []string {
 
 func (d *tcpRecoveryData) beforeSave() {}
 
+// +checklocksignore
 func (d *tcpRecoveryData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1931,6 +2062,7 @@ func (d *tcpRecoveryData) StateSave(stateSinkObject state.Sink) {
 
 func (d *tcpRecoveryData) afterLoad() {}
 
+// +checklocksignore
 func (d *tcpRecoveryData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.LoadWait(1, &d.stack)
@@ -1950,6 +2082,7 @@ func (d *tcpMemData) StateFields() []string {
 
 func (d *tcpMemData) beforeSave() {}
 
+// +checklocksignore
 func (d *tcpMemData) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.DynamicBytesFile)
@@ -1959,6 +2092,7 @@ func (d *tcpMemData) StateSave(stateSinkObject state.Sink) {
 
 func (d *tcpMemData) afterLoad() {}
 
+// +checklocksignore
 func (d *tcpMemData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.DynamicBytesFile)
 	stateSourceObject.Load(1, &d.dir)
@@ -1979,6 +2113,7 @@ func (ipf *ipForwarding) StateFields() []string {
 
 func (ipf *ipForwarding) beforeSave() {}
 
+// +checklocksignore
 func (ipf *ipForwarding) StateSave(stateSinkObject state.Sink) {
 	ipf.beforeSave()
 	stateSinkObject.Save(0, &ipf.DynamicBytesFile)
@@ -1988,6 +2123,7 @@ func (ipf *ipForwarding) StateSave(stateSinkObject state.Sink) {
 
 func (ipf *ipForwarding) afterLoad() {}
 
+// +checklocksignore
 func (ipf *ipForwarding) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ipf.DynamicBytesFile)
 	stateSourceObject.LoadWait(1, &ipf.stack)
@@ -2009,6 +2145,7 @@ func (pr *portRange) StateFields() []string {
 
 func (pr *portRange) beforeSave() {}
 
+// +checklocksignore
 func (pr *portRange) StateSave(stateSinkObject state.Sink) {
 	pr.beforeSave()
 	stateSinkObject.Save(0, &pr.DynamicBytesFile)
@@ -2019,6 +2156,7 @@ func (pr *portRange) StateSave(stateSinkObject state.Sink) {
 
 func (pr *portRange) afterLoad() {}
 
+// +checklocksignore
 func (pr *portRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &pr.DynamicBytesFile)
 	stateSourceObject.LoadWait(1, &pr.stack)
@@ -2039,6 +2177,7 @@ func (s *yamaPtraceScope) StateFields() []string {
 
 func (s *yamaPtraceScope) beforeSave() {}
 
+// +checklocksignore
 func (s *yamaPtraceScope) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.DynamicBytesFile)
@@ -2047,6 +2186,7 @@ func (s *yamaPtraceScope) StateSave(stateSinkObject state.Sink) {
 
 func (s *yamaPtraceScope) afterLoad() {}
 
+// +checklocksignore
 func (s *yamaPtraceScope) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.DynamicBytesFile)
 	stateSourceObject.Load(1, &s.level)
diff --git a/pkg/sentry/fsimpl/signalfd/signalfd_state_autogen.go b/pkg/sentry/fsimpl/signalfd/signalfd_state_autogen.go
index b3596a886..3bf27c6a6 100644
--- a/pkg/sentry/fsimpl/signalfd/signalfd_state_autogen.go
+++ b/pkg/sentry/fsimpl/signalfd/signalfd_state_autogen.go
@@ -23,6 +23,7 @@ func (sfd *SignalFileDescription) StateFields() []string {
 
 func (sfd *SignalFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (sfd *SignalFileDescription) StateSave(stateSinkObject state.Sink) {
 	sfd.beforeSave()
 	stateSinkObject.Save(0, &sfd.vfsfd)
@@ -35,6 +36,7 @@ func (sfd *SignalFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (sfd *SignalFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (sfd *SignalFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sfd.vfsfd)
 	stateSourceObject.Load(1, &sfd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/fsimpl/sockfs/sockfs_state_autogen.go b/pkg/sentry/fsimpl/sockfs/sockfs_state_autogen.go
index 6a6607555..cf6eddef2 100644
--- a/pkg/sentry/fsimpl/sockfs/sockfs_state_autogen.go
+++ b/pkg/sentry/fsimpl/sockfs/sockfs_state_autogen.go
@@ -16,12 +16,14 @@ func (fsType *filesystemType) StateFields() []string {
 
 func (fsType *filesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fsType *filesystemType) StateSave(stateSinkObject state.Sink) {
 	fsType.beforeSave()
 }
 
 func (fsType *filesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fsType *filesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -38,6 +40,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -46,6 +49,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -66,6 +70,7 @@ func (i *inode) StateFields() []string {
 
 func (i *inode) beforeSave() {}
 
+// +checklocksignore
 func (i *inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeAttrs)
@@ -76,6 +81,7 @@ func (i *inode) StateSave(stateSinkObject state.Sink) {
 
 func (i *inode) afterLoad() {}
 
+// +checklocksignore
 func (i *inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeAttrs)
 	stateSourceObject.Load(1, &i.InodeNoopRefCount)
diff --git a/pkg/sentry/fsimpl/sys/sys_state_autogen.go b/pkg/sentry/fsimpl/sys/sys_state_autogen.go
index 13cbe9a90..c5adf7db3 100644
--- a/pkg/sentry/fsimpl/sys/sys_state_autogen.go
+++ b/pkg/sentry/fsimpl/sys/sys_state_autogen.go
@@ -18,11 +18,13 @@ func (r *dirRefs) StateFields() []string {
 
 func (r *dirRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *dirRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *dirRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -44,6 +46,7 @@ func (i *kcovInode) StateFields() []string {
 
 func (i *kcovInode) beforeSave() {}
 
+// +checklocksignore
 func (i *kcovInode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeAttrs)
@@ -55,6 +58,7 @@ func (i *kcovInode) StateSave(stateSinkObject state.Sink) {
 
 func (i *kcovInode) afterLoad() {}
 
+// +checklocksignore
 func (i *kcovInode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeAttrs)
 	stateSourceObject.Load(1, &i.InodeNoopRefCount)
@@ -79,6 +83,7 @@ func (fd *kcovFD) StateFields() []string {
 
 func (fd *kcovFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *kcovFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.FileDescriptionDefaultImpl)
@@ -90,6 +95,7 @@ func (fd *kcovFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *kcovFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *kcovFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.FileDescriptionDefaultImpl)
 	stateSourceObject.Load(1, &fd.NoLockFD)
@@ -108,12 +114,14 @@ func (fsType *FilesystemType) StateFields() []string {
 
 func (fsType *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fsType *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fsType.beforeSave()
 }
 
 func (fsType *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fsType *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -130,6 +138,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.Filesystem)
@@ -138,6 +147,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.Filesystem)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -162,6 +172,7 @@ func (d *dir) StateFields() []string {
 
 func (d *dir) beforeSave() {}
 
+// +checklocksignore
 func (d *dir) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.dirRefs)
@@ -176,6 +187,7 @@ func (d *dir) StateSave(stateSinkObject state.Sink) {
 
 func (d *dir) afterLoad() {}
 
+// +checklocksignore
 func (d *dir) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.dirRefs)
 	stateSourceObject.Load(1, &d.InodeAlwaysValid)
@@ -201,6 +213,7 @@ func (c *cpuFile) StateFields() []string {
 
 func (c *cpuFile) beforeSave() {}
 
+// +checklocksignore
 func (c *cpuFile) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.implStatFS)
@@ -210,6 +223,7 @@ func (c *cpuFile) StateSave(stateSinkObject state.Sink) {
 
 func (c *cpuFile) afterLoad() {}
 
+// +checklocksignore
 func (c *cpuFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.implStatFS)
 	stateSourceObject.Load(1, &c.DynamicBytesFile)
@@ -226,12 +240,14 @@ func (i *implStatFS) StateFields() []string {
 
 func (i *implStatFS) beforeSave() {}
 
+// +checklocksignore
 func (i *implStatFS) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *implStatFS) afterLoad() {}
 
+// +checklocksignore
 func (i *implStatFS) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/fsimpl/timerfd/timerfd_state_autogen.go b/pkg/sentry/fsimpl/timerfd/timerfd_state_autogen.go
index d3c01e9e7..12970f25c 100644
--- a/pkg/sentry/fsimpl/timerfd/timerfd_state_autogen.go
+++ b/pkg/sentry/fsimpl/timerfd/timerfd_state_autogen.go
@@ -24,6 +24,7 @@ func (tfd *TimerFileDescription) StateFields() []string {
 
 func (tfd *TimerFileDescription) beforeSave() {}
 
+// +checklocksignore
 func (tfd *TimerFileDescription) StateSave(stateSinkObject state.Sink) {
 	tfd.beforeSave()
 	stateSinkObject.Save(0, &tfd.vfsfd)
@@ -37,6 +38,7 @@ func (tfd *TimerFileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (tfd *TimerFileDescription) afterLoad() {}
 
+// +checklocksignore
 func (tfd *TimerFileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tfd.vfsfd)
 	stateSourceObject.Load(1, &tfd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/fsimpl/tmpfs/tmpfs_state_autogen.go b/pkg/sentry/fsimpl/tmpfs/tmpfs_state_autogen.go
index bd0b0bf97..6d9f09eef 100644
--- a/pkg/sentry/fsimpl/tmpfs/tmpfs_state_autogen.go
+++ b/pkg/sentry/fsimpl/tmpfs/tmpfs_state_autogen.go
@@ -19,6 +19,7 @@ func (l *dentryList) StateFields() []string {
 
 func (l *dentryList) beforeSave() {}
 
+// +checklocksignore
 func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *dentryList) StateSave(stateSinkObject state.Sink) {
 
 func (l *dentryList) afterLoad() {}
 
+// +checklocksignore
 func (l *dentryList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *dentryEntry) StateFields() []string {
 
 func (e *dentryEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *dentryEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *dentryEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *dentryEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -73,6 +77,7 @@ func (d *deviceFile) StateFields() []string {
 
 func (d *deviceFile) beforeSave() {}
 
+// +checklocksignore
 func (d *deviceFile) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.inode)
@@ -83,6 +88,7 @@ func (d *deviceFile) StateSave(stateSinkObject state.Sink) {
 
 func (d *deviceFile) afterLoad() {}
 
+// +checklocksignore
 func (d *deviceFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.inode)
 	stateSourceObject.Load(1, &d.kind)
@@ -106,6 +112,7 @@ func (dir *directory) StateFields() []string {
 
 func (dir *directory) beforeSave() {}
 
+// +checklocksignore
 func (dir *directory) StateSave(stateSinkObject state.Sink) {
 	dir.beforeSave()
 	stateSinkObject.Save(0, &dir.dentry)
@@ -117,6 +124,7 @@ func (dir *directory) StateSave(stateSinkObject state.Sink) {
 
 func (dir *directory) afterLoad() {}
 
+// +checklocksignore
 func (dir *directory) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &dir.dentry)
 	stateSourceObject.Load(1, &dir.inode)
@@ -140,6 +148,7 @@ func (fd *directoryFD) StateFields() []string {
 
 func (fd *directoryFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -150,6 +159,7 @@ func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *directoryFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.DirectoryFileDescriptionDefaultImpl)
@@ -169,11 +179,13 @@ func (r *inodeRefs) StateFields() []string {
 
 func (r *inodeRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *inodeRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *inodeRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -192,6 +204,7 @@ func (n *namedPipe) StateFields() []string {
 
 func (n *namedPipe) beforeSave() {}
 
+// +checklocksignore
 func (n *namedPipe) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.inode)
@@ -200,6 +213,7 @@ func (n *namedPipe) StateSave(stateSinkObject state.Sink) {
 
 func (n *namedPipe) afterLoad() {}
 
+// +checklocksignore
 func (n *namedPipe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.inode)
 	stateSourceObject.Load(1, &n.pipe)
@@ -223,6 +237,7 @@ func (rf *regularFile) StateFields() []string {
 
 func (rf *regularFile) beforeSave() {}
 
+// +checklocksignore
 func (rf *regularFile) StateSave(stateSinkObject state.Sink) {
 	rf.beforeSave()
 	stateSinkObject.Save(0, &rf.inode)
@@ -234,6 +249,7 @@ func (rf *regularFile) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &rf.size)
 }
 
+// +checklocksignore
 func (rf *regularFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rf.inode)
 	stateSourceObject.Load(1, &rf.memoryUsageKind)
@@ -258,6 +274,7 @@ func (fd *regularFileFD) StateFields() []string {
 
 func (fd *regularFileFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -266,6 +283,7 @@ func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *regularFileFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.off)
@@ -284,6 +302,7 @@ func (s *socketFile) StateFields() []string {
 
 func (s *socketFile) beforeSave() {}
 
+// +checklocksignore
 func (s *socketFile) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.inode)
@@ -292,6 +311,7 @@ func (s *socketFile) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketFile) afterLoad() {}
 
+// +checklocksignore
 func (s *socketFile) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.inode)
 	stateSourceObject.Load(1, &s.ep)
@@ -310,6 +330,7 @@ func (s *symlink) StateFields() []string {
 
 func (s *symlink) beforeSave() {}
 
+// +checklocksignore
 func (s *symlink) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.inode)
@@ -318,6 +339,7 @@ func (s *symlink) StateSave(stateSinkObject state.Sink) {
 
 func (s *symlink) afterLoad() {}
 
+// +checklocksignore
 func (s *symlink) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.inode)
 	stateSourceObject.Load(1, &s.target)
@@ -333,12 +355,14 @@ func (fstype *FilesystemType) StateFields() []string {
 
 func (fstype *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fstype.beforeSave()
 }
 
 func (fstype *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -360,6 +384,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -373,6 +398,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.mfp)
@@ -397,6 +423,7 @@ func (f *FilesystemOpts) StateFields() []string {
 
 func (f *FilesystemOpts) beforeSave() {}
 
+// +checklocksignore
 func (f *FilesystemOpts) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.RootFileType)
@@ -406,6 +433,7 @@ func (f *FilesystemOpts) StateSave(stateSinkObject state.Sink) {
 
 func (f *FilesystemOpts) afterLoad() {}
 
+// +checklocksignore
 func (f *FilesystemOpts) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.RootFileType)
 	stateSourceObject.Load(1, &f.RootSymlinkTarget)
@@ -428,6 +456,7 @@ func (d *dentry) StateFields() []string {
 
 func (d *dentry) beforeSave() {}
 
+// +checklocksignore
 func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -439,6 +468,7 @@ func (d *dentry) StateSave(stateSinkObject state.Sink) {
 
 func (d *dentry) afterLoad() {}
 
+// +checklocksignore
 func (d *dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.parent)
@@ -472,6 +502,7 @@ func (i *inode) StateFields() []string {
 
 func (i *inode) beforeSave() {}
 
+// +checklocksignore
 func (i *inode) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.fs)
@@ -492,6 +523,7 @@ func (i *inode) StateSave(stateSinkObject state.Sink) {
 
 func (i *inode) afterLoad() {}
 
+// +checklocksignore
 func (i *inode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.fs)
 	stateSourceObject.Load(1, &i.refs)
@@ -523,6 +555,7 @@ func (fd *fileDescription) StateFields() []string {
 
 func (fd *fileDescription) beforeSave() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -532,6 +565,7 @@ func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (fd *fileDescription) afterLoad() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/inet/inet_state_autogen.go b/pkg/sentry/inet/inet_state_autogen.go
index 372a3d50a..30af4fb91 100644
--- a/pkg/sentry/inet/inet_state_autogen.go
+++ b/pkg/sentry/inet/inet_state_autogen.go
@@ -20,6 +20,7 @@ func (t *TCPBufferSize) StateFields() []string {
 
 func (t *TCPBufferSize) beforeSave() {}
 
+// +checklocksignore
 func (t *TCPBufferSize) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.Min)
@@ -29,6 +30,7 @@ func (t *TCPBufferSize) StateSave(stateSinkObject state.Sink) {
 
 func (t *TCPBufferSize) afterLoad() {}
 
+// +checklocksignore
 func (t *TCPBufferSize) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.Min)
 	stateSourceObject.Load(1, &t.Default)
@@ -48,12 +50,14 @@ func (n *Namespace) StateFields() []string {
 
 func (n *Namespace) beforeSave() {}
 
+// +checklocksignore
 func (n *Namespace) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.creator)
 	stateSinkObject.Save(1, &n.isRoot)
 }
 
+// +checklocksignore
 func (n *Namespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &n.creator)
 	stateSourceObject.Load(1, &n.isRoot)
diff --git a/pkg/sentry/kernel/auth/auth_state_autogen.go b/pkg/sentry/kernel/auth/auth_state_autogen.go
index b844c1fdc..5a7f55933 100644
--- a/pkg/sentry/kernel/auth/auth_state_autogen.go
+++ b/pkg/sentry/kernel/auth/auth_state_autogen.go
@@ -30,6 +30,7 @@ func (c *Credentials) StateFields() []string {
 
 func (c *Credentials) beforeSave() {}
 
+// +checklocksignore
 func (c *Credentials) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.RealKUID)
@@ -49,6 +50,7 @@ func (c *Credentials) StateSave(stateSinkObject state.Sink) {
 
 func (c *Credentials) afterLoad() {}
 
+// +checklocksignore
 func (c *Credentials) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.RealKUID)
 	stateSourceObject.Load(1, &c.EffectiveKUID)
@@ -79,6 +81,7 @@ func (i *IDMapEntry) StateFields() []string {
 
 func (i *IDMapEntry) beforeSave() {}
 
+// +checklocksignore
 func (i *IDMapEntry) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.FirstID)
@@ -88,6 +91,7 @@ func (i *IDMapEntry) StateSave(stateSinkObject state.Sink) {
 
 func (i *IDMapEntry) afterLoad() {}
 
+// +checklocksignore
 func (i *IDMapEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.FirstID)
 	stateSourceObject.Load(1, &i.FirstParentID)
@@ -107,6 +111,7 @@ func (r *idMapRange) StateFields() []string {
 
 func (r *idMapRange) beforeSave() {}
 
+// +checklocksignore
 func (r *idMapRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -115,6 +120,7 @@ func (r *idMapRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *idMapRange) afterLoad() {}
 
+// +checklocksignore
 func (r *idMapRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
@@ -132,6 +138,7 @@ func (s *idMapSet) StateFields() []string {
 
 func (s *idMapSet) beforeSave() {}
 
+// +checklocksignore
 func (s *idMapSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *idMapSegmentDataSlices = s.saveRoot()
@@ -140,6 +147,7 @@ func (s *idMapSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *idMapSet) afterLoad() {}
 
+// +checklocksignore
 func (s *idMapSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*idMapSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*idMapSegmentDataSlices)) })
 }
@@ -163,6 +171,7 @@ func (n *idMapnode) StateFields() []string {
 
 func (n *idMapnode) beforeSave() {}
 
+// +checklocksignore
 func (n *idMapnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -177,6 +186,7 @@ func (n *idMapnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *idMapnode) afterLoad() {}
 
+// +checklocksignore
 func (n *idMapnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -202,6 +212,7 @@ func (i *idMapSegmentDataSlices) StateFields() []string {
 
 func (i *idMapSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (i *idMapSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.Start)
@@ -211,6 +222,7 @@ func (i *idMapSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (i *idMapSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (i *idMapSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.Start)
 	stateSourceObject.Load(1, &i.End)
@@ -234,6 +246,7 @@ func (ns *UserNamespace) StateFields() []string {
 
 func (ns *UserNamespace) beforeSave() {}
 
+// +checklocksignore
 func (ns *UserNamespace) StateSave(stateSinkObject state.Sink) {
 	ns.beforeSave()
 	stateSinkObject.Save(0, &ns.parent)
@@ -246,6 +259,7 @@ func (ns *UserNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (ns *UserNamespace) afterLoad() {}
 
+// +checklocksignore
 func (ns *UserNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ns.parent)
 	stateSourceObject.Load(1, &ns.owner)
diff --git a/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go
index 7b4e62296..61f7e4ce9 100644
--- a/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go
+++ b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go
@@ -18,6 +18,7 @@ func (p *AtomicPtrCredentials) StateFields() []string {
 
 func (p *AtomicPtrCredentials) beforeSave() {}
 
+// +checklocksignore
 func (p *AtomicPtrCredentials) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var ptrValue *Credentials = p.savePtr()
@@ -26,6 +27,7 @@ func (p *AtomicPtrCredentials) StateSave(stateSinkObject state.Sink) {
 
 func (p *AtomicPtrCredentials) afterLoad() {}
 
+// +checklocksignore
 func (p *AtomicPtrCredentials) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*Credentials), func(y interface{}) { p.loadPtr(y.(*Credentials)) })
 }
diff --git a/pkg/sentry/kernel/epoll/epoll_state_autogen.go b/pkg/sentry/kernel/epoll/epoll_state_autogen.go
index ba00fe082..44bd520ac 100644
--- a/pkg/sentry/kernel/epoll/epoll_state_autogen.go
+++ b/pkg/sentry/kernel/epoll/epoll_state_autogen.go
@@ -19,6 +19,7 @@ func (f *FileIdentifier) StateFields() []string {
 
 func (f *FileIdentifier) beforeSave() {}
 
+// +checklocksignore
 func (f *FileIdentifier) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.File)
@@ -27,6 +28,7 @@ func (f *FileIdentifier) StateSave(stateSinkObject state.Sink) {
 
 func (f *FileIdentifier) afterLoad() {}
 
+// +checklocksignore
 func (f *FileIdentifier) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &f.File)
 	stateSourceObject.Load(1, &f.Fd)
@@ -49,6 +51,7 @@ func (p *pollEntry) StateFields() []string {
 
 func (p *pollEntry) beforeSave() {}
 
+// +checklocksignore
 func (p *pollEntry) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.pollEntryEntry)
@@ -59,6 +62,7 @@ func (p *pollEntry) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(5, &p.epoll)
 }
 
+// +checklocksignore
 func (p *pollEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.pollEntryEntry)
 	stateSourceObject.LoadWait(1, &p.id)
@@ -84,6 +88,7 @@ func (e *EventPoll) StateFields() []string {
 
 func (e *EventPoll) beforeSave() {}
 
+// +checklocksignore
 func (e *EventPoll) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	if !state.IsZeroValue(&e.FilePipeSeek) {
@@ -113,6 +118,7 @@ func (e *EventPoll) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(3, &e.disabledList)
 }
 
+// +checklocksignore
 func (e *EventPoll) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.files)
 	stateSourceObject.Load(1, &e.readyList)
@@ -134,6 +140,7 @@ func (l *pollEntryList) StateFields() []string {
 
 func (l *pollEntryList) beforeSave() {}
 
+// +checklocksignore
 func (l *pollEntryList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -142,6 +149,7 @@ func (l *pollEntryList) StateSave(stateSinkObject state.Sink) {
 
 func (l *pollEntryList) afterLoad() {}
 
+// +checklocksignore
 func (l *pollEntryList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -160,6 +168,7 @@ func (e *pollEntryEntry) StateFields() []string {
 
 func (e *pollEntryEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *pollEntryEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -168,6 +177,7 @@ func (e *pollEntryEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *pollEntryEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *pollEntryEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go b/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
index 336262eed..596920c42 100644
--- a/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
+++ b/pkg/sentry/kernel/eventfd/eventfd_state_autogen.go
@@ -20,6 +20,7 @@ func (e *EventOperations) StateFields() []string {
 
 func (e *EventOperations) beforeSave() {}
 
+// +checklocksignore
 func (e *EventOperations) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	if !state.IsZeroValue(&e.wq) {
@@ -32,6 +33,7 @@ func (e *EventOperations) StateSave(stateSinkObject state.Sink) {
 
 func (e *EventOperations) afterLoad() {}
 
+// +checklocksignore
 func (e *EventOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.val)
 	stateSourceObject.Load(1, &e.semMode)
diff --git a/pkg/sentry/kernel/fasync/fasync_state_autogen.go b/pkg/sentry/kernel/fasync/fasync_state_autogen.go
index 6ddebc7bb..8ec069b92 100644
--- a/pkg/sentry/kernel/fasync/fasync_state_autogen.go
+++ b/pkg/sentry/kernel/fasync/fasync_state_autogen.go
@@ -25,6 +25,7 @@ func (a *FileAsync) StateFields() []string {
 
 func (a *FileAsync) beforeSave() {}
 
+// +checklocksignore
 func (a *FileAsync) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.e)
@@ -39,6 +40,7 @@ func (a *FileAsync) StateSave(stateSinkObject state.Sink) {
 
 func (a *FileAsync) afterLoad() {}
 
+// +checklocksignore
 func (a *FileAsync) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.e)
 	stateSourceObject.Load(1, &a.fd)
diff --git a/pkg/sentry/kernel/futex/futex_state_autogen.go b/pkg/sentry/kernel/futex/futex_state_autogen.go
index f31e571f4..6e22b313a 100644
--- a/pkg/sentry/kernel/futex/futex_state_autogen.go
+++ b/pkg/sentry/kernel/futex/futex_state_autogen.go
@@ -16,6 +16,7 @@ func (b *bucket) StateFields() []string {
 
 func (b *bucket) beforeSave() {}
 
+// +checklocksignore
 func (b *bucket) StateSave(stateSinkObject state.Sink) {
 	b.beforeSave()
 	if !state.IsZeroValue(&b.waiters) {
@@ -25,6 +26,7 @@ func (b *bucket) StateSave(stateSinkObject state.Sink) {
 
 func (b *bucket) afterLoad() {}
 
+// +checklocksignore
 func (b *bucket) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -40,6 +42,7 @@ func (m *Manager) StateFields() []string {
 
 func (m *Manager) beforeSave() {}
 
+// +checklocksignore
 func (m *Manager) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	if !state.IsZeroValue(&m.privateBuckets) {
@@ -50,6 +53,7 @@ func (m *Manager) StateSave(stateSinkObject state.Sink) {
 
 func (m *Manager) afterLoad() {}
 
+// +checklocksignore
 func (m *Manager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.sharedBucket)
 }
@@ -67,6 +71,7 @@ func (l *waiterList) StateFields() []string {
 
 func (l *waiterList) beforeSave() {}
 
+// +checklocksignore
 func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -75,6 +80,7 @@ func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 
 func (l *waiterList) afterLoad() {}
 
+// +checklocksignore
 func (l *waiterList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -93,6 +99,7 @@ func (e *waiterEntry) StateFields() []string {
 
 func (e *waiterEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -101,6 +108,7 @@ func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *waiterEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go b/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go
index 19e23104f..84bb180fc 100644
--- a/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go
+++ b/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go
@@ -18,6 +18,7 @@ func (p *AtomicPtrBucket) StateFields() []string {
 
 func (p *AtomicPtrBucket) beforeSave() {}
 
+// +checklocksignore
 func (p *AtomicPtrBucket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var ptrValue *bucket = p.savePtr()
@@ -26,6 +27,7 @@ func (p *AtomicPtrBucket) StateSave(stateSinkObject state.Sink) {
 
 func (p *AtomicPtrBucket) afterLoad() {}
 
+// +checklocksignore
 func (p *AtomicPtrBucket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*bucket), func(y interface{}) { p.loadPtr(y.(*bucket)) })
 }
diff --git a/pkg/sentry/kernel/kernel_opts_state_autogen.go b/pkg/sentry/kernel/kernel_opts_state_autogen.go
index 7780c995f..73334db4c 100644
--- a/pkg/sentry/kernel/kernel_opts_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_opts_state_autogen.go
@@ -16,12 +16,14 @@ func (s *SpecialOpts) StateFields() []string {
 
 func (s *SpecialOpts) beforeSave() {}
 
+// +checklocksignore
 func (s *SpecialOpts) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
 func (s *SpecialOpts) afterLoad() {}
 
+// +checklocksignore
 func (s *SpecialOpts) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/kernel/kernel_state_autogen.go b/pkg/sentry/kernel/kernel_state_autogen.go
index 12b076fc6..bd531fe00 100644
--- a/pkg/sentry/kernel/kernel_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_state_autogen.go
@@ -24,6 +24,7 @@ func (a *abstractEndpoint) StateFields() []string {
 
 func (a *abstractEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (a *abstractEndpoint) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.ep)
@@ -34,6 +35,7 @@ func (a *abstractEndpoint) StateSave(stateSinkObject state.Sink) {
 
 func (a *abstractEndpoint) afterLoad() {}
 
+// +checklocksignore
 func (a *abstractEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.ep)
 	stateSourceObject.Load(1, &a.socket)
@@ -53,6 +55,7 @@ func (a *AbstractSocketNamespace) StateFields() []string {
 
 func (a *AbstractSocketNamespace) beforeSave() {}
 
+// +checklocksignore
 func (a *AbstractSocketNamespace) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.endpoints)
@@ -60,6 +63,7 @@ func (a *AbstractSocketNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (a *AbstractSocketNamespace) afterLoad() {}
 
+// +checklocksignore
 func (a *AbstractSocketNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.endpoints)
 }
@@ -76,6 +80,7 @@ func (f *FDFlags) StateFields() []string {
 
 func (f *FDFlags) beforeSave() {}
 
+// +checklocksignore
 func (f *FDFlags) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.CloseOnExec)
@@ -83,6 +88,7 @@ func (f *FDFlags) StateSave(stateSinkObject state.Sink) {
 
 func (f *FDFlags) afterLoad() {}
 
+// +checklocksignore
 func (f *FDFlags) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.CloseOnExec)
 }
@@ -101,6 +107,7 @@ func (d *descriptor) StateFields() []string {
 
 func (d *descriptor) beforeSave() {}
 
+// +checklocksignore
 func (d *descriptor) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.file)
@@ -110,6 +117,7 @@ func (d *descriptor) StateSave(stateSinkObject state.Sink) {
 
 func (d *descriptor) afterLoad() {}
 
+// +checklocksignore
 func (d *descriptor) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.file)
 	stateSourceObject.Load(1, &d.fileVFS2)
@@ -132,6 +140,7 @@ func (f *FDTable) StateFields() []string {
 
 func (f *FDTable) beforeSave() {}
 
+// +checklocksignore
 func (f *FDTable) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	var descriptorTableValue map[int32]descriptor = f.saveDescriptorTable()
@@ -144,6 +153,7 @@ func (f *FDTable) StateSave(stateSinkObject state.Sink) {
 
 func (f *FDTable) afterLoad() {}
 
+// +checklocksignore
 func (f *FDTable) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.FDTableRefs)
 	stateSourceObject.Load(1, &f.k)
@@ -164,11 +174,13 @@ func (r *FDTableRefs) StateFields() []string {
 
 func (r *FDTableRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *FDTableRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *FDTableRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -191,6 +203,7 @@ func (f *FSContext) StateFields() []string {
 
 func (f *FSContext) beforeSave() {}
 
+// +checklocksignore
 func (f *FSContext) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.FSContextRefs)
@@ -203,6 +216,7 @@ func (f *FSContext) StateSave(stateSinkObject state.Sink) {
 
 func (f *FSContext) afterLoad() {}
 
+// +checklocksignore
 func (f *FSContext) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.FSContextRefs)
 	stateSourceObject.Load(1, &f.root)
@@ -224,11 +238,13 @@ func (r *FSContextRefs) StateFields() []string {
 
 func (r *FSContextRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *FSContextRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *FSContextRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -249,6 +265,7 @@ func (i *IPCNamespace) StateFields() []string {
 
 func (i *IPCNamespace) beforeSave() {}
 
+// +checklocksignore
 func (i *IPCNamespace) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.IPCNamespaceRefs)
@@ -259,6 +276,7 @@ func (i *IPCNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (i *IPCNamespace) afterLoad() {}
 
+// +checklocksignore
 func (i *IPCNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.IPCNamespaceRefs)
 	stateSourceObject.Load(1, &i.userNS)
@@ -278,11 +296,13 @@ func (r *IPCNamespaceRefs) StateFields() []string {
 
 func (r *IPCNamespaceRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *IPCNamespaceRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *IPCNamespaceRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -338,6 +358,7 @@ func (k *Kernel) StateFields() []string {
 
 func (k *Kernel) beforeSave() {}
 
+// +checklocksignore
 func (k *Kernel) StateSave(stateSinkObject state.Sink) {
 	k.beforeSave()
 	var danglingEndpointsValue []tcpip.Endpoint = k.saveDanglingEndpoints()
@@ -385,6 +406,7 @@ func (k *Kernel) StateSave(stateSinkObject state.Sink) {
 
 func (k *Kernel) afterLoad() {}
 
+// +checklocksignore
 func (k *Kernel) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &k.featureSet)
 	stateSourceObject.Load(1, &k.timekeeper)
@@ -442,6 +464,7 @@ func (s *SocketRecord) StateFields() []string {
 
 func (s *SocketRecord) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketRecord) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.k)
@@ -452,6 +475,7 @@ func (s *SocketRecord) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketRecord) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketRecord) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.k)
 	stateSourceObject.Load(1, &s.Sock)
@@ -472,6 +496,7 @@ func (s *SocketRecordVFS1) StateFields() []string {
 
 func (s *SocketRecordVFS1) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketRecordVFS1) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.socketEntry)
@@ -480,6 +505,7 @@ func (s *SocketRecordVFS1) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketRecordVFS1) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketRecordVFS1) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.socketEntry)
 	stateSourceObject.Load(1, &s.SocketRecord)
@@ -497,6 +523,7 @@ func (p *pendingSignals) StateFields() []string {
 
 func (p *pendingSignals) beforeSave() {}
 
+// +checklocksignore
 func (p *pendingSignals) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var signalsValue []savedPendingSignal = p.saveSignals()
@@ -505,6 +532,7 @@ func (p *pendingSignals) StateSave(stateSinkObject state.Sink) {
 
 func (p *pendingSignals) afterLoad() {}
 
+// +checklocksignore
 func (p *pendingSignals) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new([]savedPendingSignal), func(y interface{}) { p.loadSignals(y.([]savedPendingSignal)) })
 }
@@ -522,6 +550,7 @@ func (p *pendingSignalQueue) StateFields() []string {
 
 func (p *pendingSignalQueue) beforeSave() {}
 
+// +checklocksignore
 func (p *pendingSignalQueue) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.pendingSignalList)
@@ -530,6 +559,7 @@ func (p *pendingSignalQueue) StateSave(stateSinkObject state.Sink) {
 
 func (p *pendingSignalQueue) afterLoad() {}
 
+// +checklocksignore
 func (p *pendingSignalQueue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.pendingSignalList)
 	stateSourceObject.Load(1, &p.length)
@@ -549,6 +579,7 @@ func (p *pendingSignal) StateFields() []string {
 
 func (p *pendingSignal) beforeSave() {}
 
+// +checklocksignore
 func (p *pendingSignal) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.pendingSignalEntry)
@@ -558,6 +589,7 @@ func (p *pendingSignal) StateSave(stateSinkObject state.Sink) {
 
 func (p *pendingSignal) afterLoad() {}
 
+// +checklocksignore
 func (p *pendingSignal) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.pendingSignalEntry)
 	stateSourceObject.Load(1, &p.SignalInfo)
@@ -577,6 +609,7 @@ func (l *pendingSignalList) StateFields() []string {
 
 func (l *pendingSignalList) beforeSave() {}
 
+// +checklocksignore
 func (l *pendingSignalList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -585,6 +618,7 @@ func (l *pendingSignalList) StateSave(stateSinkObject state.Sink) {
 
 func (l *pendingSignalList) afterLoad() {}
 
+// +checklocksignore
 func (l *pendingSignalList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -603,6 +637,7 @@ func (e *pendingSignalEntry) StateFields() []string {
 
 func (e *pendingSignalEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *pendingSignalEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -611,6 +646,7 @@ func (e *pendingSignalEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *pendingSignalEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *pendingSignalEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -629,6 +665,7 @@ func (s *savedPendingSignal) StateFields() []string {
 
 func (s *savedPendingSignal) beforeSave() {}
 
+// +checklocksignore
 func (s *savedPendingSignal) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.si)
@@ -637,6 +674,7 @@ func (s *savedPendingSignal) StateSave(stateSinkObject state.Sink) {
 
 func (s *savedPendingSignal) afterLoad() {}
 
+// +checklocksignore
 func (s *savedPendingSignal) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.si)
 	stateSourceObject.Load(1, &s.timer)
@@ -663,6 +701,7 @@ func (it *IntervalTimer) StateFields() []string {
 
 func (it *IntervalTimer) beforeSave() {}
 
+// +checklocksignore
 func (it *IntervalTimer) StateSave(stateSinkObject state.Sink) {
 	it.beforeSave()
 	stateSinkObject.Save(0, &it.timer)
@@ -679,6 +718,7 @@ func (it *IntervalTimer) StateSave(stateSinkObject state.Sink) {
 
 func (it *IntervalTimer) afterLoad() {}
 
+// +checklocksignore
 func (it *IntervalTimer) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &it.timer)
 	stateSourceObject.Load(1, &it.target)
@@ -705,6 +745,7 @@ func (l *processGroupList) StateFields() []string {
 
 func (l *processGroupList) beforeSave() {}
 
+// +checklocksignore
 func (l *processGroupList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -713,6 +754,7 @@ func (l *processGroupList) StateSave(stateSinkObject state.Sink) {
 
 func (l *processGroupList) afterLoad() {}
 
+// +checklocksignore
 func (l *processGroupList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -731,6 +773,7 @@ func (e *processGroupEntry) StateFields() []string {
 
 func (e *processGroupEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *processGroupEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -739,6 +782,7 @@ func (e *processGroupEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *processGroupEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *processGroupEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -756,11 +800,13 @@ func (r *ProcessGroupRefs) StateFields() []string {
 
 func (r *ProcessGroupRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *ProcessGroupRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *ProcessGroupRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -786,6 +832,7 @@ func (p *ptraceOptions) StateFields() []string {
 
 func (p *ptraceOptions) beforeSave() {}
 
+// +checklocksignore
 func (p *ptraceOptions) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.ExitKill)
@@ -801,6 +848,7 @@ func (p *ptraceOptions) StateSave(stateSinkObject state.Sink) {
 
 func (p *ptraceOptions) afterLoad() {}
 
+// +checklocksignore
 func (p *ptraceOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.ExitKill)
 	stateSourceObject.Load(1, &p.SysGood)
@@ -826,6 +874,7 @@ func (s *ptraceStop) StateFields() []string {
 
 func (s *ptraceStop) beforeSave() {}
 
+// +checklocksignore
 func (s *ptraceStop) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.frozen)
@@ -834,6 +883,7 @@ func (s *ptraceStop) StateSave(stateSinkObject state.Sink) {
 
 func (s *ptraceStop) afterLoad() {}
 
+// +checklocksignore
 func (s *ptraceStop) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.frozen)
 	stateSourceObject.Load(1, &s.listen)
@@ -852,6 +902,7 @@ func (o *OldRSeqCriticalRegion) StateFields() []string {
 
 func (o *OldRSeqCriticalRegion) beforeSave() {}
 
+// +checklocksignore
 func (o *OldRSeqCriticalRegion) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.CriticalSection)
@@ -860,6 +911,7 @@ func (o *OldRSeqCriticalRegion) StateSave(stateSinkObject state.Sink) {
 
 func (o *OldRSeqCriticalRegion) afterLoad() {}
 
+// +checklocksignore
 func (o *OldRSeqCriticalRegion) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.CriticalSection)
 	stateSourceObject.Load(1, &o.Restart)
@@ -878,6 +930,7 @@ func (l *sessionList) StateFields() []string {
 
 func (l *sessionList) beforeSave() {}
 
+// +checklocksignore
 func (l *sessionList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -886,6 +939,7 @@ func (l *sessionList) StateSave(stateSinkObject state.Sink) {
 
 func (l *sessionList) afterLoad() {}
 
+// +checklocksignore
 func (l *sessionList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -904,6 +958,7 @@ func (e *sessionEntry) StateFields() []string {
 
 func (e *sessionEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *sessionEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -912,6 +967,7 @@ func (e *sessionEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *sessionEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *sessionEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -929,11 +985,13 @@ func (r *SessionRefs) StateFields() []string {
 
 func (r *SessionRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *SessionRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *SessionRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -956,6 +1014,7 @@ func (s *Session) StateFields() []string {
 
 func (s *Session) beforeSave() {}
 
+// +checklocksignore
 func (s *Session) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SessionRefs)
@@ -968,6 +1027,7 @@ func (s *Session) StateSave(stateSinkObject state.Sink) {
 
 func (s *Session) afterLoad() {}
 
+// +checklocksignore
 func (s *Session) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SessionRefs)
 	stateSourceObject.Load(1, &s.leader)
@@ -994,6 +1054,7 @@ func (pg *ProcessGroup) StateFields() []string {
 
 func (pg *ProcessGroup) beforeSave() {}
 
+// +checklocksignore
 func (pg *ProcessGroup) StateSave(stateSinkObject state.Sink) {
 	pg.beforeSave()
 	stateSinkObject.Save(0, &pg.refs)
@@ -1006,6 +1067,7 @@ func (pg *ProcessGroup) StateSave(stateSinkObject state.Sink) {
 
 func (pg *ProcessGroup) afterLoad() {}
 
+// +checklocksignore
 func (pg *ProcessGroup) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &pg.refs)
 	stateSourceObject.Load(1, &pg.originator)
@@ -1027,6 +1089,7 @@ func (sh *SignalHandlers) StateFields() []string {
 
 func (sh *SignalHandlers) beforeSave() {}
 
+// +checklocksignore
 func (sh *SignalHandlers) StateSave(stateSinkObject state.Sink) {
 	sh.beforeSave()
 	stateSinkObject.Save(0, &sh.actions)
@@ -1034,6 +1097,7 @@ func (sh *SignalHandlers) StateSave(stateSinkObject state.Sink) {
 
 func (sh *SignalHandlers) afterLoad() {}
 
+// +checklocksignore
 func (sh *SignalHandlers) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sh.actions)
 }
@@ -1051,6 +1115,7 @@ func (l *socketList) StateFields() []string {
 
 func (l *socketList) beforeSave() {}
 
+// +checklocksignore
 func (l *socketList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -1059,6 +1124,7 @@ func (l *socketList) StateSave(stateSinkObject state.Sink) {
 
 func (l *socketList) afterLoad() {}
 
+// +checklocksignore
 func (l *socketList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -1077,6 +1143,7 @@ func (e *socketEntry) StateFields() []string {
 
 func (e *socketEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *socketEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -1085,6 +1152,7 @@ func (e *socketEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *socketEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *socketEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -1103,6 +1171,7 @@ func (s *syscallTableInfo) StateFields() []string {
 
 func (s *syscallTableInfo) beforeSave() {}
 
+// +checklocksignore
 func (s *syscallTableInfo) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.OS)
@@ -1111,6 +1180,7 @@ func (s *syscallTableInfo) StateSave(stateSinkObject state.Sink) {
 
 func (s *syscallTableInfo) afterLoad() {}
 
+// +checklocksignore
 func (s *syscallTableInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.OS)
 	stateSourceObject.Load(1, &s.Arch)
@@ -1128,6 +1198,7 @@ func (s *syslog) StateFields() []string {
 
 func (s *syslog) beforeSave() {}
 
+// +checklocksignore
 func (s *syslog) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.msg)
@@ -1135,6 +1206,7 @@ func (s *syslog) StateSave(stateSinkObject state.Sink) {
 
 func (s *syslog) afterLoad() {}
 
+// +checklocksignore
 func (s *syslog) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.msg)
 }
@@ -1213,6 +1285,7 @@ func (t *Task) StateFields() []string {
 
 func (t *Task) beforeSave() {}
 
+// +checklocksignore
 func (t *Task) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	if !state.IsZeroValue(&t.signalQueue) {
@@ -1285,6 +1358,7 @@ func (t *Task) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(62, &t.kcov)
 }
 
+// +checklocksignore
 func (t *Task) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.taskNode)
 	stateSourceObject.Load(1, &t.runState)
@@ -1365,6 +1439,7 @@ func (r *runSyscallAfterPtraceEventClone) StateFields() []string {
 
 func (r *runSyscallAfterPtraceEventClone) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallAfterPtraceEventClone) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.vforkChild)
@@ -1373,6 +1448,7 @@ func (r *runSyscallAfterPtraceEventClone) StateSave(stateSinkObject state.Sink)
 
 func (r *runSyscallAfterPtraceEventClone) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallAfterPtraceEventClone) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.vforkChild)
 	stateSourceObject.Load(1, &r.vforkChildTID)
@@ -1390,6 +1466,7 @@ func (r *runSyscallAfterVforkStop) StateFields() []string {
 
 func (r *runSyscallAfterVforkStop) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallAfterVforkStop) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.childTID)
@@ -1397,6 +1474,7 @@ func (r *runSyscallAfterVforkStop) StateSave(stateSinkObject state.Sink) {
 
 func (r *runSyscallAfterVforkStop) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallAfterVforkStop) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.childTID)
 }
@@ -1411,12 +1489,14 @@ func (v *vforkStop) StateFields() []string {
 
 func (v *vforkStop) beforeSave() {}
 
+// +checklocksignore
 func (v *vforkStop) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 }
 
 func (v *vforkStop) afterLoad() {}
 
+// +checklocksignore
 func (v *vforkStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1430,12 +1510,14 @@ func (e *execStop) StateFields() []string {
 
 func (e *execStop) beforeSave() {}
 
+// +checklocksignore
 func (e *execStop) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *execStop) afterLoad() {}
 
+// +checklocksignore
 func (e *execStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1451,6 +1533,7 @@ func (r *runSyscallAfterExecStop) StateFields() []string {
 
 func (r *runSyscallAfterExecStop) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallAfterExecStop) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.image)
@@ -1458,6 +1541,7 @@ func (r *runSyscallAfterExecStop) StateSave(stateSinkObject state.Sink) {
 
 func (r *runSyscallAfterExecStop) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallAfterExecStop) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.image)
 }
@@ -1475,6 +1559,7 @@ func (es *ExitStatus) StateFields() []string {
 
 func (es *ExitStatus) beforeSave() {}
 
+// +checklocksignore
 func (es *ExitStatus) StateSave(stateSinkObject state.Sink) {
 	es.beforeSave()
 	stateSinkObject.Save(0, &es.Code)
@@ -1483,6 +1568,7 @@ func (es *ExitStatus) StateSave(stateSinkObject state.Sink) {
 
 func (es *ExitStatus) afterLoad() {}
 
+// +checklocksignore
 func (es *ExitStatus) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &es.Code)
 	stateSourceObject.Load(1, &es.Signo)
@@ -1498,12 +1584,14 @@ func (r *runExit) StateFields() []string {
 
 func (r *runExit) beforeSave() {}
 
+// +checklocksignore
 func (r *runExit) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runExit) afterLoad() {}
 
+// +checklocksignore
 func (r *runExit) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1517,12 +1605,14 @@ func (r *runExitMain) StateFields() []string {
 
 func (r *runExitMain) beforeSave() {}
 
+// +checklocksignore
 func (r *runExitMain) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runExitMain) afterLoad() {}
 
+// +checklocksignore
 func (r *runExitMain) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1536,12 +1626,14 @@ func (r *runExitNotify) StateFields() []string {
 
 func (r *runExitNotify) beforeSave() {}
 
+// +checklocksignore
 func (r *runExitNotify) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runExitNotify) afterLoad() {}
 
+// +checklocksignore
 func (r *runExitNotify) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1561,6 +1653,7 @@ func (image *TaskImage) StateFields() []string {
 
 func (image *TaskImage) beforeSave() {}
 
+// +checklocksignore
 func (image *TaskImage) StateSave(stateSinkObject state.Sink) {
 	image.beforeSave()
 	var stValue syscallTableInfo = image.saveSt()
@@ -1573,6 +1666,7 @@ func (image *TaskImage) StateSave(stateSinkObject state.Sink) {
 
 func (image *TaskImage) afterLoad() {}
 
+// +checklocksignore
 func (image *TaskImage) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &image.Name)
 	stateSourceObject.Load(1, &image.Arch)
@@ -1594,6 +1688,7 @@ func (l *taskList) StateFields() []string {
 
 func (l *taskList) beforeSave() {}
 
+// +checklocksignore
 func (l *taskList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -1602,6 +1697,7 @@ func (l *taskList) StateSave(stateSinkObject state.Sink) {
 
 func (l *taskList) afterLoad() {}
 
+// +checklocksignore
 func (l *taskList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -1620,6 +1716,7 @@ func (e *taskEntry) StateFields() []string {
 
 func (e *taskEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *taskEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -1628,6 +1725,7 @@ func (e *taskEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *taskEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *taskEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -1643,12 +1741,14 @@ func (app *runApp) StateFields() []string {
 
 func (app *runApp) beforeSave() {}
 
+// +checklocksignore
 func (app *runApp) StateSave(stateSinkObject state.Sink) {
 	app.beforeSave()
 }
 
 func (app *runApp) afterLoad() {}
 
+// +checklocksignore
 func (app *runApp) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1667,6 +1767,7 @@ func (ts *TaskGoroutineSchedInfo) StateFields() []string {
 
 func (ts *TaskGoroutineSchedInfo) beforeSave() {}
 
+// +checklocksignore
 func (ts *TaskGoroutineSchedInfo) StateSave(stateSinkObject state.Sink) {
 	ts.beforeSave()
 	stateSinkObject.Save(0, &ts.Timestamp)
@@ -1677,6 +1778,7 @@ func (ts *TaskGoroutineSchedInfo) StateSave(stateSinkObject state.Sink) {
 
 func (ts *TaskGoroutineSchedInfo) afterLoad() {}
 
+// +checklocksignore
 func (ts *TaskGoroutineSchedInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ts.Timestamp)
 	stateSourceObject.Load(1, &ts.State)
@@ -1697,6 +1799,7 @@ func (tc *taskClock) StateFields() []string {
 
 func (tc *taskClock) beforeSave() {}
 
+// +checklocksignore
 func (tc *taskClock) StateSave(stateSinkObject state.Sink) {
 	tc.beforeSave()
 	stateSinkObject.Save(0, &tc.t)
@@ -1705,6 +1808,7 @@ func (tc *taskClock) StateSave(stateSinkObject state.Sink) {
 
 func (tc *taskClock) afterLoad() {}
 
+// +checklocksignore
 func (tc *taskClock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tc.t)
 	stateSourceObject.Load(1, &tc.includeSys)
@@ -1723,6 +1827,7 @@ func (tgc *tgClock) StateFields() []string {
 
 func (tgc *tgClock) beforeSave() {}
 
+// +checklocksignore
 func (tgc *tgClock) StateSave(stateSinkObject state.Sink) {
 	tgc.beforeSave()
 	stateSinkObject.Save(0, &tgc.tg)
@@ -1731,6 +1836,7 @@ func (tgc *tgClock) StateSave(stateSinkObject state.Sink) {
 
 func (tgc *tgClock) afterLoad() {}
 
+// +checklocksignore
 func (tgc *tgClock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tgc.tg)
 	stateSourceObject.Load(1, &tgc.includeSys)
@@ -1746,12 +1852,14 @@ func (g *groupStop) StateFields() []string {
 
 func (g *groupStop) beforeSave() {}
 
+// +checklocksignore
 func (g *groupStop) StateSave(stateSinkObject state.Sink) {
 	g.beforeSave()
 }
 
 func (g *groupStop) afterLoad() {}
 
+// +checklocksignore
 func (g *groupStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1765,12 +1873,14 @@ func (r *runInterrupt) StateFields() []string {
 
 func (r *runInterrupt) beforeSave() {}
 
+// +checklocksignore
 func (r *runInterrupt) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runInterrupt) afterLoad() {}
 
+// +checklocksignore
 func (r *runInterrupt) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1784,12 +1894,14 @@ func (r *runInterruptAfterSignalDeliveryStop) StateFields() []string {
 
 func (r *runInterruptAfterSignalDeliveryStop) beforeSave() {}
 
+// +checklocksignore
 func (r *runInterruptAfterSignalDeliveryStop) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runInterruptAfterSignalDeliveryStop) afterLoad() {}
 
+// +checklocksignore
 func (r *runInterruptAfterSignalDeliveryStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1803,12 +1915,14 @@ func (r *runSyscallAfterSyscallEnterStop) StateFields() []string {
 
 func (r *runSyscallAfterSyscallEnterStop) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallAfterSyscallEnterStop) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runSyscallAfterSyscallEnterStop) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallAfterSyscallEnterStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1822,12 +1936,14 @@ func (r *runSyscallAfterSysemuStop) StateFields() []string {
 
 func (r *runSyscallAfterSysemuStop) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallAfterSysemuStop) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runSyscallAfterSysemuStop) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallAfterSysemuStop) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1841,12 +1957,14 @@ func (r *runSyscallReinvoke) StateFields() []string {
 
 func (r *runSyscallReinvoke) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallReinvoke) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runSyscallReinvoke) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallReinvoke) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1860,12 +1978,14 @@ func (r *runSyscallExit) StateFields() []string {
 
 func (r *runSyscallExit) beforeSave() {}
 
+// +checklocksignore
 func (r *runSyscallExit) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *runSyscallExit) afterLoad() {}
 
+// +checklocksignore
 func (r *runSyscallExit) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1913,6 +2033,7 @@ func (tg *ThreadGroup) StateFields() []string {
 
 func (tg *ThreadGroup) beforeSave() {}
 
+// +checklocksignore
 func (tg *ThreadGroup) StateSave(stateSinkObject state.Sink) {
 	tg.beforeSave()
 	var oldRSeqCriticalValue *OldRSeqCriticalRegion = tg.saveOldRSeqCritical()
@@ -1953,6 +2074,7 @@ func (tg *ThreadGroup) StateSave(stateSinkObject state.Sink) {
 
 func (tg *ThreadGroup) afterLoad() {}
 
+// +checklocksignore
 func (tg *ThreadGroup) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tg.threadGroupNode)
 	stateSourceObject.Load(1, &tg.signalHandlers)
@@ -2001,6 +2123,7 @@ func (l *itimerRealListener) StateFields() []string {
 
 func (l *itimerRealListener) beforeSave() {}
 
+// +checklocksignore
 func (l *itimerRealListener) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.tg)
@@ -2008,6 +2131,7 @@ func (l *itimerRealListener) StateSave(stateSinkObject state.Sink) {
 
 func (l *itimerRealListener) afterLoad() {}
 
+// +checklocksignore
 func (l *itimerRealListener) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.tg)
 }
@@ -2025,6 +2149,7 @@ func (ts *TaskSet) StateFields() []string {
 
 func (ts *TaskSet) beforeSave() {}
 
+// +checklocksignore
 func (ts *TaskSet) StateSave(stateSinkObject state.Sink) {
 	ts.beforeSave()
 	stateSinkObject.Save(0, &ts.Root)
@@ -2033,6 +2158,7 @@ func (ts *TaskSet) StateSave(stateSinkObject state.Sink) {
 
 func (ts *TaskSet) afterLoad() {}
 
+// +checklocksignore
 func (ts *TaskSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ts.Root)
 	stateSourceObject.Load(1, &ts.sessions)
@@ -2061,6 +2187,7 @@ func (ns *PIDNamespace) StateFields() []string {
 
 func (ns *PIDNamespace) beforeSave() {}
 
+// +checklocksignore
 func (ns *PIDNamespace) StateSave(stateSinkObject state.Sink) {
 	ns.beforeSave()
 	stateSinkObject.Save(0, &ns.owner)
@@ -2079,6 +2206,7 @@ func (ns *PIDNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (ns *PIDNamespace) afterLoad() {}
 
+// +checklocksignore
 func (ns *PIDNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ns.owner)
 	stateSourceObject.Load(1, &ns.parent)
@@ -2112,6 +2240,7 @@ func (t *threadGroupNode) StateFields() []string {
 
 func (t *threadGroupNode) beforeSave() {}
 
+// +checklocksignore
 func (t *threadGroupNode) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.pidns)
@@ -2125,6 +2254,7 @@ func (t *threadGroupNode) StateSave(stateSinkObject state.Sink) {
 
 func (t *threadGroupNode) afterLoad() {}
 
+// +checklocksignore
 func (t *threadGroupNode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.pidns)
 	stateSourceObject.Load(1, &t.leader)
@@ -2151,6 +2281,7 @@ func (t *taskNode) StateFields() []string {
 
 func (t *taskNode) beforeSave() {}
 
+// +checklocksignore
 func (t *taskNode) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.tg)
@@ -2162,6 +2293,7 @@ func (t *taskNode) StateSave(stateSinkObject state.Sink) {
 
 func (t *taskNode) afterLoad() {}
 
+// +checklocksignore
 func (t *taskNode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &t.tg)
 	stateSourceObject.Load(1, &t.taskEntry)
@@ -2183,6 +2315,7 @@ func (t *Timekeeper) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (t *Timekeeper) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.bootTime)
@@ -2191,6 +2324,7 @@ func (t *Timekeeper) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(3, &t.params)
 }
 
+// +checklocksignore
 func (t *Timekeeper) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.bootTime)
 	stateSourceObject.Load(1, &t.saveMonotonic)
@@ -2212,6 +2346,7 @@ func (tc *timekeeperClock) StateFields() []string {
 
 func (tc *timekeeperClock) beforeSave() {}
 
+// +checklocksignore
 func (tc *timekeeperClock) StateSave(stateSinkObject state.Sink) {
 	tc.beforeSave()
 	stateSinkObject.Save(0, &tc.tk)
@@ -2220,6 +2355,7 @@ func (tc *timekeeperClock) StateSave(stateSinkObject state.Sink) {
 
 func (tc *timekeeperClock) afterLoad() {}
 
+// +checklocksignore
 func (tc *timekeeperClock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &tc.tk)
 	stateSourceObject.Load(1, &tc.c)
@@ -2238,6 +2374,7 @@ func (t *TTY) StateFields() []string {
 
 func (t *TTY) beforeSave() {}
 
+// +checklocksignore
 func (t *TTY) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.Index)
@@ -2246,6 +2383,7 @@ func (t *TTY) StateSave(stateSinkObject state.Sink) {
 
 func (t *TTY) afterLoad() {}
 
+// +checklocksignore
 func (t *TTY) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.Index)
 	stateSourceObject.Load(1, &t.tg)
@@ -2265,6 +2403,7 @@ func (u *UTSNamespace) StateFields() []string {
 
 func (u *UTSNamespace) beforeSave() {}
 
+// +checklocksignore
 func (u *UTSNamespace) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.hostName)
@@ -2274,6 +2413,7 @@ func (u *UTSNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (u *UTSNamespace) afterLoad() {}
 
+// +checklocksignore
 func (u *UTSNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.hostName)
 	stateSourceObject.Load(1, &u.domainName)
@@ -2295,6 +2435,7 @@ func (v *VDSOParamPage) StateFields() []string {
 
 func (v *VDSOParamPage) beforeSave() {}
 
+// +checklocksignore
 func (v *VDSOParamPage) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 	stateSinkObject.Save(0, &v.mfp)
@@ -2305,6 +2446,7 @@ func (v *VDSOParamPage) StateSave(stateSinkObject state.Sink) {
 
 func (v *VDSOParamPage) afterLoad() {}
 
+// +checklocksignore
 func (v *VDSOParamPage) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &v.mfp)
 	stateSourceObject.Load(1, &v.fr)
diff --git a/pkg/sentry/kernel/pipe/pipe_state_autogen.go b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
index 9cee1f13a..57451e951 100644
--- a/pkg/sentry/kernel/pipe/pipe_state_autogen.go
+++ b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
@@ -19,6 +19,7 @@ func (i *inodeOperations) StateFields() []string {
 
 func (i *inodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeSimpleAttributes)
@@ -27,6 +28,7 @@ func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (i *inodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &i.p)
@@ -51,6 +53,7 @@ func (p *Pipe) StateFields() []string {
 
 func (p *Pipe) beforeSave() {}
 
+// +checklocksignore
 func (p *Pipe) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.isNamed)
@@ -63,6 +66,7 @@ func (p *Pipe) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(7, &p.hadWriter)
 }
 
+// +checklocksignore
 func (p *Pipe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.isNamed)
 	stateSourceObject.Load(1, &p.readers)
@@ -87,6 +91,7 @@ func (r *Reader) StateFields() []string {
 
 func (r *Reader) beforeSave() {}
 
+// +checklocksignore
 func (r *Reader) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.ReaderWriter)
@@ -94,6 +99,7 @@ func (r *Reader) StateSave(stateSinkObject state.Sink) {
 
 func (r *Reader) afterLoad() {}
 
+// +checklocksignore
 func (r *Reader) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.ReaderWriter)
 }
@@ -110,6 +116,7 @@ func (rw *ReaderWriter) StateFields() []string {
 
 func (rw *ReaderWriter) beforeSave() {}
 
+// +checklocksignore
 func (rw *ReaderWriter) StateSave(stateSinkObject state.Sink) {
 	rw.beforeSave()
 	stateSinkObject.Save(0, &rw.Pipe)
@@ -117,6 +124,7 @@ func (rw *ReaderWriter) StateSave(stateSinkObject state.Sink) {
 
 func (rw *ReaderWriter) afterLoad() {}
 
+// +checklocksignore
 func (rw *ReaderWriter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rw.Pipe)
 }
@@ -133,6 +141,7 @@ func (vp *VFSPipe) StateFields() []string {
 
 func (vp *VFSPipe) beforeSave() {}
 
+// +checklocksignore
 func (vp *VFSPipe) StateSave(stateSinkObject state.Sink) {
 	vp.beforeSave()
 	stateSinkObject.Save(0, &vp.pipe)
@@ -140,6 +149,7 @@ func (vp *VFSPipe) StateSave(stateSinkObject state.Sink) {
 
 func (vp *VFSPipe) afterLoad() {}
 
+// +checklocksignore
 func (vp *VFSPipe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &vp.pipe)
 }
@@ -160,6 +170,7 @@ func (fd *VFSPipeFD) StateFields() []string {
 
 func (fd *VFSPipeFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *VFSPipeFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -171,6 +182,7 @@ func (fd *VFSPipeFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *VFSPipeFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *VFSPipeFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -191,6 +203,7 @@ func (w *Writer) StateFields() []string {
 
 func (w *Writer) beforeSave() {}
 
+// +checklocksignore
 func (w *Writer) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.ReaderWriter)
@@ -198,6 +211,7 @@ func (w *Writer) StateSave(stateSinkObject state.Sink) {
 
 func (w *Writer) afterLoad() {}
 
+// +checklocksignore
 func (w *Writer) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.ReaderWriter)
 }
diff --git a/pkg/sentry/kernel/semaphore/semaphore_state_autogen.go b/pkg/sentry/kernel/semaphore/semaphore_state_autogen.go
index e0578836c..f90fbff34 100644
--- a/pkg/sentry/kernel/semaphore/semaphore_state_autogen.go
+++ b/pkg/sentry/kernel/semaphore/semaphore_state_autogen.go
@@ -21,6 +21,7 @@ func (r *Registry) StateFields() []string {
 
 func (r *Registry) beforeSave() {}
 
+// +checklocksignore
 func (r *Registry) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.userNS)
@@ -31,6 +32,7 @@ func (r *Registry) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registry) afterLoad() {}
 
+// +checklocksignore
 func (r *Registry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.userNS)
 	stateSourceObject.Load(1, &r.semaphores)
@@ -59,6 +61,7 @@ func (s *Set) StateFields() []string {
 
 func (s *Set) beforeSave() {}
 
+// +checklocksignore
 func (s *Set) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.registry)
@@ -75,6 +78,7 @@ func (s *Set) StateSave(stateSinkObject state.Sink) {
 
 func (s *Set) afterLoad() {}
 
+// +checklocksignore
 func (s *Set) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.registry)
 	stateSourceObject.Load(1, &s.ID)
@@ -101,6 +105,7 @@ func (s *sem) StateFields() []string {
 
 func (s *sem) beforeSave() {}
 
+// +checklocksignore
 func (s *sem) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	if !state.IsZeroValue(&s.waiters) {
@@ -112,6 +117,7 @@ func (s *sem) StateSave(stateSinkObject state.Sink) {
 
 func (s *sem) afterLoad() {}
 
+// +checklocksignore
 func (s *sem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.value)
 	stateSourceObject.Load(1, &s.pid)
@@ -131,6 +137,7 @@ func (w *waiter) StateFields() []string {
 
 func (w *waiter) beforeSave() {}
 
+// +checklocksignore
 func (w *waiter) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.waiterEntry)
@@ -140,6 +147,7 @@ func (w *waiter) StateSave(stateSinkObject state.Sink) {
 
 func (w *waiter) afterLoad() {}
 
+// +checklocksignore
 func (w *waiter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.waiterEntry)
 	stateSourceObject.Load(1, &w.value)
@@ -159,6 +167,7 @@ func (l *waiterList) StateFields() []string {
 
 func (l *waiterList) beforeSave() {}
 
+// +checklocksignore
 func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -167,6 +176,7 @@ func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 
 func (l *waiterList) afterLoad() {}
 
+// +checklocksignore
 func (l *waiterList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -185,6 +195,7 @@ func (e *waiterEntry) StateFields() []string {
 
 func (e *waiterEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -193,6 +204,7 @@ func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *waiterEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/sentry/kernel/shm/shm_state_autogen.go b/pkg/sentry/kernel/shm/shm_state_autogen.go
index aca4c9b96..30ceeaa03 100644
--- a/pkg/sentry/kernel/shm/shm_state_autogen.go
+++ b/pkg/sentry/kernel/shm/shm_state_autogen.go
@@ -22,6 +22,7 @@ func (r *Registry) StateFields() []string {
 
 func (r *Registry) beforeSave() {}
 
+// +checklocksignore
 func (r *Registry) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.userNS)
@@ -33,6 +34,7 @@ func (r *Registry) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registry) afterLoad() {}
 
+// +checklocksignore
 func (r *Registry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.userNS)
 	stateSourceObject.Load(1, &r.shms)
@@ -69,6 +71,7 @@ func (s *Shm) StateFields() []string {
 
 func (s *Shm) beforeSave() {}
 
+// +checklocksignore
 func (s *Shm) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.ShmRefs)
@@ -92,6 +95,7 @@ func (s *Shm) StateSave(stateSinkObject state.Sink) {
 
 func (s *Shm) afterLoad() {}
 
+// +checklocksignore
 func (s *Shm) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.ShmRefs)
 	stateSourceObject.Load(1, &s.mfp)
@@ -124,11 +128,13 @@ func (r *ShmRefs) StateFields() []string {
 
 func (r *ShmRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *ShmRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *ShmRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
diff --git a/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go b/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
index 6c608aaa4..ad2622f27 100644
--- a/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
+++ b/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
@@ -19,6 +19,7 @@ func (s *SignalOperations) StateFields() []string {
 
 func (s *SignalOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.target)
@@ -27,6 +28,7 @@ func (s *SignalOperations) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.target)
 	stateSourceObject.Load(1, &s.mask)
diff --git a/pkg/sentry/kernel/time/time_state_autogen.go b/pkg/sentry/kernel/time/time_state_autogen.go
index 1a30539f0..855751953 100644
--- a/pkg/sentry/kernel/time/time_state_autogen.go
+++ b/pkg/sentry/kernel/time/time_state_autogen.go
@@ -18,6 +18,7 @@ func (t *Time) StateFields() []string {
 
 func (t *Time) beforeSave() {}
 
+// +checklocksignore
 func (t *Time) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.ns)
@@ -25,6 +26,7 @@ func (t *Time) StateSave(stateSinkObject state.Sink) {
 
 func (t *Time) afterLoad() {}
 
+// +checklocksignore
 func (t *Time) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.ns)
 }
@@ -43,6 +45,7 @@ func (s *Setting) StateFields() []string {
 
 func (s *Setting) beforeSave() {}
 
+// +checklocksignore
 func (s *Setting) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Enabled)
@@ -52,6 +55,7 @@ func (s *Setting) StateSave(stateSinkObject state.Sink) {
 
 func (s *Setting) afterLoad() {}
 
+// +checklocksignore
 func (s *Setting) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Enabled)
 	stateSourceObject.Load(1, &s.Next)
@@ -73,6 +77,7 @@ func (t *Timer) StateFields() []string {
 
 func (t *Timer) beforeSave() {}
 
+// +checklocksignore
 func (t *Timer) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.clock)
@@ -83,6 +88,7 @@ func (t *Timer) StateSave(stateSinkObject state.Sink) {
 
 func (t *Timer) afterLoad() {}
 
+// +checklocksignore
 func (t *Timer) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.clock)
 	stateSourceObject.Load(1, &t.listener)
diff --git a/pkg/sentry/limits/limits_state_autogen.go b/pkg/sentry/limits/limits_state_autogen.go
index d619cabd4..038124f76 100644
--- a/pkg/sentry/limits/limits_state_autogen.go
+++ b/pkg/sentry/limits/limits_state_autogen.go
@@ -19,6 +19,7 @@ func (l *Limit) StateFields() []string {
 
 func (l *Limit) beforeSave() {}
 
+// +checklocksignore
 func (l *Limit) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Cur)
@@ -27,6 +28,7 @@ func (l *Limit) StateSave(stateSinkObject state.Sink) {
 
 func (l *Limit) afterLoad() {}
 
+// +checklocksignore
 func (l *Limit) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Cur)
 	stateSourceObject.Load(1, &l.Max)
@@ -44,6 +46,7 @@ func (l *LimitSet) StateFields() []string {
 
 func (l *LimitSet) beforeSave() {}
 
+// +checklocksignore
 func (l *LimitSet) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.data)
@@ -51,6 +54,7 @@ func (l *LimitSet) StateSave(stateSinkObject state.Sink) {
 
 func (l *LimitSet) afterLoad() {}
 
+// +checklocksignore
 func (l *LimitSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.data)
 }
diff --git a/pkg/sentry/loader/loader_state_autogen.go b/pkg/sentry/loader/loader_state_autogen.go
index 1ae4683c4..7d001c54b 100644
--- a/pkg/sentry/loader/loader_state_autogen.go
+++ b/pkg/sentry/loader/loader_state_autogen.go
@@ -22,6 +22,7 @@ func (v *VDSO) StateFields() []string {
 
 func (v *VDSO) beforeSave() {}
 
+// +checklocksignore
 func (v *VDSO) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 	var phdrsValue []elfProgHeader = v.savePhdrs()
@@ -34,6 +35,7 @@ func (v *VDSO) StateSave(stateSinkObject state.Sink) {
 
 func (v *VDSO) afterLoad() {}
 
+// +checklocksignore
 func (v *VDSO) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &v.ParamPage)
 	stateSourceObject.Load(1, &v.vdso)
@@ -61,6 +63,7 @@ func (e *elfProgHeader) StateFields() []string {
 
 func (e *elfProgHeader) beforeSave() {}
 
+// +checklocksignore
 func (e *elfProgHeader) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Type)
@@ -75,6 +78,7 @@ func (e *elfProgHeader) StateSave(stateSinkObject state.Sink) {
 
 func (e *elfProgHeader) afterLoad() {}
 
+// +checklocksignore
 func (e *elfProgHeader) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Type)
 	stateSourceObject.Load(1, &e.Flags)
diff --git a/pkg/sentry/memmap/memmap_impl_state_autogen.go b/pkg/sentry/memmap/memmap_impl_state_autogen.go
index c77b19e77..d65558bbe 100644
--- a/pkg/sentry/memmap/memmap_impl_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_impl_state_autogen.go
@@ -18,6 +18,7 @@ func (s *MappingSet) StateFields() []string {
 
 func (s *MappingSet) beforeSave() {}
 
+// +checklocksignore
 func (s *MappingSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *MappingSegmentDataSlices = s.saveRoot()
@@ -26,6 +27,7 @@ func (s *MappingSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *MappingSet) afterLoad() {}
 
+// +checklocksignore
 func (s *MappingSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*MappingSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*MappingSegmentDataSlices)) })
 }
@@ -49,6 +51,7 @@ func (n *Mappingnode) StateFields() []string {
 
 func (n *Mappingnode) beforeSave() {}
 
+// +checklocksignore
 func (n *Mappingnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -63,6 +66,7 @@ func (n *Mappingnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *Mappingnode) afterLoad() {}
 
+// +checklocksignore
 func (n *Mappingnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -88,6 +92,7 @@ func (m *MappingSegmentDataSlices) StateFields() []string {
 
 func (m *MappingSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (m *MappingSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.Start)
@@ -97,6 +102,7 @@ func (m *MappingSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (m *MappingSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (m *MappingSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.Start)
 	stateSourceObject.Load(1, &m.End)
diff --git a/pkg/sentry/memmap/memmap_state_autogen.go b/pkg/sentry/memmap/memmap_state_autogen.go
index 7d52a10b2..8624ecb60 100644
--- a/pkg/sentry/memmap/memmap_state_autogen.go
+++ b/pkg/sentry/memmap/memmap_state_autogen.go
@@ -19,6 +19,7 @@ func (fr *FileRange) StateFields() []string {
 
 func (fr *FileRange) beforeSave() {}
 
+// +checklocksignore
 func (fr *FileRange) StateSave(stateSinkObject state.Sink) {
 	fr.beforeSave()
 	stateSinkObject.Save(0, &fr.Start)
@@ -27,6 +28,7 @@ func (fr *FileRange) StateSave(stateSinkObject state.Sink) {
 
 func (fr *FileRange) afterLoad() {}
 
+// +checklocksignore
 func (fr *FileRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fr.Start)
 	stateSourceObject.Load(1, &fr.End)
@@ -45,6 +47,7 @@ func (mr *MappableRange) StateFields() []string {
 
 func (mr *MappableRange) beforeSave() {}
 
+// +checklocksignore
 func (mr *MappableRange) StateSave(stateSinkObject state.Sink) {
 	mr.beforeSave()
 	stateSinkObject.Save(0, &mr.Start)
@@ -53,6 +56,7 @@ func (mr *MappableRange) StateSave(stateSinkObject state.Sink) {
 
 func (mr *MappableRange) afterLoad() {}
 
+// +checklocksignore
 func (mr *MappableRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mr.Start)
 	stateSourceObject.Load(1, &mr.End)
@@ -72,6 +76,7 @@ func (r *MappingOfRange) StateFields() []string {
 
 func (r *MappingOfRange) beforeSave() {}
 
+// +checklocksignore
 func (r *MappingOfRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.MappingSpace)
@@ -81,6 +86,7 @@ func (r *MappingOfRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *MappingOfRange) afterLoad() {}
 
+// +checklocksignore
 func (r *MappingOfRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.MappingSpace)
 	stateSourceObject.Load(1, &r.AddrRange)
diff --git a/pkg/sentry/mm/mm_state_autogen.go b/pkg/sentry/mm/mm_state_autogen.go
index 60aee9d2e..c4cdf8bd2 100644
--- a/pkg/sentry/mm/mm_state_autogen.go
+++ b/pkg/sentry/mm/mm_state_autogen.go
@@ -18,6 +18,7 @@ func (a *aioManager) StateFields() []string {
 
 func (a *aioManager) beforeSave() {}
 
+// +checklocksignore
 func (a *aioManager) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.contexts)
@@ -25,6 +26,7 @@ func (a *aioManager) StateSave(stateSinkObject state.Sink) {
 
 func (a *aioManager) afterLoad() {}
 
+// +checklocksignore
 func (a *aioManager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.contexts)
 }
@@ -42,6 +44,7 @@ func (i *ioResult) StateFields() []string {
 
 func (i *ioResult) beforeSave() {}
 
+// +checklocksignore
 func (i *ioResult) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.data)
@@ -50,6 +53,7 @@ func (i *ioResult) StateSave(stateSinkObject state.Sink) {
 
 func (i *ioResult) afterLoad() {}
 
+// +checklocksignore
 func (i *ioResult) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.data)
 	stateSourceObject.Load(1, &i.ioEntry)
@@ -69,6 +73,7 @@ func (ctx *AIOContext) StateFields() []string {
 
 func (ctx *AIOContext) beforeSave() {}
 
+// +checklocksignore
 func (ctx *AIOContext) StateSave(stateSinkObject state.Sink) {
 	ctx.beforeSave()
 	if !state.IsZeroValue(&ctx.dead) {
@@ -79,6 +84,7 @@ func (ctx *AIOContext) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &ctx.outstanding)
 }
 
+// +checklocksignore
 func (ctx *AIOContext) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ctx.results)
 	stateSourceObject.Load(1, &ctx.maxOutstanding)
@@ -100,6 +106,7 @@ func (m *aioMappable) StateFields() []string {
 
 func (m *aioMappable) beforeSave() {}
 
+// +checklocksignore
 func (m *aioMappable) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.aioMappableRefs)
@@ -109,6 +116,7 @@ func (m *aioMappable) StateSave(stateSinkObject state.Sink) {
 
 func (m *aioMappable) afterLoad() {}
 
+// +checklocksignore
 func (m *aioMappable) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.aioMappableRefs)
 	stateSourceObject.Load(1, &m.mfp)
@@ -127,11 +135,13 @@ func (r *aioMappableRefs) StateFields() []string {
 
 func (r *aioMappableRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *aioMappableRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *aioMappableRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -149,6 +159,7 @@ func (s *fileRefcountSet) StateFields() []string {
 
 func (s *fileRefcountSet) beforeSave() {}
 
+// +checklocksignore
 func (s *fileRefcountSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *fileRefcountSegmentDataSlices = s.saveRoot()
@@ -157,6 +168,7 @@ func (s *fileRefcountSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *fileRefcountSet) afterLoad() {}
 
+// +checklocksignore
 func (s *fileRefcountSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*fileRefcountSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*fileRefcountSegmentDataSlices)) })
 }
@@ -180,6 +192,7 @@ func (n *fileRefcountnode) StateFields() []string {
 
 func (n *fileRefcountnode) beforeSave() {}
 
+// +checklocksignore
 func (n *fileRefcountnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -194,6 +207,7 @@ func (n *fileRefcountnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *fileRefcountnode) afterLoad() {}
 
+// +checklocksignore
 func (n *fileRefcountnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -219,6 +233,7 @@ func (f *fileRefcountSegmentDataSlices) StateFields() []string {
 
 func (f *fileRefcountSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (f *fileRefcountSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.Start)
@@ -228,6 +243,7 @@ func (f *fileRefcountSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (f *fileRefcountSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (f *fileRefcountSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.Start)
 	stateSourceObject.Load(1, &f.End)
@@ -247,6 +263,7 @@ func (l *ioList) StateFields() []string {
 
 func (l *ioList) beforeSave() {}
 
+// +checklocksignore
 func (l *ioList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -255,6 +272,7 @@ func (l *ioList) StateSave(stateSinkObject state.Sink) {
 
 func (l *ioList) afterLoad() {}
 
+// +checklocksignore
 func (l *ioList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -273,6 +291,7 @@ func (e *ioEntry) StateFields() []string {
 
 func (e *ioEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *ioEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -281,6 +300,7 @@ func (e *ioEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *ioEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *ioEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -319,6 +339,7 @@ func (mm *MemoryManager) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (mm *MemoryManager) StateSave(stateSinkObject state.Sink) {
 	mm.beforeSave()
 	if !state.IsZeroValue(&mm.active) {
@@ -353,6 +374,7 @@ func (mm *MemoryManager) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(23, &mm.membarrierRSeqEnabled)
 }
 
+// +checklocksignore
 func (mm *MemoryManager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mm.p)
 	stateSourceObject.Load(1, &mm.mfp)
@@ -401,6 +423,7 @@ func (vma *vma) StateFields() []string {
 
 func (vma *vma) beforeSave() {}
 
+// +checklocksignore
 func (vma *vma) StateSave(stateSinkObject state.Sink) {
 	vma.beforeSave()
 	var realPermsValue int = vma.saveRealPerms()
@@ -417,6 +440,7 @@ func (vma *vma) StateSave(stateSinkObject state.Sink) {
 
 func (vma *vma) afterLoad() {}
 
+// +checklocksignore
 func (vma *vma) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &vma.mappable)
 	stateSourceObject.Load(1, &vma.off)
@@ -446,6 +470,7 @@ func (p *pma) StateFields() []string {
 
 func (p *pma) beforeSave() {}
 
+// +checklocksignore
 func (p *pma) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.off)
@@ -458,6 +483,7 @@ func (p *pma) StateSave(stateSinkObject state.Sink) {
 
 func (p *pma) afterLoad() {}
 
+// +checklocksignore
 func (p *pma) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.off)
 	stateSourceObject.Load(1, &p.translatePerms)
@@ -479,6 +505,7 @@ func (p *privateRefs) StateFields() []string {
 
 func (p *privateRefs) beforeSave() {}
 
+// +checklocksignore
 func (p *privateRefs) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.refs)
@@ -486,6 +513,7 @@ func (p *privateRefs) StateSave(stateSinkObject state.Sink) {
 
 func (p *privateRefs) afterLoad() {}
 
+// +checklocksignore
 func (p *privateRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.refs)
 }
@@ -502,6 +530,7 @@ func (s *pmaSet) StateFields() []string {
 
 func (s *pmaSet) beforeSave() {}
 
+// +checklocksignore
 func (s *pmaSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *pmaSegmentDataSlices = s.saveRoot()
@@ -510,6 +539,7 @@ func (s *pmaSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *pmaSet) afterLoad() {}
 
+// +checklocksignore
 func (s *pmaSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*pmaSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*pmaSegmentDataSlices)) })
 }
@@ -533,6 +563,7 @@ func (n *pmanode) StateFields() []string {
 
 func (n *pmanode) beforeSave() {}
 
+// +checklocksignore
 func (n *pmanode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -547,6 +578,7 @@ func (n *pmanode) StateSave(stateSinkObject state.Sink) {
 
 func (n *pmanode) afterLoad() {}
 
+// +checklocksignore
 func (n *pmanode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -572,6 +604,7 @@ func (p *pmaSegmentDataSlices) StateFields() []string {
 
 func (p *pmaSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (p *pmaSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.Start)
@@ -581,6 +614,7 @@ func (p *pmaSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (p *pmaSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (p *pmaSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.Start)
 	stateSourceObject.Load(1, &p.End)
@@ -602,6 +636,7 @@ func (m *SpecialMappable) StateFields() []string {
 
 func (m *SpecialMappable) beforeSave() {}
 
+// +checklocksignore
 func (m *SpecialMappable) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.SpecialMappableRefs)
@@ -612,6 +647,7 @@ func (m *SpecialMappable) StateSave(stateSinkObject state.Sink) {
 
 func (m *SpecialMappable) afterLoad() {}
 
+// +checklocksignore
 func (m *SpecialMappable) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.SpecialMappableRefs)
 	stateSourceObject.Load(1, &m.mfp)
@@ -631,11 +667,13 @@ func (r *SpecialMappableRefs) StateFields() []string {
 
 func (r *SpecialMappableRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *SpecialMappableRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *SpecialMappableRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -653,6 +691,7 @@ func (s *vmaSet) StateFields() []string {
 
 func (s *vmaSet) beforeSave() {}
 
+// +checklocksignore
 func (s *vmaSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *vmaSegmentDataSlices = s.saveRoot()
@@ -661,6 +700,7 @@ func (s *vmaSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *vmaSet) afterLoad() {}
 
+// +checklocksignore
 func (s *vmaSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*vmaSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*vmaSegmentDataSlices)) })
 }
@@ -684,6 +724,7 @@ func (n *vmanode) StateFields() []string {
 
 func (n *vmanode) beforeSave() {}
 
+// +checklocksignore
 func (n *vmanode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -698,6 +739,7 @@ func (n *vmanode) StateSave(stateSinkObject state.Sink) {
 
 func (n *vmanode) afterLoad() {}
 
+// +checklocksignore
 func (n *vmanode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -723,6 +765,7 @@ func (v *vmaSegmentDataSlices) StateFields() []string {
 
 func (v *vmaSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (v *vmaSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	v.beforeSave()
 	stateSinkObject.Save(0, &v.Start)
@@ -732,6 +775,7 @@ func (v *vmaSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (v *vmaSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (v *vmaSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &v.Start)
 	stateSourceObject.Load(1, &v.End)
diff --git a/pkg/sentry/pgalloc/pgalloc_state_autogen.go b/pkg/sentry/pgalloc/pgalloc_state_autogen.go
index d33710cab..272186381 100644
--- a/pkg/sentry/pgalloc/pgalloc_state_autogen.go
+++ b/pkg/sentry/pgalloc/pgalloc_state_autogen.go
@@ -19,6 +19,7 @@ func (r *EvictableRange) StateFields() []string {
 
 func (r *EvictableRange) beforeSave() {}
 
+// +checklocksignore
 func (r *EvictableRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -27,6 +28,7 @@ func (r *EvictableRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *EvictableRange) afterLoad() {}
 
+// +checklocksignore
 func (r *EvictableRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
@@ -44,6 +46,7 @@ func (s *evictableRangeSet) StateFields() []string {
 
 func (s *evictableRangeSet) beforeSave() {}
 
+// +checklocksignore
 func (s *evictableRangeSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *evictableRangeSegmentDataSlices = s.saveRoot()
@@ -52,6 +55,7 @@ func (s *evictableRangeSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *evictableRangeSet) afterLoad() {}
 
+// +checklocksignore
 func (s *evictableRangeSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*evictableRangeSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*evictableRangeSegmentDataSlices)) })
 }
@@ -75,6 +79,7 @@ func (n *evictableRangenode) StateFields() []string {
 
 func (n *evictableRangenode) beforeSave() {}
 
+// +checklocksignore
 func (n *evictableRangenode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -89,6 +94,7 @@ func (n *evictableRangenode) StateSave(stateSinkObject state.Sink) {
 
 func (n *evictableRangenode) afterLoad() {}
 
+// +checklocksignore
 func (n *evictableRangenode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -114,6 +120,7 @@ func (e *evictableRangeSegmentDataSlices) StateFields() []string {
 
 func (e *evictableRangeSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (e *evictableRangeSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Start)
@@ -123,6 +130,7 @@ func (e *evictableRangeSegmentDataSlices) StateSave(stateSinkObject state.Sink)
 
 func (e *evictableRangeSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (e *evictableRangeSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Start)
 	stateSourceObject.Load(1, &e.End)
@@ -143,6 +151,7 @@ func (u *usageInfo) StateFields() []string {
 
 func (u *usageInfo) beforeSave() {}
 
+// +checklocksignore
 func (u *usageInfo) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.kind)
@@ -152,6 +161,7 @@ func (u *usageInfo) StateSave(stateSinkObject state.Sink) {
 
 func (u *usageInfo) afterLoad() {}
 
+// +checklocksignore
 func (u *usageInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.kind)
 	stateSourceObject.Load(1, &u.knownCommitted)
@@ -170,6 +180,7 @@ func (s *reclaimSet) StateFields() []string {
 
 func (s *reclaimSet) beforeSave() {}
 
+// +checklocksignore
 func (s *reclaimSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *reclaimSegmentDataSlices = s.saveRoot()
@@ -178,6 +189,7 @@ func (s *reclaimSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *reclaimSet) afterLoad() {}
 
+// +checklocksignore
 func (s *reclaimSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*reclaimSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*reclaimSegmentDataSlices)) })
 }
@@ -201,6 +213,7 @@ func (n *reclaimnode) StateFields() []string {
 
 func (n *reclaimnode) beforeSave() {}
 
+// +checklocksignore
 func (n *reclaimnode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -215,6 +228,7 @@ func (n *reclaimnode) StateSave(stateSinkObject state.Sink) {
 
 func (n *reclaimnode) afterLoad() {}
 
+// +checklocksignore
 func (n *reclaimnode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -240,6 +254,7 @@ func (r *reclaimSegmentDataSlices) StateFields() []string {
 
 func (r *reclaimSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (r *reclaimSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -249,6 +264,7 @@ func (r *reclaimSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (r *reclaimSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (r *reclaimSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
@@ -267,6 +283,7 @@ func (s *usageSet) StateFields() []string {
 
 func (s *usageSet) beforeSave() {}
 
+// +checklocksignore
 func (s *usageSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var rootValue *usageSegmentDataSlices = s.saveRoot()
@@ -275,6 +292,7 @@ func (s *usageSet) StateSave(stateSinkObject state.Sink) {
 
 func (s *usageSet) afterLoad() {}
 
+// +checklocksignore
 func (s *usageSet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(0, new(*usageSegmentDataSlices), func(y interface{}) { s.loadRoot(y.(*usageSegmentDataSlices)) })
 }
@@ -298,6 +316,7 @@ func (n *usagenode) StateFields() []string {
 
 func (n *usagenode) beforeSave() {}
 
+// +checklocksignore
 func (n *usagenode) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.nrSegments)
@@ -312,6 +331,7 @@ func (n *usagenode) StateSave(stateSinkObject state.Sink) {
 
 func (n *usagenode) afterLoad() {}
 
+// +checklocksignore
 func (n *usagenode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.nrSegments)
 	stateSourceObject.Load(1, &n.parent)
@@ -337,6 +357,7 @@ func (u *usageSegmentDataSlices) StateFields() []string {
 
 func (u *usageSegmentDataSlices) beforeSave() {}
 
+// +checklocksignore
 func (u *usageSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.Start)
@@ -346,6 +367,7 @@ func (u *usageSegmentDataSlices) StateSave(stateSinkObject state.Sink) {
 
 func (u *usageSegmentDataSlices) afterLoad() {}
 
+// +checklocksignore
 func (u *usageSegmentDataSlices) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.Start)
 	stateSourceObject.Load(1, &u.End)
diff --git a/pkg/sentry/socket/control/control_state_autogen.go b/pkg/sentry/socket/control/control_state_autogen.go
index 0f567afd4..412025601 100644
--- a/pkg/sentry/socket/control/control_state_autogen.go
+++ b/pkg/sentry/socket/control/control_state_autogen.go
@@ -28,6 +28,7 @@ func (c *scmCredentials) StateFields() []string {
 
 func (c *scmCredentials) beforeSave() {}
 
+// +checklocksignore
 func (c *scmCredentials) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.t)
@@ -37,6 +38,7 @@ func (c *scmCredentials) StateSave(stateSinkObject state.Sink) {
 
 func (c *scmCredentials) afterLoad() {}
 
+// +checklocksignore
 func (c *scmCredentials) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.t)
 	stateSourceObject.Load(1, &c.kuid)
diff --git a/pkg/sentry/socket/hostinet/hostinet_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_state_autogen.go
index a229dcec5..519c65339 100644
--- a/pkg/sentry/socket/hostinet/hostinet_state_autogen.go
+++ b/pkg/sentry/socket/hostinet/hostinet_state_autogen.go
@@ -23,6 +23,7 @@ func (s *socketOpsCommon) StateFields() []string {
 
 func (s *socketOpsCommon) beforeSave() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SendReceiveTimeout)
@@ -35,6 +36,7 @@ func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketOpsCommon) afterLoad() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SendReceiveTimeout)
 	stateSourceObject.Load(1, &s.family)
@@ -60,6 +62,7 @@ func (s *socketVFS2) StateFields() []string {
 
 func (s *socketVFS2) beforeSave() {}
 
+// +checklocksignore
 func (s *socketVFS2) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.vfsfd)
@@ -71,6 +74,7 @@ func (s *socketVFS2) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketVFS2) afterLoad() {}
 
+// +checklocksignore
 func (s *socketVFS2) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.vfsfd)
 	stateSourceObject.Load(1, &s.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/socket/netlink/netlink_state_autogen.go b/pkg/sentry/socket/netlink/netlink_state_autogen.go
index 307498c1c..29c549880 100644
--- a/pkg/sentry/socket/netlink/netlink_state_autogen.go
+++ b/pkg/sentry/socket/netlink/netlink_state_autogen.go
@@ -18,6 +18,7 @@ func (s *Socket) StateFields() []string {
 
 func (s *Socket) beforeSave() {}
 
+// +checklocksignore
 func (s *Socket) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.socketOpsCommon)
@@ -25,6 +26,7 @@ func (s *Socket) StateSave(stateSinkObject state.Sink) {
 
 func (s *Socket) afterLoad() {}
 
+// +checklocksignore
 func (s *Socket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.socketOpsCommon)
 }
@@ -50,6 +52,7 @@ func (s *socketOpsCommon) StateFields() []string {
 
 func (s *socketOpsCommon) beforeSave() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SendReceiveTimeout)
@@ -66,6 +69,7 @@ func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketOpsCommon) afterLoad() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SendReceiveTimeout)
 	stateSourceObject.Load(1, &s.ports)
@@ -89,12 +93,14 @@ func (k *kernelSCM) StateFields() []string {
 
 func (k *kernelSCM) beforeSave() {}
 
+// +checklocksignore
 func (k *kernelSCM) StateSave(stateSinkObject state.Sink) {
 	k.beforeSave()
 }
 
 func (k *kernelSCM) afterLoad() {}
 
+// +checklocksignore
 func (k *kernelSCM) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -114,6 +120,7 @@ func (s *SocketVFS2) StateFields() []string {
 
 func (s *SocketVFS2) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.vfsfd)
@@ -125,6 +132,7 @@ func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketVFS2) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.vfsfd)
 	stateSourceObject.Load(1, &s.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/socket/netlink/port/port_state_autogen.go b/pkg/sentry/socket/netlink/port/port_state_autogen.go
index e0083fcad..b22471899 100644
--- a/pkg/sentry/socket/netlink/port/port_state_autogen.go
+++ b/pkg/sentry/socket/netlink/port/port_state_autogen.go
@@ -18,6 +18,7 @@ func (m *Manager) StateFields() []string {
 
 func (m *Manager) beforeSave() {}
 
+// +checklocksignore
 func (m *Manager) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.ports)
@@ -25,6 +26,7 @@ func (m *Manager) StateSave(stateSinkObject state.Sink) {
 
 func (m *Manager) afterLoad() {}
 
+// +checklocksignore
 func (m *Manager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.ports)
 }
diff --git a/pkg/sentry/socket/netlink/route/route_state_autogen.go b/pkg/sentry/socket/netlink/route/route_state_autogen.go
index 0b263b5b1..c4a94ab49 100644
--- a/pkg/sentry/socket/netlink/route/route_state_autogen.go
+++ b/pkg/sentry/socket/netlink/route/route_state_autogen.go
@@ -16,12 +16,14 @@ func (p *Protocol) StateFields() []string {
 
 func (p *Protocol) beforeSave() {}
 
+// +checklocksignore
 func (p *Protocol) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *Protocol) afterLoad() {}
 
+// +checklocksignore
 func (p *Protocol) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go b/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
index 63f488594..f45d63d9a 100644
--- a/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
+++ b/pkg/sentry/socket/netlink/uevent/uevent_state_autogen.go
@@ -16,12 +16,14 @@ func (p *Protocol) StateFields() []string {
 
 func (p *Protocol) beforeSave() {}
 
+// +checklocksignore
 func (p *Protocol) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *Protocol) afterLoad() {}
 
+// +checklocksignore
 func (p *Protocol) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/sentry/socket/netstack/netstack_state_autogen.go b/pkg/sentry/socket/netstack/netstack_state_autogen.go
index ec15d5643..335437f04 100644
--- a/pkg/sentry/socket/netstack/netstack_state_autogen.go
+++ b/pkg/sentry/socket/netstack/netstack_state_autogen.go
@@ -18,6 +18,7 @@ func (s *SocketOperations) StateFields() []string {
 
 func (s *SocketOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.socketOpsCommon)
@@ -25,6 +26,7 @@ func (s *SocketOperations) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.socketOpsCommon)
 }
@@ -50,6 +52,7 @@ func (s *socketOpsCommon) StateFields() []string {
 
 func (s *socketOpsCommon) beforeSave() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SendReceiveTimeout)
@@ -66,6 +69,7 @@ func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketOpsCommon) afterLoad() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SendReceiveTimeout)
 	stateSourceObject.Load(1, &s.Queue)
@@ -95,6 +99,7 @@ func (s *SocketVFS2) StateFields() []string {
 
 func (s *SocketVFS2) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.vfsfd)
@@ -106,6 +111,7 @@ func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketVFS2) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.vfsfd)
 	stateSourceObject.Load(1, &s.FileDescriptionDefaultImpl)
@@ -124,10 +130,12 @@ func (s *Stack) StateFields() []string {
 
 func (s *Stack) beforeSave() {}
 
+// +checklocksignore
 func (s *Stack) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
+// +checklocksignore
 func (s *Stack) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.AfterLoad(s.afterLoad)
 }
diff --git a/pkg/sentry/socket/socket_state_autogen.go b/pkg/sentry/socket/socket_state_autogen.go
index 970698808..d050093f6 100644
--- a/pkg/sentry/socket/socket_state_autogen.go
+++ b/pkg/sentry/socket/socket_state_autogen.go
@@ -29,6 +29,7 @@ func (i *IPControlMessages) StateFields() []string {
 
 func (i *IPControlMessages) beforeSave() {}
 
+// +checklocksignore
 func (i *IPControlMessages) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.HasTimestamp)
@@ -47,6 +48,7 @@ func (i *IPControlMessages) StateSave(stateSinkObject state.Sink) {
 
 func (i *IPControlMessages) afterLoad() {}
 
+// +checklocksignore
 func (i *IPControlMessages) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.HasTimestamp)
 	stateSourceObject.Load(1, &i.Timestamp)
@@ -75,6 +77,7 @@ func (to *SendReceiveTimeout) StateFields() []string {
 
 func (to *SendReceiveTimeout) beforeSave() {}
 
+// +checklocksignore
 func (to *SendReceiveTimeout) StateSave(stateSinkObject state.Sink) {
 	to.beforeSave()
 	stateSinkObject.Save(0, &to.send)
@@ -83,6 +86,7 @@ func (to *SendReceiveTimeout) StateSave(stateSinkObject state.Sink) {
 
 func (to *SendReceiveTimeout) afterLoad() {}
 
+// +checklocksignore
 func (to *SendReceiveTimeout) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &to.send)
 	stateSourceObject.Load(1, &to.recv)
diff --git a/pkg/sentry/socket/unix/transport/transport_state_autogen.go b/pkg/sentry/socket/unix/transport/transport_state_autogen.go
index ab00f8858..946b0032e 100644
--- a/pkg/sentry/socket/unix/transport/transport_state_autogen.go
+++ b/pkg/sentry/socket/unix/transport/transport_state_autogen.go
@@ -22,6 +22,7 @@ func (e *connectionedEndpoint) StateFields() []string {
 
 func (e *connectionedEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (e *connectionedEndpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	var acceptedChanValue []*connectionedEndpoint = e.saveAcceptedChan()
@@ -32,6 +33,7 @@ func (e *connectionedEndpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(3, &e.stype)
 }
 
+// +checklocksignore
 func (e *connectionedEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.baseEndpoint)
 	stateSourceObject.Load(1, &e.id)
@@ -53,11 +55,13 @@ func (e *connectionlessEndpoint) StateFields() []string {
 
 func (e *connectionlessEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (e *connectionlessEndpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.baseEndpoint)
 }
 
+// +checklocksignore
 func (e *connectionlessEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.baseEndpoint)
 	stateSourceObject.AfterLoad(e.afterLoad)
@@ -82,6 +86,7 @@ func (q *queue) StateFields() []string {
 
 func (q *queue) beforeSave() {}
 
+// +checklocksignore
 func (q *queue) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.queueRefs)
@@ -96,6 +101,7 @@ func (q *queue) StateSave(stateSinkObject state.Sink) {
 
 func (q *queue) afterLoad() {}
 
+// +checklocksignore
 func (q *queue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.queueRefs)
 	stateSourceObject.Load(1, &q.ReaderQueue)
@@ -119,11 +125,13 @@ func (r *queueRefs) StateFields() []string {
 
 func (r *queueRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *queueRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *queueRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -142,6 +150,7 @@ func (l *messageList) StateFields() []string {
 
 func (l *messageList) beforeSave() {}
 
+// +checklocksignore
 func (l *messageList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -150,6 +159,7 @@ func (l *messageList) StateSave(stateSinkObject state.Sink) {
 
 func (l *messageList) afterLoad() {}
 
+// +checklocksignore
 func (l *messageList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -168,6 +178,7 @@ func (e *messageEntry) StateFields() []string {
 
 func (e *messageEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *messageEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -176,6 +187,7 @@ func (e *messageEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *messageEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *messageEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -194,6 +206,7 @@ func (c *ControlMessages) StateFields() []string {
 
 func (c *ControlMessages) beforeSave() {}
 
+// +checklocksignore
 func (c *ControlMessages) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.Rights)
@@ -202,6 +215,7 @@ func (c *ControlMessages) StateSave(stateSinkObject state.Sink) {
 
 func (c *ControlMessages) afterLoad() {}
 
+// +checklocksignore
 func (c *ControlMessages) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.Rights)
 	stateSourceObject.Load(1, &c.Credentials)
@@ -222,6 +236,7 @@ func (m *message) StateFields() []string {
 
 func (m *message) beforeSave() {}
 
+// +checklocksignore
 func (m *message) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.messageEntry)
@@ -232,6 +247,7 @@ func (m *message) StateSave(stateSinkObject state.Sink) {
 
 func (m *message) afterLoad() {}
 
+// +checklocksignore
 func (m *message) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.messageEntry)
 	stateSourceObject.Load(1, &m.Data)
@@ -251,6 +267,7 @@ func (q *queueReceiver) StateFields() []string {
 
 func (q *queueReceiver) beforeSave() {}
 
+// +checklocksignore
 func (q *queueReceiver) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.readQueue)
@@ -258,6 +275,7 @@ func (q *queueReceiver) StateSave(stateSinkObject state.Sink) {
 
 func (q *queueReceiver) afterLoad() {}
 
+// +checklocksignore
 func (q *queueReceiver) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.readQueue)
 }
@@ -277,6 +295,7 @@ func (q *streamQueueReceiver) StateFields() []string {
 
 func (q *streamQueueReceiver) beforeSave() {}
 
+// +checklocksignore
 func (q *streamQueueReceiver) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.queueReceiver)
@@ -287,6 +306,7 @@ func (q *streamQueueReceiver) StateSave(stateSinkObject state.Sink) {
 
 func (q *streamQueueReceiver) afterLoad() {}
 
+// +checklocksignore
 func (q *streamQueueReceiver) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.queueReceiver)
 	stateSourceObject.Load(1, &q.buffer)
@@ -307,6 +327,7 @@ func (e *connectedEndpoint) StateFields() []string {
 
 func (e *connectedEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (e *connectedEndpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.endpoint)
@@ -315,6 +336,7 @@ func (e *connectedEndpoint) StateSave(stateSinkObject state.Sink) {
 
 func (e *connectedEndpoint) afterLoad() {}
 
+// +checklocksignore
 func (e *connectedEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.endpoint)
 	stateSourceObject.Load(1, &e.writeQueue)
@@ -337,6 +359,7 @@ func (e *baseEndpoint) StateFields() []string {
 
 func (e *baseEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (e *baseEndpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Queue)
@@ -349,6 +372,7 @@ func (e *baseEndpoint) StateSave(stateSinkObject state.Sink) {
 
 func (e *baseEndpoint) afterLoad() {}
 
+// +checklocksignore
 func (e *baseEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Queue)
 	stateSourceObject.Load(1, &e.DefaultSocketOptionsHandler)
diff --git a/pkg/sentry/socket/unix/unix_state_autogen.go b/pkg/sentry/socket/unix/unix_state_autogen.go
index fba990d9a..e6169dfad 100644
--- a/pkg/sentry/socket/unix/unix_state_autogen.go
+++ b/pkg/sentry/socket/unix/unix_state_autogen.go
@@ -18,11 +18,13 @@ func (r *socketOperationsRefs) StateFields() []string {
 
 func (r *socketOperationsRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *socketOperationsRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *socketOperationsRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -40,11 +42,13 @@ func (r *socketVFS2Refs) StateFields() []string {
 
 func (r *socketVFS2Refs) beforeSave() {}
 
+// +checklocksignore
 func (r *socketVFS2Refs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *socketVFS2Refs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -63,6 +67,7 @@ func (s *SocketOperations) StateFields() []string {
 
 func (s *SocketOperations) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketOperations) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.socketOperationsRefs)
@@ -71,6 +76,7 @@ func (s *SocketOperations) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketOperations) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.socketOperationsRefs)
 	stateSourceObject.Load(1, &s.socketOpsCommon)
@@ -92,6 +98,7 @@ func (s *socketOpsCommon) StateFields() []string {
 
 func (s *socketOpsCommon) beforeSave() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.SendReceiveTimeout)
@@ -103,6 +110,7 @@ func (s *socketOpsCommon) StateSave(stateSinkObject state.Sink) {
 
 func (s *socketOpsCommon) afterLoad() {}
 
+// +checklocksignore
 func (s *socketOpsCommon) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.SendReceiveTimeout)
 	stateSourceObject.Load(1, &s.ep)
@@ -128,6 +136,7 @@ func (s *SocketVFS2) StateFields() []string {
 
 func (s *SocketVFS2) beforeSave() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.vfsfd)
@@ -140,6 +149,7 @@ func (s *SocketVFS2) StateSave(stateSinkObject state.Sink) {
 
 func (s *SocketVFS2) afterLoad() {}
 
+// +checklocksignore
 func (s *SocketVFS2) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.vfsfd)
 	stateSourceObject.Load(1, &s.FileDescriptionDefaultImpl)
diff --git a/pkg/sentry/syscalls/linux/linux_state_autogen.go b/pkg/sentry/syscalls/linux/linux_state_autogen.go
index 8ae8de973..1f55db893 100644
--- a/pkg/sentry/syscalls/linux/linux_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/linux_state_autogen.go
@@ -22,6 +22,7 @@ func (f *futexWaitRestartBlock) StateFields() []string {
 
 func (f *futexWaitRestartBlock) beforeSave() {}
 
+// +checklocksignore
 func (f *futexWaitRestartBlock) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.duration)
@@ -33,6 +34,7 @@ func (f *futexWaitRestartBlock) StateSave(stateSinkObject state.Sink) {
 
 func (f *futexWaitRestartBlock) afterLoad() {}
 
+// +checklocksignore
 func (f *futexWaitRestartBlock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.duration)
 	stateSourceObject.Load(1, &f.addr)
@@ -55,6 +57,7 @@ func (p *pollRestartBlock) StateFields() []string {
 
 func (p *pollRestartBlock) beforeSave() {}
 
+// +checklocksignore
 func (p *pollRestartBlock) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.pfdAddr)
@@ -64,6 +67,7 @@ func (p *pollRestartBlock) StateSave(stateSinkObject state.Sink) {
 
 func (p *pollRestartBlock) afterLoad() {}
 
+// +checklocksignore
 func (p *pollRestartBlock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.pfdAddr)
 	stateSourceObject.Load(1, &p.nfds)
@@ -84,6 +88,7 @@ func (n *clockNanosleepRestartBlock) StateFields() []string {
 
 func (n *clockNanosleepRestartBlock) beforeSave() {}
 
+// +checklocksignore
 func (n *clockNanosleepRestartBlock) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.c)
@@ -93,6 +98,7 @@ func (n *clockNanosleepRestartBlock) StateSave(stateSinkObject state.Sink) {
 
 func (n *clockNanosleepRestartBlock) afterLoad() {}
 
+// +checklocksignore
 func (n *clockNanosleepRestartBlock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.c)
 	stateSourceObject.Load(1, &n.duration)
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_state_autogen.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_state_autogen.go
index 11d1bcc43..d02c8467f 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_state_autogen.go
@@ -20,6 +20,7 @@ func (p *pollRestartBlock) StateFields() []string {
 
 func (p *pollRestartBlock) beforeSave() {}
 
+// +checklocksignore
 func (p *pollRestartBlock) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.pfdAddr)
@@ -29,6 +30,7 @@ func (p *pollRestartBlock) StateSave(stateSinkObject state.Sink) {
 
 func (p *pollRestartBlock) afterLoad() {}
 
+// +checklocksignore
 func (p *pollRestartBlock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.pfdAddr)
 	stateSourceObject.Load(1, &p.nfds)
diff --git a/pkg/sentry/usage/usage_state_autogen.go b/pkg/sentry/usage/usage_state_autogen.go
index 50f6d27ba..a0077a6ca 100644
--- a/pkg/sentry/usage/usage_state_autogen.go
+++ b/pkg/sentry/usage/usage_state_autogen.go
@@ -20,6 +20,7 @@ func (s *CPUStats) StateFields() []string {
 
 func (s *CPUStats) beforeSave() {}
 
+// +checklocksignore
 func (s *CPUStats) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.UserTime)
@@ -29,6 +30,7 @@ func (s *CPUStats) StateSave(stateSinkObject state.Sink) {
 
 func (s *CPUStats) afterLoad() {}
 
+// +checklocksignore
 func (s *CPUStats) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.UserTime)
 	stateSourceObject.Load(1, &s.SysTime)
@@ -53,6 +55,7 @@ func (i *IO) StateFields() []string {
 
 func (i *IO) beforeSave() {}
 
+// +checklocksignore
 func (i *IO) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.CharsRead)
@@ -66,6 +69,7 @@ func (i *IO) StateSave(stateSinkObject state.Sink) {
 
 func (i *IO) afterLoad() {}
 
+// +checklocksignore
 func (i *IO) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.CharsRead)
 	stateSourceObject.Load(1, &i.CharsWritten)
diff --git a/pkg/sentry/vfs/memxattr/memxattr_state_autogen.go b/pkg/sentry/vfs/memxattr/memxattr_state_autogen.go
index eafeac473..f75223725 100644
--- a/pkg/sentry/vfs/memxattr/memxattr_state_autogen.go
+++ b/pkg/sentry/vfs/memxattr/memxattr_state_autogen.go
@@ -18,6 +18,7 @@ func (x *SimpleExtendedAttributes) StateFields() []string {
 
 func (x *SimpleExtendedAttributes) beforeSave() {}
 
+// +checklocksignore
 func (x *SimpleExtendedAttributes) StateSave(stateSinkObject state.Sink) {
 	x.beforeSave()
 	stateSinkObject.Save(0, &x.xattrs)
@@ -25,6 +26,7 @@ func (x *SimpleExtendedAttributes) StateSave(stateSinkObject state.Sink) {
 
 func (x *SimpleExtendedAttributes) afterLoad() {}
 
+// +checklocksignore
 func (x *SimpleExtendedAttributes) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &x.xattrs)
 }
diff --git a/pkg/sentry/vfs/vfs_state_autogen.go b/pkg/sentry/vfs/vfs_state_autogen.go
index c048676ea..206d55ee3 100644
--- a/pkg/sentry/vfs/vfs_state_autogen.go
+++ b/pkg/sentry/vfs/vfs_state_autogen.go
@@ -16,12 +16,14 @@ func (a *anonFilesystemType) StateFields() []string {
 
 func (a *anonFilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (a *anonFilesystemType) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 }
 
 func (a *anonFilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (a *anonFilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -38,6 +40,7 @@ func (fs *anonFilesystem) StateFields() []string {
 
 func (fs *anonFilesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *anonFilesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -46,6 +49,7 @@ func (fs *anonFilesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *anonFilesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *anonFilesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.devMinor)
@@ -64,6 +68,7 @@ func (d *anonDentry) StateFields() []string {
 
 func (d *anonDentry) beforeSave() {}
 
+// +checklocksignore
 func (d *anonDentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -72,6 +77,7 @@ func (d *anonDentry) StateSave(stateSinkObject state.Sink) {
 
 func (d *anonDentry) afterLoad() {}
 
+// +checklocksignore
 func (d *anonDentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.name)
@@ -91,6 +97,7 @@ func (d *Dentry) StateFields() []string {
 
 func (d *Dentry) beforeSave() {}
 
+// +checklocksignore
 func (d *Dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.dead)
@@ -100,6 +107,7 @@ func (d *Dentry) StateSave(stateSinkObject state.Sink) {
 
 func (d *Dentry) afterLoad() {}
 
+// +checklocksignore
 func (d *Dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.dead)
 	stateSourceObject.Load(1, &d.mounts)
@@ -128,6 +136,7 @@ func (d *devTuple) StateFields() []string {
 
 func (d *devTuple) beforeSave() {}
 
+// +checklocksignore
 func (d *devTuple) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.kind)
@@ -137,6 +146,7 @@ func (d *devTuple) StateSave(stateSinkObject state.Sink) {
 
 func (d *devTuple) afterLoad() {}
 
+// +checklocksignore
 func (d *devTuple) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.kind)
 	stateSourceObject.Load(1, &d.major)
@@ -156,6 +166,7 @@ func (r *registeredDevice) StateFields() []string {
 
 func (r *registeredDevice) beforeSave() {}
 
+// +checklocksignore
 func (r *registeredDevice) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.dev)
@@ -164,6 +175,7 @@ func (r *registeredDevice) StateSave(stateSinkObject state.Sink) {
 
 func (r *registeredDevice) afterLoad() {}
 
+// +checklocksignore
 func (r *registeredDevice) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.dev)
 	stateSourceObject.Load(1, &r.opts)
@@ -181,6 +193,7 @@ func (r *RegisterDeviceOptions) StateFields() []string {
 
 func (r *RegisterDeviceOptions) beforeSave() {}
 
+// +checklocksignore
 func (r *RegisterDeviceOptions) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.GroupName)
@@ -188,6 +201,7 @@ func (r *RegisterDeviceOptions) StateSave(stateSinkObject state.Sink) {
 
 func (r *RegisterDeviceOptions) afterLoad() {}
 
+// +checklocksignore
 func (r *RegisterDeviceOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.GroupName)
 }
@@ -210,6 +224,7 @@ func (ep *EpollInstance) StateFields() []string {
 
 func (ep *EpollInstance) beforeSave() {}
 
+// +checklocksignore
 func (ep *EpollInstance) StateSave(stateSinkObject state.Sink) {
 	ep.beforeSave()
 	stateSinkObject.Save(0, &ep.vfsfd)
@@ -223,6 +238,7 @@ func (ep *EpollInstance) StateSave(stateSinkObject state.Sink) {
 
 func (ep *EpollInstance) afterLoad() {}
 
+// +checklocksignore
 func (ep *EpollInstance) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ep.vfsfd)
 	stateSourceObject.Load(1, &ep.FileDescriptionDefaultImpl)
@@ -246,6 +262,7 @@ func (e *epollInterestKey) StateFields() []string {
 
 func (e *epollInterestKey) beforeSave() {}
 
+// +checklocksignore
 func (e *epollInterestKey) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.file)
@@ -254,6 +271,7 @@ func (e *epollInterestKey) StateSave(stateSinkObject state.Sink) {
 
 func (e *epollInterestKey) afterLoad() {}
 
+// +checklocksignore
 func (e *epollInterestKey) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.file)
 	stateSourceObject.Load(1, &e.num)
@@ -277,6 +295,7 @@ func (epi *epollInterest) StateFields() []string {
 
 func (epi *epollInterest) beforeSave() {}
 
+// +checklocksignore
 func (epi *epollInterest) StateSave(stateSinkObject state.Sink) {
 	epi.beforeSave()
 	stateSinkObject.Save(0, &epi.epoll)
@@ -288,6 +307,7 @@ func (epi *epollInterest) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &epi.userData)
 }
 
+// +checklocksignore
 func (epi *epollInterest) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &epi.epoll)
 	stateSourceObject.Load(1, &epi.key)
@@ -312,6 +332,7 @@ func (l *epollInterestList) StateFields() []string {
 
 func (l *epollInterestList) beforeSave() {}
 
+// +checklocksignore
 func (l *epollInterestList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -320,6 +341,7 @@ func (l *epollInterestList) StateSave(stateSinkObject state.Sink) {
 
 func (l *epollInterestList) afterLoad() {}
 
+// +checklocksignore
 func (l *epollInterestList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -338,6 +360,7 @@ func (e *epollInterestEntry) StateFields() []string {
 
 func (e *epollInterestEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *epollInterestEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -346,6 +369,7 @@ func (e *epollInterestEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *epollInterestEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *epollInterestEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -364,6 +388,7 @@ func (l *eventList) StateFields() []string {
 
 func (l *eventList) beforeSave() {}
 
+// +checklocksignore
 func (l *eventList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -372,6 +397,7 @@ func (l *eventList) StateSave(stateSinkObject state.Sink) {
 
 func (l *eventList) afterLoad() {}
 
+// +checklocksignore
 func (l *eventList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -390,6 +416,7 @@ func (e *eventEntry) StateFields() []string {
 
 func (e *eventEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *eventEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -398,6 +425,7 @@ func (e *eventEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *eventEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *eventEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -422,6 +450,7 @@ func (fd *FileDescription) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (fd *FileDescription) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.FileDescriptionRefs)
@@ -436,6 +465,7 @@ func (fd *FileDescription) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(9, &fd.impl)
 }
 
+// +checklocksignore
 func (fd *FileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.FileDescriptionRefs)
 	stateSourceObject.Load(1, &fd.statusFlags)
@@ -465,6 +495,7 @@ func (f *FileDescriptionOptions) StateFields() []string {
 
 func (f *FileDescriptionOptions) beforeSave() {}
 
+// +checklocksignore
 func (f *FileDescriptionOptions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.AllowDirectIO)
@@ -475,6 +506,7 @@ func (f *FileDescriptionOptions) StateSave(stateSinkObject state.Sink) {
 
 func (f *FileDescriptionOptions) afterLoad() {}
 
+// +checklocksignore
 func (f *FileDescriptionOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.AllowDirectIO)
 	stateSourceObject.Load(1, &f.DenyPRead)
@@ -497,6 +529,7 @@ func (d *Dirent) StateFields() []string {
 
 func (d *Dirent) beforeSave() {}
 
+// +checklocksignore
 func (d *Dirent) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.Name)
@@ -507,6 +540,7 @@ func (d *Dirent) StateSave(stateSinkObject state.Sink) {
 
 func (d *Dirent) afterLoad() {}
 
+// +checklocksignore
 func (d *Dirent) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.Name)
 	stateSourceObject.Load(1, &d.Type)
@@ -524,12 +558,14 @@ func (f *FileDescriptionDefaultImpl) StateFields() []string {
 
 func (f *FileDescriptionDefaultImpl) beforeSave() {}
 
+// +checklocksignore
 func (f *FileDescriptionDefaultImpl) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 }
 
 func (f *FileDescriptionDefaultImpl) afterLoad() {}
 
+// +checklocksignore
 func (f *FileDescriptionDefaultImpl) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -543,12 +579,14 @@ func (d *DirectoryFileDescriptionDefaultImpl) StateFields() []string {
 
 func (d *DirectoryFileDescriptionDefaultImpl) beforeSave() {}
 
+// +checklocksignore
 func (d *DirectoryFileDescriptionDefaultImpl) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 }
 
 func (d *DirectoryFileDescriptionDefaultImpl) afterLoad() {}
 
+// +checklocksignore
 func (d *DirectoryFileDescriptionDefaultImpl) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -562,12 +600,14 @@ func (d *DentryMetadataFileDescriptionImpl) StateFields() []string {
 
 func (d *DentryMetadataFileDescriptionImpl) beforeSave() {}
 
+// +checklocksignore
 func (d *DentryMetadataFileDescriptionImpl) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 }
 
 func (d *DentryMetadataFileDescriptionImpl) afterLoad() {}
 
+// +checklocksignore
 func (d *DentryMetadataFileDescriptionImpl) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -583,6 +623,7 @@ func (s *StaticData) StateFields() []string {
 
 func (s *StaticData) beforeSave() {}
 
+// +checklocksignore
 func (s *StaticData) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Data)
@@ -590,6 +631,7 @@ func (s *StaticData) StateSave(stateSinkObject state.Sink) {
 
 func (s *StaticData) afterLoad() {}
 
+// +checklocksignore
 func (s *StaticData) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Data)
 }
@@ -609,6 +651,7 @@ func (fd *DynamicBytesFileDescriptionImpl) StateFields() []string {
 
 func (fd *DynamicBytesFileDescriptionImpl) beforeSave() {}
 
+// +checklocksignore
 func (fd *DynamicBytesFileDescriptionImpl) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	var bufValue []byte = fd.saveBuf()
@@ -620,6 +663,7 @@ func (fd *DynamicBytesFileDescriptionImpl) StateSave(stateSinkObject state.Sink)
 
 func (fd *DynamicBytesFileDescriptionImpl) afterLoad() {}
 
+// +checklocksignore
 func (fd *DynamicBytesFileDescriptionImpl) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.data)
 	stateSourceObject.Load(2, &fd.off)
@@ -639,6 +683,7 @@ func (fd *LockFD) StateFields() []string {
 
 func (fd *LockFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *LockFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.locks)
@@ -646,6 +691,7 @@ func (fd *LockFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *LockFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *LockFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.locks)
 }
@@ -660,12 +706,14 @@ func (n *NoLockFD) StateFields() []string {
 
 func (n *NoLockFD) beforeSave() {}
 
+// +checklocksignore
 func (n *NoLockFD) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 }
 
 func (n *NoLockFD) afterLoad() {}
 
+// +checklocksignore
 func (n *NoLockFD) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -681,11 +729,13 @@ func (r *FileDescriptionRefs) StateFields() []string {
 
 func (r *FileDescriptionRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *FileDescriptionRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *FileDescriptionRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -706,6 +756,7 @@ func (fs *Filesystem) StateFields() []string {
 
 func (fs *Filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *Filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.FilesystemRefs)
@@ -716,6 +767,7 @@ func (fs *Filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *Filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *Filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.FilesystemRefs)
 	stateSourceObject.Load(1, &fs.vfs)
@@ -733,12 +785,14 @@ func (p *PrependPathAtVFSRootError) StateFields() []string {
 
 func (p *PrependPathAtVFSRootError) beforeSave() {}
 
+// +checklocksignore
 func (p *PrependPathAtVFSRootError) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *PrependPathAtVFSRootError) afterLoad() {}
 
+// +checklocksignore
 func (p *PrependPathAtVFSRootError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -752,12 +806,14 @@ func (p *PrependPathAtNonMountRootError) StateFields() []string {
 
 func (p *PrependPathAtNonMountRootError) beforeSave() {}
 
+// +checklocksignore
 func (p *PrependPathAtNonMountRootError) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *PrependPathAtNonMountRootError) afterLoad() {}
 
+// +checklocksignore
 func (p *PrependPathAtNonMountRootError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -771,12 +827,14 @@ func (p *PrependPathSyntheticError) StateFields() []string {
 
 func (p *PrependPathSyntheticError) beforeSave() {}
 
+// +checklocksignore
 func (p *PrependPathSyntheticError) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 }
 
 func (p *PrependPathSyntheticError) afterLoad() {}
 
+// +checklocksignore
 func (p *PrependPathSyntheticError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -792,11 +850,13 @@ func (r *FilesystemRefs) StateFields() []string {
 
 func (r *FilesystemRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *FilesystemRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *FilesystemRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -815,6 +875,7 @@ func (r *registeredFilesystemType) StateFields() []string {
 
 func (r *registeredFilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (r *registeredFilesystemType) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.fsType)
@@ -823,6 +884,7 @@ func (r *registeredFilesystemType) StateSave(stateSinkObject state.Sink) {
 
 func (r *registeredFilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (r *registeredFilesystemType) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.fsType)
 	stateSourceObject.Load(1, &r.opts)
@@ -842,6 +904,7 @@ func (r *RegisterFilesystemTypeOptions) StateFields() []string {
 
 func (r *RegisterFilesystemTypeOptions) beforeSave() {}
 
+// +checklocksignore
 func (r *RegisterFilesystemTypeOptions) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.AllowUserMount)
@@ -851,6 +914,7 @@ func (r *RegisterFilesystemTypeOptions) StateSave(stateSinkObject state.Sink) {
 
 func (r *RegisterFilesystemTypeOptions) afterLoad() {}
 
+// +checklocksignore
 func (r *RegisterFilesystemTypeOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.AllowUserMount)
 	stateSourceObject.Load(1, &r.AllowUserList)
@@ -886,6 +950,7 @@ func (i *Inotify) StateFields() []string {
 
 func (i *Inotify) beforeSave() {}
 
+// +checklocksignore
 func (i *Inotify) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.vfsfd)
@@ -902,6 +967,7 @@ func (i *Inotify) StateSave(stateSinkObject state.Sink) {
 
 func (i *Inotify) afterLoad() {}
 
+// +checklocksignore
 func (i *Inotify) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.vfsfd)
 	stateSourceObject.Load(1, &i.FileDescriptionDefaultImpl)
@@ -927,6 +993,7 @@ func (w *Watches) StateFields() []string {
 
 func (w *Watches) beforeSave() {}
 
+// +checklocksignore
 func (w *Watches) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.ws)
@@ -934,6 +1001,7 @@ func (w *Watches) StateSave(stateSinkObject state.Sink) {
 
 func (w *Watches) afterLoad() {}
 
+// +checklocksignore
 func (w *Watches) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.ws)
 }
@@ -954,6 +1022,7 @@ func (w *Watch) StateFields() []string {
 
 func (w *Watch) beforeSave() {}
 
+// +checklocksignore
 func (w *Watch) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.owner)
@@ -965,6 +1034,7 @@ func (w *Watch) StateSave(stateSinkObject state.Sink) {
 
 func (w *Watch) afterLoad() {}
 
+// +checklocksignore
 func (w *Watch) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.owner)
 	stateSourceObject.Load(1, &w.wd)
@@ -990,6 +1060,7 @@ func (e *Event) StateFields() []string {
 
 func (e *Event) beforeSave() {}
 
+// +checklocksignore
 func (e *Event) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.eventEntry)
@@ -1002,6 +1073,7 @@ func (e *Event) StateSave(stateSinkObject state.Sink) {
 
 func (e *Event) afterLoad() {}
 
+// +checklocksignore
 func (e *Event) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.eventEntry)
 	stateSourceObject.Load(1, &e.wd)
@@ -1024,6 +1096,7 @@ func (fl *FileLocks) StateFields() []string {
 
 func (fl *FileLocks) beforeSave() {}
 
+// +checklocksignore
 func (fl *FileLocks) StateSave(stateSinkObject state.Sink) {
 	fl.beforeSave()
 	stateSinkObject.Save(0, &fl.bsd)
@@ -1032,6 +1105,7 @@ func (fl *FileLocks) StateSave(stateSinkObject state.Sink) {
 
 func (fl *FileLocks) afterLoad() {}
 
+// +checklocksignore
 func (fl *FileLocks) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fl.bsd)
 	stateSourceObject.Load(1, &fl.posix)
@@ -1059,6 +1133,7 @@ func (mnt *Mount) StateFields() []string {
 
 func (mnt *Mount) beforeSave() {}
 
+// +checklocksignore
 func (mnt *Mount) StateSave(stateSinkObject state.Sink) {
 	mnt.beforeSave()
 	var keyValue VirtualDentry = mnt.saveKey()
@@ -1075,6 +1150,7 @@ func (mnt *Mount) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(10, &mnt.writers)
 }
 
+// +checklocksignore
 func (mnt *Mount) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mnt.vfs)
 	stateSourceObject.Load(1, &mnt.fs)
@@ -1105,6 +1181,7 @@ func (mntns *MountNamespace) StateFields() []string {
 
 func (mntns *MountNamespace) beforeSave() {}
 
+// +checklocksignore
 func (mntns *MountNamespace) StateSave(stateSinkObject state.Sink) {
 	mntns.beforeSave()
 	stateSinkObject.Save(0, &mntns.MountNamespaceRefs)
@@ -1115,6 +1192,7 @@ func (mntns *MountNamespace) StateSave(stateSinkObject state.Sink) {
 
 func (mntns *MountNamespace) afterLoad() {}
 
+// +checklocksignore
 func (mntns *MountNamespace) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &mntns.MountNamespaceRefs)
 	stateSourceObject.Load(1, &mntns.Owner)
@@ -1135,6 +1213,7 @@ func (u *umountRecursiveOptions) StateFields() []string {
 
 func (u *umountRecursiveOptions) beforeSave() {}
 
+// +checklocksignore
 func (u *umountRecursiveOptions) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.eager)
@@ -1143,6 +1222,7 @@ func (u *umountRecursiveOptions) StateSave(stateSinkObject state.Sink) {
 
 func (u *umountRecursiveOptions) afterLoad() {}
 
+// +checklocksignore
 func (u *umountRecursiveOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.eager)
 	stateSourceObject.Load(1, &u.disconnectHierarchy)
@@ -1160,11 +1240,13 @@ func (r *MountNamespaceRefs) StateFields() []string {
 
 func (r *MountNamespaceRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *MountNamespaceRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *MountNamespaceRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
@@ -1184,6 +1266,7 @@ func (fd *opathFD) StateFields() []string {
 
 func (fd *opathFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *opathFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -1193,6 +1276,7 @@ func (fd *opathFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *opathFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *opathFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -1211,6 +1295,7 @@ func (g *GetDentryOptions) StateFields() []string {
 
 func (g *GetDentryOptions) beforeSave() {}
 
+// +checklocksignore
 func (g *GetDentryOptions) StateSave(stateSinkObject state.Sink) {
 	g.beforeSave()
 	stateSinkObject.Save(0, &g.CheckSearchable)
@@ -1218,6 +1303,7 @@ func (g *GetDentryOptions) StateSave(stateSinkObject state.Sink) {
 
 func (g *GetDentryOptions) afterLoad() {}
 
+// +checklocksignore
 func (g *GetDentryOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &g.CheckSearchable)
 }
@@ -1235,6 +1321,7 @@ func (m *MkdirOptions) StateFields() []string {
 
 func (m *MkdirOptions) beforeSave() {}
 
+// +checklocksignore
 func (m *MkdirOptions) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.Mode)
@@ -1243,6 +1330,7 @@ func (m *MkdirOptions) StateSave(stateSinkObject state.Sink) {
 
 func (m *MkdirOptions) afterLoad() {}
 
+// +checklocksignore
 func (m *MkdirOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.Mode)
 	stateSourceObject.Load(1, &m.ForSyntheticMountpoint)
@@ -1263,6 +1351,7 @@ func (m *MknodOptions) StateFields() []string {
 
 func (m *MknodOptions) beforeSave() {}
 
+// +checklocksignore
 func (m *MknodOptions) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.Mode)
@@ -1273,6 +1362,7 @@ func (m *MknodOptions) StateSave(stateSinkObject state.Sink) {
 
 func (m *MknodOptions) afterLoad() {}
 
+// +checklocksignore
 func (m *MknodOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.Mode)
 	stateSourceObject.Load(1, &m.DevMajor)
@@ -1295,6 +1385,7 @@ func (m *MountFlags) StateFields() []string {
 
 func (m *MountFlags) beforeSave() {}
 
+// +checklocksignore
 func (m *MountFlags) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.NoExec)
@@ -1305,6 +1396,7 @@ func (m *MountFlags) StateSave(stateSinkObject state.Sink) {
 
 func (m *MountFlags) afterLoad() {}
 
+// +checklocksignore
 func (m *MountFlags) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.NoExec)
 	stateSourceObject.Load(1, &m.NoATime)
@@ -1327,6 +1419,7 @@ func (m *MountOptions) StateFields() []string {
 
 func (m *MountOptions) beforeSave() {}
 
+// +checklocksignore
 func (m *MountOptions) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.Flags)
@@ -1337,6 +1430,7 @@ func (m *MountOptions) StateSave(stateSinkObject state.Sink) {
 
 func (m *MountOptions) afterLoad() {}
 
+// +checklocksignore
 func (m *MountOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.Flags)
 	stateSourceObject.Load(1, &m.ReadOnly)
@@ -1358,6 +1452,7 @@ func (o *OpenOptions) StateFields() []string {
 
 func (o *OpenOptions) beforeSave() {}
 
+// +checklocksignore
 func (o *OpenOptions) StateSave(stateSinkObject state.Sink) {
 	o.beforeSave()
 	stateSinkObject.Save(0, &o.Flags)
@@ -1367,6 +1462,7 @@ func (o *OpenOptions) StateSave(stateSinkObject state.Sink) {
 
 func (o *OpenOptions) afterLoad() {}
 
+// +checklocksignore
 func (o *OpenOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &o.Flags)
 	stateSourceObject.Load(1, &o.Mode)
@@ -1385,6 +1481,7 @@ func (r *ReadOptions) StateFields() []string {
 
 func (r *ReadOptions) beforeSave() {}
 
+// +checklocksignore
 func (r *ReadOptions) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Flags)
@@ -1392,6 +1489,7 @@ func (r *ReadOptions) StateSave(stateSinkObject state.Sink) {
 
 func (r *ReadOptions) afterLoad() {}
 
+// +checklocksignore
 func (r *ReadOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Flags)
 }
@@ -1409,6 +1507,7 @@ func (r *RenameOptions) StateFields() []string {
 
 func (r *RenameOptions) beforeSave() {}
 
+// +checklocksignore
 func (r *RenameOptions) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Flags)
@@ -1417,6 +1516,7 @@ func (r *RenameOptions) StateSave(stateSinkObject state.Sink) {
 
 func (r *RenameOptions) afterLoad() {}
 
+// +checklocksignore
 func (r *RenameOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Flags)
 	stateSourceObject.Load(1, &r.MustBeDir)
@@ -1435,6 +1535,7 @@ func (s *SetStatOptions) StateFields() []string {
 
 func (s *SetStatOptions) beforeSave() {}
 
+// +checklocksignore
 func (s *SetStatOptions) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Stat)
@@ -1443,6 +1544,7 @@ func (s *SetStatOptions) StateSave(stateSinkObject state.Sink) {
 
 func (s *SetStatOptions) afterLoad() {}
 
+// +checklocksignore
 func (s *SetStatOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Stat)
 	stateSourceObject.Load(1, &s.NeedWritePerm)
@@ -1460,6 +1562,7 @@ func (b *BoundEndpointOptions) StateFields() []string {
 
 func (b *BoundEndpointOptions) beforeSave() {}
 
+// +checklocksignore
 func (b *BoundEndpointOptions) StateSave(stateSinkObject state.Sink) {
 	b.beforeSave()
 	stateSinkObject.Save(0, &b.Addr)
@@ -1467,6 +1570,7 @@ func (b *BoundEndpointOptions) StateSave(stateSinkObject state.Sink) {
 
 func (b *BoundEndpointOptions) afterLoad() {}
 
+// +checklocksignore
 func (b *BoundEndpointOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &b.Addr)
 }
@@ -1484,6 +1588,7 @@ func (g *GetXattrOptions) StateFields() []string {
 
 func (g *GetXattrOptions) beforeSave() {}
 
+// +checklocksignore
 func (g *GetXattrOptions) StateSave(stateSinkObject state.Sink) {
 	g.beforeSave()
 	stateSinkObject.Save(0, &g.Name)
@@ -1492,6 +1597,7 @@ func (g *GetXattrOptions) StateSave(stateSinkObject state.Sink) {
 
 func (g *GetXattrOptions) afterLoad() {}
 
+// +checklocksignore
 func (g *GetXattrOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &g.Name)
 	stateSourceObject.Load(1, &g.Size)
@@ -1511,6 +1617,7 @@ func (s *SetXattrOptions) StateFields() []string {
 
 func (s *SetXattrOptions) beforeSave() {}
 
+// +checklocksignore
 func (s *SetXattrOptions) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Name)
@@ -1520,6 +1627,7 @@ func (s *SetXattrOptions) StateSave(stateSinkObject state.Sink) {
 
 func (s *SetXattrOptions) afterLoad() {}
 
+// +checklocksignore
 func (s *SetXattrOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Name)
 	stateSourceObject.Load(1, &s.Value)
@@ -1539,6 +1647,7 @@ func (s *StatOptions) StateFields() []string {
 
 func (s *StatOptions) beforeSave() {}
 
+// +checklocksignore
 func (s *StatOptions) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Mask)
@@ -1547,6 +1656,7 @@ func (s *StatOptions) StateSave(stateSinkObject state.Sink) {
 
 func (s *StatOptions) afterLoad() {}
 
+// +checklocksignore
 func (s *StatOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Mask)
 	stateSourceObject.Load(1, &s.Sync)
@@ -1564,6 +1674,7 @@ func (u *UmountOptions) StateFields() []string {
 
 func (u *UmountOptions) beforeSave() {}
 
+// +checklocksignore
 func (u *UmountOptions) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.Flags)
@@ -1571,6 +1682,7 @@ func (u *UmountOptions) StateSave(stateSinkObject state.Sink) {
 
 func (u *UmountOptions) afterLoad() {}
 
+// +checklocksignore
 func (u *UmountOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.Flags)
 }
@@ -1587,6 +1699,7 @@ func (w *WriteOptions) StateFields() []string {
 
 func (w *WriteOptions) beforeSave() {}
 
+// +checklocksignore
 func (w *WriteOptions) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.Flags)
@@ -1594,6 +1707,7 @@ func (w *WriteOptions) StateSave(stateSinkObject state.Sink) {
 
 func (w *WriteOptions) afterLoad() {}
 
+// +checklocksignore
 func (w *WriteOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.Flags)
 }
@@ -1635,6 +1749,7 @@ func (rp *ResolvingPath) StateFields() []string {
 
 func (rp *ResolvingPath) beforeSave() {}
 
+// +checklocksignore
 func (rp *ResolvingPath) StateSave(stateSinkObject state.Sink) {
 	rp.beforeSave()
 	stateSinkObject.Save(0, &rp.vfs)
@@ -1659,6 +1774,7 @@ func (rp *ResolvingPath) StateSave(stateSinkObject state.Sink) {
 
 func (rp *ResolvingPath) afterLoad() {}
 
+// +checklocksignore
 func (rp *ResolvingPath) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rp.vfs)
 	stateSourceObject.Load(1, &rp.root)
@@ -1690,12 +1806,14 @@ func (r *resolveMountRootOrJumpError) StateFields() []string {
 
 func (r *resolveMountRootOrJumpError) beforeSave() {}
 
+// +checklocksignore
 func (r *resolveMountRootOrJumpError) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *resolveMountRootOrJumpError) afterLoad() {}
 
+// +checklocksignore
 func (r *resolveMountRootOrJumpError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1709,12 +1827,14 @@ func (r *resolveMountPointError) StateFields() []string {
 
 func (r *resolveMountPointError) beforeSave() {}
 
+// +checklocksignore
 func (r *resolveMountPointError) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *resolveMountPointError) afterLoad() {}
 
+// +checklocksignore
 func (r *resolveMountPointError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1728,12 +1848,14 @@ func (r *resolveAbsSymlinkError) StateFields() []string {
 
 func (r *resolveAbsSymlinkError) beforeSave() {}
 
+// +checklocksignore
 func (r *resolveAbsSymlinkError) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 }
 
 func (r *resolveAbsSymlinkError) afterLoad() {}
 
+// +checklocksignore
 func (r *resolveAbsSymlinkError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -1757,6 +1879,7 @@ func (vfs *VirtualFilesystem) StateFields() []string {
 
 func (vfs *VirtualFilesystem) beforeSave() {}
 
+// +checklocksignore
 func (vfs *VirtualFilesystem) StateSave(stateSinkObject state.Sink) {
 	vfs.beforeSave()
 	var mountsValue []*Mount = vfs.saveMounts()
@@ -1773,6 +1896,7 @@ func (vfs *VirtualFilesystem) StateSave(stateSinkObject state.Sink) {
 
 func (vfs *VirtualFilesystem) afterLoad() {}
 
+// +checklocksignore
 func (vfs *VirtualFilesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &vfs.mountpoints)
 	stateSourceObject.Load(2, &vfs.lastMountID)
@@ -1800,6 +1924,7 @@ func (p *PathOperation) StateFields() []string {
 
 func (p *PathOperation) beforeSave() {}
 
+// +checklocksignore
 func (p *PathOperation) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.Root)
@@ -1810,6 +1935,7 @@ func (p *PathOperation) StateSave(stateSinkObject state.Sink) {
 
 func (p *PathOperation) afterLoad() {}
 
+// +checklocksignore
 func (p *PathOperation) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.Root)
 	stateSourceObject.Load(1, &p.Start)
@@ -1830,6 +1956,7 @@ func (vd *VirtualDentry) StateFields() []string {
 
 func (vd *VirtualDentry) beforeSave() {}
 
+// +checklocksignore
 func (vd *VirtualDentry) StateSave(stateSinkObject state.Sink) {
 	vd.beforeSave()
 	stateSinkObject.Save(0, &vd.mount)
@@ -1838,6 +1965,7 @@ func (vd *VirtualDentry) StateSave(stateSinkObject state.Sink) {
 
 func (vd *VirtualDentry) afterLoad() {}
 
+// +checklocksignore
 func (vd *VirtualDentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &vd.mount)
 	stateSourceObject.Load(1, &vd.dentry)
diff --git a/pkg/tcpip/buffer/buffer_state_autogen.go b/pkg/tcpip/buffer/buffer_state_autogen.go
index 9f0e96ed1..51bfbff8a 100644
--- a/pkg/tcpip/buffer/buffer_state_autogen.go
+++ b/pkg/tcpip/buffer/buffer_state_autogen.go
@@ -19,6 +19,7 @@ func (vv *VectorisedView) StateFields() []string {
 
 func (vv *VectorisedView) beforeSave() {}
 
+// +checklocksignore
 func (vv *VectorisedView) StateSave(stateSinkObject state.Sink) {
 	vv.beforeSave()
 	stateSinkObject.Save(0, &vv.views)
@@ -27,6 +28,7 @@ func (vv *VectorisedView) StateSave(stateSinkObject state.Sink) {
 
 func (vv *VectorisedView) afterLoad() {}
 
+// +checklocksignore
 func (vv *VectorisedView) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &vv.views)
 	stateSourceObject.Load(1, &vv.size)
diff --git a/pkg/tcpip/header/header_state_autogen.go b/pkg/tcpip/header/header_state_autogen.go
index ddcc980e8..d6dd58874 100644
--- a/pkg/tcpip/header/header_state_autogen.go
+++ b/pkg/tcpip/header/header_state_autogen.go
@@ -19,6 +19,7 @@ func (r *SACKBlock) StateFields() []string {
 
 func (r *SACKBlock) beforeSave() {}
 
+// +checklocksignore
 func (r *SACKBlock) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -27,6 +28,7 @@ func (r *SACKBlock) StateSave(stateSinkObject state.Sink) {
 
 func (r *SACKBlock) afterLoad() {}
 
+// +checklocksignore
 func (r *SACKBlock) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
@@ -47,6 +49,7 @@ func (t *TCPOptions) StateFields() []string {
 
 func (t *TCPOptions) beforeSave() {}
 
+// +checklocksignore
 func (t *TCPOptions) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.TS)
@@ -57,6 +60,7 @@ func (t *TCPOptions) StateSave(stateSinkObject state.Sink) {
 
 func (t *TCPOptions) afterLoad() {}
 
+// +checklocksignore
 func (t *TCPOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.TS)
 	stateSourceObject.Load(1, &t.TSVal)
diff --git a/pkg/tcpip/link/channel/channel_state_autogen.go b/pkg/tcpip/link/channel/channel_state_autogen.go
index 38c12a3bf..7730b59b8 100644
--- a/pkg/tcpip/link/channel/channel_state_autogen.go
+++ b/pkg/tcpip/link/channel/channel_state_autogen.go
@@ -18,6 +18,7 @@ func (n *NotificationHandle) StateFields() []string {
 
 func (n *NotificationHandle) beforeSave() {}
 
+// +checklocksignore
 func (n *NotificationHandle) StateSave(stateSinkObject state.Sink) {
 	n.beforeSave()
 	stateSinkObject.Save(0, &n.n)
@@ -25,6 +26,7 @@ func (n *NotificationHandle) StateSave(stateSinkObject state.Sink) {
 
 func (n *NotificationHandle) afterLoad() {}
 
+// +checklocksignore
 func (n *NotificationHandle) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &n.n)
 }
diff --git a/pkg/tcpip/link/tun/tun_state_autogen.go b/pkg/tcpip/link/tun/tun_state_autogen.go
index 3515d86fd..c5773cc11 100644
--- a/pkg/tcpip/link/tun/tun_state_autogen.go
+++ b/pkg/tcpip/link/tun/tun_state_autogen.go
@@ -19,6 +19,7 @@ func (d *Device) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (d *Device) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.Queue)
@@ -29,6 +30,7 @@ func (d *Device) StateSave(stateSinkObject state.Sink) {
 
 func (d *Device) afterLoad() {}
 
+// +checklocksignore
 func (d *Device) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.Queue)
 	stateSourceObject.Load(1, &d.endpoint)
@@ -48,11 +50,13 @@ func (r *tunEndpointRefs) StateFields() []string {
 
 func (r *tunEndpointRefs) beforeSave() {}
 
+// +checklocksignore
 func (r *tunEndpointRefs) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.refCount)
 }
 
+// +checklocksignore
 func (r *tunEndpointRefs) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.refCount)
 	stateSourceObject.AfterLoad(r.afterLoad)
diff --git a/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go b/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
index 3f82c184a..21c5774e9 100644
--- a/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
+++ b/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
@@ -19,6 +19,7 @@ func (l *reassemblerList) StateFields() []string {
 
 func (l *reassemblerList) beforeSave() {}
 
+// +checklocksignore
 func (l *reassemblerList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *reassemblerList) StateSave(stateSinkObject state.Sink) {
 
 func (l *reassemblerList) afterLoad() {}
 
+// +checklocksignore
 func (l *reassemblerList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *reassemblerEntry) StateFields() []string {
 
 func (e *reassemblerEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *reassemblerEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *reassemblerEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *reassemblerEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *reassemblerEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
index 87a48e2ce..19b672251 100644
--- a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
+++ b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
@@ -16,12 +16,14 @@ func (i *icmpv4DestinationUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *icmpv4DestinationUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -37,6 +39,7 @@ func (i *icmpv4DestinationHostUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationHostUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationHostUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv4DestinationUnreachableSockError)
@@ -44,6 +47,7 @@ func (i *icmpv4DestinationHostUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv4DestinationHostUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationHostUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv4DestinationUnreachableSockError)
 }
@@ -60,6 +64,7 @@ func (i *icmpv4DestinationPortUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationPortUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationPortUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv4DestinationUnreachableSockError)
@@ -67,6 +72,7 @@ func (i *icmpv4DestinationPortUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv4DestinationPortUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationPortUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv4DestinationUnreachableSockError)
 }
@@ -84,6 +90,7 @@ func (e *icmpv4FragmentationNeededSockError) StateFields() []string {
 
 func (e *icmpv4FragmentationNeededSockError) beforeSave() {}
 
+// +checklocksignore
 func (e *icmpv4FragmentationNeededSockError) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.icmpv4DestinationUnreachableSockError)
@@ -92,6 +99,7 @@ func (e *icmpv4FragmentationNeededSockError) StateSave(stateSinkObject state.Sin
 
 func (e *icmpv4FragmentationNeededSockError) afterLoad() {}
 
+// +checklocksignore
 func (e *icmpv4FragmentationNeededSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.icmpv4DestinationUnreachableSockError)
 	stateSourceObject.Load(1, &e.mtu)
diff --git a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
index 675fdc220..13d427822 100644
--- a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
+++ b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
@@ -16,12 +16,14 @@ func (i *icmpv6DestinationUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *icmpv6DestinationUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -37,6 +39,7 @@ func (i *icmpv6DestinationNetworkUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationNetworkUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationNetworkUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -44,6 +47,7 @@ func (i *icmpv6DestinationNetworkUnreachableSockError) StateSave(stateSinkObject
 
 func (i *icmpv6DestinationNetworkUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationNetworkUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -60,6 +64,7 @@ func (i *icmpv6DestinationPortUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationPortUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationPortUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -67,6 +72,7 @@ func (i *icmpv6DestinationPortUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv6DestinationPortUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationPortUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -83,6 +89,7 @@ func (i *icmpv6DestinationAddressUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationAddressUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationAddressUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -90,6 +97,7 @@ func (i *icmpv6DestinationAddressUnreachableSockError) StateSave(stateSinkObject
 
 func (i *icmpv6DestinationAddressUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationAddressUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -106,6 +114,7 @@ func (e *icmpv6PacketTooBigSockError) StateFields() []string {
 
 func (e *icmpv6PacketTooBigSockError) beforeSave() {}
 
+// +checklocksignore
 func (e *icmpv6PacketTooBigSockError) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.mtu)
@@ -113,6 +122,7 @@ func (e *icmpv6PacketTooBigSockError) StateSave(stateSinkObject state.Sink) {
 
 func (e *icmpv6PacketTooBigSockError) afterLoad() {}
 
+// +checklocksignore
 func (e *icmpv6PacketTooBigSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.mtu)
 }
diff --git a/pkg/tcpip/ports/ports_state_autogen.go b/pkg/tcpip/ports/ports_state_autogen.go
index 1e1d9cd4c..2719f6c41 100644
--- a/pkg/tcpip/ports/ports_state_autogen.go
+++ b/pkg/tcpip/ports/ports_state_autogen.go
@@ -20,6 +20,7 @@ func (f *Flags) StateFields() []string {
 
 func (f *Flags) beforeSave() {}
 
+// +checklocksignore
 func (f *Flags) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.MostRecent)
@@ -29,6 +30,7 @@ func (f *Flags) StateSave(stateSinkObject state.Sink) {
 
 func (f *Flags) afterLoad() {}
 
+// +checklocksignore
 func (f *Flags) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.MostRecent)
 	stateSourceObject.Load(1, &f.LoadBalanced)
diff --git a/pkg/tcpip/stack/stack_state_autogen.go b/pkg/tcpip/stack/stack_state_autogen.go
index 462139b82..6b10c1e98 100644
--- a/pkg/tcpip/stack/stack_state_autogen.go
+++ b/pkg/tcpip/stack/stack_state_autogen.go
@@ -21,6 +21,7 @@ func (t *tuple) StateFields() []string {
 
 func (t *tuple) beforeSave() {}
 
+// +checklocksignore
 func (t *tuple) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.tupleEntry)
@@ -31,6 +32,7 @@ func (t *tuple) StateSave(stateSinkObject state.Sink) {
 
 func (t *tuple) afterLoad() {}
 
+// +checklocksignore
 func (t *tuple) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.tupleEntry)
 	stateSourceObject.Load(1, &t.tupleID)
@@ -55,6 +57,7 @@ func (ti *tupleID) StateFields() []string {
 
 func (ti *tupleID) beforeSave() {}
 
+// +checklocksignore
 func (ti *tupleID) StateSave(stateSinkObject state.Sink) {
 	ti.beforeSave()
 	stateSinkObject.Save(0, &ti.srcAddr)
@@ -67,6 +70,7 @@ func (ti *tupleID) StateSave(stateSinkObject state.Sink) {
 
 func (ti *tupleID) afterLoad() {}
 
+// +checklocksignore
 func (ti *tupleID) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ti.srcAddr)
 	stateSourceObject.Load(1, &ti.srcPort)
@@ -93,6 +97,7 @@ func (cn *conn) StateFields() []string {
 
 func (cn *conn) beforeSave() {}
 
+// +checklocksignore
 func (cn *conn) StateSave(stateSinkObject state.Sink) {
 	cn.beforeSave()
 	var lastUsedValue unixTime = cn.saveLastUsed()
@@ -106,6 +111,7 @@ func (cn *conn) StateSave(stateSinkObject state.Sink) {
 
 func (cn *conn) afterLoad() {}
 
+// +checklocksignore
 func (cn *conn) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &cn.original)
 	stateSourceObject.Load(1, &cn.reply)
@@ -126,6 +132,7 @@ func (ct *ConnTrack) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (ct *ConnTrack) StateSave(stateSinkObject state.Sink) {
 	ct.beforeSave()
 	stateSinkObject.Save(0, &ct.seed)
@@ -134,6 +141,7 @@ func (ct *ConnTrack) StateSave(stateSinkObject state.Sink) {
 
 func (ct *ConnTrack) afterLoad() {}
 
+// +checklocksignore
 func (ct *ConnTrack) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ct.seed)
 	stateSourceObject.Load(1, &ct.buckets)
@@ -151,6 +159,7 @@ func (b *bucket) StateFields() []string {
 
 func (b *bucket) beforeSave() {}
 
+// +checklocksignore
 func (b *bucket) StateSave(stateSinkObject state.Sink) {
 	b.beforeSave()
 	stateSinkObject.Save(0, &b.tuples)
@@ -158,6 +167,7 @@ func (b *bucket) StateSave(stateSinkObject state.Sink) {
 
 func (b *bucket) afterLoad() {}
 
+// +checklocksignore
 func (b *bucket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &b.tuples)
 }
@@ -175,6 +185,7 @@ func (u *unixTime) StateFields() []string {
 
 func (u *unixTime) beforeSave() {}
 
+// +checklocksignore
 func (u *unixTime) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.second)
@@ -183,6 +194,7 @@ func (u *unixTime) StateSave(stateSinkObject state.Sink) {
 
 func (u *unixTime) afterLoad() {}
 
+// +checklocksignore
 func (u *unixTime) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.second)
 	stateSourceObject.Load(1, &u.nano)
@@ -204,6 +216,7 @@ func (it *IPTables) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (it *IPTables) StateSave(stateSinkObject state.Sink) {
 	it.beforeSave()
 	stateSinkObject.Save(0, &it.mu)
@@ -215,6 +228,7 @@ func (it *IPTables) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(6, &it.reaperDone)
 }
 
+// +checklocksignore
 func (it *IPTables) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &it.mu)
 	stateSourceObject.Load(1, &it.v4Tables)
@@ -240,6 +254,7 @@ func (table *Table) StateFields() []string {
 
 func (table *Table) beforeSave() {}
 
+// +checklocksignore
 func (table *Table) StateSave(stateSinkObject state.Sink) {
 	table.beforeSave()
 	stateSinkObject.Save(0, &table.Rules)
@@ -249,6 +264,7 @@ func (table *Table) StateSave(stateSinkObject state.Sink) {
 
 func (table *Table) afterLoad() {}
 
+// +checklocksignore
 func (table *Table) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &table.Rules)
 	stateSourceObject.Load(1, &table.BuiltinChains)
@@ -269,6 +285,7 @@ func (r *Rule) StateFields() []string {
 
 func (r *Rule) beforeSave() {}
 
+// +checklocksignore
 func (r *Rule) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Filter)
@@ -278,6 +295,7 @@ func (r *Rule) StateSave(stateSinkObject state.Sink) {
 
 func (r *Rule) afterLoad() {}
 
+// +checklocksignore
 func (r *Rule) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Filter)
 	stateSourceObject.Load(1, &r.Matchers)
@@ -309,6 +327,7 @@ func (fl *IPHeaderFilter) StateFields() []string {
 
 func (fl *IPHeaderFilter) beforeSave() {}
 
+// +checklocksignore
 func (fl *IPHeaderFilter) StateSave(stateSinkObject state.Sink) {
 	fl.beforeSave()
 	stateSinkObject.Save(0, &fl.Protocol)
@@ -329,6 +348,7 @@ func (fl *IPHeaderFilter) StateSave(stateSinkObject state.Sink) {
 
 func (fl *IPHeaderFilter) afterLoad() {}
 
+// +checklocksignore
 func (fl *IPHeaderFilter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fl.Protocol)
 	stateSourceObject.Load(1, &fl.CheckProtocol)
@@ -359,6 +379,7 @@ func (l *neighborEntryList) StateFields() []string {
 
 func (l *neighborEntryList) beforeSave() {}
 
+// +checklocksignore
 func (l *neighborEntryList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -367,6 +388,7 @@ func (l *neighborEntryList) StateSave(stateSinkObject state.Sink) {
 
 func (l *neighborEntryList) afterLoad() {}
 
+// +checklocksignore
 func (l *neighborEntryList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -385,6 +407,7 @@ func (e *neighborEntryEntry) StateFields() []string {
 
 func (e *neighborEntryEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *neighborEntryEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -393,6 +416,7 @@ func (e *neighborEntryEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *neighborEntryEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *neighborEntryEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -411,6 +435,7 @@ func (p *PacketBufferList) StateFields() []string {
 
 func (p *PacketBufferList) beforeSave() {}
 
+// +checklocksignore
 func (p *PacketBufferList) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.head)
@@ -419,6 +444,7 @@ func (p *PacketBufferList) StateSave(stateSinkObject state.Sink) {
 
 func (p *PacketBufferList) afterLoad() {}
 
+// +checklocksignore
 func (p *PacketBufferList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.head)
 	stateSourceObject.Load(1, &p.tail)
@@ -437,6 +463,7 @@ func (e *PacketBufferEntry) StateFields() []string {
 
 func (e *PacketBufferEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *PacketBufferEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -445,6 +472,7 @@ func (e *PacketBufferEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *PacketBufferEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *PacketBufferEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -465,6 +493,7 @@ func (t *TransportEndpointID) StateFields() []string {
 
 func (t *TransportEndpointID) beforeSave() {}
 
+// +checklocksignore
 func (t *TransportEndpointID) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.LocalPort)
@@ -475,6 +504,7 @@ func (t *TransportEndpointID) StateSave(stateSinkObject state.Sink) {
 
 func (t *TransportEndpointID) afterLoad() {}
 
+// +checklocksignore
 func (t *TransportEndpointID) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.LocalPort)
 	stateSourceObject.Load(1, &t.LocalAddress)
@@ -507,6 +537,7 @@ func (g *GSO) StateFields() []string {
 
 func (g *GSO) beforeSave() {}
 
+// +checklocksignore
 func (g *GSO) StateSave(stateSinkObject state.Sink) {
 	g.beforeSave()
 	stateSinkObject.Save(0, &g.Type)
@@ -519,6 +550,7 @@ func (g *GSO) StateSave(stateSinkObject state.Sink) {
 
 func (g *GSO) afterLoad() {}
 
+// +checklocksignore
 func (g *GSO) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &g.Type)
 	stateSourceObject.Load(1, &g.NeedsCsum)
@@ -545,6 +577,7 @@ func (t *TransportEndpointInfo) StateFields() []string {
 
 func (t *TransportEndpointInfo) beforeSave() {}
 
+// +checklocksignore
 func (t *TransportEndpointInfo) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.NetProto)
@@ -557,6 +590,7 @@ func (t *TransportEndpointInfo) StateSave(stateSinkObject state.Sink) {
 
 func (t *TransportEndpointInfo) afterLoad() {}
 
+// +checklocksignore
 func (t *TransportEndpointInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.NetProto)
 	stateSourceObject.Load(1, &t.TransProto)
@@ -582,6 +616,7 @@ func (ep *multiPortEndpoint) StateFields() []string {
 
 func (ep *multiPortEndpoint) beforeSave() {}
 
+// +checklocksignore
 func (ep *multiPortEndpoint) StateSave(stateSinkObject state.Sink) {
 	ep.beforeSave()
 	stateSinkObject.Save(0, &ep.demux)
@@ -593,6 +628,7 @@ func (ep *multiPortEndpoint) StateSave(stateSinkObject state.Sink) {
 
 func (ep *multiPortEndpoint) afterLoad() {}
 
+// +checklocksignore
 func (ep *multiPortEndpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ep.demux)
 	stateSourceObject.Load(1, &ep.netProto)
@@ -614,6 +650,7 @@ func (l *tupleList) StateFields() []string {
 
 func (l *tupleList) beforeSave() {}
 
+// +checklocksignore
 func (l *tupleList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -622,6 +659,7 @@ func (l *tupleList) StateSave(stateSinkObject state.Sink) {
 
 func (l *tupleList) afterLoad() {}
 
+// +checklocksignore
 func (l *tupleList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -640,6 +678,7 @@ func (e *tupleEntry) StateFields() []string {
 
 func (e *tupleEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *tupleEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -648,6 +687,7 @@ func (e *tupleEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *tupleEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *tupleEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/tcpip_state_autogen.go b/pkg/tcpip/tcpip_state_autogen.go
index 743e1b598..2557f2b9e 100644
--- a/pkg/tcpip/tcpip_state_autogen.go
+++ b/pkg/tcpip/tcpip_state_autogen.go
@@ -16,12 +16,14 @@ func (e *ErrAborted) StateFields() []string {
 
 func (e *ErrAborted) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrAborted) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrAborted) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrAborted) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -35,12 +37,14 @@ func (e *ErrAddressFamilyNotSupported) StateFields() []string {
 
 func (e *ErrAddressFamilyNotSupported) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrAddressFamilyNotSupported) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrAddressFamilyNotSupported) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrAddressFamilyNotSupported) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -54,12 +58,14 @@ func (e *ErrAlreadyBound) StateFields() []string {
 
 func (e *ErrAlreadyBound) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrAlreadyBound) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrAlreadyBound) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrAlreadyBound) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -73,12 +79,14 @@ func (e *ErrAlreadyConnected) StateFields() []string {
 
 func (e *ErrAlreadyConnected) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrAlreadyConnected) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrAlreadyConnected) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrAlreadyConnected) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -92,12 +100,14 @@ func (e *ErrAlreadyConnecting) StateFields() []string {
 
 func (e *ErrAlreadyConnecting) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrAlreadyConnecting) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrAlreadyConnecting) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrAlreadyConnecting) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -111,12 +121,14 @@ func (e *ErrBadAddress) StateFields() []string {
 
 func (e *ErrBadAddress) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrBadAddress) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrBadAddress) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrBadAddress) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -130,12 +142,14 @@ func (e *ErrBadBuffer) StateFields() []string {
 
 func (e *ErrBadBuffer) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrBadBuffer) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrBadBuffer) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrBadBuffer) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -149,12 +163,14 @@ func (e *ErrBadLocalAddress) StateFields() []string {
 
 func (e *ErrBadLocalAddress) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrBadLocalAddress) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrBadLocalAddress) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrBadLocalAddress) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -168,12 +184,14 @@ func (e *ErrBroadcastDisabled) StateFields() []string {
 
 func (e *ErrBroadcastDisabled) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrBroadcastDisabled) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrBroadcastDisabled) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrBroadcastDisabled) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -187,12 +205,14 @@ func (e *ErrClosedForReceive) StateFields() []string {
 
 func (e *ErrClosedForReceive) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrClosedForReceive) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrClosedForReceive) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrClosedForReceive) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -206,12 +226,14 @@ func (e *ErrClosedForSend) StateFields() []string {
 
 func (e *ErrClosedForSend) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrClosedForSend) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrClosedForSend) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrClosedForSend) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -225,12 +247,14 @@ func (e *ErrConnectStarted) StateFields() []string {
 
 func (e *ErrConnectStarted) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrConnectStarted) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrConnectStarted) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrConnectStarted) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -244,12 +268,14 @@ func (e *ErrConnectionAborted) StateFields() []string {
 
 func (e *ErrConnectionAborted) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrConnectionAborted) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrConnectionAborted) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrConnectionAborted) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -263,12 +289,14 @@ func (e *ErrConnectionRefused) StateFields() []string {
 
 func (e *ErrConnectionRefused) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrConnectionRefused) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrConnectionRefused) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrConnectionRefused) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -282,12 +310,14 @@ func (e *ErrConnectionReset) StateFields() []string {
 
 func (e *ErrConnectionReset) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrConnectionReset) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrConnectionReset) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrConnectionReset) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -301,12 +331,14 @@ func (e *ErrDestinationRequired) StateFields() []string {
 
 func (e *ErrDestinationRequired) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrDestinationRequired) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrDestinationRequired) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrDestinationRequired) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -320,12 +352,14 @@ func (e *ErrDuplicateAddress) StateFields() []string {
 
 func (e *ErrDuplicateAddress) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrDuplicateAddress) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrDuplicateAddress) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrDuplicateAddress) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -339,12 +373,14 @@ func (e *ErrDuplicateNICID) StateFields() []string {
 
 func (e *ErrDuplicateNICID) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrDuplicateNICID) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrDuplicateNICID) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrDuplicateNICID) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -358,12 +394,14 @@ func (e *ErrInvalidEndpointState) StateFields() []string {
 
 func (e *ErrInvalidEndpointState) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrInvalidEndpointState) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrInvalidEndpointState) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrInvalidEndpointState) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -377,12 +415,14 @@ func (e *ErrInvalidOptionValue) StateFields() []string {
 
 func (e *ErrInvalidOptionValue) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrInvalidOptionValue) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrInvalidOptionValue) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrInvalidOptionValue) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -396,12 +436,14 @@ func (e *ErrInvalidPortRange) StateFields() []string {
 
 func (e *ErrInvalidPortRange) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrInvalidPortRange) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrInvalidPortRange) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrInvalidPortRange) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -415,12 +457,14 @@ func (e *ErrMalformedHeader) StateFields() []string {
 
 func (e *ErrMalformedHeader) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrMalformedHeader) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrMalformedHeader) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrMalformedHeader) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -434,12 +478,14 @@ func (e *ErrMessageTooLong) StateFields() []string {
 
 func (e *ErrMessageTooLong) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrMessageTooLong) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrMessageTooLong) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrMessageTooLong) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -453,12 +499,14 @@ func (e *ErrNetworkUnreachable) StateFields() []string {
 
 func (e *ErrNetworkUnreachable) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNetworkUnreachable) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNetworkUnreachable) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNetworkUnreachable) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -472,12 +520,14 @@ func (e *ErrNoBufferSpace) StateFields() []string {
 
 func (e *ErrNoBufferSpace) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNoBufferSpace) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNoBufferSpace) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNoBufferSpace) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -491,12 +541,14 @@ func (e *ErrNoPortAvailable) StateFields() []string {
 
 func (e *ErrNoPortAvailable) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNoPortAvailable) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNoPortAvailable) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNoPortAvailable) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -510,12 +562,14 @@ func (e *ErrNoRoute) StateFields() []string {
 
 func (e *ErrNoRoute) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNoRoute) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNoRoute) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNoRoute) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -529,12 +583,14 @@ func (e *ErrNoSuchFile) StateFields() []string {
 
 func (e *ErrNoSuchFile) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNoSuchFile) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNoSuchFile) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNoSuchFile) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -548,12 +604,14 @@ func (e *ErrNotConnected) StateFields() []string {
 
 func (e *ErrNotConnected) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNotConnected) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNotConnected) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNotConnected) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -567,12 +625,14 @@ func (e *ErrNotPermitted) StateFields() []string {
 
 func (e *ErrNotPermitted) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNotPermitted) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNotPermitted) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNotPermitted) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -586,12 +646,14 @@ func (e *ErrNotSupported) StateFields() []string {
 
 func (e *ErrNotSupported) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrNotSupported) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrNotSupported) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrNotSupported) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -605,12 +667,14 @@ func (e *ErrPortInUse) StateFields() []string {
 
 func (e *ErrPortInUse) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrPortInUse) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrPortInUse) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrPortInUse) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -624,12 +688,14 @@ func (e *ErrQueueSizeNotSupported) StateFields() []string {
 
 func (e *ErrQueueSizeNotSupported) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrQueueSizeNotSupported) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrQueueSizeNotSupported) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrQueueSizeNotSupported) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -643,12 +709,14 @@ func (e *ErrTimeout) StateFields() []string {
 
 func (e *ErrTimeout) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrTimeout) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrTimeout) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrTimeout) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -662,12 +730,14 @@ func (e *ErrUnknownDevice) StateFields() []string {
 
 func (e *ErrUnknownDevice) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrUnknownDevice) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrUnknownDevice) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrUnknownDevice) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -681,12 +751,14 @@ func (e *ErrUnknownNICID) StateFields() []string {
 
 func (e *ErrUnknownNICID) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrUnknownNICID) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrUnknownNICID) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrUnknownNICID) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -700,12 +772,14 @@ func (e *ErrUnknownProtocol) StateFields() []string {
 
 func (e *ErrUnknownProtocol) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrUnknownProtocol) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrUnknownProtocol) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrUnknownProtocol) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -719,12 +793,14 @@ func (e *ErrUnknownProtocolOption) StateFields() []string {
 
 func (e *ErrUnknownProtocolOption) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrUnknownProtocolOption) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrUnknownProtocolOption) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrUnknownProtocolOption) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -738,12 +814,14 @@ func (e *ErrWouldBlock) StateFields() []string {
 
 func (e *ErrWouldBlock) beforeSave() {}
 
+// +checklocksignore
 func (e *ErrWouldBlock) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 }
 
 func (e *ErrWouldBlock) afterLoad() {}
 
+// +checklocksignore
 func (e *ErrWouldBlock) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -760,6 +838,7 @@ func (l *sockErrorList) StateFields() []string {
 
 func (l *sockErrorList) beforeSave() {}
 
+// +checklocksignore
 func (l *sockErrorList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -768,6 +847,7 @@ func (l *sockErrorList) StateSave(stateSinkObject state.Sink) {
 
 func (l *sockErrorList) afterLoad() {}
 
+// +checklocksignore
 func (l *sockErrorList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -786,6 +866,7 @@ func (e *sockErrorEntry) StateFields() []string {
 
 func (e *sockErrorEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *sockErrorEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -794,6 +875,7 @@ func (e *sockErrorEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *sockErrorEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *sockErrorEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -832,6 +914,7 @@ func (so *SocketOptions) StateFields() []string {
 
 func (so *SocketOptions) beforeSave() {}
 
+// +checklocksignore
 func (so *SocketOptions) StateSave(stateSinkObject state.Sink) {
 	so.beforeSave()
 	stateSinkObject.Save(0, &so.handler)
@@ -860,6 +943,7 @@ func (so *SocketOptions) StateSave(stateSinkObject state.Sink) {
 
 func (so *SocketOptions) afterLoad() {}
 
+// +checklocksignore
 func (so *SocketOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &so.handler)
 	stateSourceObject.Load(1, &so.broadcastEnabled)
@@ -897,6 +981,7 @@ func (l *LocalSockError) StateFields() []string {
 
 func (l *LocalSockError) beforeSave() {}
 
+// +checklocksignore
 func (l *LocalSockError) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.info)
@@ -904,6 +989,7 @@ func (l *LocalSockError) StateSave(stateSinkObject state.Sink) {
 
 func (l *LocalSockError) afterLoad() {}
 
+// +checklocksignore
 func (l *LocalSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.info)
 }
@@ -926,6 +1012,7 @@ func (s *SockError) StateFields() []string {
 
 func (s *SockError) beforeSave() {}
 
+// +checklocksignore
 func (s *SockError) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.sockErrorEntry)
@@ -939,6 +1026,7 @@ func (s *SockError) StateSave(stateSinkObject state.Sink) {
 
 func (s *SockError) afterLoad() {}
 
+// +checklocksignore
 func (s *SockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.sockErrorEntry)
 	stateSourceObject.Load(1, &s.Err)
@@ -963,6 +1051,7 @@ func (f *FullAddress) StateFields() []string {
 
 func (f *FullAddress) beforeSave() {}
 
+// +checklocksignore
 func (f *FullAddress) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.NIC)
@@ -972,6 +1061,7 @@ func (f *FullAddress) StateSave(stateSinkObject state.Sink) {
 
 func (f *FullAddress) afterLoad() {}
 
+// +checklocksignore
 func (f *FullAddress) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.NIC)
 	stateSourceObject.Load(1, &f.Addr)
@@ -1002,6 +1092,7 @@ func (c *ControlMessages) StateFields() []string {
 
 func (c *ControlMessages) beforeSave() {}
 
+// +checklocksignore
 func (c *ControlMessages) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.HasTimestamp)
@@ -1021,6 +1112,7 @@ func (c *ControlMessages) StateSave(stateSinkObject state.Sink) {
 
 func (c *ControlMessages) afterLoad() {}
 
+// +checklocksignore
 func (c *ControlMessages) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.HasTimestamp)
 	stateSourceObject.Load(1, &c.Timestamp)
@@ -1050,6 +1142,7 @@ func (l *LinkPacketInfo) StateFields() []string {
 
 func (l *LinkPacketInfo) beforeSave() {}
 
+// +checklocksignore
 func (l *LinkPacketInfo) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Protocol)
@@ -1058,6 +1151,7 @@ func (l *LinkPacketInfo) StateSave(stateSinkObject state.Sink) {
 
 func (l *LinkPacketInfo) afterLoad() {}
 
+// +checklocksignore
 func (l *LinkPacketInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Protocol)
 	stateSourceObject.Load(1, &l.PktType)
@@ -1076,6 +1170,7 @@ func (l *LingerOption) StateFields() []string {
 
 func (l *LingerOption) beforeSave() {}
 
+// +checklocksignore
 func (l *LingerOption) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.Enabled)
@@ -1084,6 +1179,7 @@ func (l *LingerOption) StateSave(stateSinkObject state.Sink) {
 
 func (l *LingerOption) afterLoad() {}
 
+// +checklocksignore
 func (l *LingerOption) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.Enabled)
 	stateSourceObject.Load(1, &l.Timeout)
@@ -1103,6 +1199,7 @@ func (i *IPPacketInfo) StateFields() []string {
 
 func (i *IPPacketInfo) beforeSave() {}
 
+// +checklocksignore
 func (i *IPPacketInfo) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.NIC)
@@ -1112,6 +1209,7 @@ func (i *IPPacketInfo) StateSave(stateSinkObject state.Sink) {
 
 func (i *IPPacketInfo) afterLoad() {}
 
+// +checklocksignore
 func (i *IPPacketInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.NIC)
 	stateSourceObject.Load(1, &i.LocalAddr)
diff --git a/pkg/tcpip/tcpip_unsafe_state_autogen.go b/pkg/tcpip/tcpip_unsafe_state_autogen.go
index 92ada718b..387b5aa20 100644
--- a/pkg/tcpip/tcpip_unsafe_state_autogen.go
+++ b/pkg/tcpip/tcpip_unsafe_state_autogen.go
@@ -19,12 +19,14 @@ func (s *StdClock) StateFields() []string {
 
 func (s *StdClock) beforeSave() {}
 
+// +checklocksignore
 func (s *StdClock) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 }
 
 func (s *StdClock) afterLoad() {}
 
+// +checklocksignore
 func (s *StdClock) StateLoad(stateSourceObject state.Source) {
 }
 
diff --git a/pkg/tcpip/transport/icmp/icmp_state_autogen.go b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
index fe5af3d97..4175f0f8b 100644
--- a/pkg/tcpip/transport/icmp/icmp_state_autogen.go
+++ b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
@@ -22,6 +22,7 @@ func (p *icmpPacket) StateFields() []string {
 
 func (p *icmpPacket) beforeSave() {}
 
+// +checklocksignore
 func (p *icmpPacket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var dataValue buffer.VectorisedView = p.saveData()
@@ -33,6 +34,7 @@ func (p *icmpPacket) StateSave(stateSinkObject state.Sink) {
 
 func (p *icmpPacket) afterLoad() {}
 
+// +checklocksignore
 func (p *icmpPacket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.icmpPacketEntry)
 	stateSourceObject.Load(1, &p.senderAddress)
@@ -63,6 +65,7 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	var rcvBufSizeMaxValue int = e.saveRcvBufSizeMax()
@@ -82,6 +85,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(13, &e.ops)
 }
 
+// +checklocksignore
 func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.TransportEndpointInfo)
 	stateSourceObject.Load(1, &e.DefaultSocketOptionsHandler)
@@ -113,6 +117,7 @@ func (l *icmpPacketList) StateFields() []string {
 
 func (l *icmpPacketList) beforeSave() {}
 
+// +checklocksignore
 func (l *icmpPacketList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -121,6 +126,7 @@ func (l *icmpPacketList) StateSave(stateSinkObject state.Sink) {
 
 func (l *icmpPacketList) afterLoad() {}
 
+// +checklocksignore
 func (l *icmpPacketList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -139,6 +145,7 @@ func (e *icmpPacketEntry) StateFields() []string {
 
 func (e *icmpPacketEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *icmpPacketEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -147,6 +154,7 @@ func (e *icmpPacketEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *icmpPacketEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *icmpPacketEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/transport/packet/packet_state_autogen.go b/pkg/tcpip/transport/packet/packet_state_autogen.go
index e78427555..f8b82e575 100644
--- a/pkg/tcpip/transport/packet/packet_state_autogen.go
+++ b/pkg/tcpip/transport/packet/packet_state_autogen.go
@@ -23,6 +23,7 @@ func (p *packet) StateFields() []string {
 
 func (p *packet) beforeSave() {}
 
+// +checklocksignore
 func (p *packet) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var dataValue buffer.VectorisedView = p.saveData()
@@ -35,6 +36,7 @@ func (p *packet) StateSave(stateSinkObject state.Sink) {
 
 func (p *packet) afterLoad() {}
 
+// +checklocksignore
 func (p *packet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.packetEntry)
 	stateSourceObject.Load(2, &p.timestampNS)
@@ -66,6 +68,7 @@ func (ep *endpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (ep *endpoint) StateSave(stateSinkObject state.Sink) {
 	ep.beforeSave()
 	var rcvBufSizeMaxValue int = ep.saveRcvBufSizeMax()
@@ -85,6 +88,7 @@ func (ep *endpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(13, &ep.ops)
 }
 
+// +checklocksignore
 func (ep *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &ep.TransportEndpointInfo)
 	stateSourceObject.Load(1, &ep.DefaultSocketOptionsHandler)
@@ -116,6 +120,7 @@ func (l *packetList) StateFields() []string {
 
 func (l *packetList) beforeSave() {}
 
+// +checklocksignore
 func (l *packetList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -124,6 +129,7 @@ func (l *packetList) StateSave(stateSinkObject state.Sink) {
 
 func (l *packetList) afterLoad() {}
 
+// +checklocksignore
 func (l *packetList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -142,6 +148,7 @@ func (e *packetEntry) StateFields() []string {
 
 func (e *packetEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *packetEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -150,6 +157,7 @@ func (e *packetEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *packetEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *packetEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/transport/raw/raw_state_autogen.go b/pkg/tcpip/transport/raw/raw_state_autogen.go
index db4b393a7..3bcfc7c61 100644
--- a/pkg/tcpip/transport/raw/raw_state_autogen.go
+++ b/pkg/tcpip/transport/raw/raw_state_autogen.go
@@ -22,6 +22,7 @@ func (p *rawPacket) StateFields() []string {
 
 func (p *rawPacket) beforeSave() {}
 
+// +checklocksignore
 func (p *rawPacket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	var dataValue buffer.VectorisedView = p.saveData()
@@ -33,6 +34,7 @@ func (p *rawPacket) StateSave(stateSinkObject state.Sink) {
 
 func (p *rawPacket) afterLoad() {}
 
+// +checklocksignore
 func (p *rawPacket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.rawPacketEntry)
 	stateSourceObject.Load(2, &p.timestampNS)
@@ -62,6 +64,7 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	var rcvBufSizeMaxValue int = e.saveRcvBufSizeMax()
@@ -80,6 +83,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(12, &e.ops)
 }
 
+// +checklocksignore
 func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.TransportEndpointInfo)
 	stateSourceObject.Load(1, &e.DefaultSocketOptionsHandler)
@@ -110,6 +114,7 @@ func (l *rawPacketList) StateFields() []string {
 
 func (l *rawPacketList) beforeSave() {}
 
+// +checklocksignore
 func (l *rawPacketList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -118,6 +123,7 @@ func (l *rawPacketList) StateSave(stateSinkObject state.Sink) {
 
 func (l *rawPacketList) afterLoad() {}
 
+// +checklocksignore
 func (l *rawPacketList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -136,6 +142,7 @@ func (e *rawPacketEntry) StateFields() []string {
 
 func (e *rawPacketEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *rawPacketEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -144,6 +151,7 @@ func (e *rawPacketEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *rawPacketEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *rawPacketEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/transport/tcp/tcp_state_autogen.go b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
index 4f3f62b98..a92bec6c5 100644
--- a/pkg/tcpip/transport/tcp/tcp_state_autogen.go
+++ b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
@@ -28,6 +28,7 @@ func (c *cubicState) StateFields() []string {
 
 func (c *cubicState) beforeSave() {}
 
+// +checklocksignore
 func (c *cubicState) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	var tValue unixTime = c.saveT()
@@ -45,6 +46,7 @@ func (c *cubicState) StateSave(stateSinkObject state.Sink) {
 
 func (c *cubicState) afterLoad() {}
 
+// +checklocksignore
 func (c *cubicState) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.wLastMax)
 	stateSourceObject.Load(1, &c.wMax)
@@ -71,6 +73,7 @@ func (s *SACKInfo) StateFields() []string {
 
 func (s *SACKInfo) beforeSave() {}
 
+// +checklocksignore
 func (s *SACKInfo) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Blocks)
@@ -79,6 +82,7 @@ func (s *SACKInfo) StateSave(stateSinkObject state.Sink) {
 
 func (s *SACKInfo) afterLoad() {}
 
+// +checklocksignore
 func (s *SACKInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Blocks)
 	stateSourceObject.Load(1, &s.NumBlocks)
@@ -102,6 +106,7 @@ func (r *rcvBufAutoTuneParams) StateFields() []string {
 
 func (r *rcvBufAutoTuneParams) beforeSave() {}
 
+// +checklocksignore
 func (r *rcvBufAutoTuneParams) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	var measureTimeValue unixTime = r.saveMeasureTime()
@@ -117,6 +122,7 @@ func (r *rcvBufAutoTuneParams) StateSave(stateSinkObject state.Sink) {
 
 func (r *rcvBufAutoTuneParams) afterLoad() {}
 
+// +checklocksignore
 func (r *rcvBufAutoTuneParams) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &r.copied)
 	stateSourceObject.Load(2, &r.prevCopied)
@@ -139,6 +145,7 @@ func (e *EndpointInfo) StateFields() []string {
 
 func (e *EndpointInfo) beforeSave() {}
 
+// +checklocksignore
 func (e *EndpointInfo) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.TransportEndpointInfo)
@@ -146,6 +153,7 @@ func (e *EndpointInfo) StateSave(stateSinkObject state.Sink) {
 
 func (e *EndpointInfo) afterLoad() {}
 
+// +checklocksignore
 func (e *EndpointInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.TransportEndpointInfo)
 }
@@ -221,6 +229,7 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	var stateValue EndpointState = e.saveState()
@@ -291,6 +300,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(60, &e.ops)
 }
 
+// +checklocksignore
 func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.EndpointInfo)
 	stateSourceObject.Load(1, &e.DefaultSocketOptionsHandler)
@@ -372,6 +382,7 @@ func (k *keepalive) StateFields() []string {
 
 func (k *keepalive) beforeSave() {}
 
+// +checklocksignore
 func (k *keepalive) StateSave(stateSinkObject state.Sink) {
 	k.beforeSave()
 	stateSinkObject.Save(0, &k.idle)
@@ -382,6 +393,7 @@ func (k *keepalive) StateSave(stateSinkObject state.Sink) {
 
 func (k *keepalive) afterLoad() {}
 
+// +checklocksignore
 func (k *keepalive) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &k.idle)
 	stateSourceObject.Load(1, &k.interval)
@@ -415,6 +427,7 @@ func (rc *rackControl) StateFields() []string {
 
 func (rc *rackControl) beforeSave() {}
 
+// +checklocksignore
 func (rc *rackControl) StateSave(stateSinkObject state.Sink) {
 	rc.beforeSave()
 	var xmitTimeValue unixTime = rc.saveXmitTime()
@@ -437,6 +450,7 @@ func (rc *rackControl) StateSave(stateSinkObject state.Sink) {
 
 func (rc *rackControl) afterLoad() {}
 
+// +checklocksignore
 func (rc *rackControl) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rc.dsackSeen)
 	stateSourceObject.Load(1, &rc.endSequence)
@@ -477,6 +491,7 @@ func (r *receiver) StateFields() []string {
 
 func (r *receiver) beforeSave() {}
 
+// +checklocksignore
 func (r *receiver) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	var lastRcvdAckTimeValue unixTime = r.saveLastRcvdAckTime()
@@ -495,6 +510,7 @@ func (r *receiver) StateSave(stateSinkObject state.Sink) {
 
 func (r *receiver) afterLoad() {}
 
+// +checklocksignore
 func (r *receiver) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.ep)
 	stateSourceObject.Load(1, &r.rcvNxt)
@@ -521,6 +537,7 @@ func (r *renoState) StateFields() []string {
 
 func (r *renoState) beforeSave() {}
 
+// +checklocksignore
 func (r *renoState) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.s)
@@ -528,6 +545,7 @@ func (r *renoState) StateSave(stateSinkObject state.Sink) {
 
 func (r *renoState) afterLoad() {}
 
+// +checklocksignore
 func (r *renoState) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.s)
 }
@@ -544,6 +562,7 @@ func (rr *renoRecovery) StateFields() []string {
 
 func (rr *renoRecovery) beforeSave() {}
 
+// +checklocksignore
 func (rr *renoRecovery) StateSave(stateSinkObject state.Sink) {
 	rr.beforeSave()
 	stateSinkObject.Save(0, &rr.s)
@@ -551,6 +570,7 @@ func (rr *renoRecovery) StateSave(stateSinkObject state.Sink) {
 
 func (rr *renoRecovery) afterLoad() {}
 
+// +checklocksignore
 func (rr *renoRecovery) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rr.s)
 }
@@ -567,6 +587,7 @@ func (sr *sackRecovery) StateFields() []string {
 
 func (sr *sackRecovery) beforeSave() {}
 
+// +checklocksignore
 func (sr *sackRecovery) StateSave(stateSinkObject state.Sink) {
 	sr.beforeSave()
 	stateSinkObject.Save(0, &sr.s)
@@ -574,6 +595,7 @@ func (sr *sackRecovery) StateSave(stateSinkObject state.Sink) {
 
 func (sr *sackRecovery) afterLoad() {}
 
+// +checklocksignore
 func (sr *sackRecovery) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &sr.s)
 }
@@ -591,6 +613,7 @@ func (s *SACKScoreboard) StateFields() []string {
 
 func (s *SACKScoreboard) beforeSave() {}
 
+// +checklocksignore
 func (s *SACKScoreboard) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.smss)
@@ -599,6 +622,7 @@ func (s *SACKScoreboard) StateSave(stateSinkObject state.Sink) {
 
 func (s *SACKScoreboard) afterLoad() {}
 
+// +checklocksignore
 func (s *SACKScoreboard) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.smss)
 	stateSourceObject.Load(1, &s.maxSACKED)
@@ -640,6 +664,7 @@ func (s *segment) StateFields() []string {
 
 func (s *segment) beforeSave() {}
 
+// +checklocksignore
 func (s *segment) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var dataValue buffer.VectorisedView = s.saveData()
@@ -675,6 +700,7 @@ func (s *segment) StateSave(stateSinkObject state.Sink) {
 
 func (s *segment) afterLoad() {}
 
+// +checklocksignore
 func (s *segment) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.segmentEntry)
 	stateSourceObject.Load(1, &s.refCnt)
@@ -717,6 +743,7 @@ func (q *segmentQueue) StateFields() []string {
 
 func (q *segmentQueue) beforeSave() {}
 
+// +checklocksignore
 func (q *segmentQueue) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.list)
@@ -726,6 +753,7 @@ func (q *segmentQueue) StateSave(stateSinkObject state.Sink) {
 
 func (q *segmentQueue) afterLoad() {}
 
+// +checklocksignore
 func (q *segmentQueue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadWait(0, &q.list)
 	stateSourceObject.Load(1, &q.ep)
@@ -774,6 +802,7 @@ func (s *sender) StateFields() []string {
 
 func (s *sender) beforeSave() {}
 
+// +checklocksignore
 func (s *sender) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	var lastSendTimeValue unixTime = s.saveLastSendTime()
@@ -812,6 +841,7 @@ func (s *sender) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(30, &s.rc)
 }
 
+// +checklocksignore
 func (s *sender) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.ep)
 	stateSourceObject.Load(2, &s.dupAckCount)
@@ -861,6 +891,7 @@ func (r *rtt) StateFields() []string {
 
 func (r *rtt) beforeSave() {}
 
+// +checklocksignore
 func (r *rtt) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.srtt)
@@ -870,6 +901,7 @@ func (r *rtt) StateSave(stateSinkObject state.Sink) {
 
 func (r *rtt) afterLoad() {}
 
+// +checklocksignore
 func (r *rtt) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.srtt)
 	stateSourceObject.Load(1, &r.rttvar)
@@ -893,6 +925,7 @@ func (f *fastRecovery) StateFields() []string {
 
 func (f *fastRecovery) beforeSave() {}
 
+// +checklocksignore
 func (f *fastRecovery) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.active)
@@ -905,6 +938,7 @@ func (f *fastRecovery) StateSave(stateSinkObject state.Sink) {
 
 func (f *fastRecovery) afterLoad() {}
 
+// +checklocksignore
 func (f *fastRecovery) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.active)
 	stateSourceObject.Load(1, &f.first)
@@ -927,6 +961,7 @@ func (u *unixTime) StateFields() []string {
 
 func (u *unixTime) beforeSave() {}
 
+// +checklocksignore
 func (u *unixTime) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	stateSinkObject.Save(0, &u.second)
@@ -935,6 +970,7 @@ func (u *unixTime) StateSave(stateSinkObject state.Sink) {
 
 func (u *unixTime) afterLoad() {}
 
+// +checklocksignore
 func (u *unixTime) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.second)
 	stateSourceObject.Load(1, &u.nano)
@@ -953,6 +989,7 @@ func (l *endpointList) StateFields() []string {
 
 func (l *endpointList) beforeSave() {}
 
+// +checklocksignore
 func (l *endpointList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -961,6 +998,7 @@ func (l *endpointList) StateSave(stateSinkObject state.Sink) {
 
 func (l *endpointList) afterLoad() {}
 
+// +checklocksignore
 func (l *endpointList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -979,6 +1017,7 @@ func (e *endpointEntry) StateFields() []string {
 
 func (e *endpointEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *endpointEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -987,6 +1026,7 @@ func (e *endpointEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *endpointEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *endpointEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
@@ -1005,6 +1045,7 @@ func (l *segmentList) StateFields() []string {
 
 func (l *segmentList) beforeSave() {}
 
+// +checklocksignore
 func (l *segmentList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -1013,6 +1054,7 @@ func (l *segmentList) StateSave(stateSinkObject state.Sink) {
 
 func (l *segmentList) afterLoad() {}
 
+// +checklocksignore
 func (l *segmentList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -1031,6 +1073,7 @@ func (e *segmentEntry) StateFields() []string {
 
 func (e *segmentEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *segmentEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -1039,6 +1082,7 @@ func (e *segmentEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *segmentEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *segmentEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/transport/udp/udp_state_autogen.go b/pkg/tcpip/transport/udp/udp_state_autogen.go
index 16900d0f9..5d7859a9e 100644
--- a/pkg/tcpip/transport/udp/udp_state_autogen.go
+++ b/pkg/tcpip/transport/udp/udp_state_autogen.go
@@ -25,6 +25,7 @@ func (u *udpPacket) StateFields() []string {
 
 func (u *udpPacket) beforeSave() {}
 
+// +checklocksignore
 func (u *udpPacket) StateSave(stateSinkObject state.Sink) {
 	u.beforeSave()
 	var dataValue buffer.VectorisedView = u.saveData()
@@ -39,6 +40,7 @@ func (u *udpPacket) StateSave(stateSinkObject state.Sink) {
 
 func (u *udpPacket) afterLoad() {}
 
+// +checklocksignore
 func (u *udpPacket) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &u.udpPacketEntry)
 	stateSourceObject.Load(1, &u.senderAddress)
@@ -83,6 +85,7 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
+// +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	var rcvBufSizeMaxValue int = e.saveRcvBufSizeMax()
@@ -113,6 +116,7 @@ func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(24, &e.ops)
 }
 
+// +checklocksignore
 func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.TransportEndpointInfo)
 	stateSourceObject.Load(1, &e.DefaultSocketOptionsHandler)
@@ -155,6 +159,7 @@ func (m *multicastMembership) StateFields() []string {
 
 func (m *multicastMembership) beforeSave() {}
 
+// +checklocksignore
 func (m *multicastMembership) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.nicID)
@@ -163,6 +168,7 @@ func (m *multicastMembership) StateSave(stateSinkObject state.Sink) {
 
 func (m *multicastMembership) afterLoad() {}
 
+// +checklocksignore
 func (m *multicastMembership) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.nicID)
 	stateSourceObject.Load(1, &m.multicastAddr)
@@ -181,6 +187,7 @@ func (l *udpPacketList) StateFields() []string {
 
 func (l *udpPacketList) beforeSave() {}
 
+// +checklocksignore
 func (l *udpPacketList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -189,6 +196,7 @@ func (l *udpPacketList) StateSave(stateSinkObject state.Sink) {
 
 func (l *udpPacketList) afterLoad() {}
 
+// +checklocksignore
 func (l *udpPacketList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -207,6 +215,7 @@ func (e *udpPacketEntry) StateFields() []string {
 
 func (e *udpPacketEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *udpPacketEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -215,6 +224,7 @@ func (e *udpPacketEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *udpPacketEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *udpPacketEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/usermem/usermem_state_autogen.go b/pkg/usermem/usermem_state_autogen.go
index ca2035504..48714d65c 100644
--- a/pkg/usermem/usermem_state_autogen.go
+++ b/pkg/usermem/usermem_state_autogen.go
@@ -20,6 +20,7 @@ func (a *AccessType) StateFields() []string {
 
 func (a *AccessType) beforeSave() {}
 
+// +checklocksignore
 func (a *AccessType) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.Read)
@@ -29,6 +30,7 @@ func (a *AccessType) StateSave(stateSinkObject state.Sink) {
 
 func (a *AccessType) afterLoad() {}
 
+// +checklocksignore
 func (a *AccessType) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.Read)
 	stateSourceObject.Load(1, &a.Write)
@@ -56,6 +58,7 @@ func (r *AddrRange) StateFields() []string {
 
 func (r *AddrRange) beforeSave() {}
 
+// +checklocksignore
 func (r *AddrRange) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.Start)
@@ -64,6 +67,7 @@ func (r *AddrRange) StateSave(stateSinkObject state.Sink) {
 
 func (r *AddrRange) afterLoad() {}
 
+// +checklocksignore
 func (r *AddrRange) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.Start)
 	stateSourceObject.Load(1, &r.End)
diff --git a/pkg/waiter/waiter_state_autogen.go b/pkg/waiter/waiter_state_autogen.go
index e1287330a..498b7e79e 100644
--- a/pkg/waiter/waiter_state_autogen.go
+++ b/pkg/waiter/waiter_state_autogen.go
@@ -20,6 +20,7 @@ func (e *Entry) StateFields() []string {
 
 func (e *Entry) beforeSave() {}
 
+// +checklocksignore
 func (e *Entry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.Callback)
@@ -29,6 +30,7 @@ func (e *Entry) StateSave(stateSinkObject state.Sink) {
 
 func (e *Entry) afterLoad() {}
 
+// +checklocksignore
 func (e *Entry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.Callback)
 	stateSourceObject.Load(1, &e.mask)
@@ -47,6 +49,7 @@ func (q *Queue) StateFields() []string {
 
 func (q *Queue) beforeSave() {}
 
+// +checklocksignore
 func (q *Queue) StateSave(stateSinkObject state.Sink) {
 	q.beforeSave()
 	stateSinkObject.Save(0, &q.list)
@@ -54,6 +57,7 @@ func (q *Queue) StateSave(stateSinkObject state.Sink) {
 
 func (q *Queue) afterLoad() {}
 
+// +checklocksignore
 func (q *Queue) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &q.list)
 }
@@ -71,6 +75,7 @@ func (l *waiterList) StateFields() []string {
 
 func (l *waiterList) beforeSave() {}
 
+// +checklocksignore
 func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -79,6 +84,7 @@ func (l *waiterList) StateSave(stateSinkObject state.Sink) {
 
 func (l *waiterList) afterLoad() {}
 
+// +checklocksignore
 func (l *waiterList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -97,6 +103,7 @@ func (e *waiterEntry) StateFields() []string {
 
 func (e *waiterEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -105,6 +112,7 @@ func (e *waiterEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *waiterEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *waiterEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/runsc/boot/boot_state_autogen.go b/runsc/boot/boot_state_autogen.go
index 92736f360..0f6746d1f 100644
--- a/runsc/boot/boot_state_autogen.go
+++ b/runsc/boot/boot_state_autogen.go
@@ -19,6 +19,7 @@ func (f *sandboxNetstackCreator) StateFields() []string {
 
 func (f *sandboxNetstackCreator) beforeSave() {}
 
+// +checklocksignore
 func (f *sandboxNetstackCreator) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.clock)
@@ -27,6 +28,7 @@ func (f *sandboxNetstackCreator) StateSave(stateSinkObject state.Sink) {
 
 func (f *sandboxNetstackCreator) afterLoad() {}
 
+// +checklocksignore
 func (f *sandboxNetstackCreator) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.clock)
 	stateSourceObject.Load(1, &f.uniqueID)