Merge release-20200422.0-51-g1f4087e (automated)

64 files changed, 325 insertions, 161 deletions

diff --git a/pkg/buffer/buffer_unsafe_state_autogen.go b/pkg/buffer/buffer_unsafe_state_autogen.go
new file mode 100755
index 000000000..5a5c40722
--- /dev/null
+++ b/pkg/buffer/buffer_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package buffer
diff --git a/pkg/cpuid/cpuid_state_autogen.go b/pkg/cpuid/cpuid_state_autogen.go
index 591868c88..86206a6bf 100755
--- a/pkg/cpuid/cpuid_state_autogen.go
+++ b/pkg/cpuid/cpuid_state_autogen.go
@@ -1,70 +1,3 @@
 // automatically generated by stateify.
 
-// +build 386 amd64
-
 package cpuid
-
-import (
-	"gvisor.dev/gvisor/pkg/state"
-)
-
-func (x *Cache) beforeSave() {}
-func (x *Cache) save(m state.Map) {
-	x.beforeSave()
-	m.Save("Level", &x.Level)
-	m.Save("Type", &x.Type)
-	m.Save("FullyAssociative", &x.FullyAssociative)
-	m.Save("Partitions", &x.Partitions)
-	m.Save("Ways", &x.Ways)
-	m.Save("Sets", &x.Sets)
-	m.Save("InvalidateHierarchical", &x.InvalidateHierarchical)
-	m.Save("Inclusive", &x.Inclusive)
-	m.Save("DirectMapped", &x.DirectMapped)
-}
-
-func (x *Cache) afterLoad() {}
-func (x *Cache) load(m state.Map) {
-	m.Load("Level", &x.Level)
-	m.Load("Type", &x.Type)
-	m.Load("FullyAssociative", &x.FullyAssociative)
-	m.Load("Partitions", &x.Partitions)
-	m.Load("Ways", &x.Ways)
-	m.Load("Sets", &x.Sets)
-	m.Load("InvalidateHierarchical", &x.InvalidateHierarchical)
-	m.Load("Inclusive", &x.Inclusive)
-	m.Load("DirectMapped", &x.DirectMapped)
-}
-
-func (x *FeatureSet) beforeSave() {}
-func (x *FeatureSet) save(m state.Map) {
-	x.beforeSave()
-	m.Save("Set", &x.Set)
-	m.Save("VendorID", &x.VendorID)
-	m.Save("ExtendedFamily", &x.ExtendedFamily)
-	m.Save("ExtendedModel", &x.ExtendedModel)
-	m.Save("ProcessorType", &x.ProcessorType)
-	m.Save("Family", &x.Family)
-	m.Save("Model", &x.Model)
-	m.Save("SteppingID", &x.SteppingID)
-	m.Save("Caches", &x.Caches)
-	m.Save("CacheLine", &x.CacheLine)
-}
-
-func (x *FeatureSet) afterLoad() {}
-func (x *FeatureSet) load(m state.Map) {
-	m.Load("Set", &x.Set)
-	m.Load("VendorID", &x.VendorID)
-	m.Load("ExtendedFamily", &x.ExtendedFamily)
-	m.Load("ExtendedModel", &x.ExtendedModel)
-	m.Load("ProcessorType", &x.ProcessorType)
-	m.Load("Family", &x.Family)
-	m.Load("Model", &x.Model)
-	m.Load("SteppingID", &x.SteppingID)
-	m.Load("Caches", &x.Caches)
-	m.Load("CacheLine", &x.CacheLine)
-}
-
-func init() {
-	state.Register("pkg/cpuid.Cache", (*Cache)(nil), state.Fns{Save: (*Cache).save, Load: (*Cache).load})
-	state.Register("pkg/cpuid.FeatureSet", (*FeatureSet)(nil), state.Fns{Save: (*FeatureSet).save, Load: (*FeatureSet).load})
-}
diff --git a/pkg/cpuid/cpuid_x86_state_autogen.go b/pkg/cpuid/cpuid_x86_state_autogen.go
new file mode 100755
index 000000000..591868c88
--- /dev/null
+++ b/pkg/cpuid/cpuid_x86_state_autogen.go
@@ -0,0 +1,70 @@
+// automatically generated by stateify.
+
+// +build 386 amd64
+
+package cpuid
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *Cache) beforeSave() {}
+func (x *Cache) save(m state.Map) {
+	x.beforeSave()
+	m.Save("Level", &x.Level)
+	m.Save("Type", &x.Type)
+	m.Save("FullyAssociative", &x.FullyAssociative)
+	m.Save("Partitions", &x.Partitions)
+	m.Save("Ways", &x.Ways)
+	m.Save("Sets", &x.Sets)
+	m.Save("InvalidateHierarchical", &x.InvalidateHierarchical)
+	m.Save("Inclusive", &x.Inclusive)
+	m.Save("DirectMapped", &x.DirectMapped)
+}
+
+func (x *Cache) afterLoad() {}
+func (x *Cache) load(m state.Map) {
+	m.Load("Level", &x.Level)
+	m.Load("Type", &x.Type)
+	m.Load("FullyAssociative", &x.FullyAssociative)
+	m.Load("Partitions", &x.Partitions)
+	m.Load("Ways", &x.Ways)
+	m.Load("Sets", &x.Sets)
+	m.Load("InvalidateHierarchical", &x.InvalidateHierarchical)
+	m.Load("Inclusive", &x.Inclusive)
+	m.Load("DirectMapped", &x.DirectMapped)
+}
+
+func (x *FeatureSet) beforeSave() {}
+func (x *FeatureSet) save(m state.Map) {
+	x.beforeSave()
+	m.Save("Set", &x.Set)
+	m.Save("VendorID", &x.VendorID)
+	m.Save("ExtendedFamily", &x.ExtendedFamily)
+	m.Save("ExtendedModel", &x.ExtendedModel)
+	m.Save("ProcessorType", &x.ProcessorType)
+	m.Save("Family", &x.Family)
+	m.Save("Model", &x.Model)
+	m.Save("SteppingID", &x.SteppingID)
+	m.Save("Caches", &x.Caches)
+	m.Save("CacheLine", &x.CacheLine)
+}
+
+func (x *FeatureSet) afterLoad() {}
+func (x *FeatureSet) load(m state.Map) {
+	m.Load("Set", &x.Set)
+	m.Load("VendorID", &x.VendorID)
+	m.Load("ExtendedFamily", &x.ExtendedFamily)
+	m.Load("ExtendedModel", &x.ExtendedModel)
+	m.Load("ProcessorType", &x.ProcessorType)
+	m.Load("Family", &x.Family)
+	m.Load("Model", &x.Model)
+	m.Load("SteppingID", &x.SteppingID)
+	m.Load("Caches", &x.Caches)
+	m.Load("CacheLine", &x.CacheLine)
+}
+
+func init() {
+	state.Register("pkg/cpuid.Cache", (*Cache)(nil), state.Fns{Save: (*Cache).save, Load: (*Cache).load})
+	state.Register("pkg/cpuid.FeatureSet", (*FeatureSet)(nil), state.Fns{Save: (*FeatureSet).save, Load: (*FeatureSet).load})
+}
diff --git a/pkg/fdchannel/fdchannel_state_autogen.go b/pkg/fdchannel/fdchannel_unsafe_state_autogen.go
index 61447d773..61447d773 100755
--- a/pkg/fdchannel/fdchannel_state_autogen.go
+++ b/pkg/fdchannel/fdchannel_unsafe_state_autogen.go
diff --git a/pkg/fdnotifier/fdnotifier_state_autogen.go b/pkg/fdnotifier/fdnotifier_state_autogen.go
index c665190ae..527d44091 100755
--- a/pkg/fdnotifier/fdnotifier_state_autogen.go
+++ b/pkg/fdnotifier/fdnotifier_state_autogen.go
@@ -1,6 +1,5 @@
 // automatically generated by stateify.
 
 // +build linux
