From nobody Fri Dec 08 22:03:05 2023 X-Original-To: dev-commits-src-branches@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 4Sn4rp3YmSz53TZb; Fri, 8 Dec 2023 22:03:06 +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 4Sn4rn6qZ5z4T57; Fri, 8 Dec 2023 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; 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=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=bQNU5r63xoNwjWqFqThExNND/asOLhE09hz3MgTAlhupwqC1PqyFiVejuvIj7L2lDM/CzK f6hItRnlKL/oC80YPURCGyufCpf8q0GXA4vhB0dXIuAlO95M7YVuSkAHEJoQxtSQ+TOTCC V9Y7dWNqND+Fy7OtLjhVziWKzO7V2ot/HTdN8CGOUGWyuqKzxEbHtomTcp8mAY2Nl3INDV 1dMbl9n1xymSeMeImttxNeYzkgiiWmGaOHfv6VuCSu5sHxk0UcqUzAxPCTW5r/+NvlM6NN EHUywmxHMUHfxBfBhxru6vZctCURh5s1Zd1vAr1j8zr+Ym8ADSwgnyvYA0Uzhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072986; a=rsa-sha256; cv=none; b=wcsv12K/3U323hqdlk6BnJV9BZHQED9HIgn5T6waHup/TrrVgXq5LBxnSReU5kG9E96G8u KW6VyDG4eFrLSvRDRY65dPKrtUuK3JbDCjQdE89TLoyP2ehQLu1fiZS/IB0zm9mdskW0+n t3Smq4ZpeS7t2Zl4zB64Y/tf02jq62QBdF3Ltu19gxXqNKcFMvrA2K6NuAX9l+bFY9NCHl CqQ7mNWAwIAhLi2y7DKPO4+jwsUVhnkm2FPXTMBGIq/+i+UxLWVU6aEAIdFdNSQ6ctlbOK Wj8m3kQ8/8/o29lKJaPsS4LxiJj14kP2P/VH9FRsyTquGyffreV7/SkaWEFWbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072986; 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=Y2aBLsAFkLGDtJY5Y5DnIUrba94hG9QDhkHSQQvXHkQ=; b=M0J3yWY/tCTPcnBR3J6syebFO9nQIX+K4bLUKoszUpn9CNq8hiSAU7xrzP6pSQje0Mvy4f VBvnnmK3lcGIhTD9fZBRoArNRzAX5LGz5/jPibLuaolBMQ6rphzo1/m5pxv6wbUgOjEsIf ik+2MfJD3dK45GPDobB+TVXJJaLsF0gEUffsjfcYW6yBFEouGQSvhaXjEdELVuA44N8k71 gBtm6IT2+x80UOKj4JqR3AWOGahDSqVhzeWzvd0XDsnjlJeNM7GKvqvadUhSLosFh/4rFk ruK1Zk7yDL+gfef/wHK7+l4jAZDE7TaSQoEZrfYVOZoQl43bwH+8RUcOkK8Jjg== 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 4Sn4rn5sF0zdb7; Fri, 8 Dec 2023 22:03:05 +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 3B8M35Ed020887; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M35d7020884; Fri, 8 Dec 2023 22:03:05 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:05 GMT Message-Id: <202312082203.3B8M35d7020884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: bbfd41d4308b - stable/14 - alq, siftr: add panic/debugger checks to shutdown hooks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bbfd41d4308be599a374ce8fba73b2d6ec990dcc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bbfd41d4308be599a374ce8fba73b2d6ec990dcc commit bbfd41d4308be599a374ce8fba73b2d6ec990dcc Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:30 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 alq, siftr: add panic/debugger checks to shutdown hooks Don't try to gracefully terminate the pkt_manager thread if the scheduler is not running. We should not attempt to shutdown ald if RB_NOSYNC is set, and must not if the scheduler is stopped (the function calls wakeup()). Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42340 (cherry picked from commit d79a9edb5ce162c1ba49e12e5c93b894e6a25ad2) --- sys/kern/kern_alq.c | 14 +++++++++----- sys/netinet/siftr.c | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 51fd66f2fe9f..1bcce92509c5 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -37,19 +37,20 @@ #include #include +#include +#include +#include #include #include #include +#include #include #include #include #include -#include -#include -#include +#include #include -#include -#include +#include #include @@ -228,6 +229,9 @@ ald_shutdown(void *arg, int howto) { struct alq *alq; + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + ALD_LOCK(); /* Ensure no new queues can be created. */ diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 58603e4aa53c..52e2b8838b0f 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -1263,8 +1264,11 @@ siftr_sysctl_enabled_handler(SYSCTL_HANDLER_ARGS) } static void -siftr_shutdown_handler(void *arg) +siftr_shutdown_handler(void *arg, int howto) { + if ((howto & RB_NOSYNC) != 0 || SCHEDULER_STOPPED()) + return; + if (siftr_enabled == 1) { siftr_manage_ops(SIFTR_DISABLE); }