claude-noether
988b848908
Closes three internal carry items in one fork commit. iter6 deferred
these as TODOs; iter7 lands the implementations + supporting tests.
# Track B — slot-leak error recovery (src/)
iter6 documented the RequestSyncSurface error paths as a "bounded
leak we accept" — slots stayed busy=true after REINIT/DQBUF failures
until RequestTerminate ran. With pool=16 and rare errors this was
acceptable, but a sustained-error scenario could starve the pool.
Adds request_pool_force_release(pool, index) which:
1. Tries media_request_reinit on the slot's fd (cheap path)
2. Falls back to close + media_request_alloc (recovery)
3. Leaves the slot dead-busy if even alloc fails (other slots
unaffected, pool capacity reduced by 1 until destroy)
Wires it into surface.c RequestSyncSurface error paths only for
errors before the OUTPUT-DQBUF attempt. After OUTPUT-DQBUF failure
the V4L2 buffer is in indeterminate kernel state, so a separate
error label (`error_buffer_indeterminate`) leaves the slot
dead-busy — reusing the slot would QBUF on a kernel-still-held
buffer and EINVAL.
Phase 5 sonnet review caught this discriminator subtlety pre-commit.
Files: request_pool.{h,c}, surface.c.
# Track C — cap_pool race synthetic harness (tests/)
iter5 sonnet C4 / iter6 candidate A: cap_pool resolution-change
race was organically exercised by YT's quality renegotiations
(iter6 close, 4 cap_pool_init events clean) but had no
deterministic regression test.
tests/cap_pool_probe_pattern.c — ~170-line C program: opens
libva display, vaCreateConfig, vaCreateSurfaces(small) +
vaCreateContext (triggers OUTPUT pool init at small resolution),
dispose, vaCreateSurfaces(big) + vaCreateContext (forces S_FMT
on the new resolution against an in-use OUTPUT pool — the actual
race-hitting path).
Phase 5 sonnet flagged that without vaCreateContext the test
would pass trivially (OUTPUT pool never init'd, REQBUFS(0) on
empty queue is a no-op). Fixed before commit.
tests/run_cap_pool_probe.sh — runner; greps driver stderr for
REQBUFS / EBUSY / "Unable to set format" race indicators.
# Track A — msync pixel-correctness verify harness (tests/)
iter5 sweep removed msync(MS_SYNC|MS_INVALIDATE) from CAPTURE
DQBUF path. iter5 sonnet C3 flagged: no formal pixel verification.
tests/run_msync_pixel_verify.sh — runs FFmpeg SW decode (libavcodec
reference) and FFmpeg HW decode (via our v4l2_request driver),
compares NV12 byte streams. Probes fixture dimensions via ffprobe
and uses crop=$W:$H after hwdownload to normalize MB-padding
artifacts (hantro pads height to 16-line align; SW returns
crop-aligned).
Phase 5 sonnet flagged the stride-mismatch false-failure risk
pre-commit. Fixed: explicit crop + diagnostic that distinguishes
genuine pixel divergence from MB-padding stride artifacts.
# Phase 5 sonnet code review
Verdict: APPROVE-WITH-CHANGES. Three actionable findings, all
addressed before this commit:
1. surface.c error path: separated OUTPUT-DQBUF-failure into
error_buffer_indeterminate label, slot stays dead-busy
2. cap_pool_probe_pattern.c: added vaCreateContext to actually
exercise the OUTPUT pool init at the small resolution
3. run_msync_pixel_verify.sh: explicit crop on HW path,
stride-mismatch diagnostic distinguished from corruption
Empirical verification (Phase 6+7 deploy + run): pending operator
ohm-tools availability.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
51 lines
1.5 KiB
Bash
Executable File
51 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
# run_cap_pool_probe.sh — orchestrate the cap_pool probe-pattern regression test.
|
|
#
|
|
# Runs the cap_pool_probe_pattern test program with the v4l2_request driver
|
|
# and grep-checks driver stderr for race indicators. Exits 0 on PASS, 1 on FAIL.
|
|
#
|
|
# Usage: ./run_cap_pool_probe.sh [path_to_test_binary]
|
|
# If no argument, looks for ./cap_pool_probe_pattern in the same directory.
|
|
|
|
set -eu
|
|
|
|
BIN="${1:-$(dirname "$0")/cap_pool_probe_pattern}"
|
|
|
|
if [[ ! -x "$BIN" ]]; then
|
|
echo "FAIL: test binary not found or not executable: $BIN" >&2
|
|
echo "Build it first:" >&2
|
|
echo " gcc -O2 -Wall -Wextra -o $BIN $(dirname "$0")/cap_pool_probe_pattern.c \\" >&2
|
|
echo " \$(pkg-config --cflags --libs libva libva-drm)" >&2
|
|
exit 2
|
|
fi
|
|
|
|
LOG=$(mktemp -t cap_pool_probe.XXXXXX.log)
|
|
trap 'rm -f "$LOG"' EXIT
|
|
|
|
env LIBVA_DRIVER_NAME=v4l2_request \
|
|
LIBVA_V4L2_REQUEST_VIDEO_PATH=/dev/video1 \
|
|
LIBVA_V4L2_REQUEST_MEDIA_PATH=/dev/media0 \
|
|
"$BIN" >"$LOG" 2>&1
|
|
rc=$?
|
|
|
|
echo "--- test program output ---"
|
|
cat "$LOG"
|
|
echo "--- end output ---"
|
|
|
|
if [[ "$rc" -ne 0 ]]; then
|
|
echo "FAIL: test binary exited with rc=$rc" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Race indicators (case-insensitive grep on driver stderr lines).
|
|
# These should NOT appear on iter6 driver and later.
|
|
race_lines=$(grep -iE 'REQBUFS|EBUSY|Unable to request buffers|Unable to set format' "$LOG" || true)
|
|
if [[ -n "$race_lines" ]]; then
|
|
echo "FAIL: driver stderr contains race indicators:" >&2
|
|
echo "$race_lines" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "PASS: cap_pool probe-pattern test clean (no race indicators)."
|
|
exit 0
|