From nobody Fri Feb 24 03:08:35 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 4PNFGD19nKz3t7pP; Fri, 24 Feb 2023 03:08:36 +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 4PNFGD0lFgz4Jqk; Fri, 24 Feb 2023 03:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677208116; 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=0TJLdy1vRQqcCPbLHJx9RCpM2qIVjCL1fBKMD2rtT8I=; b=Ucniczimf1RZYvKbGf672QuZN6eAH11Uvflti0VjbLLobnu2KFynVgmFgqzNfKle6UJ1dE iYEppuPrmQPPPQKbIQgpuTR8Q7Ya8QvR6PasiJF292hEgHT7I9/tGFxxj1mDhonfEy8CJF 8wH7hTAMZ3q0UxlmEgKPC3QfTosMq23hR0mcSPFct006p7Bh/f/Tn/tmlCB8an6D10ZXr/ LXVxt6pV6qjTVXyaVY0/O8EVNS4m5/8OaAN0iD7GNnX68Y8XDPLL8mWb+kRZxDYgdKsPGH OhKI55O4/RoYFAJHkmhbgRsCnorZ9fdXxRCykoVsW49UUXHnM6GC8OBI4eEHuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677208116; 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=0TJLdy1vRQqcCPbLHJx9RCpM2qIVjCL1fBKMD2rtT8I=; b=hxkPh6uNxuUQoaZm/FhDXeY4NC+Vqgc2AaMdynP6XvbOzDRdrLM3PowgFcu0UXZO0Ia3Wv +jElzaTDHYk1KAYE+W475nWKo7JZXING3ij/zTgb8LHhkeOBKzcBwe+sIFsQk+LL1weA/a UwPYpXT/ruYMxjWjb27yWOH73Qojr4eefzxd70W3fyrCC1G0oruOjZX/ABGcc9FAFSgrXi WA3SJd007jxX6eM4kfVF2kbBFK5zU2pMktTtuptpuy3gvRMZxlrZw8kPVIQBqn+Tt9CFfB 3rKS618zmpBJoe7yPKceEbRbBDDGBUX5mF/0Xduc4JQgZu22N0GjbmSVCQdM5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677208116; a=rsa-sha256; cv=none; b=BzPocRuvVuy1hS57wQFdABOnNsyhji2EwPyWYktj/LQEgLlbGJm/BcXJrf5XykUUxysb1b P+IGnEIuTl0iX+MQdFucewdYDCNVq35OB18cP24P6RJpZ0EsImGE5GOQZ2rRjzWKvjVUUM jXZPn9/1xKX6a4ywewcAreijtuZ/U55h6EEduxnfE9saJSTOU0UDycaqLM+0ywq4b1nTyk zjpTyKBm/E/UPPSaQGcbLcg8xr/IbyXcI5SajWXIi2X+1zF7ZU769K9M56IpN15dtGSz+O VaLKFv8ndC8u1rMS3mBKvrldjesrmVcAwSE9yNMTZRhhTVcH5evMkA//DJ1YZw== 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 4PNFGC6vK8z16Zv; Fri, 24 Feb 2023 03:08:35 +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 31O38ZCr063570; Fri, 24 Feb 2023 03:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O38Zba063569; Fri, 24 Feb 2023 03:08:35 GMT (envelope-from git) Date: Fri, 24 Feb 2023 03:08:35 GMT Message-Id: <202302240308.31O38Zba063569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9d7cc536e261 - main - buf: Make bufspace_daemon_shutdown() a no-op after a panic 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d7cc536e261a7d207476115dac6058c38f469bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7cc536e261a7d207476115dac6058c38f469bd commit 9d7cc536e261a7d207476115dac6058c38f469bd Author: Mark Johnston AuthorDate: 2023-02-24 02:56:36 +0000 Commit: Mark Johnston CommitDate: 2023-02-24 02:56:36 +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 --- 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 abc3eea9be4e..b40ee382c42a 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -766,6 +766,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);