From nobody Mon Jan 23 19:11:25 2023 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 4P107y1XgTz3b9Pq; Mon, 23 Jan 2023 19:11:26 +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 4P107y14Vqz4FCX; Mon, 23 Jan 2023 19:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674501086; 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=3wn6FtbP6YtCY4uEfqMp5DKC5V2wVt8O+fKpwRMEp8E=; b=POuaPi5oY2O/4FtM6h86vFdKsSBwdCtjxmvo0itK7QoPTJddCmjjSBmR2qSEuCcsrrk40o eX0WsKMJ8wGUUzY74yEqTUwHSE5Wkrta7w108HVa9HUqfrtdIfnmO+xQ4WWrD770RYlSE8 0p5jcaZpmJV6nFSeQ9JFUwqm3ulbXjYrPruPd7P+t8YSLz/KGJk816/LibassrCm7DHqir FAt3+jrBV11sZQ7A3pnSuXq5OibOdqu3KhSxGbEQQ0Iqq/+6cmoRugDfeeP+oZqpg45SDS gU+KCsB0XeENVAWGGcx1D8Shhoxad2ngJhmgEiLza2SVbCzs7Mrg+GIpongVxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674501086; 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=3wn6FtbP6YtCY4uEfqMp5DKC5V2wVt8O+fKpwRMEp8E=; b=pEatRKbTyQIYPeitfZjg/lPnWdfABE6VpWBNphdionkIH4UFHFlSLZhX70KoUzELFFkhdC jb7g+Owtqy6wRQLnTKqJQ7vIkgduJLHjXUICgdkC4QpDe2SYUqvI4QSWD9z0WqDbZGM1xu /87axxS9/VSU6I9A+TXtKVXJ1fHYUDbTQn4ntuMfGGwRTE2ncFsTWzFpNBRfS0BSUwCfjm vaBTYNKtktEwYucEQQEtKdRSEXMFXv0/COnWkIo6jR6cxXd0x59BgMn76RJGEicOS/fJnj 22jVdVUkoNDBXVTeMhfBctVXicwJDUMnMFSrtOnfh54ir6YypI9UqpjLVp+9Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674501086; a=rsa-sha256; cv=none; b=vABeTKA1ecKynshh+CBEHotW8P8aTNAnL6RU0lQjyJyGt6ADml1T3szo+GkK1WlZbuhltS eAfJJ91ul1f1IdF0njhIqhSTcVYzxWXcYch+qgTonKLMEpC1ZyFHW18NuiwdcM34//EnEL DIJ0L2C1nVREi6u/DurydtGJU9WPGpLZw2Yhu4z1zj5K9e5ALMbgMOwjV/CZIx89YDAxzk XSdOvvhnyHKNtj8S9Up+y9tVP3d4xl6muvjWZc3jD2cUu5IN9YlrDxabdXI/TKuX8gjAIT Pwm2sQcRR7vdaFYMfFCOi8UQnnsQJJ8qU23S9+f2zYglMJPoEhdvqisqSVlJBg== 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 4P107y06LTzg1k; Mon, 23 Jan 2023 19:11:26 +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 30NJBPHe057023; Mon, 23 Jan 2023 19:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NJBPNL057022; Mon, 23 Jan 2023 19:11:25 GMT (envelope-from git) Date: Mon, 23 Jan 2023 19:11:25 GMT Message-Id: <202301231911.30NJBPNL057022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 627ca221c311 - main - kern_reboot: unconditionally call shutdown_reset() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 627ca221c311b5d9c4132e03664a96f390ff5c0d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=627ca221c311b5d9c4132e03664a96f390ff5c0d commit 627ca221c311b5d9c4132e03664a96f390ff5c0d Author: Mitchell Horne AuthorDate: 2023-01-23 18:47:11 +0000 Commit: Mitchell Horne CommitDate: 2023-01-23 19:10:24 +0000 kern_reboot: unconditionally call shutdown_reset() Currently shutdown_reset() is registered as the final entry of the shutdown_final event handler. However, if a panic occurs early in boot before the event is registered (SI_SUB_INTRINSIC), we may end up spinning in the subsequent infinite for loop and failing to reset altogether. Instead we can simply call this function unconditionally. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D37981 --- sys/kern/kern_shutdown.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index ab37b54667f9..6f912369268a 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -270,8 +270,6 @@ shutdown_conf(void *unused) SHUTDOWN_PRI_LAST + 100); EVENTHANDLER_REGISTER(shutdown_final, shutdown_panic, NULL, SHUTDOWN_PRI_LAST + 100); - EVENTHANDLER_REGISTER(shutdown_final, shutdown_reset, NULL, - SHUTDOWN_PRI_LAST + 200); } SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL); @@ -548,6 +546,12 @@ kern_reboot(int howto) EVENTHANDLER_INVOKE(shutdown_final, howto); + /* + * Call this directly so that reset is attempted even if shutdown + * handlers are not yet registered. + */ + shutdown_reset(NULL, howto); + for(;;) ; /* safety against shutdown_reset not working */ /* NOTREACHED */ }