Skip to content

cgroupfs: drop registry entries on filesystem release #14946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 2 commits into from
Sep 25, 2026
+24 −0
Merged

cgroupfs: drop registry entries on filesystem release #14946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8d03ce
cgroupfs: drop registry entries on filesystem release
ibondarenko1 May 20, 2026
bc2e4d8
Merge pull request #13215 from ibondarenko1:cgroupfs-release-removecg…
gvisor-bot Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions pkg/sentry/fsimpl/cgroupfs/cgroupfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,9 @@ func (fs *filesystem) Release(ctx context.Context) {
k := kernel.KernelFromContext(ctx)
r := k.CgroupRegistry()

// Remove registry entries for cgroups still owned by this filesystem.
fs.removeCgroupsFromRegistry(r)

if fs.hierarchyID != kernel.InvalidCgroupHierarchyID {
k.ReleaseCgroupHierarchy(fs.hierarchyID)
r.Unregister(ctx, fs.hierarchyID)
Expand All @@ -481,6 +484,27 @@ func (fs *filesystem) Release(ctx context.Context) {
fs.Filesystem.Release(ctx)
}

// removeCgroupsFromRegistry removes each cgroup in fs.root from the registry.
func (fs *filesystem) removeCgroupsFromRegistry(r *kernel.CgroupRegistry) {
if fs.root == nil {
return
}
rootInode, ok := fs.root.Inode().(*cgroupInode)
if !ok {
return
}
var walk func(c *cgroupInode)
walk = func(c *cgroupInode) {
r.RemoveCgroup(c.id)
c.dir.forEachChildDir(func(child *dir) {
if child.cgi != nil {
walk(child.cgi)
}
})
}
walk(rootInode)
}

// MountOptions implements vfs.FilesystemImpl.MountOptions.
func (fs *filesystem) MountOptions() string {
var cnames []string
Expand Down
Loading