-// +build linux
 
 package fdnotifier
diff --git a/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go b/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go
new file mode 100755
index 000000000..527d44091
--- /dev/null
+++ b/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go
@@ -0,0 +1,5 @@
+// automatically generated by stateify.
+
+// +build linux
+
+package fdnotifier
diff --git a/pkg/flipcall/flipcall_unsafe_state_autogen.go b/pkg/flipcall/flipcall_unsafe_state_autogen.go
new file mode 100755
index 000000000..0e03c2a65
--- /dev/null
+++ b/pkg/flipcall/flipcall_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package flipcall
diff --git a/pkg/gohacks/gohacks_state_autogen.go b/pkg/gohacks/gohacks_unsafe_state_autogen.go
index c651ff01e..c651ff01e 100755
--- a/pkg/gohacks/gohacks_state_autogen.go
+++ b/pkg/gohacks/gohacks_unsafe_state_autogen.go
diff --git a/pkg/memutil/memutil_state_autogen.go b/pkg/memutil/memutil_unsafe_state_autogen.go
index 173297149..173297149 100755
--- a/pkg/memutil/memutil_state_autogen.go
+++ b/pkg/memutil/memutil_unsafe_state_autogen.go
diff --git a/pkg/safecopy/safecopy_unsafe_state_autogen.go b/pkg/safecopy/safecopy_unsafe_state_autogen.go
new file mode 100755
index 000000000..791eef959
--- /dev/null
+++ b/pkg/safecopy/safecopy_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package safecopy
diff --git a/pkg/safemem/safemem_unsafe_state_autogen.go b/pkg/safemem/safemem_unsafe_state_autogen.go
new file mode 100755
index 000000000..66d53f22d
--- /dev/null
+++ b/pkg/safemem/safemem_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package safemem
diff --git a/pkg/seccomp/seccomp_unsafe_state_autogen.go b/pkg/seccomp/seccomp_unsafe_state_autogen.go
new file mode 100755
index 000000000..e16b5d7c2
--- /dev/null
+++ b/pkg/seccomp/seccomp_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package seccomp
diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go
index 3e94c6144..98cc11f75 100755
--- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go
@@ -1,7 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// +build amd64 386
-// +build amd64 386
 // +build 386 amd64 arm64
 
 package arch
diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go
index bb4bcda4b..82f4d9d73 100755
--- a/pkg/sentry/arch/arch_state_autogen.go
+++ b/pkg/sentry/arch/arch_state_autogen.go
@@ -1,7 +1,5 @@
 // automatically generated by stateify.
 
-// +build amd64 386
-// +build amd64 386
 // +build 386 amd64 arm64
 
 package arch
diff --git a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go
new file mode 100755
index 000000000..521dcbb06
--- /dev/null
+++ b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go
@@ -0,0 +1,10 @@
+// Automatically generated marshal implementation. See tools/go_marshal.
+
+// +build amd64 386
+// +build amd64 386
+
+package arch
+
+import (
+)
+
diff --git a/pkg/sentry/arch/arch_impl_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go
index 4357dc093..4357dc093 100755
--- a/pkg/sentry/arch/arch_impl_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go
diff --git a/pkg/sentry/arch/arch_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
index 7303bb17f..7303bb17f 100755
--- a/pkg/sentry/arch/arch_impl_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go
new file mode 100755
index 000000000..20eaa99a6
--- /dev/null
+++ b/pkg/sentry/arch/arch_x86_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build amd64 386
+// +build amd64 386
+
+package arch
diff --git a/pkg/sentry/fs/fsutil/fsutil_unsafe_state_autogen.go b/pkg/sentry/fs/fsutil/fsutil_unsafe_state_autogen.go
new file mode 100755
index 000000000..00b0994f6
--- /dev/null
+++ b/pkg/sentry/fs/fsutil/fsutil_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package fsutil
diff --git a/pkg/sentry/fs/host/host_unsafe_state_autogen.go b/pkg/sentry/fs/host/host_unsafe_state_autogen.go
new file mode 100755
index 000000000..b2d8c661f
--- /dev/null
+++ b/pkg/sentry/fs/host/host_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package host
diff --git a/pkg/sentry/fsimpl/host/host_unsafe_state_autogen.go b/pkg/sentry/fsimpl/host/host_unsafe_state_autogen.go
new file mode 100755
index 000000000..b2d8c661f
--- /dev/null
+++ b/pkg/sentry/fsimpl/host/host_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package host
diff --git a/pkg/sentry/hostfd/hostfd_unsafe_state_autogen.go b/pkg/sentry/hostfd/hostfd_unsafe_state_autogen.go
new file mode 100755
index 000000000..9033424d5
--- /dev/null
+++ b/pkg/sentry/hostfd/hostfd_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package hostfd
diff --git a/pkg/sentry/kernel/auth/auth_state_autogen.go b/pkg/sentry/kernel/auth/auth_state_autogen.go
index 09ca564b8..5b97d58a6 100755
--- a/pkg/sentry/kernel/auth/auth_state_autogen.go
+++ b/pkg/sentry/kernel/auth/auth_state_autogen.go
@@ -6,18 +6,6 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *AtomicPtrCredentials) beforeSave() {}
-func (x *AtomicPtrCredentials) save(m state.Map) {
-	x.beforeSave()
-	var ptr *Credentials = x.savePtr()
-	m.SaveValue("ptr", ptr)
-}
-
-func (x *AtomicPtrCredentials) afterLoad() {}
-func (x *AtomicPtrCredentials) load(m state.Map) {
-	m.LoadValue("ptr", new(*Credentials), func(y interface{}) { x.loadPtr(y.(*Credentials)) })
-}
-
 func (x *Credentials) beforeSave() {}
 func (x *Credentials) save(m state.Map) {
 	x.beforeSave()
@@ -153,7 +141,6 @@ func (x *UserNamespace) load(m state.Map) {
 }
 
 func init() {
-	state.Register("pkg/sentry/kernel/auth.AtomicPtrCredentials", (*AtomicPtrCredentials)(nil), state.Fns{Save: (*AtomicPtrCredentials).save, Load: (*AtomicPtrCredentials).load})
 	state.Register("pkg/sentry/kernel/auth.Credentials", (*Credentials)(nil), state.Fns{Save: (*Credentials).save, Load: (*Credentials).load})
 	state.Register("pkg/sentry/kernel/auth.IDMapEntry", (*IDMapEntry)(nil), state.Fns{Save: (*IDMapEntry).save, Load: (*IDMapEntry).load})
 	state.Register("pkg/sentry/kernel/auth.idMapRange", (*idMapRange)(nil), state.Fns{Save: (*idMapRange).save, Load: (*idMapRange).load})
diff --git a/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go
new file mode 100755
index 000000000..6589b612c
--- /dev/null
+++ b/pkg/sentry/kernel/auth/auth_unsafe_state_autogen.go
@@ -0,0 +1,23 @@
+// automatically generated by stateify.
+
+package auth
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *AtomicPtrCredentials) beforeSave() {}
+func (x *AtomicPtrCredentials) save(m state.Map) {
+	x.beforeSave()
+	var ptr *Credentials = x.savePtr()
+	m.SaveValue("ptr", ptr)
+}
+
+func (x *AtomicPtrCredentials) afterLoad() {}
+func (x *AtomicPtrCredentials) load(m state.Map) {
+	m.LoadValue("ptr", new(*Credentials), func(y interface{}) { x.loadPtr(y.(*Credentials)) })
+}
+
+func init() {
+	state.Register("pkg/sentry/kernel/auth.AtomicPtrCredentials", (*AtomicPtrCredentials)(nil), state.Fns{Save: (*AtomicPtrCredentials).save, Load: (*AtomicPtrCredentials).load})
+}
diff --git a/pkg/sentry/kernel/futex/futex_state_autogen.go b/pkg/sentry/kernel/futex/futex_state_autogen.go
index 68aa69daa..12a0788ff 100755
--- a/pkg/sentry/kernel/futex/futex_state_autogen.go
+++ b/pkg/sentry/kernel/futex/futex_state_autogen.go
@@ -6,18 +6,6 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *AtomicPtrBucket) beforeSave() {}
-func (x *AtomicPtrBucket) save(m state.Map) {
-	x.beforeSave()
-	var ptr *bucket = x.savePtr()
-	m.SaveValue("ptr", ptr)
-}
-
-func (x *AtomicPtrBucket) afterLoad() {}
-func (x *AtomicPtrBucket) load(m state.Map) {
-	m.LoadValue("ptr", new(*bucket), func(y interface{}) { x.loadPtr(y.(*bucket)) })
-}
-
 func (x *bucket) beforeSave() {}
 func (x *bucket) save(m state.Map) {
 	x.beforeSave()
@@ -71,7 +59,6 @@ func (x *waiterEntry) load(m state.Map) {
 }
 
 func init() {
-	state.Register("pkg/sentry/kernel/futex.AtomicPtrBucket", (*AtomicPtrBucket)(nil), state.Fns{Save: (*AtomicPtrBucket).save, Load: (*AtomicPtrBucket).load})
 	state.Register("pkg/sentry/kernel/futex.bucket", (*bucket)(nil), state.Fns{Save: (*bucket).save, Load: (*bucket).load})
 	state.Register("pkg/sentry/kernel/futex.Manager", (*Manager)(nil), state.Fns{Save: (*Manager).save, Load: (*Manager).load})
 	state.Register("pkg/sentry/kernel/futex.waiterList", (*waiterList)(nil), state.Fns{Save: (*waiterList).save, Load: (*waiterList).load})
diff --git a/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go b/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go
new file mode 100755
index 000000000..7fc038fce
--- /dev/null
+++ b/pkg/sentry/kernel/futex/futex_unsafe_state_autogen.go
@@ -0,0 +1,23 @@
+// automatically generated by stateify.
+
+package futex
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *AtomicPtrBucket) beforeSave() {}
+func (x *AtomicPtrBucket) save(m state.Map) {
+	x.beforeSave()
+	var ptr *bucket = x.savePtr()
+	m.SaveValue("ptr", ptr)
+}
+
+func (x *AtomicPtrBucket) afterLoad() {}
+func (x *AtomicPtrBucket) load(m state.Map) {
+	m.LoadValue("ptr", new(*bucket), func(y interface{}) { x.loadPtr(y.(*bucket)) })
+}
+
+func init() {
+	state.Register("pkg/sentry/kernel/futex.AtomicPtrBucket", (*AtomicPtrBucket)(nil), state.Fns{Save: (*AtomicPtrBucket).save, Load: (*AtomicPtrBucket).load})
+}
diff --git a/pkg/sentry/kernel/kernel_unsafe_state_autogen.go b/pkg/sentry/kernel/kernel_unsafe_state_autogen.go
new file mode 100755
index 000000000..12130bf74
--- /dev/null
+++ b/pkg/sentry/kernel/kernel_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package kernel
diff --git a/pkg/sentry/pgalloc/pgalloc_unsafe_state_autogen.go b/pkg/sentry/pgalloc/pgalloc_unsafe_state_autogen.go
new file mode 100755
index 000000000..87c214008
--- /dev/null
+++ b/pkg/sentry/pgalloc/pgalloc_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package pgalloc
diff --git a/pkg/sentry/platform/kvm/kvm_state_autogen.go b/pkg/sentry/platform/kvm/kvm_state_autogen.go
index 2325262dc..8d85b96d0 100755
--- a/pkg/sentry/platform/kvm/kvm_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_state_autogen.go
@@ -1,8 +1,3 @@
 // automatically generated by stateify.
 
-// +build go1.12
-// +build !go1.15
-// +build go1.12
-// +build !go1.15
-
 package kvm
diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
new file mode 100755
index 000000000..2325262dc
--- /dev/null
+++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
@@ -0,0 +1,8 @@
+// automatically generated by stateify.
+
+// +build go1.12
+// +build !go1.15
+// +build go1.12
+// +build !go1.15
+
+package kvm
diff --git a/pkg/sentry/platform/ptrace/ptrace_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_state_autogen.go
index 4526fc387..1bf0526f9 100755
--- a/pkg/sentry/platform/ptrace/ptrace_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_state_autogen.go
@@ -1,6 +1,3 @@
 // automatically generated by stateify.
 
-// +build go1.12
-// +build !go1.15
-
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
new file mode 100755
index 000000000..4526fc387
--- /dev/null
+++ b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build go1.12
+// +build !go1.15
+
+package ptrace
diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go
index 6fe78c51c..4c4540603 100755
--- a/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go
+++ b/pkg/sentry/platform/ring0/pagetables/pagetables_state_autogen.go
@@ -1,6 +1,3 @@
 // automatically generated by stateify.
 
-// +build 386 amd64
-// +build i386 amd64
-
 package pagetables
diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_unsafe_state_autogen.go b/pkg/sentry/platform/ring0/pagetables/pagetables_unsafe_state_autogen.go
new file mode 100755
index 000000000..4c4540603
--- /dev/null
+++ b/pkg/sentry/platform/ring0/pagetables/pagetables_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package pagetables
diff --git a/pkg/sentry/platform/ring0/pagetables/pagetables_x86_state_autogen.go b/pkg/sentry/platform/ring0/pagetables/pagetables_x86_state_autogen.go
new file mode 100755
index 000000000..6fe78c51c
--- /dev/null
+++ b/pkg/sentry/platform/ring0/pagetables/pagetables_x86_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build 386 amd64
+// +build i386 amd64
+
+package pagetables
diff --git a/pkg/sentry/platform/ring0/ring0_impl_amd64_state_autogen.go b/pkg/sentry/platform/ring0/ring0_impl_amd64_state_autogen.go
new file mode 100755
index 000000000..327aba163
--- /dev/null
+++ b/pkg/sentry/platform/ring0/ring0_impl_amd64_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package ring0
diff --git a/pkg/sentry/platform/ring0/ring0_impl_arm64_state_autogen.go b/pkg/sentry/platform/ring0/ring0_impl_arm64_state_autogen.go
new file mode 100755
index 000000000..327aba163
--- /dev/null
+++ b/pkg/sentry/platform/ring0/ring0_impl_arm64_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package ring0
diff --git a/pkg/sentry/platform/ring0/ring0_unsafe_state_autogen.go b/pkg/sentry/platform/ring0/ring0_unsafe_state_autogen.go
new file mode 100755
index 000000000..327aba163
--- /dev/null
+++ b/pkg/sentry/platform/ring0/ring0_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package ring0
diff --git a/pkg/sentry/sighandling/sighandling_unsafe_state_autogen.go b/pkg/sentry/sighandling/sighandling_unsafe_state_autogen.go
new file mode 100755
index 000000000..da9d96382
--- /dev/null
+++ b/pkg/sentry/sighandling/sighandling_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package sighandling
diff --git a/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go
new file mode 100755
index 000000000..b0a59ba93
--- /dev/null
+++ b/pkg/sentry/socket/hostinet/hostinet_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package hostinet
diff --git a/pkg/sentry/state/state_unsafe_state_autogen.go b/pkg/sentry/state/state_unsafe_state_autogen.go
new file mode 100755
index 000000000..6c2b29632
--- /dev/null
+++ b/pkg/sentry/state/state_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package state
diff --git a/pkg/sentry/time/time_unsafe_state_autogen.go b/pkg/sentry/time/time_unsafe_state_autogen.go
new file mode 100755
index 000000000..2adc9c9e0
--- /dev/null
+++ b/pkg/sentry/time/time_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package time
diff --git a/pkg/sentry/usage/usage_unsafe_state_autogen.go b/pkg/sentry/usage/usage_unsafe_state_autogen.go
new file mode 100755
index 000000000..5d9e86efa
--- /dev/null
+++ b/pkg/sentry/usage/usage_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package usage
diff --git a/pkg/sentry/vfs/vfs_state_autogen.go b/pkg/sentry/vfs/vfs_state_autogen.go
index 7fc34dedd..0cf6ed48d 100755
--- a/pkg/sentry/vfs/vfs_state_autogen.go
+++ b/pkg/sentry/vfs/vfs_state_autogen.go
@@ -1,8 +1,5 @@
 // automatically generated by stateify.
 
-// +build go1.12
-// +build !go1.15
-
 package vfs
 
 import (
@@ -150,19 +147,6 @@ func (x *MountNamespace) load(m state.Map) {
 	m.Load("mountpoints", &x.mountpoints)
 }
 
-func (x *mountTable) beforeSave() {}
-func (x *mountTable) save(m state.Map) {
-	x.beforeSave()
-	m.Save("seed", &x.seed)
-	m.Save("size", &x.size)
-}
-
-func (x *mountTable) afterLoad() {}
-func (x *mountTable) load(m state.Map) {
-	m.Load("seed", &x.seed)
-	m.Load("size", &x.size)
-}
-
 func (x *VirtualFilesystem) beforeSave() {}
 func (x *VirtualFilesystem) save(m state.Map) {
 	x.beforeSave()
@@ -211,7 +195,6 @@ func init() {
 	state.Register("pkg/sentry/vfs.registeredFilesystemType", (*registeredFilesystemType)(nil), state.Fns{Save: (*registeredFilesystemType).save, Load: (*registeredFilesystemType).load})
 	state.Register("pkg/sentry/vfs.Mount", (*Mount)(nil), state.Fns{Save: (*Mount).save, Load: (*Mount).load})
 	state.Register("pkg/sentry/vfs.MountNamespace", (*MountNamespace)(nil), state.Fns{Save: (*MountNamespace).save, Load: (*MountNamespace).load})
-	state.Register("pkg/sentry/vfs.mountTable", (*mountTable)(nil), state.Fns{Save: (*mountTable).save, Load: (*mountTable).load})
 	state.Register("pkg/sentry/vfs.VirtualFilesystem", (*VirtualFilesystem)(nil), state.Fns{Save: (*VirtualFilesystem).save, Load: (*VirtualFilesystem).load})
 	state.Register("pkg/sentry/vfs.VirtualDentry", (*VirtualDentry)(nil), state.Fns{Save: (*VirtualDentry).save, Load: (*VirtualDentry).load})
 }
diff --git a/pkg/sentry/vfs/vfs_unsafe_state_autogen.go b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go
new file mode 100755
index 000000000..8b198c5dd
--- /dev/null
+++ b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go
@@ -0,0 +1,27 @@
+// automatically generated by stateify.
+
+// +build go1.12
+// +build !go1.15
+
+package vfs
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *mountTable) beforeSave() {}
+func (x *mountTable) save(m state.Map) {
+	x.beforeSave()
+	m.Save("seed", &x.seed)
+	m.Save("size", &x.size)
+}
+
+func (x *mountTable) afterLoad() {}
+func (x *mountTable) load(m state.Map) {
+	m.Load("seed", &x.seed)
+	m.Load("size", &x.size)
+}
+
+func init() {
+	state.Register("pkg/sentry/vfs.mountTable", (*mountTable)(nil), state.Fns{Save: (*mountTable).save, Load: (*mountTable).load})
+}
diff --git a/pkg/sleep/sleep_state_autogen.go b/pkg/sleep/sleep_state_autogen.go
index e8727e1c9..39986b478 100755
--- a/pkg/sleep/sleep_state_autogen.go
+++ b/pkg/sleep/sleep_state_autogen.go
@@ -3,7 +3,5 @@
 // +build amd64 arm64
 // +build !race
 // +build !amd64,!arm64
-// +build go1.11
-// +build !go1.15
 
 package sleep
diff --git a/pkg/sleep/sleep_unsafe_state_autogen.go b/pkg/sleep/sleep_unsafe_state_autogen.go
new file mode 100755
index 000000000..023c828d7
--- /dev/null
+++ b/pkg/sleep/sleep_unsafe_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build go1.11
+// +build !go1.15
+
+package sleep
diff --git a/pkg/sync/sync_state_autogen.go b/pkg/sync/sync_state_autogen.go
index 6876ee883..c6dc2c7e7 100755
--- a/pkg/sync/sync_state_autogen.go
+++ b/pkg/sync/sync_state_autogen.go
@@ -1,12 +1,3 @@
 // automatically generated by stateify.
 
-// +build go1.12
-// +build !go1.15
-// +build go1.13
-// +build !go1.15
-// +build !race
-// +build race
-// +build go1.13
-// +build !go1.15
-
 package sync
diff --git a/pkg/sync/sync_unsafe_state_autogen.go b/pkg/sync/sync_unsafe_state_autogen.go
new file mode 100755
index 000000000..6876ee883
--- /dev/null
+++ b/pkg/sync/sync_unsafe_state_autogen.go
@@ -0,0 +1,12 @@
+// automatically generated by stateify.
+
+// +build go1.12
+// +build !go1.15
+// +build go1.13
+// +build !go1.15
+// +build !race
+// +build race
+// +build go1.13
+// +build !go1.15
+
+package sync
diff --git a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
index 97cb3958e..b84e8f21c 100755
--- a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
+++ b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
@@ -1,10 +1,8 @@
 // automatically generated by stateify.
 
 // +build linux
-// +build linux
 // +build linux,amd64 linux,arm64
 // +build !linux !amd64,!arm64
-// +build linux,amd64 linux,arm64
 // +build linux
 
 package fdbased
diff --git a/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go
new file mode 100755
index 000000000..e2ed505b2
--- /dev/null
+++ b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build linux
+// +build linux,amd64 linux,arm64
+
+package fdbased
diff --git a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
index 6b6816bae..338e9679b 100755
--- a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
+++ b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
@@ -1,10 +1,5 @@
 // automatically generated by stateify.
 
-// +build linux,!amd64,!arm64
-// +build linux,amd64 linux,arm64
-// +build go1.12
-// +build !go1.15
-// +build linux
 // +build linux
 
 package rawfile
diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
new file mode 100755
index 000000000..70d62c4a1
--- /dev/null
+++ b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
@@ -0,0 +1,9 @@
+// automatically generated by stateify.
+
+// +build linux,!amd64,!arm64
+// +build linux,amd64 linux,arm64
+// +build go1.12
+// +build !go1.15
+// +build linux
+
+package rawfile
diff --git a/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go b/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go
new file mode 100755
index 000000000..d3b40feb4
--- /dev/null
+++ b/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package pipe
diff --git a/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go b/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go
new file mode 100755
index 000000000..ac3a66520
--- /dev/null
+++ b/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package sharedmem
diff --git a/pkg/tcpip/link/tun/tun_state_autogen.go b/pkg/tcpip/link/tun/tun_state_autogen.go
index 8b56175e4..4b70647af 100755
--- a/pkg/tcpip/link/tun/tun_state_autogen.go
+++ b/pkg/tcpip/link/tun/tun_state_autogen.go
@@ -1,7 +1,5 @@
 // automatically generated by stateify.
 
-// +build linux
-
 package tun
 
 import (
diff --git a/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go
new file mode 100755
index 000000000..149299ea3
--- /dev/null
+++ b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go
@@ -0,0 +1,5 @@
+// automatically generated by stateify.
+
+// +build linux
+
+package tun
diff --git a/pkg/tcpip/tcpip_state_autogen.go b/pkg/tcpip/tcpip_state_autogen.go
index 37b11704b..8ea900688 100755
--- a/pkg/tcpip/tcpip_state_autogen.go
+++ b/pkg/tcpip/tcpip_state_autogen.go
@@ -1,8 +1,5 @@
 // automatically generated by stateify.
 
-// +build go1.9
-// +build !go1.15
-
 package tcpip
 
 import (
@@ -68,18 +65,8 @@ func (x *IPPacketInfo) load(m state.Map) {
 	m.Load("DestinationAddr", &x.DestinationAddr)
 }
 
-func (x *StdClock) beforeSave() {}
-func (x *StdClock) save(m state.Map) {
-	x.beforeSave()
-}
-
-func (x *StdClock) afterLoad() {}
-func (x *StdClock) load(m state.Map) {
-}
-
 func init() {
 	state.Register("pkg/tcpip.FullAddress", (*FullAddress)(nil), state.Fns{Save: (*FullAddress).save, Load: (*FullAddress).load})
 	state.Register("pkg/tcpip.ControlMessages", (*ControlMessages)(nil), state.Fns{Save: (*ControlMessages).save, Load: (*ControlMessages).load})
 	state.Register("pkg/tcpip.IPPacketInfo", (*IPPacketInfo)(nil), state.Fns{Save: (*IPPacketInfo).save, Load: (*IPPacketInfo).load})
-	state.Register("pkg/tcpip.StdClock", (*StdClock)(nil), state.Fns{Save: (*StdClock).save, Load: (*StdClock).load})
 }
diff --git a/pkg/tcpip/tcpip_unsafe_state_autogen.go b/pkg/tcpip/tcpip_unsafe_state_autogen.go
new file mode 100755
index 000000000..32d2350f4
--- /dev/null
+++ b/pkg/tcpip/tcpip_unsafe_state_autogen.go
@@ -0,0 +1,23 @@
+// automatically generated by stateify.
+
+// +build go1.9
+// +build !go1.15
+
+package tcpip
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *StdClock) beforeSave() {}
+func (x *StdClock) save(m state.Map) {
+	x.beforeSave()
+}
+
+func (x *StdClock) afterLoad() {}
+func (x *StdClock) load(m state.Map) {
+}
+
+func init() {
+	state.Register("pkg/tcpip.StdClock", (*StdClock)(nil), state.Fns{Save: (*StdClock).save, Load: (*StdClock).load})
+}
diff --git a/pkg/tcpip/transport/tcp/tcp_unsafe_state_autogen.go b/pkg/tcpip/transport/tcp/tcp_unsafe_state_autogen.go
new file mode 100755
index 000000000..4cb82fcc9
--- /dev/null
+++ b/pkg/tcpip/transport/tcp/tcp_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package tcp
diff --git a/pkg/unet/unet_unsafe_state_autogen.go b/pkg/unet/unet_unsafe_state_autogen.go
new file mode 100755
index 000000000..9bbf31d35
--- /dev/null
+++ b/pkg/unet/unet_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package unet
diff --git a/pkg/usermem/usermem_state_autogen.go b/pkg/usermem/usermem_state_autogen.go
index 646e9eb9a..20aa2d2de 100755
--- a/pkg/usermem/usermem_state_autogen.go
+++ b/pkg/usermem/usermem_state_autogen.go
@@ -1,7 +1,5 @@
 // automatically generated by stateify.
 
-// +build amd64 386
-
 package usermem
 
 import (
diff --git a/pkg/usermem/usermem_unsafe_state_autogen.go b/pkg/usermem/usermem_unsafe_state_autogen.go
new file mode 100755
index 000000000..62f8af4c9
--- /dev/null
+++ b/pkg/usermem/usermem_unsafe_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package usermem
diff --git a/pkg/usermem/usermem_x86_state_autogen.go b/pkg/usermem/usermem_x86_state_autogen.go
new file mode 100755
index 000000000..cca386593
--- /dev/null
+++ b/pkg/usermem/usermem_x86_state_autogen.go
@@ -0,0 +1,5 @@
+// automatically generated by stateify.
+
+// +build amd64 386
+
+package usermem