From 007d1c9d51b607d9b3e1dd4b969e4e37f843d15d Mon Sep 17 00:00:00 2001 From: Arthur Hanson Rasmusson Date: Tue, 17 Nov 2026 08:44:36 -0500 Subject: vgsp: phys_gr_dump_push_all (per-draw MME body scan); guest video harness - gsp_phys_booter: phys_gr_dump_push_all scans every beef and 0x1000013 push for the MME IR/SA ports (0x114/0x118/0x11c/0x120) with a one-line PUSH-SCAN receipt and full-dumps upload-bearing pushes. c1030/c1035 receipts: 14895-word beef push m114=0/m11c=0; draw push 0x400f9d8 m114=0 m1b00=6 (CALL(0) 0x3800 data=0xd48 present, no macro body). - cycle-r1780: kill QEMU by exact pidfile PID (never pkill -f), refuse a foreign qemu, poll the pidfile after daemonize, virtio-vga display. - params-r1624: enable dump-all + any-channel prelude capture + draw census; fix the stale gsp_phys_gr_dump_push parameter name. - tools/guest-diag: demo-video.sh (Xvfb+XFCE desktop, nvidia-smi, GZDoom segment, honest CUDA battery) and qmp_record.py (QMP screendump). --- tools/guest-diag/cycle-r1780.sh | 31 +++++- tools/guest-diag/demo-video.sh | 154 ++++++++++++++++++++++++++++ tools/guest-diag/params-r1624-maps6-780.txt | 4 +- tools/guest-diag/qmp_record.py | 112 ++++++++++++++++++++ 4 files changed, 295 insertions(+), 6 deletions(-) create mode 100644 tools/guest-diag/demo-video.sh create mode 100644 tools/guest-diag/qmp_record.py (limited to 'tools/guest-diag') diff --git a/tools/guest-diag/cycle-r1780.sh b/tools/guest-diag/cycle-r1780.sh index 24bff12..dabeac3 100755 --- a/tools/guest-diag/cycle-r1780.sh +++ b/tools/guest-diag/cycle-r1780.sh @@ -41,9 +41,25 @@ s.close() PYEOF sleep 2 fi -sudo pkill -f qemu-system-x86_64 2>/dev/null || true -for i in $(seq 1 20); do pgrep -f qemu-system-x86_64 >/dev/null || break; sleep 0.5; done -sudo pkill -9 -f qemu-system-x86_64 2>/dev/null || true +# HARD RULE: kill by exact PID, never by command-line pattern. The only +# QEMU this script owns is the one named in /tmp/qemu-harness.pid; anything +# else is reported and left alone (one QEMU at a time, no collateral kills). +QPIDFILE="/tmp/qemu-harness.pid" +if [ -f "$QPIDFILE" ]; then + QPID=$(sudo cat "$QPIDFILE" 2>/dev/null | tr -dc '0-9') + if [ -n "${QPID:-}" ] && [ -r "/proc/$QPID/comm" ] && \ + [ "$(cat "/proc/$QPID/comm")" = "qemu-system-x86" ]; then + sudo kill -TERM "$QPID" 2>/dev/null || true + for i in $(seq 1 20); do [ -d "/proc/$QPID" ] || break; sleep 0.5; done + if [ -d "/proc/$QPID" ]; then sudo kill -KILL "$QPID" 2>/dev/null || true; fi + fi + rm -f "$QPIDFILE" +fi +for p in /proc/[0-9]*/comm; do + [ "$(cat "$p" 2>/dev/null)" = "qemu-system-x86" ] || continue + echo "FATAL: foreign qemu-system-x86 pid ${p#/proc/} (kill it by exact PID first)" >&2 + exit 1 +done sleep 1 # Always repair the guest root after a forced teardown (cheap when clean, @@ -114,6 +130,7 @@ exec /bin/qemu-system-x86_64 -D $QLOG -no-hpet \ -chardev socket,path=/tmp/qemu-guest-agent.sock,server=on,wait=off,id=qga0 \ -device virtio-serial-pci -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \ -serial file:$SL -gdb tcp::1234 -display none \ + -device virtio-vga \ -device ivshmem-plain,id=shmem0,memdev=ivshmem_kvmfr \ -object memory-backend-file,id=ivshmem_kvmfr,mem-path=/dev/shm/kvmfr-$U,size=128M,share=yes \ -device ivshmem-plain,id=shmem1,memdev=ivshmem_kvmsr \ @@ -133,8 +150,12 @@ chmod +x "$QEMU_SCRIPT" echo "[cycle $TAG] launch QEMU (mdev $U)" sudo bash "$QEMU_SCRIPT" > "$RUNDIR/qemu-$TAG.log" 2>&1 -sleep 3 -if ! pgrep -f qemu-system-x86_64 >/dev/null; then +for i in $(seq 1 30); do + [ -r /tmp/qemu-harness.pid ] && break + sleep 0.5 +done +QPID=$(sudo cat /tmp/qemu-harness.pid 2>/dev/null | tr -dc '0-9') +if [ -z "${QPID:-}" ] || [ ! -d "/proc/$QPID" ]; then echo "FATAL: QEMU failed"; tail -5 "$RUNDIR/qemu-$TAG.log"; exit 1 fi diff --git a/tools/guest-diag/demo-video.sh b/tools/guest-diag/demo-video.sh new file mode 100644 index 0000000..c8c8ee1 --- /dev/null +++ b/tools/guest-diag/demo-video.sh @@ -0,0 +1,154 @@ +#!/bin/bash +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Open-IOV contributors +# demo-video.sh - run INSIDE the guest: desktop + demo segments for the +# Open-IOV vGPU recording. +# +# The desktop X server is Xvfb (a sanctioned "working X server" for the video: +# the vGPU NVIDIA DDX hangs in ScreenInit and the virtio-gpu KMS scanout +# fails its mode set on this device). The guest still runs the REAL NVIDIA +# 570.144 driver for nvidia-smi/CUDA and the vGPU 3D stream; GZDoom runs on +# Mesa llvmpipe here and its window title says so. +# +# Usage: +# demo-video.sh x_up start Xvfb :0 + XFCE +# demo-video.sh term-nvsmi terminal: nvidia-smi (held) +# demo-video.sh gz-start launch GZDoom windowed (llvmpipe GL) +# demo-video.sh gz-move walk/turn the player for visible motion +# demo-video.sh gz-stop stop GZDoom +# demo-video.sh term-cuda terminal: CUDA battery with visible results +# demo-video.sh status +set -u +export DISPLAY=:0 +export HOME=/root +GZLOG=/tmp/demo-gz.log +FONT="Monospace 16" + +x_up() { + pkill -x Xorg 2>/dev/null + pkill -x Xvfb 2>/dev/null + pkill -x xfwm4 2>/dev/null + sleep 1 + rm -f /tmp/.X0-lock /tmp/.X11-unix/X0 + mkdir -p /tmp/.X11-unix + nohup Xvfb :0 -screen 0 1280x800x24 -nolisten tcp -ac \ + > /tmp/demo-xvfb.log 2>&1 & + for i in $(seq 1 20); do + xdpyinfo >/dev/null 2>&1 && break + sleep 0.5 + done + xdpyinfo >/dev/null 2>&1 || { echo "X_FAIL"; tail -3 /tmp/demo-xvfb.log; return 1; } + xsetroot -solid '#20303f' 2>/dev/null + if ! pgrep -x xfce4-session >/dev/null; then + nohup dbus-launch --exit-with-session startxfce4 >/tmp/demo-xfce.log 2>&1 & + fi + for i in $(seq 1 40); do + pgrep -x xfwm4 >/dev/null && pgrep -x xfdesktop >/dev/null && break + sleep 0.5 + done + sleep 2 + echo "DESKTOP $(pgrep -x xfwm4 >/dev/null && echo WM_OK || echo WM_MISSING) $(pgrep -x xfdesktop >/dev/null && echo DESKTOP_OK || echo DESKTOP_MISSING)" + xdpyinfo 2>/dev/null | awk '/dimensions:/ {print "SCREEN " $2}' +} + +term() { # term <shell command> + local title="$1" cmd="$2" + nohup xfce4-terminal --display=:0 --title "$title" --maximize \ + --font="$FONT" --hide-menubar --hide-toolbar \ + -x bash -lc "$cmd" >/tmp/demo-term.log 2>&1 & + sleep 1 +} + +term_nvsmi() { + term "nvidia-smi - RTX 2080 SUPER / driver 570.144 (real vGPU)" \ + "clear; nvidia-smi; echo; nvidia-smi --query-gpu=name,driver_version,memory.total --format=csv; echo; nvidia-smi -L; echo; echo 'real NVIDIA 570.144 in the guest vGPU'; echo 'GZDoom here uses the software renderer (GPU-GL gate open; see project status).'; sleep 45" +} + +gz_start() { + pkill -x gzdoom 2>/dev/null + sleep 1 + if [ ! -x /opt/gzdoom/gzdoom ]; then echo "GZ_MISSING"; return 1; fi + WAD=/usr/share/games/doom/freedoom2.wad + [ -f "$WAD" ] || WAD=/usr/share/games/doom/freedoom1.wad + nohup env DISPLAY=:0 SDL_VIDEODRIVER=x11 LIBGL_ALWAYS_SOFTWARE=1 \ + GALLIUM_DRIVER=llvmpipe \ + /opt/gzdoom/gzdoom -iwad "$WAD" \ + +set vid_fullscreen 0 +set vid_defwidth 1280 +set vid_defheight 720 \ + +set vid_preferbackend 0 +vid_rendermode 4 \ + +set gl_pipeline_depth 2 +set gl_finishbeforeswap 0 \ + -nosound -nomusic +map MAP01 > "$GZLOG" 2>&1 & + for i in $(seq 1 20); do + grep -q 'GL_RENDERER' "$GZLOG" 2>/dev/null && break + pgrep -x gzdoom >/dev/null || break + sleep 1 + done + if grep -q 'GL_RENDERER' "$GZLOG" 2>/dev/null; then + echo "GZ_GL_PID=$(pgrep -x gzdoom | head -1)" + grep -E 'GL_RENDERER|GL_VERSION' "$GZLOG" | head -2 + else + echo "GZ_GL_FAILED (falling back to software renderer)" + gz_sw + fi +} + +gz_sw() { + pkill -x gzdoom 2>/dev/null + sleep 1 + WAD=/usr/share/games/doom/freedoom2.wad + [ -f "$WAD" ] || WAD=/usr/share/games/doom/freedoom1.wad + nohup env DISPLAY=:0 SDL_VIDEODRIVER=x11 \ + /opt/gzdoom/gzdoom -iwad "$WAD" \ + +set vid_fullscreen 0 +set vid_defwidth 1280 +set vid_defheight 720 \ + +vid_rendermode 0 -nosound -nomusic +map MAP01 > "$GZLOG" 2>&1 & + sleep 8 + local w + w=$(xdotool search --class gzdoom 2>/dev/null | head -1) + [ -n "$w" ] && { xdotool windowsize "$w" 1280 800; xdotool windowmove "$w" 0 0; xdotool set_window --name "GZDoom - Freedoom Phase 2 [software renderer; real NVIDIA 570.144 shown by nvidia-smi]" "$w"; xdotool windowactivate "$w"; } 2>/dev/null + echo "GZ_SW_PID=$(pgrep -x gzdoom | head -1)" + grep -iE 'render|using' "$GZLOG" | head -4 +} + +gz_title() { + local t="$1" + local w + w=$(xdotool search --class gzdoom 2>/dev/null | head -1) + [ -n "$w" ] && xdotool set_window --name "$t" "$w" 2>/dev/null + echo "TITLE_SET $t" +} + +gz_move() { + local n="${1:-1}" + local w + w=$(xdotool search --class gzdoom 2>/dev/null | head -1) + [ -n "$w" ] && { xdotool windowactivate "$w" 2>/dev/null; xdotool windowfocus "$w" 2>/dev/null; } + for i in $(seq 1 "$n"); do + xdotool keydown w; sleep 1.2; xdotool keyup w + xdotool key Right; sleep 0.6 + xdotool keydown a; sleep 0.6; xdotool keyup a + xdotool key Left; sleep 0.4 + done + echo MOVE_DONE +} + +gz_stop() { pkill -x gzdoom 2>/dev/null; sleep 1; pkill -9 -x gzdoom 2>/dev/null; echo GZ_STOPPED; } + +term_cuda() { + term "CUDA battery - guest vGPU (real driver 570.144)" \ + "clear; echo 'CUDA battery: guest /dev/nvidia via vgsp (real 570.144)'; echo; for k in victory_mail vector_add vecadd_loop; do if [ -x /tmp/\$k ]; then echo \"=== \$k\"; rm -f /tmp/out.\$k; timeout -s KILL 12 /tmp/\$k > /tmp/out.\$k 2>&1 & pid=\$!; n=0; while kill -0 \$pid 2>/dev/null && [ \$n -lt 16 ]; do sleep 1; n=\$((n+1)); done; grep -E '^(DEVICE|RESULT|STATUS|SUM|PASS|FAIL|KERNEL|ERROR)' /tmp/out.\$k 2>/dev/null | head -4; tail -2 /tmp/out.\$k 2>/dev/null; if kill -0 \$pid 2>/dev/null; then echo 'STATUS: timeout - kernel completion not observed (process unkillable in D state)'; else wait \$pid; echo \"rc=\$?\"; fi; echo; fi; done; echo '--- nvidia-smi after the battery ---'; nvidia-smi | head -12; echo; echo '--- end of battery (honest results above) ---'; sleep 40" +} + +case "${1:-status}" in +x_up) x_up ;; +term-nvsmi) term_nvsmi ;; +gz-start) gz_start ;; +gz-sw) gz_sw ;; +gz-title) gz_title "${2:-GZDoom}" ;; +gz-move) gz_move "${2:-1}" ;; +gz-stop) gz_stop ;; +term-cuda) term_cuda ;; +status) + echo "Xorg=$(pgrep -c Xorg) Xvfb=$(pgrep -c Xvfb) gzdoom=$(pgrep -c gzdoom) xfwm4=$(pgrep -c xfwm4)" + xdpyinfo 2>/dev/null | awk '/dimensions:/ {print "SCREEN " $2}' + ;; +*) echo "usage: $0 {x_up|term-nvsmi|gz-start|gz-sw|gz-title|gz-move|gz-stop|term-cuda|status}" >&2; exit 2 ;; +esac diff --git a/tools/guest-diag/params-r1624-maps6-780.txt b/tools/guest-diag/params-r1624-maps6-780.txt index 958e831..24efb38 100644 --- a/tools/guest-diag/params-r1624-maps6-780.txt +++ b/tools/guest-diag/params-r1624-maps6-780.txt @@ -12,4 +12,6 @@ sema_gl_mme_pack_carry=1 sema_gl_mme_pack_carry_ms=100 sema_gl_mme_pack_release= sema_gl_wit_shown=40 sema_gl_surf_alias_pref=1 -sema_gl_stream_inorder=1 gsp_phys_gr_dump_push=1 +sema_gl_stream_inorder=1 phys_gr_dump_push=1 + +phys_gr_dump_push_all=1 sema_mme_prelude_cap_any=1 sema_draw_census=1 diff --git a/tools/guest-diag/qmp_record.py b/tools/guest-diag/qmp_record.py new file mode 100644 index 0000000..026a0d8 --- /dev/null +++ b/tools/guest-diag/qmp_record.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2026 Open-IOV contributors +""" +qmp_record.py - record the QEMU graphic console via QMP screendump. + +The guest desktop is shown on a QEMU display device (virtio-vga); QMP +`screendump` returns the scanout as a PPM file with no guest-side capture +agent. This script paces the dumps at a fixed rate; the host then encodes +the numbered PPM sequence with ffmpeg. + +Usage: + qmp_record.py --out DIR [--fps 12] [--duration 90] [--socket PATH] + qmp_record.py --out DIR --until-file /tmp/stop # stop when file exists + +Every screendump is written as DIR/f000001.ppm (6-digit counter). A +`record.log` line per second records the achieved rate and any QMP error. +Bounded: never runs without a duration or a stop file. +""" +import argparse +import json +import os +import socket +import sys +import time + + +def connect(path, timeout=10.0): + s = socket.socket(socket.AF_UNIX) + s.settimeout(timeout) + s.connect(path) + f = s.makefile("rwb", buffering=0) + greet = json.loads(f.readline()) + if "QMP" not in greet: + raise RuntimeError("not a QMP greeting: %r" % (greet,)) + f.write(json.dumps({"execute": "qmp_capabilities"}).encode() + b"\n") + while True: + r = json.loads(f.readline()) + if "return" in r: + break + if "error" in r: + raise RuntimeError("qmp_capabilities: %r" % (r,)) + return s, f + + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument("--socket", default="/tmp/qemu-qmp.sock") + ap.add_argument("--out", required=True) + ap.add_argument("--fps", type=float, default=12.0) + ap.add_argument("--duration", type=float, default=0.0) + ap.add_argument("--until-file", default="") + ap.add_argument("--max-frames", type=int, default=100000) + a = ap.parse_args() + + if a.duration <= 0 and not a.until_file: + print("refusing to record unbounded (need --duration or --until-file)", + file=sys.stderr) + return 2 + os.makedirs(a.out, exist_ok=True) + log = open(os.path.join(a.out, "record.log"), "w", buffering=1) + + sock, f = connect(a.socket) + period = 1.0 / a.fps + t0 = time.monotonic() + deadline = t0 + a.duration if a.duration > 0 else 0.0 + n = 0 + nerr = 0 + next_t = t0 + last_log = t0 + while n < a.max_frames: + now = time.monotonic() + if deadline and now >= deadline: + break + if a.until_file and os.path.exists(a.until_file): + break + if now < next_t: + time.sleep(next_t - now) + now = time.monotonic() + next_t += period + if next_t < now: # fell behind: resynchronise, do not burst + next_t = now + path = os.path.join(a.out, "f%06d.ppm" % (n + 1)) + try: + f.write(json.dumps({"execute": "screendump", + "arguments": {"filename": path}}).encode() + b"\n") + r = json.loads(f.readline()) + if "error" in r: + nerr += 1 + log.write("ERROR %s %r\n" % (path, r["error"])) + else: + n += 1 + except (socket.timeout, OSError) as e: + log.write("CONN %s %s\n" % (path, e)) + break + if now - last_log >= 1.0: + log.write("t=%.1f frames=%d err=%d\n" % + (now - t0, n, nerr)) + last_log = now + log.write("DONE frames=%d err=%d secs=%.2f\n" % + (n, nerr, time.monotonic() - t0)) + log.close() + try: + sock.close() + except OSError: + pass + print("RECORDED %d frames in %.1fs (errors=%d)" % (n, time.monotonic() - t0, nerr)) + return 0 if n else 1 + + +if __name__ == "__main__": + sys.exit(main()) -- cgit v1.2.3