From owner-dev-commits-src-all@freebsd.org Wed Jan 20 10:37:44 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 833D94F1348; Wed, 20 Jan 2021 10:37:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DLMRX2Wtfz4X3B; Wed, 20 Jan 2021 10:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 39CCD17DB3; Wed, 20 Jan 2021 10:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10KAbiM9093427; Wed, 20 Jan 2021 10:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10KAbiCb093426; Wed, 20 Jan 2021 10:37:44 GMT (envelope-from git) Date: Wed, 20 Jan 2021 10:37:44 GMT Message-Id: <202101201037.10KAbiCb093426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 7e99c034f788 - main - Emit uprintf() output for initproc if there is no controlling terminal MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e99c034f788128c7d168eaf27af9a3acaa06163 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 10:37:44 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=7e99c034f788128c7d168eaf27af9a3acaa06163 commit 7e99c034f788128c7d168eaf27af9a3acaa06163 Author: Alex Richardson AuthorDate: 2021-01-20 09:54:46 +0000 Commit: Alex Richardson CommitDate: 2021-01-20 09:54:46 +0000 Emit uprintf() output for initproc if there is no controlling terminal This patch helped me debug why /sbin/init was not being loaded after making changes to the image activator in CheriBSD. Reviewed By: jhb (earlier version), kib Differential Revision: https://reviews.freebsd.org/D28121 --- sys/kern/subr_prf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 31117c4e3415..b51213a25d0d 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -179,6 +179,14 @@ uprintf(const char *fmt, ...) if (TD_IS_IDLETHREAD(td)) return (0); + if (td->td_proc == initproc) { + /* Produce output when we fail to load /sbin/init: */ + va_start(ap, fmt); + retval = vprintf(fmt, ap); + va_end(ap); + return (retval); + } + sx_slock(&proctree_lock); p = td->td_proc; PROC_LOCK(p);