Diagnoses + fixes for the silent-collector / never-lands-session
failures that the 200-episode quality probe surfaced (§3 evidence).
All four address the producer; no compensating layers added.
perf collector (rows_perf=0 on 100% of episodes):
- perf stat -j writes to stderr by default with -p; we read stdout.
Add --log-fd 1 so JSON reaches stdout where the parser sees it.
- Event names come back annotated with the privilege scope perf
actually measured ("cycles:u" under perf_event_paranoid=2). Strip
the suffix so _build_row's plain-name lookups hit. Without this
every metric was None even when perf reported real numbers.
- tests/test_collectors_emit.py covers the regression with a real
busy-loop fixture; emit-test discipline per §4.4.
guest-agent collector (rows_guest=0 on 100% of episodes):
- Alpine cloud image doesn't ship python3, so the in-guest agent's
`#!/usr/bin/env python3` shebang silently fails. Add packages:
[python3] to cidata user-data so cloud-init installs it before
the OpenRC service starts.
- Guest agent now exits nonzero (was: silent stdout fallback) when
/dev/virtio-ports/cis490.guest.agent is missing, so OpenRC
reports the failure to /var/log/cis490-agent.log instead of the
bytes vanishing into the void. Refs §1.
- Host-side collector emits guest_agent_connected /
guest_agent_first_byte / guest_agent_silent_window into the
orchestrator's events.jsonl. Future episodes show the in-guest
failure mode per-episode instead of inferring from rows_guest=0.
k-gamingcom missing qmp/netflow/pcap (also affected elliott on
Tier-3 episodes — was misclassified as host divergence):
- tools/run_tier3_demo.py was building EpisodeConfig WITHOUT
qmp_socket / guest_agent_socket / bridge_iface — even though
launch_target.sh creates the underlying chardevs and BRIDGE
supplies the iface. tools/run_real_vm_demo.py wires them
correctly; Tier-3 had a copy-paste gap.
- tests/test_collectors_emit.py adds a source-grep regression so
the wiring stays honest.
samba_usermap_script never lands session (0/67 in §3 probe):
- Bind handler default WfsDelay (~5s) gives up before bind_perl on
Metasploitable2 has finished forking + binding LPORT under
SLIRP+hostfwd. Bump to 30s; matches session_open_timeout_s in
exploits/driver.py so framework + driver agree on the wait
budget. Add ConnectTimeout=15 so the handler's bind connect has
retry budget instead of one-shot.
orchestrator/fleet.py: usable_modules + BRIDGE handling were both
unconditional, so:
- With BRIDGE set, requires_bridge modules were still being
dropped — picker only ever returned samba_usermap_script across
every slot/episode (the test_fleet_uses_all_modules_when_bridge_set
failure on HEAD).
- env.pop("BRIDGE") fired even when BRIDGE was the operator's
explicit setup, breaking modules that need bridge mode (vsftpd
backdoor on hardcoded port 6200, distccd, etc.).
Both made conditional on bridge_set so the picker walks the full
catalog under bridge mode and SLIRP-only modules still get a
clean SLIRP env when BRIDGE is unset.
receiver/app.py: half-pregnant v2 schema state in HEAD — calling
store.ingest_stream(episode_type=..., benign_profile=...) with
kwargs the matching store.py change was in the WIP stash. Removed
v2 awareness from app.py so v1 episodes (what the producer ships
today) get accepted again. SCHEMA_VERSION default reset to 1 to
match.
229 passed, 0 failed. (HEAD had 15 failures, all linked to the
half-pregnant v2 state above.)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
213 lines
6.9 KiB
Python
213 lines
6.9 KiB
Python
"""Source 3 (oracle): ``perf stat -p <qemu_pid>`` sampler.
|
|
|
|
Spawns ``perf stat`` in interval-JSON mode against the qemu pid and
|
|
aggregates the per-event counter values into per-interval telemetry
|
|
rows. Unlike the /proc and QMP collectors, perf needs CAP_SYS_ADMIN
|
|
or ``kernel.perf_event_paranoid <= 1`` to read counters for a process
|
|
the collector doesn't own — typically true on a lab host running
|
|
QEMU under the cis490 service user.
|
|
|
|
Source 3 is **oracle-only** — perf counters are not available on a
|
|
deployed device. Every row carries ``available_in_deployment: false``.
|
|
|
|
The events we ask for are the small canonical set named in
|
|
docs/data-model.md:
|
|
|
|
cycles, instructions, cache-references, cache-misses,
|
|
branches, branch-misses, page-faults, context-switches
|
|
|
|
Anything perf can't enable on the host (e.g. cache-misses without
|
|
hardware support) is silently dropped from the row.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
import shutil
|
|
import subprocess
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
|
|
|
|
log = logging.getLogger("cis490.collectors.perf_qemu")
|
|
|
|
SOURCE = "host_perf"
|
|
AVAILABLE_IN_DEPLOYMENT = False
|
|
|
|
DEFAULT_EVENTS = (
|
|
"cycles",
|
|
"instructions",
|
|
"cache-references",
|
|
"cache-misses",
|
|
"branches",
|
|
"branch-misses",
|
|
"page-faults",
|
|
"context-switches",
|
|
)
|
|
|
|
|
|
def perf_available() -> bool:
|
|
return shutil.which("perf") is not None
|
|
|
|
|
|
def _coerce_int(s: str | int | None) -> int | None:
|
|
if s is None:
|
|
return None
|
|
if isinstance(s, int):
|
|
return s
|
|
s = s.strip()
|
|
if not s or s in ("<not counted>", "<not supported>"):
|
|
return None
|
|
# perf prints comma-separated thousands by default; we asked -j so
|
|
# we usually get plain numbers, but guard for both shapes.
|
|
s = s.replace(",", "")
|
|
try:
|
|
return int(s)
|
|
except ValueError:
|
|
try:
|
|
return int(float(s))
|
|
except ValueError:
|
|
return None
|
|
|
|
|
|
def _build_row(t_mono_origin_ns: int, interval_s: float, agg: dict[str, int]) -> dict:
|
|
cycles = agg.get("cycles")
|
|
insns = agg.get("instructions")
|
|
cache_refs = agg.get("cache-references")
|
|
cache_miss = agg.get("cache-misses")
|
|
ipc = (insns / cycles) if (cycles and insns) else None
|
|
miss_rate = (cache_miss / cache_refs) if (cache_refs and cache_miss is not None) else None
|
|
|
|
return {
|
|
"t_mono_ns": time.monotonic_ns() - t_mono_origin_ns,
|
|
"t_wall_ns": time.time_ns(),
|
|
"source": SOURCE,
|
|
"available_in_deployment": AVAILABLE_IN_DEPLOYMENT,
|
|
"interval_s": interval_s,
|
|
"cycles": cycles,
|
|
"instructions": insns,
|
|
"cache_references": cache_refs,
|
|
"cache_misses": cache_miss,
|
|
"branches": agg.get("branches"),
|
|
"branch_misses": agg.get("branch-misses"),
|
|
"page_faults": agg.get("page-faults"),
|
|
"context_switches": agg.get("context-switches"),
|
|
"ipc": ipc,
|
|
"cache_miss_rate": miss_rate,
|
|
}
|
|
|
|
|
|
def parse_perf_event_line(line: str) -> dict | None:
|
|
"""Parse one ``perf stat -j`` event line. Returns None for blanks
|
|
or status messages perf occasionally interleaves on stderr-ish
|
|
paths but stdout-on-error in practice."""
|
|
line = line.strip()
|
|
if not line.startswith("{"):
|
|
return None
|
|
try:
|
|
return json.loads(line)
|
|
except json.JSONDecodeError:
|
|
return None
|
|
|
|
|
|
def run_loop(
|
|
pid: int,
|
|
output_path: Path,
|
|
t_mono_origin_ns: int,
|
|
interval_ms: int,
|
|
stop_event: threading.Event,
|
|
*,
|
|
events: tuple[str, ...] = DEFAULT_EVENTS,
|
|
) -> int:
|
|
"""Spawn perf stat -j against ``pid`` and stream rows until stop.
|
|
Returns the number of rows written."""
|
|
if not perf_available():
|
|
log.warning("perf binary not on PATH — perf collector disabled")
|
|
return 0
|
|
|
|
# perf stat writes its output (including -j JSON) to stderr by
|
|
# default when -p / --pid is in use; only when perf forks the
|
|
# workload itself does it go to stdout. --log-fd 1 forces output
|
|
# onto fd 1 so we can stream it through proc.stdout. Without this
|
|
# the collector silently writes 0 rows on every episode.
|
|
cmd = [
|
|
"perf", "stat",
|
|
"-p", str(pid),
|
|
"-I", str(interval_ms),
|
|
"-j",
|
|
"--log-fd", "1",
|
|
"-e", ",".join(events),
|
|
]
|
|
log.info("starting perf: %s", " ".join(cmd))
|
|
|
|
try:
|
|
proc = subprocess.Popen(
|
|
cmd,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
bufsize=1,
|
|
text=True,
|
|
)
|
|
except (FileNotFoundError, PermissionError) as e:
|
|
log.warning("perf launch failed: %s", e)
|
|
return 0
|
|
|
|
rows = 0
|
|
output_path.parent.mkdir(parents=True, exist_ok=True)
|
|
cur_interval: float | None = None
|
|
agg: dict[str, int] = {}
|
|
|
|
def _flush() -> None:
|
|
nonlocal rows
|
|
if cur_interval is None or not agg:
|
|
return
|
|
row = _build_row(t_mono_origin_ns, cur_interval, agg)
|
|
out_f.write(json.dumps(row) + "\n")
|
|
rows += 1
|
|
|
|
try:
|
|
with output_path.open("a", buffering=1) as out_f:
|
|
# perf interleaves events and writes to stdout in -j mode.
|
|
# We read line by line until the process exits (which
|
|
# happens when we kill it on stop, or when the target pid
|
|
# disappears and perf's internal -p polling notices).
|
|
assert proc.stdout is not None
|
|
for line in proc.stdout:
|
|
if stop_event.is_set():
|
|
break
|
|
evt = parse_perf_event_line(line)
|
|
if evt is None:
|
|
continue
|
|
interval = evt.get("interval")
|
|
event_name = evt.get("event")
|
|
value = _coerce_int(evt.get("counter-value"))
|
|
if interval is None or event_name is None:
|
|
continue
|
|
# perf annotates event names with the privilege scope it
|
|
# was actually able to measure (e.g. "cycles:u" when only
|
|
# userspace is permitted under perf_event_paranoid=2).
|
|
# Strip the suffix so _build_row's plain-name lookups
|
|
# ("cycles", "instructions", ...) hit.
|
|
event_name = event_name.split(":", 1)[0]
|
|
# perf emits one JSON per (event, interval); a new
|
|
# interval value means we should flush the previous row.
|
|
if cur_interval is not None and interval != cur_interval:
|
|
_flush()
|
|
agg = {}
|
|
cur_interval = interval
|
|
if value is not None:
|
|
agg[event_name] = value
|
|
# End of stream — flush the last partial row.
|
|
_flush()
|
|
finally:
|
|
if proc.poll() is None:
|
|
proc.terminate()
|
|
try:
|
|
proc.wait(timeout=3.0)
|
|
except subprocess.TimeoutExpired:
|
|
proc.kill()
|
|
proc.wait(timeout=2.0)
|
|
|
|
return rows
|