From nobody Wed Aug 09 06:07:55 2023 X-Original-To: dev-commits-src-all@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 4RLKNW4h8cz4mFPG; Wed, 9 Aug 2023 06:07:55 +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 4RLKNW48nNz4HYw; Wed, 9 Aug 2023 06:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691561275; 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=he7XNlZ9/8URUuScPK6LSBuS8a0L3Zid7dK3w7I6Aac=; b=LgabK5nZJjsqsU9DhXzHB5RCgUjuqUI/SunIatIMQV7/iwQBspSQBCxZrp3uK+GXUGBwbs neYpZN8bjj7XdOlX/08/64BroUlW372UWlzSnDFr08Q9JAmu6J5vkPdMseIjUab5B0zVN1 FEiaWLLNOCy2VBAPNNSL5UXJYOyGfl1UGS2eNrCoXTRkSA6BFVyxRw5okmrbswez9hS2nh V5/UCGDkrgKdhnC5iZx3He2f0kcQioAc6QJQX+JF26dhw/A3AdostPVMbCgk27W2WXNiQa TjrMrNGk9TZDlzNZ8VpxFOVUflAQxReMCKtx8u5+pT70kn10H1tNxWdGADspPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691561275; 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=he7XNlZ9/8URUuScPK6LSBuS8a0L3Zid7dK3w7I6Aac=; b=XG2dKhldBOmnrDiEzZHPlFmwHymP2b9Sn54AeJLerOVrErKiL+AhoV9g39gZG1fpAf0ilU vdEbmTmHlhcP3XwFF1Ps/YTY3UzOdp64hsYYwMJgtpilRLbwf4ZCrJMrU+84Xe5FeTEKCH QwPauFprGHk3sUtD7L+1r//E3bB1bwfF9AYi4USitG+SKRML/3Hf1bP7ATIZIZiIqVZxPI Lyh3wpEhwqIN5ATEilNVzOhiSAypUscokUHD/hCkbLT/qfJSX7RY8eBRyLok1GSoJdpRDZ y4SoKvexL5xTvQdUz1och0NmbkmCONUOPL9hgtVlO3aYCs6kRUh3+//yebjiIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691561275; a=rsa-sha256; cv=none; b=ypYIeBuDuiKoZuTjQp7s1UcBRGStatU7fS7+5BCK6fhIi4Q0Y7rQV5NuOPRCfRufAbyjC8 D/MJ2aLrwUUKJ6zl+baFzwBCEc7HWsNLfmGTdjgweN5WNB5lKsbBU8EQjz58aUI1gsimLY aGSpgn3/+zQuZsereW4gp9q4HXDK2vVJmnHxERLSyyMO07fC03IBh/kH/MGzOczAGuua8w 6X/kBptNddA0+udzASRGF8+e6IcZQSIIt16l/3YowYTl7uK/EgpjgyEWqyCPjQHsVfxcV0 nmH21swFfIMuclAVWzbkSLr/UamkCT0DyN1o0xcDMU0zruklyW0c/NKCry8Jcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLKNW3C3Qz13xL; Wed, 9 Aug 2023 06:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37967txK090818; Wed, 9 Aug 2023 06:07:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37967t9e090815; Wed, 9 Aug 2023 06:07:55 GMT (envelope-from git) Date: Wed, 9 Aug 2023 06:07:55 GMT Message-Id: <202308090607.37967t9e090815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 28b36ecf990f - main - Revert "exit1(): Revert sparc64 workaround" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28b36ecf990fc28a935ab2ce75f7504721c3a7ea Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=28b36ecf990fc28a935ab2ce75f7504721c3a7ea commit 28b36ecf990fc28a935ab2ce75f7504721c3a7ea Author: Konstantin Belousov AuthorDate: 2023-08-09 05:56:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 06:00:20 +0000 Revert "exit1(): Revert sparc64 workaround" This reverts commit 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a. There are other relatively common reasons why init might get killed during reboot, the workaround was really not sparc64-specific. Discussed with: marius Sponsored by: The FreeBSD Foundation --- sys/kern/kern_exit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index e3345c14df26..f1ab2f68b3f2 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -238,7 +238,14 @@ exit1(struct thread *td, int rval, int signo) TSPROCEXIT(td->td_proc->p_pid); p = td->td_proc; - if (p == initproc) { + /* + * In case we're rebooting we just let init die in order to + * work around an issues where pid 1 might get a fatal signal. + * For instance, if network interface serving NFS root is + * going down due to reboot, page-in requests for text are + * failing. + */ + if (p == initproc && rebooting == 0) { printf("init died (signal %d, exit %d)\n", signo, rval); panic("Going nowhere without my init!"); }