From nobody Fri Mar 3 14:28:04 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 4PSr105RcDz3vyrv; Fri, 3 Mar 2023 14:28:04 +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 4PSr104qqDz3Dft; Fri, 3 Mar 2023 14:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677853684; 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=PZlECAY15X+WFcdFQ0EVPDZgkRm9uh/dd9/OA8IPPjo=; b=AEYVmbdic52Sm8fdvoD1DOji58vePJ5moSKucBAN8B3vwR5mV9wZBWnDrVc6WlIWkUgrkC VUbR/SJS6dr2ZumeElN1nMy/PijzlRmd8c5w80t+arASOoLWN2QADqZJM1kiLBPuJmU46P 9vBw+u9W5BroD7qsO34lBc89WkeekELupEEhmz/QFV5U2EZO1L0CO/d7UB3nGd8aoGM3Xm xK8fxwoKWKXW0BpDAtrYPIPP3anpmSZFv2iMjMTOIk/WSMFl5OCYLsksAvEM3lWMuzdemY 7Z9eqRQPrylTzEYEIR0isgLjdAbx5B95IFCjINnXA4VpJBul3+L+pkLc4k4eqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677853684; 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=PZlECAY15X+WFcdFQ0EVPDZgkRm9uh/dd9/OA8IPPjo=; b=FFVr+WZcor/VwQSBNKqXX21YdPYuCWk3IUM0iSa4IpAzfnRyI0DH51VlugZutvsri5KKnu UxV/8qTex2spALhK053VHdu6k9EU13zJFqbqUiNFcpq0mBsud02KCzyb5papgeRaw4cG5Y vct0E4Lh+1FQb0Hw8AL75nm37UnuVhSQ+GDkHB3YY0bHnPcVFrlc7/hQ3TtBls7TGcblD2 rDWr6a6NqnUe2wOIdMohX6AxGqHaukMco4mAPOuTtSiaHOqjNSY1u4v2tLhH97o2J33Ocm v8F6zTk7my0VOgVvqhp6Hkir71Mdv9qYyJ1erh8F+3qVdlk9BCtQywPZ6cPE6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677853684; a=rsa-sha256; cv=none; b=m4sWST8Kyu8AevAoKcjAajR1vA0lKa/plYYsRim1FrSH4t4nMMRn8tmLoV/K+7m0hQPj8P V9MZYUpM9IBZwzC7vbEPrj6QmfrFNTr5ZjkZegztYYRkonhb5eFL/QyZTuOBi/8viatU0R dIeXbsRwMb9OZcOEbGUqkcxGqvIi1Cp6NE0sf6US9x5cj2yCcJ2/G9J7fCQCrUOYd1RvEp VLwbzO5FoOs9aJmKuQY33yFaFNTjdRvK02wl2lnUl7+7Hv2I9Pylbm/9U9cqz5ppkmDjoN E4LVmAOAN9Og6e2IRdf9Zh0E1BH+IsA1N5gEzRKVPozBNWvcclAjj3hDgrBsPw== 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 4PSr103tPgz11Mj; Fri, 3 Mar 2023 14:28:04 +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 323ES4Bl019958; Fri, 3 Mar 2023 14:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323ES4in019957; Fri, 3 Mar 2023 14:28:04 GMT (envelope-from git) Date: Fri, 3 Mar 2023 14:28:04 GMT Message-Id: <202303031428.323ES4in019957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a102020bf393 - stable/13 - buf: Make bufspace_daemon_shutdown() a no-op after a panic 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a102020bf39374210de95e54b83886ecedd8b166 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a102020bf39374210de95e54b83886ecedd8b166 commit a102020bf39374210de95e54b83886ecedd8b166 Author: Mark Johnston AuthorDate: 2023-02-24 02:56:36 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 14:27:50 +0000 buf: Make bufspace_daemon_shutdown() a no-op after a panic This function doesn't need to do anything in that context, and calling wakeup() can lead to recursive panics. Discussed with: mhorne MFC after: 1 week (cherry picked from commit 9d7cc536e261a7d207476115dac6058c38f469bd) --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 6a479ed335ef..98047f161077 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -764,6 +764,9 @@ bufspace_daemon_shutdown(void *arg, int howto __unused) struct bufdomain *bd = arg; int error; + if (KERNEL_PANICKED()) + return; + BD_RUN_LOCK(bd); bd->bd_shutdown = true; wakeup(&bd->bd_running);