From nobody Fri Oct 02 02:20:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hwsvv3Rgyz6v4Mf for ; Fri, 02 Oct 2026 02:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwsvv0wmyz3Cxq for ; Fri, 02 Oct 2026 02:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790907659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mpb4sIgN5rN6AGNDSnDaMPRnw81ukwgtEjhPfnlMqA=; b=f1ARPs2RA2Incv8U1EEbJSp6wIzrerQaIC4a/dCOsAi/S/Oy5FUAt3j1zMU/ToIRBoL9PA m4NnuFFboO5WltxzGf1ekrpkeGxm2xxmh7v3eZpe91vw+kGuKZIq/1RYo9MUy95O2gw6hO +XAsXofoi+p2/+YUPD0wWw5bl2ESAm+sZoDjHR+IYdwF0fxNRRG2uWzZSmr9o47xXtkEBw e0W6tEr+LpnRIwAmKihbtCP/YSAuKM49r9RCcNpmR3Xw6nZe8FwGIUflU7do0oVUirB9rX +NGcR67t/E96PnCX7MPDa4b50WJ7hL6oUg8z1A02ZopHqPhc0pP2B+cDDu+P6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790907659; b=dSKDJ4SFcnUVRKHqyqTNnXNcSG41kFRfgTA2jmrx8sdEcRULiNz9JFjHP4PxHnLFpZEpF9 5oGpQBG4UJ8b64FNktg/CMbXof/++RhomVQKpds7Ss6wNyxl4dsksuRpN/57WIig/MA702 aX+AQF9kYGPN0wrHCxPGxrwSLOPUXNgyJPpUCxQTHfegvEADSsYXTKcaYZhhhslsgKQyBP bxCM/T/FAyDi6ewohPZ4shhjdWK1XO5u5y5LJePWPd4psZJIJ2XQcZ9aKl3e2QQtEOAvyc Hf03zqzvMBwMVIaFkRcfvFdjPhYFmQgs9XpnRcH4jxE0+YGs0u8AH6wRTZK7hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790907659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mpb4sIgN5rN6AGNDSnDaMPRnw81ukwgtEjhPfnlMqA=; b=AD4hGxdrbZUzy/RQbUMaqCmZYtxEsqn5MKHbYJ24uxBlvNGicQxIfrZcqArUyw4hbsGItp 8ktehVcd23a/b1//4j9KryOWw2CCxO3K05uG4SLyijOnvbaWQ1GoWduO92vYTipXwUlr4R WJ7l1G6KAC2yYQQhVjR/24E4wzb58uJfkfuLrMtOt9wRno6WzMpFRntZNWfclYbNjWm954 2UGTOkMlRZ2TMUCWbi9Sbsk6aZKvTm5mB8WiWtu5dPs2y0MWqXbnouRFPS4P8KwT8mBWYd nGg1+ljmrEH9LV/24z9lngoW4PiU2neA1QiDVNGFsRf9uiumB5iM4jrtsIqLtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwsvv016SzyQH for ; Fri, 02 Oct 2026 02:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32891 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Oct 2026 02:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Ahmad Khalifa Subject: git: f958aa7e754d - main - vt: Fix timer race between vtterm_splash() and vt_flush() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f958aa7e754d88f3955f3c30a13f0e492822e3c3 Auto-Submitted: auto-generated Date: Fri, 02 Oct 2026 02:20:58 +0000 Message-Id: <6abf150a.32891.729f44@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=f958aa7e754d88f3955f3c30a13f0e492822e3c3 commit f958aa7e754d88f3955f3c30a13f0e492822e3c3 Author: Quentin Thébault AuthorDate: 2026-09-30 01:42:33 +0000 Commit: Ahmad Khalifa CommitDate: 2026-10-02 02:13:15 +0000 vt: Fix timer race between vtterm_splash() and vt_flush() Current code leads to console text being drawn over the splash image. vt_flush() draws while holding the vtbuf lock. Have it check VDF_SPLASH under it too, and make vtterm_splash() take the vtbuf lock when setting it, before drawing the splash. Sponsored by: Defenso Signed-off-by: Quentin Thébault Reviewed by: vexeduxr Differential Revision: https://reviews.freebsd.org/D59928 --- sys/dev/vt/vt_core.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 0030a3868219..0ea2ec58f4cc 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1501,7 +1501,7 @@ vt_flush(struct vt_device *vd) if (vw == NULL) return (0); - if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY) + if (vw->vw_flags & VWF_BUSY) return (0); vf = vw->vw_font; @@ -1511,6 +1511,13 @@ vt_flush(struct vt_device *vd) VT_FLUSH_LOCK(vd); vtbuf_lock(&vw->vw_buf); + + if (vd->vd_flags & VDF_SPLASH) { + vtbuf_unlock(&vw->vw_buf); + VT_FLUSH_UNLOCK(vd); + return (0); + } + inside_vt_flush = true; #ifndef SC_NO_CUTPASTE @@ -1697,17 +1704,21 @@ vtterm_splash(struct vt_device *vd) si = MD_FETCH(preload_kmdp, rebooting == 1 ? MODINFOMD_SHTDWNSPLASH : MODINFOMD_SPLASH, struct splash_info *); + /* Quit before taking the lock if the backend lacks something. */ if (si == NULL) { if (vd->vd_driver->vd_bitblt_bmp == NULL) return; - } else if (vd->vd_driver->vd_bitblt_argb == NULL) + } else if (vd->vd_driver->vd_bitblt_argb == NULL || si->si_depth != 4) + return; + if (rebooting == 1 && vd->vd_driver->vd_blank == NULL) return; - if (rebooting == 1) { - if (vd->vd_driver->vd_blank == NULL) - return; + vtbuf_lock(&vd->vd_curwindow->vw_buf); + vd->vd_flags |= VDF_SPLASH; + vtbuf_unlock(&vd->vd_curwindow->vw_buf); + + if (rebooting == 1) vd->vd_driver->vd_blank(vd, TC_BLACK); - } if (si == NULL) { top = (vd->vd_height - vt_logo_height) / 2; @@ -1716,8 +1727,6 @@ vtterm_splash(struct vt_device *vd) vd->vd_curwindow, vt_logo_image, NULL, vt_logo_width, vt_logo_height, left, top, TC_WHITE, TC_BLACK); } else { - if (si->si_depth != 4) - return; image = (uintptr_t)si + sizeof(struct splash_info); image = roundup2(image, 8); top = (vd->vd_height - si->si_height) / 2; @@ -1726,7 +1735,6 @@ vtterm_splash(struct vt_device *vd) (unsigned char *)image, si->si_width, si->si_height, left, top); } - vd->vd_flags |= VDF_SPLASH; } #endif