From nobody Mon Jul 21 14:33:59 2025 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 4bm2vr1pWkz62k32; Mon, 21 Jul 2025 14:34:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bm2vr0x7nz47WR; Mon, 21 Jul 2025 14:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753108440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oplvsvn0DoKxH/P/mYtZsdSVbMtJjpEqR4QJnH2fJhg=; b=e85G8K38C7TNaUN7IKCSENupYuadhlHxxrjm3nZZC2Zw8/hJhVhzqxGXG9xg/KhDAx4i/b vP8iLmmRpijlLSewtHfp6N9Kn7Z1QyI8lQzQ8v0VzPoFhwz1S2hMTMF4nYmVqT2pKhsy3n P74A0Wmne0sy5gF0E/RPfgsjeixvq9zYHxcfTeCBNJp9ANcgG8tUYQFTWtXPmt8O/Fja0p hAP8FthAOkqizE4XQ5RPDwJBjsRsP1m0S6ndlHreVSievhMOuWoKu6jSC4awiY6fp7RlEl WDwDAVgLH1BbszEHS0T5v/4LdcMtY+28Y0CErm7/FKeKVofsAL+cap/0cjBSDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753108440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oplvsvn0DoKxH/P/mYtZsdSVbMtJjpEqR4QJnH2fJhg=; b=Qy+IliIJQx/d+j3y0vUx5bgkzEObb6XGbCGHMW1CiI+TLKKC51E8rX8vsE5q8kBrgX8743 AmUuRrZ9wIfIm0pc7tBLLzp3wZfUJ0J2dnQnNIgfdFwIA0OaBJ37mSbORRBw1UKQ1JMiV6 wmuC5m6EPqJuDcdV9GAa6Oyzm7fi1ecUT2FLqzmPzR6FP4GnILY5BUiFTzEE2gnYSX9+RG rVk7+dDmpa+PRETPY4Yl2T5QzY3fPlApLGzvyp6Cwqh3SajTYPdEBglijjjgnRt7J20Hxl 1AuPKUA1jD3RJ6iWct8Z3tH5eH4IFq7Wvtu3VlGf8Lf7uwivlCwNP89YmHjGiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753108440; a=rsa-sha256; cv=none; b=wGaOU0ryXsytavdp5ViGYDX5j7YDAvLLfQRAgvxq5OYCwRxqO4Qr//TxZzJ37IesHPxw5g RV49q7i71WHf+FDTZQIFkbGWoTnzJR/yP4uvsR5rtttDqxsMoD2p8pfC8rtwEVvl7rgbdX T/+m6BhVZALBtGOcf/RoXyL6iDynj+CJRKdjh8sGIaj8DLnZTQlB29sQ3dahCcnSUSv/Wf 0gZqxbuHrykvxCjx7CfwTe/fJtie4Klqagbe3nrOTW5FbvWSJJIwB2aoJgU3vGeaMm+6vJ IWUvfaVjZnQprUNSKT9ecGDsqKu6RIqI5NyvDQxzNWyXt4poBcdjZN2lzJBsew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bm2vr0WcDz11xF; Mon, 21 Jul 2025 14:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56LEXxss014608; Mon, 21 Jul 2025 14:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56LEXxbN014605; Mon, 21 Jul 2025 14:33:59 GMT (envelope-from git) Date: Mon, 21 Jul 2025 14:33:59 GMT Message-Id: <202507211433.56LEXxbN014605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 860f20cc133c - main - stand: Add print_delay environment variable in loader 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 860f20cc133cb4072224e4e98c01c9f4716c8952 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=860f20cc133cb4072224e4e98c01c9f4716c8952 commit 860f20cc133cb4072224e4e98c01c9f4716c8952 Author: Aymeric Wibo AuthorDate: 2025-07-19 22:01:37 +0000 Commit: Aymeric Wibo CommitDate: 2025-07-21 14:33:20 +0000 stand: Add print_delay environment variable in loader This adds support for a new `print_delay` environment variable, which inserts a delay in microseconds when `putchar` encounters a newline character. This can be useful when debugging. Reviewed by: markj, imp, ziaee, mckusick (mentor) Approved by: markj, imp, ziaee, mckusick (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50832 --- stand/common/bootstrap.h | 2 ++ stand/common/console.c | 23 +++++++++++++++++++++++ stand/defaults/loader.conf | 2 ++ stand/defaults/loader.conf.5 | 6 +++++- stand/efi/loader/main.c | 3 +++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index dca0cf6bb2d5..17887919089c 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -372,6 +372,8 @@ extern struct arch_switch archsw; /* This must be provided by the MD code, but should it be in the archsw? */ void delay(int delay); +int setprint_delay(struct env_var *ev, int flags, const void *value); + /* common code to set currdev variable. */ int gen_setcurrdev(struct env_var *ev, int flags, const void *value); int mount_currdev(struct env_var *, int, const void *); diff --git a/stand/common/console.c b/stand/common/console.c index 82cb552b4ef2..65ab7ffad622 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -44,6 +44,8 @@ static int twiddle_set(struct env_var *ev, int flags, const void *value); #endif int module_verbose = MODULE_VERBOSE; +static uint32_t print_delay_usec = 0; + static int module_verbose_set(struct env_var *ev, int flags, const void *value) { @@ -65,6 +67,23 @@ module_verbose_set(struct env_var *ev, int flags, const void *value) return (CMD_OK); } +/* + * Hook to set the print delay + */ +int +setprint_delay(struct env_var *ev, int flags, const void *value) +{ + char *end; + int usec = strtol(value, &end, 10); + + if (*(char *)value == '\0' || *end != '\0') + return (EINVAL); + if (usec < 0) + return (EINVAL); + print_delay_usec = usec; + return (0); +} + /* * Detect possible console(s) to use. If preferred console(s) have been * specified, mark them as active. Else, mark the first probed console @@ -178,6 +197,10 @@ putchar(int c) (C_PRESENTOUT | C_ACTIVEOUT)) consoles[cons]->c_out(c); } + + /* Pause after printing newline character if a print delay is set */ + if (print_delay_usec != 0 && c == '\n') + delay(print_delay_usec); } /* diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 1834e3ba3b34..f0843f3e930b 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -95,6 +95,8 @@ audit_event_type="etc_security_audit_event" # Default is unset and disabled (no delay). #autoboot_delay="10" # Delay in seconds before autobooting, # -1 for no user interrupts, NO to disable +#print_delay="1000000" # Slow printing of loader messages, useful for + # debugging. Given in microseconds. #password="" # Prevent changes to boot options #bootlock_password="" # Prevent booting (see check-password.4th(8)) #geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 021f68f2309e..dc1c8f7f44e0 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd June 5, 2025 +.Dd June 12, 2025 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -116,6 +116,10 @@ option in this manner, .Va beastie_disable must be set to .Dq Li YES . +.It Ar print_delay +Add a delay in microseconds after printing each line. +Default +.Dq Li 0 . .It Ar boot_* See list in .Xr loader.efi 8 diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 3ef418d20df3..436676368447 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1241,6 +1241,9 @@ main(int argc, CHAR16 *argv[]) #endif cons_probe(); + /* Set print_delay variable to have hooks in place. */ + env_setenv("print_delay", EV_VOLATILE, "", setprint_delay, env_nounset); + /* Set up currdev variable to have hooks in place. */ env_setenv("currdev", EV_VOLATILE, "", gen_setcurrdev, env_nounset);