Vendor apple/containerization with a VM-extensions forwarding patch

Switch the containerization dependency from the github URL to a vendored copy (third_party/containerization, upstream commit 6b7b42ca) referenced by path, so we can carry a small local patch that upstream lacks: LinuxContainer.Configuration gains a `vmExtensions` field forwarded into VMConfiguration.extensions. Upstream already supports VMConfiguration.extensions + the VZInstanceExtension hook, but LinuxContainer — our only entry point — never forwarded them, so there was no way to attach a device (e.g. a memory balloon) to a container's VM. Tests/, docs/, examples/, images/ and the corresponding test targets are trimmed for footprint (we never build the dependency's tests). See PATCHES.md for the full diff vs. upstream and the re-vendoring procedure. Also adds the ContainerizationExtras product to NucleicCore (AddressAllocator, named in the configureVZ signature). Co-Authored-By: Claude Opus 4.8 <[email protected]>
2026-06-21 20:22:21 -07:00
commit 11b9825e09
280 changed files with 75699 additions and 0 deletions
@@ -0,0 +1,169 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2026 Apple Inc. and the Containerization project 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
+//
+//   https://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.
+//===----------------------------------------------------------------------===//
+
+#if os(Linux)
+
+import ContainerizationOS
+import Foundation
+import LCShim
+import Logging
+import Synchronization
+
+final class TerminalIO: ManagedProcess.IO & Sendable {
+    private struct State {
+        var stdinSocket: Socket?
+        var stdoutSocket: Socket?
+
+        var stdin: IOPair?
+        var stdout: IOPair?
+        var parent: Terminal?
+    }
+
+    private let log: Logger?
+    private let hostStdio: HostStdio
+    private let state: Mutex<State>
+
+    init(
+        stdio: HostStdio,
+        log: Logger?
+    ) throws {
+        self.hostStdio = stdio
+        self.log = log
+        self.state = Mutex(State())
+    }
+
+    func resize(size: Terminal.Size) throws {
+        try self.state.withLock {
+            if let parent = $0.parent {
+                try parent.resize(size: size)
+            }
+        }
+    }
+
+    func start(process: inout Command) throws {
+        try self.state.withLock {
+            process.stdin = nil
+            process.stdout = nil
+            process.stderr = nil
+
+            if let stdinPort = self.hostStdio.stdin {
+                let type = VsockType(
+                    port: stdinPort,
+                    cid: VsockType.hostCID
+                )
+                let stdinSocket = try Socket(type: type, closeOnDeinit: false)
+                try stdinSocket.connect()
+                $0.stdinSocket = stdinSocket
+            }
+
+            if let stdoutPort = self.hostStdio.stdout {
+                let type = VsockType(
+                    port: stdoutPort,
+                    cid: VsockType.hostCID
+                )
+                let stdoutSocket = try Socket(type: type, closeOnDeinit: false)
+                try stdoutSocket.connect()
+                $0.stdoutSocket = stdoutSocket
+            }
+        }
+    }
+
+    func attach(pid: Int32, fd: Int32) throws {
+        try self.state.withLock {
+            let containerFd = CZ_pidfd_open(pid, 0)
+            guard containerFd != -1 else {
+                throw POSIXError.fromErrno()
+            }
+            defer { Foundation.close(Int32(containerFd)) }
+
+            let hostFd = CZ_pidfd_getfd(containerFd, fd, 0)
+            guard hostFd != -1 else {
+                throw POSIXError.fromErrno()
+            }
+
+            let term = try Terminal(descriptor: Int32(hostFd), setInitState: false)
+            $0.parent = term
+
+            if let stdinSocket = $0.stdinSocket {
+                let pair = IOPair(
+                    readFrom: stdinSocket,
+                    writeTo: UnownedIOCloser(term),
+                    reason: "TerminalIO stdin",
+                    logger: log
+                )
+                try pair.relay(ignoreHup: true)
+                $0.stdin = pair
+            }
+
+            if let stdoutSocket = $0.stdoutSocket {
+                let pair = IOPair(
+                    readFrom: term,
+                    writeTo: stdoutSocket,
+                    reason: "TerminalIO stdout",
+                    logger: log
+                )
+                try pair.relay(ignoreHup: true)
+                $0.stdout = pair
+            }
+        }
+    }
+
+    func close() throws {
+        self.state.withLock {
+            // stdout must close before stdin because both IOPairs share the
+            // Terminal fd. stdout registered that fd with epoll (as its read
+            // source) and needs to unregister it while the fd is still valid.
+            // stdin closes the Terminal as its write destination, which would
+            // invalidate the fd before stdout can unregister.
+            if let stdout = $0.stdout {
+                stdout.close()
+                $0.stdout = nil
+            }
+            if let stdin = $0.stdin {
+                stdin.close()
+                $0.stdin = nil
+            }
+
+            // If IOPairs were never created (process exited before attach),
+            // close the raw sockets directly since they have closeOnDeinit
+            // disabled.
+            if let stdinSocket = $0.stdinSocket {
+                try? stdinSocket.close()
+                $0.stdinSocket = nil
+            }
+            if let stdoutSocket = $0.stdoutSocket {
+                try? stdoutSocket.close()
+                $0.stdoutSocket = nil
+            }
+
+            $0.parent = nil
+        }
+    }
+
+    // NOP
+    func closeAfterExec() throws {}
+
+    func closeStdin() throws {
+        self.state.withLock {
+            if let stdin = $0.stdin {
+                stdin.close()
+                $0.stdin = nil
+            }
+        }
+    }
+}
+
+#endif