From 87c0ff99b833f43f3aeced5ae2970d6245d09961 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Wed, 10 Sep 2025 11:24:07 -0700 Subject: [PATCH] kernel: convert FSContext.mu to a lockdep mutex PiperOrigin-RevId: 805443681 --- pkg/sentry/kernel/BUILD | 8 ++++++++ pkg/sentry/kernel/fs_context.go | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/sentry/kernel/BUILD b/pkg/sentry/kernel/BUILD index 2fabdb7c3a..11b6b4331c 100644 --- a/pkg/sentry/kernel/BUILD +++ b/pkg/sentry/kernel/BUILD @@ -94,6 +94,13 @@ declare_mutex( prefix = "fdTable", ) +declare_mutex( + name = "fs_context_mutex", + out = "fs_context_mutex.go", + package = "kernel", + prefix = "fsContext", +) + declare_mutex( name = "running_tasks_mutex", out = "running_tasks_mutex.go", @@ -245,6 +252,7 @@ go_library( "fd_table_refs.go", "fd_table_unsafe.go", "fs_context.go", + "fs_context_mutex.go", "fs_context_refs.go", "ipc_namespace.go", "kcov.go", diff --git a/pkg/sentry/kernel/fs_context.go b/pkg/sentry/kernel/fs_context.go index 85684eb5a0..c23a2efba8 100644 --- a/pkg/sentry/kernel/fs_context.go +++ b/pkg/sentry/kernel/fs_context.go @@ -19,7 +19,6 @@ import ( "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/vfs" - "gvisor.dev/gvisor/pkg/sync" ) // FSContext contains filesystem context. @@ -31,7 +30,7 @@ type FSContext struct { FSContextRefs // mu protects below. - mu sync.Mutex `state:"nosave"` + mu fsContextMutex `state:"nosave"` // root is the filesystem root. root vfs.VirtualDentry