fix(host): name the lid-closed/no-frames failure — display-write decode, console-session guard, driver-truth attach diagnostics
Field report (Windows laptop, lid closed, Tailscale): v0.12.0's activation fix works — the pf-vdisplay target activates in ~200ms — but the session still dies at the first-frame gate: 'driver_status=1 but no frame published within 4s'. Triage showed three independent blind spots; this names all of them at their source instead of guessing downstream: - pf-win-display: decode ChangeDisplaySettingsExW failures (-1 FAILED — a display write rejected, the wrong/remote-session signature — vs -2 BADMODE, which the old 'mode not advertised?' text conflated), and WARN on every non-zero SetDisplayConfig rc in the CCD isolate even when verification passes vacuously (the lid-closed case: nothing else active, so the INFO swallowed rc=0x5 ERROR_ACCESS_DENIED while the load-bearing COMMIT_MODES → ASSIGN_SWAPCHAIN re-commit silently never applied). Access-denied rcs get the remedy appended (console session / installed service). - host: console-session guard (interactive::console_session_mismatch) — a host outside the active console session (a hand-launched host after an RDP round-trip) fails every display write, reads the wrong session's GDI view, and its SendInput compose kicks go nowhere. Named ERROR at vdisplay acquire + appended to the first-frame timeout, instead of the misleading generic failure. (The idd_push diagnosis half of this landed in 9a36ea21; this commit adds the proto helpers + session guard it references, healing the windows-cfg build.) - proto + driver: while OPENED, driver_status_detail now carries a live packed word (bit31 live-marker | offered 15-bit | mismatch-dropped 16-bit) maintained by the publisher, so the host's first-frame timeout can tell apart: never-attached (no swap-chain worker ran), attached-but-DWM-composed- zero-frames (undamaged/powered-off desktop, kicks blocked on the secure desktop), and composed-but-every-frame-mismatched (ring sized from a stale/ foreign-session GDI mode). Zero layout change, old drivers read as 'no detail'; unit-tested pack/unpack in pf-driver-proto. Verified on winbox: cargo check + clippy -p punktfunk-host -p pf-win-display -p pf-driver-proto EXIT 0, drivers ws cargo check -p pf-vdisplay EXIT 0 (Version_Number=10.0.26100.0), cargo fmt --all --check clean; pf-driver-proto tests 13/13 pass locally. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -379,6 +379,46 @@ pub mod frame {
|
||||
/// `design/idd-push-security.md`); `driver_status_detail` carries the target id the ring claims.
|
||||
pub const DRV_STATUS_BIND_FAIL: u32 = 4;
|
||||
|
||||
/// While `driver_status` is [`DRV_STATUS_OPENED`], `driver_status_detail` carries a LIVE
|
||||
/// diagnostic word maintained by the driver's publisher (best-effort plain writes — the same
|
||||
/// visibility contract as `driver_status` itself). Layout:
|
||||
///
|
||||
/// - bit 31 (this constant): stamped at attach by a detail-capable driver, so the host can
|
||||
/// tell "pre-detail driver, no information" (field = 0) from "zero frames offered".
|
||||
/// - bits 30..16: surfaces the swap-chain worker OFFERED to the ring (15-bit, saturating) —
|
||||
/// every DWM compose that reached `publish()`, whatever its outcome.
|
||||
/// - bits 15..0: publishes DROPPED for a descriptor mismatch (16-bit, saturating) — the
|
||||
/// surface's size/format didn't match the ring's.
|
||||
///
|
||||
/// The host's wait-for-attach reads this on its first-frame timeout to NAME the failure
|
||||
/// instead of guessing (the lid-closed field report was undiagnosable without it):
|
||||
/// `offered == 0` → DWM never composed the display (powered-off / undamaged desktop, compose
|
||||
/// kicks blocked); `offered > 0` with `seq` still 0 → every compose was dropped mismatched
|
||||
/// (the host sized the ring from a stale or foreign-session GDI mode).
|
||||
pub const OPENED_DETAIL_LIVE: u32 = 0x8000_0000;
|
||||
|
||||
/// Pack the live OPENED diagnostic word (see [`OPENED_DETAIL_LIVE`]); both counters saturate.
|
||||
#[must_use]
|
||||
pub const fn pack_opened_detail(offered: u32, mismatched: u32) -> u32 {
|
||||
let o = if offered > 0x7FFF { 0x7FFF } else { offered };
|
||||
let m = if mismatched > 0xFFFF {
|
||||
0xFFFF
|
||||
} else {
|
||||
mismatched
|
||||
};
|
||||
OPENED_DETAIL_LIVE | (o << 16) | m
|
||||
}
|
||||
|
||||
/// Unpack a live OPENED diagnostic word → `(offered, mismatched)`; `None` when the driver
|
||||
/// never stamped [`OPENED_DETAIL_LIVE`] (a pre-detail driver — the field carries nothing).
|
||||
#[must_use]
|
||||
pub const fn unpack_opened_detail(detail: u32) -> Option<(u32, u32)> {
|
||||
if detail & OPENED_DETAIL_LIVE == 0 {
|
||||
return None;
|
||||
}
|
||||
Some(((detail >> 16) & 0x7FFF, detail & 0xFFFF))
|
||||
}
|
||||
|
||||
/// The shared metadata header (host-created, mapped by both sides). Atomic fields (`magic`, `latest`,
|
||||
/// `generation`) are accessed via each side's own atomic view over the mapping; this is the layout.
|
||||
#[repr(C)]
|
||||
@@ -758,6 +798,27 @@ mod tests {
|
||||
assert_eq!(t.pack(), (7u64 << 40) | (42u64 << 8) | 3u64);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn opened_detail_roundtrips_and_saturates() {
|
||||
use frame::{pack_opened_detail, unpack_opened_detail, OPENED_DETAIL_LIVE};
|
||||
// Zero counters still stamp LIVE — "attached, nothing offered yet" is information.
|
||||
assert_eq!(pack_opened_detail(0, 0), OPENED_DETAIL_LIVE);
|
||||
assert_eq!(unpack_opened_detail(pack_opened_detail(0, 0)), Some((0, 0)));
|
||||
// Roundtrip within range.
|
||||
assert_eq!(
|
||||
unpack_opened_detail(pack_opened_detail(1234, 567)),
|
||||
Some((1234, 567))
|
||||
);
|
||||
// Saturation at each counter's width (15-bit offered, 16-bit mismatched).
|
||||
assert_eq!(
|
||||
unpack_opened_detail(pack_opened_detail(u32::MAX, u32::MAX)),
|
||||
Some((0x7FFF, 0xFFFF))
|
||||
);
|
||||
// A pre-detail driver's field (any value without the LIVE bit) carries no information.
|
||||
assert_eq!(unpack_opened_detail(0), None);
|
||||
assert_eq!(unpack_opened_detail(0x7FFF_FFFF), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_header_is_pod_and_64_bytes() {
|
||||
let mut h = frame::SharedHeader::zeroed();
|
||||
|
||||
@@ -429,10 +429,11 @@ pub fn set_active_mode(gdi_name: &str, mode: Mode) {
|
||||
if test != DISP_CHANGE_SUCCESSFUL {
|
||||
tracing::warn!(
|
||||
result = test.0,
|
||||
"{gdi_name}: driver rejected {}x{}@{} (mode not advertised?) — leaving OS default",
|
||||
"{gdi_name}: mode-set {}x{}@{} rejected ({}) — leaving OS default",
|
||||
mode.width,
|
||||
mode.height,
|
||||
chosen_hz
|
||||
chosen_hz,
|
||||
disp_change_reason(test.0)
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -458,14 +459,48 @@ pub fn set_active_mode(gdi_name: &str, mode: Mode) {
|
||||
} else {
|
||||
tracing::warn!(
|
||||
result = apply.0,
|
||||
"{gdi_name}: failed to apply {}x{}@{}",
|
||||
"{gdi_name}: failed to apply {}x{}@{} ({})",
|
||||
mode.width,
|
||||
mode.height,
|
||||
chosen_hz
|
||||
chosen_hz,
|
||||
disp_change_reason(apply.0)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Human decode for a failed `ChangeDisplaySettingsExW` result. The two codes worth telling apart
|
||||
/// in a field log: `BADMODE` (the display's mode list genuinely lacks the mode) vs `FAILED` (the
|
||||
/// write itself was rejected — on a healthy driver that is the signature of a host process without
|
||||
/// console-session access, e.g. one trapped in a disconnected RDP session). An earlier revision
|
||||
/// printed "mode not advertised?" for BOTH, which sent a lid-closed field report chasing the wrong
|
||||
/// cause.
|
||||
fn disp_change_reason(rc: i32) -> &'static str {
|
||||
match rc {
|
||||
-1 => {
|
||||
"DISP_CHANGE_FAILED: the display write was rejected — a host without console-session \
|
||||
access (disconnected RDP session / non-console session) fails ALL display writes \
|
||||
this way"
|
||||
}
|
||||
-2 => "DISP_CHANGE_BADMODE: the display does not advertise this mode",
|
||||
-3 => "DISP_CHANGE_NOTUPDATED: registry write failed",
|
||||
-4 => "DISP_CHANGE_BADFLAGS",
|
||||
-5 => "DISP_CHANGE_BADPARAM",
|
||||
_ => "unrecognized DISP_CHANGE code",
|
||||
}
|
||||
}
|
||||
|
||||
/// Appended to `SetDisplayConfig` failure logs when rc is `ERROR_ACCESS_DENIED` (0x5) — per MS
|
||||
/// docs "the caller does not have access to the console session", the field signature of a host
|
||||
/// running in a disconnected RDP / non-console session. Every other rc gets no hint.
|
||||
fn sdc_access_denied_hint(rc: i32) -> &'static str {
|
||||
if rc == 5 {
|
||||
" (ERROR_ACCESS_DENIED: the host has no console-session access — disconnected RDP \
|
||||
session? run via the installed service so it tracks the console session)"
|
||||
} else {
|
||||
""
|
||||
}
|
||||
}
|
||||
|
||||
/// Saved active display topology, for restoring on teardown.
|
||||
// pub so vdisplay::pf_vdisplay's Monitor can hold the same saved-topology type.
|
||||
pub type SavedConfig = (Vec<DISPLAYCONFIG_PATH_INFO>, Vec<DISPLAYCONFIG_MODE_INFO>);
|
||||
@@ -688,6 +723,17 @@ pub unsafe fn isolate_displays_ccd(keep_target_ids: &[u32]) -> Option<SavedConfi
|
||||
flags |= SDC_SAVE_TO_DATABASE;
|
||||
}
|
||||
let rc = SetDisplayConfig(Some(paths.as_slice()), Some(modes.as_slice()), flags);
|
||||
// A failed apply must be VISIBLE even when the verification below passes vacuously (nothing
|
||||
// else was active to deactivate — the lid-closed laptop case, where the success INFO used to
|
||||
// swallow rc=0x5): the re-commit above is load-bearing (COMMIT_MODES → ASSIGN_SWAPCHAIN),
|
||||
// and a denied apply means it never drove the IddCx adapter.
|
||||
if rc != 0 {
|
||||
tracing::warn!(
|
||||
"display isolate (CCD): SetDisplayConfig rc={rc:#x}{} — the re-commit did NOT \
|
||||
apply (COMMIT_MODES/ASSIGN_SWAPCHAIN may not fire for the virtual display)",
|
||||
sdc_access_denied_hint(rc)
|
||||
);
|
||||
}
|
||||
|
||||
// VERIFY the OUTCOME (rc alone lies — a "successful" apply can leave a panel active): re-query
|
||||
// and confirm no non-keep display survived. Only then is the virtual set truly the sole desktop.
|
||||
@@ -870,7 +916,10 @@ pub unsafe fn set_virtual_primary_ccd(keep_target_id: u32) -> Option<SavedConfig
|
||||
if rc == 0 {
|
||||
tracing::info!("display primary (CCD): virtual target {keep_target_id} set PRIMARY at (0,0); {others} other display(s) kept ACTIVE + packed to its right");
|
||||
} else {
|
||||
tracing::warn!("display primary (CCD): SetDisplayConfig failed rc={rc:#x} (virtual {keep_target_id} primary, physicals kept)");
|
||||
tracing::warn!(
|
||||
"display primary (CCD): SetDisplayConfig failed rc={rc:#x}{} (virtual {keep_target_id} primary, physicals kept)",
|
||||
sdc_access_denied_hint(rc)
|
||||
);
|
||||
}
|
||||
Some(saved)
|
||||
}
|
||||
@@ -891,6 +940,9 @@ pub unsafe fn restore_displays_ccd(saved: &SavedConfig) {
|
||||
if rc == 0 {
|
||||
tracing::info!("display isolate (CCD): restored original topology");
|
||||
} else {
|
||||
tracing::warn!("display isolate (CCD): topology restore failed rc={rc:#x} — physical displays may be left deactivated");
|
||||
tracing::warn!(
|
||||
"display isolate (CCD): topology restore failed rc={rc:#x}{} — physical displays may be left deactivated",
|
||||
sdc_access_denied_hint(rc)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -378,6 +378,22 @@ impl VirtualDisplayManager {
|
||||
client_hdr: Option<punktfunk_core::quic::HdrMeta>,
|
||||
quit: Option<Arc<AtomicBool>>,
|
||||
) -> Result<VirtualOutput> {
|
||||
// Console-session guard: a host outside the ACTIVE console session cannot drive the display
|
||||
// it is about to create — every SetDisplayConfig/CDS write fails ERROR_ACCESS_DENIED, GDI
|
||||
// reads describe the wrong session's displays, and SendInput compose kicks go nowhere; the
|
||||
// session then dies far downstream as "no frame published within 4s" (the lid-closed field
|
||||
// report). Name the real problem up front, once per acquire. Non-fatal: the OS-side
|
||||
// persistence-DB activation can still succeed, so the attempt proceeds.
|
||||
if let Some((own, console)) = crate::interactive::console_session_mismatch() {
|
||||
tracing::error!(
|
||||
own_session = own,
|
||||
console_session = console,
|
||||
"punktfunk-host is NOT in the active console session — display activation, \
|
||||
mode-set and capture will fail (disconnected RDP session?). Reconnect the \
|
||||
console (`tscon {own} /dest:console`) or run the host via the installed \
|
||||
service, which follows the console session"
|
||||
);
|
||||
}
|
||||
self.ensure_linger_timer();
|
||||
let slot = slot_id_for(client_fp, (mode.width, mode.height));
|
||||
let mut inner = self.state.lock().unwrap();
|
||||
|
||||
@@ -30,6 +30,27 @@ use windows::Win32::System::Threading::{
|
||||
CreateProcessAsUserW, CREATE_UNICODE_ENVIRONMENT, PROCESS_INFORMATION, STARTUPINFOW,
|
||||
};
|
||||
|
||||
/// `Some((own_session, console_session))` when this process is NOT in the active console session —
|
||||
/// the state in which every display write (`SetDisplayConfig` / `ChangeDisplaySettingsExW`) fails
|
||||
/// `ERROR_ACCESS_DENIED`, GDI reads describe the wrong session's displays, and `SendInput` compose
|
||||
/// kicks go nowhere. Field signature: a hand-launched host whose session later went remote (an RDP
|
||||
/// round-trip) — the installed service relaunches the host when the console session moves, a
|
||||
/// hand-launched one stays trapped. `None` in the console session, and `None` when the check
|
||||
/// itself can't answer (no console session attached — boot / session transition — or the session
|
||||
/// query failed): the guard exists to NAME a known-bad state, so an unknown state stays quiet.
|
||||
pub fn console_session_mismatch() -> Option<(u32, u32)> {
|
||||
use windows::Win32::System::RemoteDesktop::ProcessIdToSessionId;
|
||||
use windows::Win32::System::Threading::GetCurrentProcessId;
|
||||
let mut own: u32 = 0;
|
||||
// SAFETY: `own` is a live local out-param for this synchronous call; no pointer escapes it.
|
||||
if unsafe { ProcessIdToSessionId(GetCurrentProcessId(), &mut own) }.is_err() {
|
||||
return None;
|
||||
}
|
||||
// SAFETY: takes no arguments and returns the console session id by value.
|
||||
let console = unsafe { WTSGetActiveConsoleSessionId() };
|
||||
(console != 0xFFFF_FFFF && own != console).then_some((own, console))
|
||||
}
|
||||
|
||||
/// Spawn `cmdline` in the active console session, under the logged-in user's token, on the
|
||||
/// interactive desktop (`winsta0\default`). Returns the new process id.
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user