ba68a98873
Continues the structural unsafe-proof program (every unsafe carries a documented
proof of soundness; the file gains #![deny(clippy::undocumented_unsafe_blocks)]
so it stays proven). This batch covers all 10 remaining pure-Linux files
(104 blocks), each proof stating the REAL invariant — not boilerplate:
zerocopy/cuda.rs (26) leaked process-lifetime libcuda fn-ptr table; opaque
CUcontext never dereferenced; free-exactly-once via the
Arc<Mutex<PoolInner>> ownership graph; dmabuf fd take/close split
zerocopy/egl.rs (18) eglGetProcAddress'd procs with the GL context current;
EGLImage liveness; the two-call modifier-query bounds
zerocopy/vulkan.rs (4) copy-bounds arithmetic (src_size>=span); Send = thread
confinement to the punktfunk-pipewire thread
dmabuf_fence.rs (4) poll/ioctl/close fd liveness + ownership
capture/linux/mod.rs (16) spa_data repr(transparent) cast; null-checked spa
derefs; single-loop-thread buffer ownership until requeue
inject/linux/gamepad.rs (10) uinput ioctl request-number ↔ struct-size match
(static-asserted); InputEventRaw no-padding for the byte cast
encode/linux/vaapi.rs (15) + encode/linux/mod.rs (9) ffmpeg object ownership/
free ladders; VAAPI/DRM graph; Send = single-thread transfer
inject/linux/wlr.rs (2), vdisplay/linux/kwin.rs (1)
No memory-unsafety SUSPECT blocks were found — the unsafe is sound. The vaapi
agent did flag two real AVBufferRef *leaks* (not UB) in DmabufInner::open; marked
inline with NOTE(leak) and addressed in a follow-up.
Verified: cargo clippy -p punktfunk-host --all-targets -- -D warnings is clean
(each file's deny gate hard-errors on any undocumented block).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
94 lines
4.8 KiB
Rust
94 lines
4.8 KiB
Rust
//! Consumer-side implicit-fence wait for dmabuf capture (`DMA_BUF_IOCTL_EXPORT_SYNC_FILE`).
|
|
//!
|
|
//! Mutter renders its virtual monitor DIRECTLY into the PipeWire dmabuf and hands the buffer over
|
|
//! at GPU-submit time. With no fencing the consumer can sample mid-render and encode the buffer's
|
|
//! *previous* contents — the "stale/old frame" flashing on NVIDIA (KWin/gamescope blit into the
|
|
//! buffer so they don't hit this). The producer-driven fix is PipeWire explicit sync, but
|
|
//! Mutter+NVIDIA can't produce a sync_fd (`error alloc buffers` / no cogl sync_fd).
|
|
//!
|
|
//! So sync from the *consumer* side instead: a dmabuf carries its in-flight GPU work as an implicit
|
|
//! fence on its reservation object. `DMA_BUF_IOCTL_EXPORT_SYNC_FILE` snapshots that into a sync_file
|
|
//! fd we can `poll()` — readable once the producer's writes complete. This makes zero-copy capture
|
|
//! race-free WITHOUT the producer doing anything, *iff* the driver actually attaches the fence. If it
|
|
//! attaches none, the export yields an already-signaled sync_file (poll returns immediately) — no
|
|
//! wait, no harm, and `waited=false` tells us the driver doesn't fence (so zero-copy would still race).
|
|
|
|
// Every `unsafe` block in this file carries a `// SAFETY:` proof; enforce it (unsafe-proof program).
|
|
#![deny(clippy::undocumented_unsafe_blocks)]
|
|
|
|
use std::os::fd::RawFd;
|
|
|
|
// linux/dma-buf.h ioctls on the DMA_BUF_BASE ('b' = 0x62) magic. _IOWR = dir(3)<<30 | size<<16 | base<<8 | nr.
|
|
const DMA_BUF_BASE: u64 = 0x62;
|
|
const fn iowr(nr: u32, size: usize) -> u64 {
|
|
(3u64 << 30) | ((size as u64) << 16) | (DMA_BUF_BASE << 8) | nr as u64
|
|
}
|
|
|
|
#[repr(C)]
|
|
struct DmaBufExportSyncFile {
|
|
flags: u32,
|
|
fd: i32,
|
|
}
|
|
|
|
const DMA_BUF_IOCTL_EXPORT_SYNC_FILE: u64 = iowr(2, std::mem::size_of::<DmaBufExportSyncFile>());
|
|
/// We will READ the buffer → export the fence(s) we must wait for before reading (the producer's writes).
|
|
const DMA_BUF_SYNC_READ: u32 = 1 << 0;
|
|
|
|
/// Wait until the producer's writes to `dmabuf_fd` complete (or `timeout_ms` elapses). Returns:
|
|
/// - `Ok(true)` — a render was still in flight and we waited on its fence (the race was real, now closed).
|
|
/// - `Ok(false)` — no fence / already signaled (the driver attaches no implicit fence; zero-copy can race).
|
|
/// - `Err` — the ioctl failed (e.g. the kernel/driver lacks `EXPORT_SYNC_FILE`).
|
|
pub fn wait_read_ready(dmabuf_fd: RawFd, timeout_ms: i32) -> std::io::Result<bool> {
|
|
let mut req = DmaBufExportSyncFile {
|
|
flags: DMA_BUF_SYNC_READ,
|
|
fd: -1,
|
|
};
|
|
// SAFETY: `dmabuf_fd` is a live dmabuf fd supplied by the caller (borrowed for this call; we
|
|
// never close it). `DMA_BUF_IOCTL_EXPORT_SYNC_FILE` encodes `size_of::<DmaBufExportSyncFile>()`
|
|
// — the exact byte count the kernel copies — and `&mut req` is a live, correctly-sized
|
|
// `#[repr(C)]` struct the EXPORT_SYNC_FILE ioctl reads (`flags`) and writes (`fd`). `req`
|
|
// outlives this synchronous call and is not aliased elsewhere.
|
|
let r = unsafe { libc::ioctl(dmabuf_fd, DMA_BUF_IOCTL_EXPORT_SYNC_FILE, &mut req) };
|
|
if r < 0 {
|
|
return Err(std::io::Error::last_os_error());
|
|
}
|
|
let sync_fd = req.fd;
|
|
if sync_fd < 0 {
|
|
return Ok(false); // no sync_file exported
|
|
}
|
|
let mut pfd = libc::pollfd {
|
|
fd: sync_fd,
|
|
events: libc::POLLIN,
|
|
revents: 0,
|
|
};
|
|
// Non-blocking probe: not-yet-signaled (poll==0) means the producer is still rendering.
|
|
// SAFETY: `&mut pfd` points at a single live `libc::pollfd` and `nfds == 1` matches that one
|
|
// element; `pfd.fd` is `sync_fd`, the sync_file fd just exported (already checked `>= 0`).
|
|
// `poll` reads `fd`/`events` and writes `revents` for this non-blocking (timeout 0) probe, then
|
|
// returns — `pfd` outlives the call and aliases nothing.
|
|
let pending = unsafe { libc::poll(&mut pfd, 1, 0) } == 0;
|
|
if pending {
|
|
pfd.revents = 0;
|
|
// SAFETY: same live single-element `pfd` (its `revents` reset to 0 just above), `nfds == 1`,
|
|
// and `sync_fd` still open. This blocking `poll` (up to `timeout_ms`) waits for the render
|
|
// fence to signal; it reads `fd`/`events`, writes `revents`, and returns before `pfd` ends.
|
|
unsafe { libc::poll(&mut pfd, 1, timeout_ms) }; // block until the render fence signals
|
|
}
|
|
// SAFETY: `sync_fd` is the sync_file fd the EXPORT_SYNC_FILE ioctl created and handed us to own;
|
|
// this point is reached only when `sync_fd >= 0`, this `close` runs exactly once on it, and it is
|
|
// never used afterward — no double-close or use-after-close.
|
|
unsafe { libc::close(sync_fd) };
|
|
Ok(pending)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
/// The ioctl number must match linux/dma-buf.h exactly — it's computed, so lock it down.
|
|
#[test]
|
|
fn ioctl_number_matches_dma_buf_h() {
|
|
assert_eq!(DMA_BUF_IOCTL_EXPORT_SYNC_FILE, 0xC008_6202);
|
|
}
|
|
}
|