From nobody Fri Dec 08 22:03:10 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 4Sn4rt66W6z53V2Z; Fri, 8 Dec 2023 22:03:10 +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 4Sn4rt3y2vz4TPy; Fri, 8 Dec 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072990; 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=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=fQbr0KiZfV0RlpsmlvAabN0wrzgMjrop5oTRuLvJkX7cikkLd4rQB/tAkxc7lWSVs2KkPb HuJFHyN0trW070esniBMD27Sawkn3JOBgkBkiQQgF5LIcmI9+uGBXZfISBVLQPAodGwHfM HaSTulJu94WqI1ZYBkLUfNxVoOgdUnyTDMTkFhzsAfm375tXJ9GMk7z8TdS2NAs36ricU8 j/XrE76FETuzw9T0p6/9G26ZTu0mTHTo0x3cEfYsF445ngfm7Tm9ahGtjOvXSqNNBOLmAy Qk7q54iVTt5JHeNzXyib/6b7lwM5Opdx81tIqQxpkxLma5ZXDmFN/8Nl4BS10Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072990; a=rsa-sha256; cv=none; b=h6Wx5zuupgYMqAx2aWcOc8ynA9jHeRBL/qVQOIaPn2hUmtNLlmhRP1yowdy/2PSfdQEY+J kv571Ntf5Jd+g9eC1QrmP29jEfyEFBNQOEWWOMeDwi4rMnETegZK+TU9KpiZ1lf0TsbxSU 3QtheEJXyxLyDEU5MM4bFn6hFnJ/cciAa7JUyqD65fdHYs7oIwcgf8Zmhu+sWAe3HRbD/N LW+lmPhdeNL+g2BSKt7I2D4n7MnAOTcsRbEP5TCCUvtxKGa8DYv48DgHFBQef1Hb789mop zJW5Sv2Z6behdbusoStsOhMBtGyJdZo7p/FalECBNTMby8FREu7pE8NnQvvVWw== 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=1702072990; 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=fCty3+dwTfuwXcApOUbBNGsKaNvoK8mjnUu395G66dY=; b=Y+mnBsGyPcdIvZ/Mvi42GXCwpYhrriLrffKWDXYwNK8ZO/urmI1jDW+NzomI064Qa4huyO nnHMhbIIY300nWhelWKZiPVUCAbUaUUgJOUqxGtmSeYCwPhVn5VcpTy92842VAknK0AAs6 wYomWy8fpOxe7pucvinFDJb/vsnpcl0Y43oFIs3GFJPvcZpP963qUxhjrOUPOM7hp1nyEX Jz7MnlN6xAM/9P4g9MnzH00TGt2INfihRERozRPP5cdnymy4LSqi9aaEeEwUgw0RhTGJW8 Ez8S3Pfc7WPhuYa7AJvufvwbm4iZkIzVK1p6bat5noTdELtYUdJuXbdFBW8WXw== 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 4Sn4rt2qB8zf2m; Fri, 8 Dec 2023 22:03:10 +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 3B8M3Akp021067; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M3ALq021064; Fri, 8 Dec 2023 22:03:10 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:10 GMT Message-Id: <202312082203.3B8M3ALq021064@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: 08b952c56b5e - stable/14 - shutdown: tweak kproc/kthread shutdown check 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: 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08b952c56b5e69d752a8a4bf42ff16f666c3eb5d commit 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:57 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:45 +0000 shutdown: tweak kproc/kthread shutdown check This is to handle the case where the system has not panicked but the debugger is active, where we still can't wait for thread termination. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42683 (cherry picked from commit 960612a19f009df602a4cb008fa90a45a6e869bb) --- sys/kern/kern_shutdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 19920d30357f..b69caebe17d9 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -1011,7 +1011,7 @@ kproc_shutdown(void *arg, int howto) struct proc *p; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; p = (struct proc *)arg; @@ -1031,7 +1031,7 @@ kthread_shutdown(void *arg, int howto) struct thread *td; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; td = (struct thread *)arg;