@impz/testing 6.5.0 → 6.6.0

package/dist/index.js

@@ -18834,7 +18834,11 @@ import { createImpClient as createImpClient2, watchEvents } from "@impz/client";
 // packages/daemon/src/vm/storage/data-layout.ts
 import { mkdirSync } from "fs";
 import { join } from "path";
-var UFFD_RUN_FILES = { socket: "uffd.sock", pidFile: "uffd.pid" };
+var UFFD_RUN_FILES = {
+  socket: "uffd.sock",
+  pidFile: "uffd.pid",
+  statsFile: "uffd.stats"
+};
 var DATA_DIRS = ["db", "system", "images", "imps"];
 function createDataDirs(dataDir) {
   for (const name of DATA_DIRS) {
@@ -18864,6 +18868,7 @@ function buildImpPaths(dataDir, impId) {
     pidFile: join(runDir, "pid"),
     uffdSocket: join(runDir, UFFD_RUN_FILES.socket),
     uffdPidFile: join(runDir, UFFD_RUN_FILES.pidFile),
+    uffdStatsFile: join(runDir, UFFD_RUN_FILES.statsFile),
     ...buildSnapshotPaths(join(directory, "snapshot")),
     vmIdentity: join(directory, "vm.json"),
     checkpointsDir: join(directory, "checkpoints"),
@@ -21961,13 +21966,13 @@ function parseKsmConfig(parsed) {
 }
 
 // packages/daemon/src/create-impd.ts
-import { readFileSync as readFileSync37 } from "fs";
+import { readFileSync as readFileSync38 } from "fs";
 import { release as release2 } from "os";
 import { join as join48 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.5.0",
+  version: "6.6.0",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -24141,6 +24146,12 @@ function writeRegularFile(path, text) {
     closeSync2(fd);
   }
 }
+function createZeroedFile(path, sizeBytes) {
+  const fd = openRegularFile(path, constants.O_RDWR, 420);
+  ftruncateSync(fd, 0);
+  ftruncateSync(fd, sizeBytes);
+  return fd;
+}
 function readRegularFile(path) {
   const fd = openSync2(path, constants.O_RDONLY | SAFE_FLAGS);
   try {
@@ -37526,6 +37537,7 @@ async function createImpdFirewall(config, deps, secretFiles, plan) {
 }
 
 // packages/daemon/src/create-impd-imps.ts
+import { readFileSync as readFileSync25 } from "fs";
 import { availableParallelism } from "os";
 
 // packages/daemon/src/host-net/net/tap-bytes.ts
@@ -42547,6 +42559,11 @@ function readDiskMib(path) {
   }
 }
 
+// packages/daemon/src/imps/imps/format-page-handler.ts
+function formatPageHandler(stats) {
+  return stats === undefined ? "" : `; page handler faults=${String(stats.faults)} blocks=${String(stats.blocks)} serve=${String(stats.serveMs)}ms`;
+}
+
 // packages/daemon/src/imps/imps/pick-huge-pages.ts
 function pickHugePages(isOn, imp) {
   return isOn && imp.maxMemoryMib <= imp.memoryMib && imp.memoryMib % 2 === 0 ? "2M" : "None";
@@ -42628,10 +42645,11 @@ function makeWakeImpVm(deps) {
       return startAfterFailedWake(imp, paths, wrong);
     }
     const wakeMs = Math.round(performance.now() - started);
-    getImpdLogger("imps").with({ imp: imp.name }).info("woke pid {pid} in {wakeMs}ms {timings}", {
+    getImpdLogger("imps").with({ imp: imp.name }).info("woke pid {pid} in {wakeMs}ms {timings}{pageHandler}", {
       pid: String(woken.pid),
       wakeMs: String(wakeMs),
-      timings: formatTimings(woken.timings)
+      timings: formatTimings(woken.timings),
+      pageHandler: formatPageHandler(woken.pageHandler)
     });
     if (hugePages === "None") {
       writeHostPagesIdentity(imp, paths);
@@ -43206,10 +43224,11 @@ function probeSealedEntry(paths, path) {
   const entry = lstatSync3(path);
   const uffdSocket = join21(paths.runDir, UFFD_RUN_FILES.socket);
   const uffdPidFile = join21(paths.runDir, UFFD_RUN_FILES.pidFile);
+  const uffdStatsFile = join21(paths.runDir, UFFD_RUN_FILES.statsFile);
   if (path === paths.apiSocket || path === paths.vsockSocket || path === uffdSocket) {
     return entry.isSocket();
   }
-  return (path === paths.logFile || path === paths.pidFile || path === uffdPidFile) && entry.isFile() && entry.uid === IMPD_USER.uid && entry.nlink === 1;
+  return (path === paths.logFile || path === paths.pidFile || path === uffdPidFile || path === uffdStatsFile) && entry.isFile() && entry.uid === IMPD_USER.uid && entry.nlink === 1;
 }
 function setupImpdDir(directory) {
   setupRealDir(directory);
@@ -43254,6 +43273,16 @@ function readOwnerUid(path) {
 
 // packages/daemon/src/vm/vmm/uffd-handler.ts
 import { closeSync as closeSync10, existsSync as existsSync13, openSync as openSync8, rmSync as rmSync20 } from "fs";
+
+// packages/daemon/src/vm/vmm/uffd-stats-layout.ts
+var UFFD_STATS_OFFSETS = {
+  faults: 0,
+  blocks: 8,
+  serveNs: 16
+};
+var UFFD_STATS_BYTES = 24;
+
+// packages/daemon/src/vm/vmm/uffd-handler.ts
 var MEM_FILE_FD = 3;
 var SOCKET_WAIT_MS2 = 3000;
 async function startUffdHandler(plan) {
@@ -43266,11 +43295,13 @@ async function startUffdHandler(plan) {
     ...plan.jail === null ? [] : ["--uid", String(plan.jail.uid), "--gid", String(plan.jail.gid)]
   ];
   const memFd = openSync8(plan.memFile, "r");
+  const statsFd = createZeroedFile(paths.uffdStatsFile, UFFD_STATS_BYTES);
   const log = setupLogFile(paths.logFile);
   const child = Bun.spawn(buildSpawnArgv(command, plan.cgroup?.procsPath ?? null, null), {
-    stdio: ["ignore", log, log, memFd]
+    stdio: ["ignore", log, log, memFd, statsFd]
   });
   closeSync10(memFd);
+  closeSync10(statsFd);
   closeSync10(log);
   child.unref();
   writeRegularFile(paths.uffdPidFile, `${String(child.pid)}
@@ -43289,6 +43320,15 @@ function removeUffdFiles(paths) {
   rmSync20(paths.uffdSocket, { force: true });
   rmSync20(`${paths.uffdSocket}.new`, { force: true });
   rmSync20(paths.uffdPidFile, { force: true });
+  rmSync20(paths.uffdStatsFile, { force: true });
+}
+function readUffdStats(paths, readFile) {
+  const raw = readFile(paths.uffdStatsFile);
+  return {
+    faults: Number(raw.readBigUInt64LE(UFFD_STATS_OFFSETS.faults)),
+    blocks: Number(raw.readBigUInt64LE(UFFD_STATS_OFFSETS.blocks)),
+    serveMs: Math.round(Number(raw.readBigUInt64LE(UFFD_STATS_OFFSETS.serveNs)) / 1e6)
+  };
 }
 function readHandlerState(paths, procRoot = "/proc") {
   if (!existsSync13(paths.uffdPidFile)) {
@@ -45160,11 +45200,12 @@ var UFFD_WATCH_INTERVAL_MS = 100;
 var WAKE_AGENT_DEADLINE_MS = 1e4;
 var GUEST_MEMORY_TIMEOUTS = { requestMs: 1000, snapshotMs: 1000 };
 var UPTIME_PING_TIMEOUT_MS = 250;
-function createVmRunner(jails, options = {}) {
+function createVmRunner(jails, options) {
   const mergeWrapper = options.mergeWrapper ?? null;
   const sendUptimePing = options.sendUptimePing ?? sendPing;
   const procRoot = options.procRoot ?? "/proc";
   const createClient = options.createClient ?? createFirecrackerClient;
+  const readFile = options.readFile;
   const uffdHandlerBin = options.uffdHandlerBin ?? null;
   const uffdWatch = createUffdWatch({
     probeVmAlive: (pid, paths) => probeProcessAlive(pid, paths.apiSocket, procRoot),
@@ -45395,7 +45436,8 @@ ${readLogTail(plan.paths.logFile)}`, {
           firecrackerVersion,
           agentVersion: ping.version,
           timings: timer.marks,
-          bootId: ping.bootId
+          bootId: ping.bootId,
+          ...isUffd && { pageHandler: readUffdStats(plan.paths, readFile) }
         };
       } catch (error) {
         const reason = explainUffdFailure(plan.paths, procRoot, getErrorMessage(error));
@@ -45494,7 +45536,8 @@ function createImpdImps(config, deps, parts) {
     killCgroup: cgroups.kill
   }), {
     mergeWrapper: config.ksm?.execBin ?? null,
-    uffdHandlerBin: config.hugePages?.handlerBin ?? null
+    uffdHandlerBin: config.hugePages?.handlerBin ?? null,
+    readFile: readFileSync25
   });
   const {
     readVmRam,
@@ -50099,7 +50142,7 @@ function planRootfsOverhead(treeBytes) {
 }
 
 // packages/daemon/src/imps/images/rootfs/unpack-export.ts
-import { readFileSync as readFileSync25 } from "fs";
+import { readFileSync as readFileSync26 } from "fs";
 var CAP_SETFCAP_BIT = 31n;
 var SETFCAP_HELP = "imp-host needs CAP_SETFCAP (docs/architecture/host.md#privileges)";
 var UNPACK_TAR_ARGS = [
@@ -50141,7 +50184,7 @@ function findXattrFailure(stderr) {
   });
   return failures.find((failure) => failure.missingSetfcap) ?? failures[0] ?? null;
 }
-function readSetfcapWarning(status = readFileSync25("/proc/self/status", "utf8")) {
+function readSetfcapWarning(status = readFileSync26("/proc/self/status", "utf8")) {
   const effective = /^CapEff:\s*(?<mask>[0-9a-f]+)$/mu.exec(status)?.groups?.["mask"] ?? "0";
   if (BigInt(`0x${effective}`) >> CAP_SETFCAP_BIT & 1n) {
     return null;
@@ -51627,12 +51670,12 @@ function createTailnetAccess(config, deps, readStatus) {
 }
 
 // packages/daemon/src/identity/token.ts
-import { existsSync as existsSync21, readFileSync as readFileSync26, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync27, writeFileSync as writeFileSync9 } from "fs";
 import { join as join34 } from "path";
 function loadOrCreateToken(dataDir) {
   const path = join34(dataDir, "token");
   if (existsSync21(path)) {
-    return readFileSync26(path, "utf8").trim();
+    return readFileSync27(path, "utf8").trim();
   }
   const token = mintSecret();
   writeFileSync9(path, `${token}
@@ -52969,13 +53012,13 @@ function createPublicRecordsLink() {
 
 // packages/daemon/src/network/tailnet-names/host-id.ts
 import { randomBytes as randomBytes11 } from "crypto";
-import { existsSync as existsSync22, mkdirSync as mkdirSync23, readFileSync as readFileSync27, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync23, readFileSync as readFileSync28, writeFileSync as writeFileSync10 } from "fs";
 import { join as join36 } from "path";
 function loadOrCreateHostId(dataDir) {
   const directory = join36(dataDir, "tailnet-names");
   const path = join36(directory, "host-id");
   if (existsSync22(path)) {
-    return readFileSync27(path, "utf8").trim();
+    return readFileSync28(path, "utf8").trim();
   }
   mkdirSync23(directory, { recursive: true });
   const id = randomBytes11(16).toString("hex");
@@ -52985,7 +53028,7 @@ function loadOrCreateHostId(dataDir) {
 }
 
 // packages/daemon/src/network/tailnet-names/oauth-credential.ts
-import { readFileSync as readFileSync28, statSync as statSync14 } from "fs";
+import { readFileSync as readFileSync29, statSync as statSync14 } from "fs";
 import * as z92 from "zod";
 var CredentialSchema = z92.object({ clientId: z92.string().min(1), clientSecret: z92.string().min(1) });
 function readOAuthCredential(path) {
@@ -53001,7 +53044,7 @@ function readOAuthCredential(path) {
 }
 function readJson(path) {
   try {
-    return JSON.parse(readFileSync28(path, "utf8"));
+    return JSON.parse(readFileSync29(path, "utf8"));
   } catch {
     return null;
   }
@@ -53398,7 +53441,7 @@ async function startOtlpExport(env, version) {
 }
 
 // packages/daemon/src/network/https/wire-https-service.ts
-import { readFileSync as readFileSync30 } from "fs";
+import { readFileSync as readFileSync31 } from "fs";
 
 // packages/daemon/src/platform/db/exposure.ts
 async function readPublicImp(db, name) {
@@ -53593,7 +53636,7 @@ function formatAcmeError(error) {
 }
 
 // packages/daemon/src/network/https/acme/cert-store.ts
-import { existsSync as existsSync23, mkdirSync as mkdirSync24, readFileSync as readFileSync29, rmSync as rmSync29 } from "fs";
+import { existsSync as existsSync23, mkdirSync as mkdirSync24, readFileSync as readFileSync30, rmSync as rmSync29 } from "fs";
 import { join as join37 } from "path";
 import * as z95 from "zod";
 var AttemptStateSchema = z95.object({
@@ -53675,7 +53718,7 @@ ${certificate.chainPem.trimEnd()}
   };
 }
 function readIfExists(path) {
-  return existsSync23(path) ? readFileSync29(path, "utf8") : null;
+  return existsSync23(path) ? readFileSync30(path, "utf8") : null;
 }
 function parseJson(text) {
   try {
@@ -54481,7 +54524,7 @@ function wireHttpsService(options) {
   const issue = createAcmeIssuer({
     directoryUrl: config.acmeDirectory,
     email: config.acmeEmail,
-    caPem: config.acmeCaFile === null ? null : readFileSync30(config.acmeCaFile, "utf8"),
+    caPem: config.acmeCaFile === null ? null : readFileSync31(config.acmeCaFile, "utf8"),
     store,
     dns
   });
@@ -55068,7 +55111,7 @@ function buildTooMany() {
 
 // packages/daemon/src/surface/ssh/host-key.ts
 var import_ssh22 = __toESM(require_lib2(), 1);
-import { existsSync as existsSync24, mkdirSync as mkdirSync25, readFileSync as readFileSync31, writeFileSync as writeFileSync11 } from "fs";
+import { existsSync as existsSync24, mkdirSync as mkdirSync25, readFileSync as readFileSync32, writeFileSync as writeFileSync11 } from "fs";
 import { join as join38 } from "path";
 function setupSshDir(dataDir) {
   const directory = join38(dataDir, "ssh");
@@ -55078,7 +55121,7 @@ function setupSshDir(dataDir) {
 function loadOrCreateHostKey(sshDir) {
   const path = join38(sshDir, "host_key");
   if (existsSync24(path)) {
-    return readFileSync31(path, "utf8");
+    return readFileSync32(path, "utf8");
   }
   const pair = generateEd25519Key();
   writeFileSync11(path, pair.private, { mode: 384, flag: "wx" });
@@ -56243,7 +56286,7 @@ async function stopImpd(parts, options) {
 }
 
 // packages/daemon/src/vm/storage/create-storage-backend.ts
-import { existsSync as existsSync31, readFileSync as readFileSync35, readdirSync as readdirSync14, writeFileSync as writeFileSync14 } from "fs";
+import { existsSync as existsSync31, readFileSync as readFileSync36, readdirSync as readdirSync14, writeFileSync as writeFileSync14 } from "fs";
 import { join as join47 } from "path";
 
 // packages/daemon/src/vm/storage/xfs-backend.ts
@@ -56314,7 +56357,7 @@ import {
   copyFileSync as copyFileSync4,
   existsSync as existsSync25,
   mkdirSync as mkdirSync26,
-  readFileSync as readFileSync32,
+  readFileSync as readFileSync33,
   readdirSync as readdirSync10,
   renameSync as renameSync6,
   rmSync as rmSync30,
@@ -56328,7 +56371,7 @@ function createXfsBackups(ctx) {
   const freshCopies = new Set;
   const readCopies = () => {
     try {
-      return CopiesSchema.parse(JSON.parse(readFileSync32(backup.copies, "utf8")));
+      return CopiesSchema.parse(JSON.parse(readFileSync33(backup.copies, "utf8")));
     } catch {
       return {};
     }
@@ -56423,13 +56466,13 @@ function removeUnlisted(directory, keep) {
 }
 
 // packages/daemon/src/vm/storage/loop-backing-file.ts
-import { readFileSync as readFileSync33, realpathSync, statfsSync } from "fs";
+import { readFileSync as readFileSync34, realpathSync, statfsSync } from "fs";
 import { dirname as dirname12, join as join40 } from "path";
 var HOST_DIRS = { procDir: "/proc", sysDir: "/sys" };
 function readLoopBackingFile(directory, hostDirs = HOST_DIRS) {
   try {
     const target = realpathSync(directory);
-    const mountInfo = readFileSync33(join40(hostDirs.procDir, "self", "mountinfo"), "utf8");
+    const mountInfo = readFileSync34(join40(hostDirs.procDir, "self", "mountinfo"), "utf8");
     for (const line of mountInfo.split(`
 `)) {
       const [mounts = "", fields = ""] = line.split(" - ");
@@ -56438,7 +56481,7 @@ function readLoopBackingFile(directory, hostDirs = HOST_DIRS) {
       const loop = /^\/dev\/(?<name>loop\d+)$/u.exec(source)?.groups?.["name"];
       if (mountPoint === target && loop !== undefined) {
         const backing = join40(hostDirs.sysDir, "block", loop, "loop", "backing_file");
-        return readFileSync33(backing, "utf8").trim();
+        return readFileSync34(backing, "utf8").trim();
       }
     }
   } catch {}
@@ -56779,7 +56822,7 @@ function isSharedExtent(extent) {
 }
 
 // packages/daemon/src/vm/storage/zfs/zfs-backend.ts
-import { existsSync as existsSync30, mkdirSync as mkdirSync28, readFileSync as readFileSync34, rmdirSync as rmdirSync3, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync30, mkdirSync as mkdirSync28, readFileSync as readFileSync35, rmdirSync as rmdirSync3, writeFileSync as writeFileSync13 } from "fs";
 import { join as join46 } from "path";
 
 // packages/daemon/src/platform/process/run-stream.ts
@@ -58041,7 +58084,7 @@ function createZfsBackend(deps) {
 }
 function readZfsModuleVersion() {
   try {
-    return readFileSync34("/sys/module/zfs/version", "utf8").trim();
+    return readFileSync35("/sys/module/zfs/version", "utf8").trim();
   } catch {
     return null;
   }
@@ -58085,7 +58128,7 @@ function createBackend(config, boundaries) {
 }
 function checkStorageMarker(dataDir, kind) {
   const marker = join47(dataDir, MARKER_FILE);
-  const recorded = existsSync31(marker) ? readFileSync35(marker, "utf8").trim() : readUnmarked(dataDir);
+  const recorded = existsSync31(marker) ? readFileSync36(marker, "utf8").trim() : readUnmarked(dataDir);
   if (recorded !== null && recorded !== kind) {
     throw new Error(`${dataDir} holds ${recorded} storage, but IMP_STORAGE_BACKEND is ${kind}; moving imps between backends is not supported`);
   }
@@ -58104,7 +58147,7 @@ function readUnmarked(dataDir) {
 }
 
 // packages/daemon/src/vm/storage/setup-system-files.ts
-import { existsSync as existsSync32, mkdirSync as mkdirSync29, readFileSync as readFileSync36 } from "fs";
+import { existsSync as existsSync32, mkdirSync as mkdirSync29, readFileSync as readFileSync37 } from "fs";
 import { dirname as dirname15 } from "path";
 
 // packages/daemon/src/vm/storage/system-file-info.ts
@@ -58140,7 +58183,7 @@ async function setupSystemFiles(config) {
     const missing = config.kernelSource === null ? " and no source is configured" : "";
     throw new Error(`${kernelSource} does not exist${missing}`);
   }
-  const kernel = readFileSync36(kernelSource);
+  const kernel = readFileSync37(kernelSource);
   const guestKernel = readKernelInfo(kernel);
   if (config.kernelSource !== null && !probeContent(config.kernelPath, kernel)) {
     writeCopy(config.kernelSource, config.kernelPath);
@@ -58160,7 +58203,7 @@ async function setupSystemFiles(config) {
   };
 }
 function probeContent(path, content) {
-  return existsSync32(path) && Buffer.from(content).equals(readFileSync36(path));
+  return existsSync32(path) && Buffer.from(content).equals(readFileSync37(path));
 }
 function writeCopy(source, target) {
   mkdirSync29(dirname15(target), { recursive: true });
@@ -58385,7 +58428,7 @@ async function startImpdParts(config, boundaries, plan) {
     readTailnetNames: tailnetNames === null ? null : tailnetNames.readStatus,
     hostReaders: {
       readKernel: () => deps.hostKernelRelease ?? release2(),
-      readCpuInfo: deps.readCpuInfo ?? (() => readFileSync37("/proc/cpuinfo", "utf8")),
+      readCpuInfo: deps.readCpuInfo ?? (() => readFileSync38("/proc/cpuinfo", "utf8")),
       readHugePagePool: deps.imps?.readHugePagePool ?? (() => readHugePagePool())
     },
     isReady: () => state.ready,
@@ -58634,7 +58677,8 @@ function buildStubVmm() {
     uptimeMs: 60000,
     identityReset: "ok",
     hasBootId: true,
-    bootSteps: {}
+    bootSteps: {},
+    pageHandler: undefined
   };
   const guestMemory = new Map;
   const readFakeGuestMemory = (directory) => {
@@ -58756,7 +58800,8 @@ log tail`);
           return {
             ...vm,
             hugePages: plan.hugePages ?? "None",
-            bootId: bootIds.get(plan.paths.apiSocket)
+            bootId: bootIds.get(plan.paths.apiSocket),
+            ...plan.hugePages === "2M" && { pageHandler: guest.pageHandler }
           };
         } finally {
           usedSnapshots.add(plan.paths.snapshotDir);
@@ -58966,6 +59011,9 @@ log tail`);
     setGuestBootSteps: (steps) => {
       guest.bootSteps = steps;
     },
+    setPageHandlerStats: (stats) => {
+      guest.pageHandler = stats;
+    },
     setIdentityReset: (result) => {
       guest.identityReset = result;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "A real impd on stand-ins, for Bun tests of code that drives impd through @impz/client",
   "license": "MIT",
   "repository": {
@@ -43,7 +43,7 @@
     "ts-pattern": "^5.9.2",
     "xstate": "^5.33.3",
     "zod": "^4.6.7",
-    "@impz/client": "6.5.0"
+    "@impz/client": "6.6.0"
   },
   "engines": {
     "bun": ">=1.4.3"