13 files changed, 646 insertions, 649 deletions

diff --git a/pkg/sentry/fsimpl/proc/BUILD b/pkg/sentry/fsimpl/proc/BUILD
deleted file mode 100644
index 17c1342b5..000000000
--- a/pkg/sentry/fsimpl/proc/BUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-load("//tools:defs.bzl", "go_library", "go_test")
-
-licenses(["notice"])
-
-go_library(
-    name = "proc",
-    srcs = [
-        "filesystem.go",
-        "subtasks.go",
-        "task.go",
-        "task_fds.go",
-        "task_files.go",
-        "task_net.go",
-        "tasks.go",
-        "tasks_files.go",
-        "tasks_sys.go",
-    ],
-    visibility = ["//pkg/sentry:internal"],
-    deps = [
-        "//pkg/abi/linux",
-        "//pkg/context",
-        "//pkg/log",
-        "//pkg/refs",
-        "//pkg/safemem",
-        "//pkg/sentry/fsbridge",
-        "//pkg/sentry/fsimpl/kernfs",
-        "//pkg/sentry/inet",
-        "//pkg/sentry/kernel",
-        "//pkg/sentry/kernel/auth",
-        "//pkg/sentry/kernel/time",
-        "//pkg/sentry/limits",
-        "//pkg/sentry/mm",
-        "//pkg/sentry/socket",
-        "//pkg/sentry/socket/unix",
-        "//pkg/sentry/socket/unix/transport",
-        "//pkg/sentry/usage",
-        "//pkg/sentry/vfs",
-        "//pkg/syserror",
-        "//pkg/tcpip/header",
-        "//pkg/usermem",
-    ],
-)
-
-go_test(
-    name = "proc_test",
-    size = "small",
-    srcs = [
-        "tasks_sys_test.go",
-        "tasks_test.go",
-    ],
-    library = ":proc",
-    deps = [
-        "//pkg/abi/linux",
-        "//pkg/context",
-        "//pkg/fspath",
-        "//pkg/sentry/contexttest",
-        "//pkg/sentry/fsimpl/testutil",
-        "//pkg/sentry/fsimpl/tmpfs",
-        "//pkg/sentry/inet",
-        "//pkg/sentry/kernel",
-        "//pkg/sentry/kernel/auth",
-        "//pkg/sentry/vfs",
-        "//pkg/syserror",
-        "//pkg/usermem",
-    ],
-)
diff --git a/pkg/sentry/fsimpl/proc/filesystem.go b/pkg/sentry/fsimpl/proc/filesystem.go
index 104fc9030..104fc9030 100644..100755
--- a/pkg/sentry/fsimpl/proc/filesystem.go
+++ b/pkg/sentry/fsimpl/proc/filesystem.go
diff --git a/pkg/sentry/fsimpl/proc/proc_state_autogen.go b/pkg/sentry/fsimpl/proc/proc_state_autogen.go
new file mode 100755
index 000000000..26c7165d3
--- /dev/null
+++ b/pkg/sentry/fsimpl/proc/proc_state_autogen.go
@@ -0,0 +1,646 @@
+// automatically generated by stateify.
+
+package proc
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *FilesystemType) beforeSave() {}
+func (x *FilesystemType) save(m state.Map) {
+	x.beforeSave()
+}
+
+func (x *FilesystemType) afterLoad() {}
+func (x *FilesystemType) load(m state.Map) {
+}
+
+func (x *subtasksInode) beforeSave() {}
+func (x *subtasksInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Save("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("OrderedChildren", &x.OrderedChildren)
+	m.Save("AlwaysValid", &x.AlwaysValid)
+	m.Save("task", &x.task)
+	m.Save("pidns", &x.pidns)
+	m.Save("inoGen", &x.inoGen)
+	m.Save("cgroupControllers", &x.cgroupControllers)
+}
+
+func (x *subtasksInode) afterLoad() {}
+func (x *subtasksInode) load(m state.Map) {
+	m.Load("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Load("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("OrderedChildren", &x.OrderedChildren)
+	m.Load("AlwaysValid", &x.AlwaysValid)
+	m.Load("task", &x.task)
+	m.Load("pidns", &x.pidns)
+	m.Load("inoGen", &x.inoGen)
+	m.Load("cgroupControllers", &x.cgroupControllers)
+}
+
+func (x *taskInode) beforeSave() {}
+func (x *taskInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Save("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Save("InodeNoDynamicLookup", &x.InodeNoDynamicLookup)
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("OrderedChildren", &x.OrderedChildren)
+	m.Save("task", &x.task)
+}
+
+func (x *taskInode) afterLoad() {}
+func (x *taskInode) load(m state.Map) {
+	m.Load("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Load("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Load("InodeNoDynamicLookup", &x.InodeNoDynamicLookup)
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("OrderedChildren", &x.OrderedChildren)
+	m.Load("task", &x.task)
+}
+
+func (x *fdDirInode) beforeSave() {}
+func (x *fdDirInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Save("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("OrderedChildren", &x.OrderedChildren)
+	m.Save("AlwaysValid", &x.AlwaysValid)
+	m.Save("fdDir", &x.fdDir)
+}
+
+func (x *fdDirInode) afterLoad() {}
+func (x *fdDirInode) load(m state.Map) {
+	m.Load("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Load("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("OrderedChildren", &x.OrderedChildren)
+	m.Load("AlwaysValid", &x.AlwaysValid)
+	m.Load("fdDir", &x.fdDir)
+}
+
+func (x *fdSymlink) beforeSave() {}
+func (x *fdSymlink) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("InodeNoopRefCount", &x.InodeNoopRefCount)
+	m.Save("InodeSymlink", &x.InodeSymlink)
+	m.Save("task", &x.task)
+	m.Save("fd", &x.fd)
+}
+
+func (x *fdSymlink) afterLoad() {}
+func (x *fdSymlink) load(m state.Map) {
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("InodeNoopRefCount", &x.InodeNoopRefCount)
+	m.Load("InodeSymlink", &x.InodeSymlink)
+	m.Load("task", &x.task)
+	m.Load("fd", &x.fd)
+}
+
+func (x *fdInfoDirInode) beforeSave() {}
+func (x *fdInfoDirInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Save("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("OrderedChildren", &x.OrderedChildren)
+	m.Save("AlwaysValid", &x.AlwaysValid)
+	m.Save("fdDir", &x.fdDir)
+}
+
+func (x *fdInfoDirInode) afterLoad() {}
+func (x *fdInfoDirInode) load(m state.Map) {
+	m.Load("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Load("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("OrderedChildren", &x.OrderedChildren)
+	m.Load("AlwaysValid", &x.AlwaysValid)
+	m.Load("fdDir", &x.fdDir)
+}
+
+func (x *fdInfoData) beforeSave() {}
+func (x *fdInfoData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("AtomicRefCount", &x.AtomicRefCount)
+	m.Save("task", &x.task)
+	m.Save("fd", &x.fd)
+}
+
+func (x *fdInfoData) afterLoad() {}
+func (x *fdInfoData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("AtomicRefCount", &x.AtomicRefCount)
+	m.Load("task", &x.task)
+	m.Load("fd", &x.fd)
+}
+
+func (x *auxvData) beforeSave() {}
+func (x *auxvData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *auxvData) afterLoad() {}
+func (x *auxvData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *cmdlineData) beforeSave() {}
+func (x *cmdlineData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+	m.Save("arg", &x.arg)
+}
+
+func (x *cmdlineData) afterLoad() {}
+func (x *cmdlineData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+	m.Load("arg", &x.arg)
+}
+
+func (x *commInode) beforeSave() {}
+func (x *commInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *commInode) afterLoad() {}
+func (x *commInode) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *commData) beforeSave() {}
+func (x *commData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *commData) afterLoad() {}
+func (x *commData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *idMapData) beforeSave() {}
+func (x *idMapData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+	m.Save("gids", &x.gids)
+}
+
+func (x *idMapData) afterLoad() {}
+func (x *idMapData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+	m.Load("gids", &x.gids)
+}
+
+func (x *mapsData) beforeSave() {}
+func (x *mapsData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *mapsData) afterLoad() {}
+func (x *mapsData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *smapsData) beforeSave() {}
+func (x *smapsData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *smapsData) afterLoad() {}
+func (x *smapsData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *taskStatData) beforeSave() {}
+func (x *taskStatData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+	m.Save("tgstats", &x.tgstats)
+	m.Save("pidns", &x.pidns)
+}
+
+func (x *taskStatData) afterLoad() {}
+func (x *taskStatData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+	m.Load("tgstats", &x.tgstats)
+	m.Load("pidns", &x.pidns)
+}
+
+func (x *statmData) beforeSave() {}
+func (x *statmData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *statmData) afterLoad() {}
+func (x *statmData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *statusData) beforeSave() {}
+func (x *statusData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+	m.Save("pidns", &x.pidns)
+}
+
+func (x *statusData) afterLoad() {}
+func (x *statusData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+	m.Load("pidns", &x.pidns)
+}
+
+func (x *ioData) beforeSave() {}
+func (x *ioData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("ioUsage", &x.ioUsage)
+}
+
+func (x *ioData) afterLoad() {}
+func (x *ioData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("ioUsage", &x.ioUsage)
+}
+
+func (x *oomScoreAdj) beforeSave() {}
+func (x *oomScoreAdj) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *oomScoreAdj) afterLoad() {}
+func (x *oomScoreAdj) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *exeSymlink) beforeSave() {}
+func (x *exeSymlink) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("InodeNoopRefCount", &x.InodeNoopRefCount)
+	m.Save("InodeSymlink", &x.InodeSymlink)
+	m.Save("task", &x.task)
+}
+
+func (x *exeSymlink) afterLoad() {}
+func (x *exeSymlink) load(m state.Map) {
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("InodeNoopRefCount", &x.InodeNoopRefCount)
+	m.Load("InodeSymlink", &x.InodeSymlink)
+	m.Load("task", &x.task)
+}
+
+func (x *mountInfoData) beforeSave() {}
+func (x *mountInfoData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *mountInfoData) afterLoad() {}
+func (x *mountInfoData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *mountsData) beforeSave() {}
+func (x *mountsData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("task", &x.task)
+}
+
+func (x *mountsData) afterLoad() {}
+func (x *mountsData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("task", &x.task)
+}
+
+func (x *ifinet6) beforeSave() {}
+func (x *ifinet6) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+}
+
+func (x *ifinet6) afterLoad() {}
+func (x *ifinet6) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("stack", &x.stack)
+}
+
+func (x *netDevData) beforeSave() {}
+func (x *netDevData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+}
+
+func (x *netDevData) afterLoad() {}
+func (x *netDevData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("stack", &x.stack)
+}
+
+func (x *netUnixData) beforeSave() {}
+func (x *netUnixData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("kernel", &x.kernel)
+}
+
+func (x *netUnixData) afterLoad() {}
+func (x *netUnixData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("kernel", &x.kernel)
+}
+
+func (x *netTCPData) beforeSave() {}
+func (x *netTCPData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("kernel", &x.kernel)
+}
+
+func (x *netTCPData) afterLoad() {}
+func (x *netTCPData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("kernel", &x.kernel)
+}
+
+func (x *netTCP6Data) beforeSave() {}
+func (x *netTCP6Data) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("kernel", &x.kernel)
+}
+
+func (x *netTCP6Data) afterLoad() {}
+func (x *netTCP6Data) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("kernel", &x.kernel)
+}
+
+func (x *netUDPData) beforeSave() {}
+func (x *netUDPData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("kernel", &x.kernel)
+}
+
+func (x *netUDPData) afterLoad() {}
+func (x *netUDPData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("kernel", &x.kernel)
+}
+
+func (x *netSnmpData) beforeSave() {}
+func (x *netSnmpData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+}
+
+func (x *netSnmpData) afterLoad() {}
+func (x *netSnmpData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("stack", &x.stack)
+}
+
+func (x *netRouteData) beforeSave() {}
+func (x *netRouteData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+}
+
+func (x *netRouteData) afterLoad() {}
+func (x *netRouteData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("stack", &x.stack)
+}
+
+func (x *netStatData) beforeSave() {}
+func (x *netStatData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+}
+
+func (x *netStatData) afterLoad() {}
+func (x *netStatData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("stack", &x.stack)
+}
+
+func (x *tasksInode) beforeSave() {}
+func (x *tasksInode) save(m state.Map) {
+	x.beforeSave()
+	m.Save("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Save("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Save("InodeAttrs", &x.InodeAttrs)
+	m.Save("OrderedChildren", &x.OrderedChildren)
+	m.Save("AlwaysValid", &x.AlwaysValid)
+	m.Save("inoGen", &x.inoGen)
+	m.Save("pidns", &x.pidns)
+	m.Save("selfSymlink", &x.selfSymlink)
+	m.Save("threadSelfSymlink", &x.threadSelfSymlink)
+	m.Save("cgroupControllers", &x.cgroupControllers)
+}
+
+func (x *tasksInode) afterLoad() {}
+func (x *tasksInode) load(m state.Map) {
+	m.Load("InodeNotSymlink", &x.InodeNotSymlink)
+	m.Load("InodeDirectoryNoNewChildren", &x.InodeDirectoryNoNewChildren)
+	m.Load("InodeAttrs", &x.InodeAttrs)
+	m.Load("OrderedChildren", &x.OrderedChildren)
+	m.Load("AlwaysValid", &x.AlwaysValid)
+	m.Load("inoGen", &x.inoGen)
+	m.Load("pidns", &x.pidns)
+	m.Load("selfSymlink", &x.selfSymlink)
+	m.Load("threadSelfSymlink", &x.threadSelfSymlink)
+	m.Load("cgroupControllers", &x.cgroupControllers)
+}
+
+func (x *statData) beforeSave() {}
+func (x *statData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *statData) afterLoad() {}
+func (x *statData) load(m state.Map) {
+	m.Load("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *loadavgData) beforeSave() {}
+func (x *loadavgData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *loadavgData) afterLoad() {}
+func (x *loadavgData) load(m state.Map) {
+	m.Load("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *meminfoData) beforeSave() {}
+func (x *meminfoData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *meminfoData) afterLoad() {}
+func (x *meminfoData) load(m state.Map) {
+	m.Load("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *uptimeData) beforeSave() {}
+func (x *uptimeData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *uptimeData) afterLoad() {}
+func (x *uptimeData) load(m state.Map) {
+	m.Load("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *versionData) beforeSave() {}
+func (x *versionData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *versionData) afterLoad() {}
+func (x *versionData) load(m state.Map) {
+	m.Load("dynamicBytesFileSetAttr", &x.dynamicBytesFileSetAttr)
+}
+
+func (x *filesystemsData) beforeSave() {}
+func (x *filesystemsData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+}
+
+func (x *filesystemsData) afterLoad() {}
+func (x *filesystemsData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+}
+
+func (x *mmapMinAddrData) beforeSave() {}
+func (x *mmapMinAddrData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("k", &x.k)
+}
+
+func (x *mmapMinAddrData) afterLoad() {}
+func (x *mmapMinAddrData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Load("k", &x.k)
+}
+
+func (x *hostnameData) beforeSave() {}
+func (x *hostnameData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+}
+
+func (x *hostnameData) afterLoad() {}
+func (x *hostnameData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+}
+
+func (x *tcpSackData) beforeSave() {}
+func (x *tcpSackData) save(m state.Map) {
+	x.beforeSave()
+	m.Save("DynamicBytesFile", &x.DynamicBytesFile)
+	m.Save("stack", &x.stack)
+	m.Save("enabled", &x.enabled)
+}
+
+func (x *tcpSackData) afterLoad() {}
+func (x *tcpSackData) load(m state.Map) {
+	m.Load("DynamicBytesFile", &x.DynamicBytesFile)
+	m.LoadWait("stack", &x.stack)
+	m.Load("enabled", &x.enabled)
+}
+
+func init() {
+	state.Register("pkg/sentry/fsimpl/proc.FilesystemType", (*FilesystemType)(nil), state.Fns{Save: (*FilesystemType).save, Load: (*FilesystemType).load})
+	state.Register("pkg/sentry/fsimpl/proc.subtasksInode", (*subtasksInode)(nil), state.Fns{Save: (*subtasksInode).save, Load: (*subtasksInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.taskInode", (*taskInode)(nil), state.Fns{Save: (*taskInode).save, Load: (*taskInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.fdDirInode", (*fdDirInode)(nil), state.Fns{Save: (*fdDirInode).save, Load: (*fdDirInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.fdSymlink", (*fdSymlink)(nil), state.Fns{Save: (*fdSymlink).save, Load: (*fdSymlink).load})
+	state.Register("pkg/sentry/fsimpl/proc.fdInfoDirInode", (*fdInfoDirInode)(nil), state.Fns{Save: (*fdInfoDirInode).save, Load: (*fdInfoDirInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.fdInfoData", (*fdInfoData)(nil), state.Fns{Save: (*fdInfoData).save, Load: (*fdInfoData).load})
+	state.Register("pkg/sentry/fsimpl/proc.auxvData", (*auxvData)(nil), state.Fns{Save: (*auxvData).save, Load: (*auxvData).load})
+	state.Register("pkg/sentry/fsimpl/proc.cmdlineData", (*cmdlineData)(nil), state.Fns{Save: (*cmdlineData).save, Load: (*cmdlineData).load})
+	state.Register("pkg/sentry/fsimpl/proc.commInode", (*commInode)(nil), state.Fns{Save: (*commInode).save, Load: (*commInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.commData", (*commData)(nil), state.Fns{Save: (*commData).save, Load: (*commData).load})
+	state.Register("pkg/sentry/fsimpl/proc.idMapData", (*idMapData)(nil), state.Fns{Save: (*idMapData).save, Load: (*idMapData).load})
+	state.Register("pkg/sentry/fsimpl/proc.mapsData", (*mapsData)(nil), state.Fns{Save: (*mapsData).save, Load: (*mapsData).load})
+	state.Register("pkg/sentry/fsimpl/proc.smapsData", (*smapsData)(nil), state.Fns{Save: (*smapsData).save, Load: (*smapsData).load})
+	state.Register("pkg/sentry/fsimpl/proc.taskStatData", (*taskStatData)(nil), state.Fns{Save: (*taskStatData).save, Load: (*taskStatData).load})
+	state.Register("pkg/sentry/fsimpl/proc.statmData", (*statmData)(nil), state.Fns{Save: (*statmData).save, Load: (*statmData).load})
+	state.Register("pkg/sentry/fsimpl/proc.statusData", (*statusData)(nil), state.Fns{Save: (*statusData).save, Load: (*statusData).load})
+	state.Register("pkg/sentry/fsimpl/proc.ioData", (*ioData)(nil), state.Fns{Save: (*ioData).save, Load: (*ioData).load})
+	state.Register("pkg/sentry/fsimpl/proc.oomScoreAdj", (*oomScoreAdj)(nil), state.Fns{Save: (*oomScoreAdj).save, Load: (*oomScoreAdj).load})
+	state.Register("pkg/sentry/fsimpl/proc.exeSymlink", (*exeSymlink)(nil), state.Fns{Save: (*exeSymlink).save, Load: (*exeSymlink).load})
+	state.Register("pkg/sentry/fsimpl/proc.mountInfoData", (*mountInfoData)(nil), state.Fns{Save: (*mountInfoData).save, Load: (*mountInfoData).load})
+	state.Register("pkg/sentry/fsimpl/proc.mountsData", (*mountsData)(nil), state.Fns{Save: (*mountsData).save, Load: (*mountsData).load})
+	state.Register("pkg/sentry/fsimpl/proc.ifinet6", (*ifinet6)(nil), state.Fns{Save: (*ifinet6).save, Load: (*ifinet6).load})
+	state.Register("pkg/sentry/fsimpl/proc.netDevData", (*netDevData)(nil), state.Fns{Save: (*netDevData).save, Load: (*netDevData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netUnixData", (*netUnixData)(nil), state.Fns{Save: (*netUnixData).save, Load: (*netUnixData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netTCPData", (*netTCPData)(nil), state.Fns{Save: (*netTCPData).save, Load: (*netTCPData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netTCP6Data", (*netTCP6Data)(nil), state.Fns{Save: (*netTCP6Data).save, Load: (*netTCP6Data).load})
+	state.Register("pkg/sentry/fsimpl/proc.netUDPData", (*netUDPData)(nil), state.Fns{Save: (*netUDPData).save, Load: (*netUDPData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netSnmpData", (*netSnmpData)(nil), state.Fns{Save: (*netSnmpData).save, Load: (*netSnmpData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netRouteData", (*netRouteData)(nil), state.Fns{Save: (*netRouteData).save, Load: (*netRouteData).load})
+	state.Register("pkg/sentry/fsimpl/proc.netStatData", (*netStatData)(nil), state.Fns{Save: (*netStatData).save, Load: (*netStatData).load})
+	state.Register("pkg/sentry/fsimpl/proc.tasksInode", (*tasksInode)(nil), state.Fns{Save: (*tasksInode).save, Load: (*tasksInode).load})
+	state.Register("pkg/sentry/fsimpl/proc.statData", (*statData)(nil), state.Fns{Save: (*statData).save, Load: (*statData).load})
+	state.Register("pkg/sentry/fsimpl/proc.loadavgData", (*loadavgData)(nil), state.Fns{Save: (*loadavgData).save, Load: (*loadavgData).load})
+	state.Register("pkg/sentry/fsimpl/proc.meminfoData", (*meminfoData)(nil), state.Fns{Save: (*meminfoData).save, Load: (*meminfoData).load})
+	state.Register("pkg/sentry/fsimpl/proc.uptimeData", (*uptimeData)(nil), state.Fns{Save: (*uptimeData).save, Load: (*uptimeData).load})
+	state.Register("pkg/sentry/fsimpl/proc.versionData", (*versionData)(nil), state.Fns{Save: (*versionData).save, Load: (*versionData).load})
+	state.Register("pkg/sentry/fsimpl/proc.filesystemsData", (*filesystemsData)(nil), state.Fns{Save: (*filesystemsData).save, Load: (*filesystemsData).load})
+	state.Register("pkg/sentry/fsimpl/proc.mmapMinAddrData", (*mmapMinAddrData)(nil), state.Fns{Save: (*mmapMinAddrData).save, Load: (*mmapMinAddrData).load})
+	state.Register("pkg/sentry/fsimpl/proc.hostnameData", (*hostnameData)(nil), state.Fns{Save: (*hostnameData).save, Load: (*hostnameData).load})
+	state.Register("pkg/sentry/fsimpl/proc.tcpSackData", (*tcpSackData)(nil), state.Fns{Save: (*tcpSackData).save, Load: (*tcpSackData).load})
+}
diff --git a/pkg/sentry/fsimpl/proc/subtasks.go b/pkg/sentry/fsimpl/proc/subtasks.go
index a5cfa8333..a5cfa8333 100644..100755
--- a/pkg/sentry/fsimpl/proc/subtasks.go
+++ b/pkg/sentry/fsimpl/proc/subtasks.go
diff --git a/pkg/sentry/fsimpl/proc/task.go b/pkg/sentry/fsimpl/proc/task.go
index 66419d91b..66419d91b 100644..100755
--- a/pkg/sentry/fsimpl/proc/task.go
+++ b/pkg/sentry/fsimpl/proc/task.go
diff --git a/pkg/sentry/fsimpl/proc/task_fds.go b/pkg/sentry/fsimpl/proc/task_fds.go
index 8ad976073..8ad976073 100644..100755
--- a/pkg/sentry/fsimpl/proc/task_fds.go
+++ b/pkg/sentry/fsimpl/proc/task_fds.go
diff --git a/pkg/sentry/fsimpl/proc/task_files.go b/pkg/sentry/fsimpl/proc/task_files.go
index 515f25327..515f25327 100644..100755
--- a/pkg/sentry/fsimpl/proc/task_files.go
+++ b/pkg/sentry/fsimpl/proc/task_files.go
diff --git a/pkg/sentry/fsimpl/proc/task_net.go b/pkg/sentry/fsimpl/proc/task_net.go
index 9c329341a..9c329341a 100644..100755
--- a/pkg/sentry/fsimpl/proc/task_net.go
+++ b/pkg/sentry/fsimpl/proc/task_net.go
diff --git a/pkg/sentry/fsimpl/proc/tasks.go b/pkg/sentry/fsimpl/proc/tasks.go
index 5aeda8c9b..5aeda8c9b 100644..100755
--- a/pkg/sentry/fsimpl/proc/tasks.go
+++ b/pkg/sentry/fsimpl/proc/tasks.go
diff --git a/pkg/sentry/fsimpl/proc/tasks_files.go b/pkg/sentry/fsimpl/proc/tasks_files.go
index 92007df81..92007df81 100644..100755
--- a/pkg/sentry/fsimpl/proc/tasks_files.go
+++ b/pkg/sentry/fsimpl/proc/tasks_files.go
diff --git a/pkg/sentry/fsimpl/proc/tasks_sys.go b/pkg/sentry/fsimpl/proc/tasks_sys.go
index 0e90e02fe..0e90e02fe 100644..100755
--- a/pkg/sentry/fsimpl/proc/tasks_sys.go
+++ b/pkg/sentry/fsimpl/proc/tasks_sys.go
diff --git a/pkg/sentry/fsimpl/proc/tasks_sys_test.go b/pkg/sentry/fsimpl/proc/tasks_sys_test.go
deleted file mode 100644
index be54897bb..000000000
--- a/pkg/sentry/fsimpl/proc/tasks_sys_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2019 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package proc
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-
-	"gvisor.dev/gvisor/pkg/abi/linux"
-	"gvisor.dev/gvisor/pkg/sentry/contexttest"
-	"gvisor.dev/gvisor/pkg/sentry/inet"
-)
-
-func newIPv6TestStack() *inet.TestStack {
-	s := inet.NewTestStack()
-	s.SupportsIPv6Flag = true
-	return s
-}
-
-func TestIfinet6NoAddresses(t *testing.T) {
-	n := &ifinet6{stack: newIPv6TestStack()}
-	var buf bytes.Buffer
-	n.Generate(contexttest.Context(t), &buf)
-	if buf.Len() > 0 {
-		t.Errorf("n.Generate() generated = %v, want = %v", buf.Bytes(), []byte{})
-	}
-}
-
-func TestIfinet6(t *testing.T) {
-	s := newIPv6TestStack()
-	s.InterfacesMap[1] = inet.Interface{Name: "eth0"}
-	s.InterfaceAddrsMap[1] = []inet.InterfaceAddr{
-		{
-			Family:    linux.AF_INET6,
-			PrefixLen: 128,
-			Addr:      []byte("\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"),
-		},
-	}
-	s.InterfacesMap[2] = inet.Interface{Name: "eth1"}
-	s.InterfaceAddrsMap[2] = []inet.InterfaceAddr{
-		{
-			Family:    linux.AF_INET6,
-			PrefixLen: 128,
-			Addr:      []byte("\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"),
-		},
-	}
-	want := map[string]struct{}{
-		"000102030405060708090a0b0c0d0e0f 01 80 00 00     eth0\n": {},
-		"101112131415161718191a1b1c1d1e1f 02 80 00 00     eth1\n": {},
-	}
-
-	n := &ifinet6{stack: s}
-	contents := n.contents()
-	if len(contents) != len(want) {
-		t.Errorf("Got len(n.contents()) = %d, want = %d", len(contents), len(want))
-	}
-	got := map[string]struct{}{}
-	for _, l := range contents {
-		got[l] = struct{}{}
-	}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Got n.contents() = %v, want = %v", got, want)
-	}
-}
diff --git a/pkg/sentry/fsimpl/proc/tasks_test.go b/pkg/sentry/fsimpl/proc/tasks_test.go
deleted file mode 100644
index 19abb5034..000000000
--- a/pkg/sentry/fsimpl/proc/tasks_test.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright 2019 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package proc
-
-import (
-	"fmt"
-	"math"
-	"path"
-	"strconv"
-	"testing"
-
-	"gvisor.dev/gvisor/pkg/abi/linux"
-	"gvisor.dev/gvisor/pkg/context"
-	"gvisor.dev/gvisor/pkg/fspath"
-	"gvisor.dev/gvisor/pkg/sentry/fsimpl/testutil"
-	"gvisor.dev/gvisor/pkg/sentry/fsimpl/tmpfs"
-	"gvisor.dev/gvisor/pkg/sentry/kernel"
-	"gvisor.dev/gvisor/pkg/sentry/kernel/auth"
-	"gvisor.dev/gvisor/pkg/sentry/vfs"
-	"gvisor.dev/gvisor/pkg/syserror"
-	"gvisor.dev/gvisor/pkg/usermem"
-)
-
-var (
-	// Next offset 256 by convention. Adds 1 for the next offset.
-	selfLink       = vfs.Dirent{Type: linux.DT_LNK, NextOff: 256 + 0 + 1}
-	threadSelfLink = vfs.Dirent{Type: linux.DT_LNK, NextOff: 256 + 1 + 1}
-
-	// /proc/[pid] next offset starts at 256+2 (files above), then adds the
-	// PID, and adds 1 for the next offset.
-	proc1 = vfs.Dirent{Type: linux.DT_DIR, NextOff: 258 + 1 + 1}
-	proc2 = vfs.Dirent{Type: linux.DT_DIR, NextOff: 258 + 2 + 1}
-	proc3 = vfs.Dirent{Type: linux.DT_DIR, NextOff: 258 + 3 + 1}
-)
-
-var (
-	tasksStaticFiles = map[string]testutil.DirentType{
-		"cpuinfo":     linux.DT_REG,
-		"filesystems": linux.DT_REG,
-		"loadavg":     linux.DT_REG,
-		"meminfo":     linux.DT_REG,
-		"mounts":      linux.DT_LNK,
-		"net":         linux.DT_LNK,
-		"self":        linux.DT_LNK,
-		"stat":        linux.DT_REG,
-		"sys":         linux.DT_DIR,
-		"thread-self": linux.DT_LNK,
-		"uptime":      linux.DT_REG,
-		"version":     linux.DT_REG,
-	}
-	tasksStaticFilesNextOffs = map[string]int64{
-		"self":        selfLink.NextOff,
-		"thread-self": threadSelfLink.NextOff,
-	}
-	taskStaticFiles = map[string]testutil.DirentType{
-		"auxv":          linux.DT_REG,
-		"cgroup":        linux.DT_REG,
-		"cmdline":       linux.DT_REG,
-		"comm":          linux.DT_REG,
-		"environ":       linux.DT_REG,
-		"exe":           linux.DT_LNK,
-		"fd":            linux.DT_DIR,
-		"fdinfo":        linux.DT_DIR,
-		"gid_map":       linux.DT_REG,
-		"io":            linux.DT_REG,
-		"maps":          linux.DT_REG,
-		"mountinfo":     linux.DT_REG,
-		"mounts":        linux.DT_REG,
-		"net":           linux.DT_DIR,
-		"ns":            linux.DT_DIR,
-		"oom_score":     linux.DT_REG,
-		"oom_score_adj": linux.DT_REG,
-		"smaps":         linux.DT_REG,
-		"stat":          linux.DT_REG,
-		"statm":         linux.DT_REG,
-		"status":        linux.DT_REG,
-		"task":          linux.DT_DIR,
-		"uid_map":       linux.DT_REG,
-	}
-)
-
-func setup(t *testing.T) *testutil.System {
-	k, err := testutil.Boot()
-	if err != nil {
-		t.Fatalf("Error creating kernel: %v", err)
-	}
-
-	ctx := k.SupervisorContext()
-	creds := auth.CredentialsFromContext(ctx)
-
-	k.VFS().MustRegisterFilesystemType(Name, &FilesystemType{}, &vfs.RegisterFilesystemTypeOptions{
-		AllowUserMount: true,
-	})
-
-	mntns, err := k.VFS().NewMountNamespace(ctx, creds, "", tmpfs.Name, &vfs.GetFilesystemOptions{})
-	if err != nil {
-		t.Fatalf("NewMountNamespace(): %v", err)
-	}
-	pop := &vfs.PathOperation{
-		Root:  mntns.Root(),
-		Start: mntns.Root(),
-		Path:  fspath.Parse("/proc"),
-	}
-	if err := k.VFS().MkdirAt(ctx, creds, pop, &vfs.MkdirOptions{Mode: 0777}); err != nil {
-		t.Fatalf("MkDir(/proc): %v", err)
-	}
-
-	pop = &vfs.PathOperation{
-		Root:  mntns.Root(),
-		Start: mntns.Root(),
-		Path:  fspath.Parse("/proc"),
-	}
-	mntOpts := &vfs.MountOptions{
-		GetFilesystemOptions: vfs.GetFilesystemOptions{
-			InternalData: &InternalData{
-				Cgroups: map[string]string{
-					"cpuset": "/foo/cpuset",
-					"memory": "/foo/memory",
-				},
-			},
-		},
-	}
-	if err := k.VFS().MountAt(ctx, creds, "", pop, Name, mntOpts); err != nil {
-		t.Fatalf("MountAt(/proc): %v", err)
-	}
-	return testutil.NewSystem(ctx, t, k.VFS(), mntns)
-}
-
-func TestTasksEmpty(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	collector := s.ListDirents(s.PathOpAtRoot("/proc"))
-	s.AssertAllDirentTypes(collector, tasksStaticFiles)
-	s.AssertDirentOffsets(collector, tasksStaticFilesNextOffs)
-}
-
-func TestTasks(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	expectedDirents := make(map[string]testutil.DirentType)
-	for n, d := range tasksStaticFiles {
-		expectedDirents[n] = d
-	}
-
-	k := kernel.KernelFromContext(s.Ctx)
-	var tasks []*kernel.Task
-	for i := 0; i < 5; i++ {
-		tc := k.NewThreadGroup(nil, k.RootPIDNamespace(), kernel.NewSignalHandlers(), linux.SIGCHLD, k.GlobalInit().Limits())
-		task, err := testutil.CreateTask(s.Ctx, fmt.Sprintf("name-%d", i), tc, s.MntNs, s.Root, s.Root)
-		if err != nil {
-			t.Fatalf("CreateTask(): %v", err)
-		}
-		tasks = append(tasks, task)
-		expectedDirents[fmt.Sprintf("%d", i+1)] = linux.DT_DIR
-	}
-
-	collector := s.ListDirents(s.PathOpAtRoot("/proc"))
-	s.AssertAllDirentTypes(collector, expectedDirents)
-	s.AssertDirentOffsets(collector, tasksStaticFilesNextOffs)
-
-	lastPid := 0
-	dirents := collector.OrderedDirents()
-	doneSkippingNonTaskDirs := false
-	for _, d := range dirents {
-		pid, err := strconv.Atoi(d.Name)
-		if err != nil {
-			if !doneSkippingNonTaskDirs {
-				// We haven't gotten to the task dirs yet.
-				continue
-			}
-			t.Fatalf("Invalid process directory %q", d.Name)
-		}
-		doneSkippingNonTaskDirs = true
-		if lastPid > pid {
-			t.Errorf("pids not in order: %v", dirents)
-		}
-		found := false
-		for _, t := range tasks {
-			if k.TaskSet().Root.IDOfTask(t) == kernel.ThreadID(pid) {
-				found = true
-			}
-		}
-		if !found {
-			t.Errorf("Additional task ID %d listed: %v", pid, tasks)
-		}
-		// Next offset starts at 256+2 ('self' and 'thread-self'), then adds the
-		// PID, and adds 1 for the next offset.
-		if want := int64(256 + 2 + pid + 1); d.NextOff != want {
-			t.Errorf("Wrong dirent offset want: %d got: %d: %+v", want, d.NextOff, d)
-		}
-	}
-	if !doneSkippingNonTaskDirs {
-		t.Fatalf("Never found any process directories.")
-	}
-
-	// Test lookup.
-	for _, path := range []string{"/proc/1", "/proc/2"} {
-		fd, err := s.VFS.OpenAt(
-			s.Ctx,
-			s.Creds,
-			s.PathOpAtRoot(path),
-			&vfs.OpenOptions{},
-		)
-		if err != nil {
-			t.Fatalf("vfsfs.OpenAt(%q) failed: %v", path, err)
-		}
-		defer fd.DecRef()
-		buf := make([]byte, 1)
-		bufIOSeq := usermem.BytesIOSequence(buf)
-		if _, err := fd.Read(s.Ctx, bufIOSeq, vfs.ReadOptions{}); err != syserror.EISDIR {
-			t.Errorf("wrong error reading directory: %v", err)
-		}
-	}
-
-	if _, err := s.VFS.OpenAt(
-		s.Ctx,
-		s.Creds,
-		s.PathOpAtRoot("/proc/9999"),
-		&vfs.OpenOptions{},
-	); err != syserror.ENOENT {
-		t.Fatalf("wrong error from vfsfs.OpenAt(/proc/9999): %v", err)
-	}
-}
-
-func TestTasksOffset(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	k := kernel.KernelFromContext(s.Ctx)
-	for i := 0; i < 3; i++ {
-		tc := k.NewThreadGroup(nil, k.RootPIDNamespace(), kernel.NewSignalHandlers(), linux.SIGCHLD, k.GlobalInit().Limits())
-		if _, err := testutil.CreateTask(s.Ctx, fmt.Sprintf("name-%d", i), tc, s.MntNs, s.Root, s.Root); err != nil {
-			t.Fatalf("CreateTask(): %v", err)
-		}
-	}
-
-	for _, tc := range []struct {
-		name   string
-		offset int64
-		wants  map[string]vfs.Dirent
-	}{
-		{
-			name:   "small offset",
-			offset: 100,
-			wants: map[string]vfs.Dirent{
-				"self":        selfLink,
-				"thread-self": threadSelfLink,
-				"1":           proc1,
-				"2":           proc2,
-				"3":           proc3,
-			},
-		},
-		{
-			name:   "offset at start",
-			offset: 256,
-			wants: map[string]vfs.Dirent{
-				"self":        selfLink,
-				"thread-self": threadSelfLink,
-				"1":           proc1,
-				"2":           proc2,
-				"3":           proc3,
-			},
-		},
-		{
-			name:   "skip /proc/self",
-			offset: 257,
-			wants: map[string]vfs.Dirent{
-				"thread-self": threadSelfLink,
-				"1":           proc1,
-				"2":           proc2,
-				"3":           proc3,
-			},
-		},
-		{
-			name:   "skip symlinks",
-			offset: 258,
-			wants: map[string]vfs.Dirent{
-				"1": proc1,
-				"2": proc2,
-				"3": proc3,
-			},
-		},
-		{
-			name:   "skip first process",
-			offset: 260,
-			wants: map[string]vfs.Dirent{
-				"2": proc2,
-				"3": proc3,
-			},
-		},
-		{
-			name:   "last process",
-			offset: 261,
-			wants: map[string]vfs.Dirent{
-				"3": proc3,
-			},
-		},
-		{
-			name:   "after last",
-			offset: 262,
-			wants:  nil,
-		},
-		{
-			name:   "TaskLimit+1",
-			offset: kernel.TasksLimit + 1,
-			wants:  nil,
-		},
-		{
-			name:   "max",
-			offset: math.MaxInt64,
-			wants:  nil,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			s := s.WithSubtest(t)
-			fd, err := s.VFS.OpenAt(
-				s.Ctx,
-				s.Creds,
-				s.PathOpAtRoot("/proc"),
-				&vfs.OpenOptions{},
-			)
-			if err != nil {
-				t.Fatalf("vfsfs.OpenAt(/) failed: %v", err)
-			}
-			defer fd.DecRef()
-			if _, err := fd.Seek(s.Ctx, tc.offset, linux.SEEK_SET); err != nil {
-				t.Fatalf("Seek(%d, SEEK_SET): %v", tc.offset, err)
-			}
-
-			var collector testutil.DirentCollector
-			if err := fd.IterDirents(s.Ctx, &collector); err != nil {
-				t.Fatalf("IterDirent(): %v", err)
-			}
-
-			expectedTypes := make(map[string]testutil.DirentType)
-			expectedOffsets := make(map[string]int64)
-			for name, want := range tc.wants {
-				expectedTypes[name] = want.Type
-				if want.NextOff != 0 {
-					expectedOffsets[name] = want.NextOff
-				}
-			}
-
-			collector.SkipDotsChecks(true) // We seek()ed past the dots.
-			s.AssertAllDirentTypes(&collector, expectedTypes)
-			s.AssertDirentOffsets(&collector, expectedOffsets)
-		})
-	}
-}
-
-func TestTask(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	k := kernel.KernelFromContext(s.Ctx)
-	tc := k.NewThreadGroup(nil, k.RootPIDNamespace(), kernel.NewSignalHandlers(), linux.SIGCHLD, k.GlobalInit().Limits())
-	_, err := testutil.CreateTask(s.Ctx, "name", tc, s.MntNs, s.Root, s.Root)
-	if err != nil {
-		t.Fatalf("CreateTask(): %v", err)
-	}
-
-	collector := s.ListDirents(s.PathOpAtRoot("/proc/1"))
-	s.AssertAllDirentTypes(collector, taskStaticFiles)
-}
-
-func TestProcSelf(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	k := kernel.KernelFromContext(s.Ctx)
-	tc := k.NewThreadGroup(nil, k.RootPIDNamespace(), kernel.NewSignalHandlers(), linux.SIGCHLD, k.GlobalInit().Limits())
-	task, err := testutil.CreateTask(s.Ctx, "name", tc, s.MntNs, s.Root, s.Root)
-	if err != nil {
-		t.Fatalf("CreateTask(): %v", err)
-	}
-
-	collector := s.WithTemporaryContext(task).ListDirents(&vfs.PathOperation{
-		Root:               s.Root,
-		Start:              s.Root,
-		Path:               fspath.Parse("/proc/self/"),
-		FollowFinalSymlink: true,
-	})
-	s.AssertAllDirentTypes(collector, taskStaticFiles)
-}
-
-func iterateDir(ctx context.Context, t *testing.T, s *testutil.System, fd *vfs.FileDescription) {
-	t.Logf("Iterating: %s", fd.MappedName(ctx))
-
-	var collector testutil.DirentCollector
-	if err := fd.IterDirents(ctx, &collector); err != nil {
-		t.Fatalf("IterDirents(): %v", err)
-	}
-	if err := collector.Contains(".", linux.DT_DIR); err != nil {
-		t.Error(err.Error())
-	}
-	if err := collector.Contains("..", linux.DT_DIR); err != nil {
-		t.Error(err.Error())
-	}
-
-	for _, d := range collector.Dirents() {
-		if d.Name == "." || d.Name == ".." {
-			continue
-		}
-		absPath := path.Join(fd.MappedName(ctx), d.Name)
-		if d.Type == linux.DT_LNK {
-			link, err := s.VFS.ReadlinkAt(
-				ctx,
-				auth.CredentialsFromContext(ctx),
-				&vfs.PathOperation{Root: s.Root, Start: s.Root, Path: fspath.Parse(absPath)},
-			)
-			if err != nil {
-				t.Errorf("vfsfs.ReadlinkAt(%v) failed: %v", absPath, err)
-			} else {
-				t.Logf("Skipping symlink: %s => %s", absPath, link)
-			}
-			continue
-		}
-
-		t.Logf("Opening: %s", absPath)
-		child, err := s.VFS.OpenAt(
-			ctx,
-			auth.CredentialsFromContext(ctx),
-			&vfs.PathOperation{Root: s.Root, Start: s.Root, Path: fspath.Parse(absPath)},
-			&vfs.OpenOptions{},
-		)
-		if err != nil {
-			t.Errorf("vfsfs.OpenAt(%v) failed: %v", absPath, err)
-			continue
-		}
-		defer child.DecRef()
-		stat, err := child.Stat(ctx, vfs.StatOptions{})
-		if err != nil {
-			t.Errorf("Stat(%v) failed: %v", absPath, err)
-		}
-		if got := linux.FileMode(stat.Mode).DirentType(); got != d.Type {
-			t.Errorf("wrong file mode, stat: %v, dirent: %v", got, d.Type)
-		}
-		if d.Type == linux.DT_DIR {
-			// Found another dir, let's do it again!
-			iterateDir(ctx, t, s, child)
-		}
-	}
-}
-
-// TestTree iterates all directories and stats every file.
-func TestTree(t *testing.T) {
-	s := setup(t)
-	defer s.Destroy()
-
-	k := kernel.KernelFromContext(s.Ctx)
-
-	pop := &vfs.PathOperation{
-		Root:  s.Root,
-		Start: s.Root,
-		Path:  fspath.Parse("test-file"),
-	}
-	opts := &vfs.OpenOptions{
-		Flags: linux.O_RDONLY | linux.O_CREAT,
-		Mode:  0777,
-	}
-	file, err := s.VFS.OpenAt(s.Ctx, s.Creds, pop, opts)
-	if err != nil {
-		t.Fatalf("failed to create test file: %v", err)
-	}
-	defer file.DecRef()
-
-	var tasks []*kernel.Task
-	for i := 0; i < 5; i++ {
-		tc := k.NewThreadGroup(nil, k.RootPIDNamespace(), kernel.NewSignalHandlers(), linux.SIGCHLD, k.GlobalInit().Limits())
-		task, err := testutil.CreateTask(s.Ctx, fmt.Sprintf("name-%d", i), tc, s.MntNs, s.Root, s.Root)
-		if err != nil {
-			t.Fatalf("CreateTask(): %v", err)
-		}
-		// Add file to populate /proc/[pid]/fd and fdinfo directories.
-		task.FDTable().NewFDVFS2(task, 0, file, kernel.FDFlags{})
-		tasks = append(tasks, task)
-	}
-
-	ctx := tasks[0]
-	fd, err := s.VFS.OpenAt(
-		ctx,
-		auth.CredentialsFromContext(s.Ctx),
-		&vfs.PathOperation{Root: s.Root, Start: s.Root, Path: fspath.Parse("/proc")},
-		&vfs.OpenOptions{},
-	)
-	if err != nil {
-		t.Fatalf("vfsfs.OpenAt(/proc) failed: %v", err)
-	}
-	iterateDir(ctx, t, s, fd)
-	fd.DecRef()
-}