Skip to content

Dont remount /run/virtiofs when adding container #824

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
adityaramani merged 2 commits into from
Jul 28, 2026
Merged

Dont remount /run/virtiofs when adding container #824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18c7a2
Dont remount /run/virtiofs when adding container
adityaramani Jul 28, 2026
71ee339
Merge branch 'main' into common-virtiofs-mount
adityaramani Jul 28, 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
29 changes: 17 additions & 12 deletions Sources/Containerization/LinuxPod.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ public final class LinuxPod: Sendable {
var phase: Phase
var containers: [String: PodContainer]
var pauseProcess: LinuxProcess?
// Whether the unified virtiofs share is mounted at `/run/virtiofs` in the guest
var unifiedVirtiofsMounted: Bool = false
}

private enum Phase: Sendable {
Expand Down Expand Up @@ -451,17 +453,17 @@ extension LinuxPod {
// and is never consumed from /run/virtiofs.
let newVirtiofsTags = try virtioFSMounts.map { try hashFilePath(path: $0.source) }
if !newVirtiofsTags.isEmpty {
// Tags already mounted in the guest at boot or by a
// prior hotplug (i.e. present on another container).
let alreadyMounted = Set(
vm.mounts
.filter { $0.key != id }
.values.flatMap { $0 }
.filter { $0.type == "virtiofs" }
.map { $0.source }
)
try await agent.mkdir(path: "/run/virtiofs", all: true, perms: 0o755)
if vm.virtiofsLayout == .perTag {
// Tags already mounted in the guest at boot or by a
// prior hotplug (i.e. present on another container).
let alreadyMounted = Set(
vm.mounts
.filter { $0.key != id }
.values.flatMap { $0 }
.filter { $0.type == "virtiofs" }
.map { $0.source }
)
var seen: Set<String> = []
for tag in newVirtiofsTags
where !alreadyMounted.contains(tag) && seen.insert(tag).inserted {
Expand All @@ -475,16 +477,18 @@ extension LinuxPod {
options: []
))
}
} else if alreadyMounted.isEmpty {
// Unified layout: one /run/virtiofs mount, needed
// only if nothing mounted it at boot / earlier.
} else if !state.unifiedVirtiofsMounted && vm.virtiofsLayout == .unified {
// Unified layout: one /run/virtiofs mount for the
// VM's lifetime, so mount it only if nothing has
// mounted it at boot or on an earlier hotplug.
try await agent.mount(
ContainerizationOCI.Mount(
type: "virtiofs",
source: "virtiofs",
destination: "/run/virtiofs",
options: []
))
state.unifiedVirtiofsMounted = true
}
}

Expand Down Expand Up @@ -812,6 +816,7 @@ extension LinuxPod {
}

state.pauseProcess = pauseProcessHolder.withLock { $0 }
state.unifiedVirtiofsMounted = hasVirtiofsMount && vm.virtiofsLayout == .unified

// Apply file mount context updates.
let updates = fileMountContextUpdates.withLock { $0 }
Expand Down
Loading