From nobody Thu Nov 23 16:08: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 4Sbjh50Bryz51ng1; Thu, 23 Nov 2023 16:08:05 +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 4Sbjh46Pt4z4QFx; Thu, 23 Nov 2023 16:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700755684; 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=ysGdZLEQnph2TrMJLOQxRsjNc/jOvhmEQsUSOzeSVis=; b=A6doW4qxhuLVRJBP0otoz4nRe4U86IFBc2JGWx0S4pnexWusVFD/9sioCECEzK+zhKH3gb ixEP+gntI4ir4l+MqlcFJL1xvx/5HEd+wgRdrV+4npGpYRZbWrxkqwfdSzY+5DCzwnuiKt qdt1XwczU3vi/5Qve36tw0Pyv1sGmTHaa42TXrKtuHvV9Y7+LgdxW4ZNkQMUQ20kHYxl7g Lz13ud+vQQ+IZ+PJJ9bRnVYdsnhyZTb6ZDQ79XSjZwxB6WBxsDY3Mi8DMTPNTInTwFG6hv 3+/4Q2YuopXBKiXvEcFQgfc0daoShkwXHtkEecmDpbNkFDfAajsXQdAFAaLUAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700755684; 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=ysGdZLEQnph2TrMJLOQxRsjNc/jOvhmEQsUSOzeSVis=; b=i7zM1GkK4AyREkIzUyrLrPmciITeJokY6Hxaq77a5BCy02KRnuo0xVl+K203hgDDVtlZNT kUsVYqToboZSjfIPKrUNknmH5ybzPeFXfXGguVrqijhIbCjX2a6cl0NAD6fmzCyPKgKquP 6Wy2Jq9Ut1EC3V20cIfZYyo0vFdlQVn3D3V+g8/dYYJIWwGf//SU1onD0T/ZrsPMDaNdWY ksCT9KOSHK3j5U3jHt3qcU5zrZtliXN3b3ZNq6Uuv/cHBAnxT2KgrUNq1ygcwctkD9jbpu rNw19DnWGEVeN4F+wkE/UYYeOnJG8pdxG5MLcNVFQZUE4oPAdSUWaNPflG6NAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700755684; a=rsa-sha256; cv=none; b=loGJZItOdMXq62s+QkmOA+AcQfJojMC8FsEy51WsxY1OUcsJpmxeF3ZvUAZNpY1UXoYNW+ pSUVg1NIMnk7NfqsUujJQGSIDBi4nzoj4tEAz4l0UPJIbPsU9bhKrH+xhHM94RTPiIQmCg cr4atpLlHvX+t17+1GwIXDdwDLrAyEf3C0GVHKJyOjbf/kwFOhYciqkbr9MXnQKs08P+Rr 7JxbO/AV0FHP78swQBdx5DrPUtaXzL2KuGaY6gHUZ6sIYEWGXkBqMbCE8+gNtNkkb0b3cN Y3WlDmBTWbxs51TpMprJ2+KJp0yxw7cyFD7gXDh3zJm6AzpVJ50albU0cUg7pw== 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 4Sbjh45Qhpz17B3; Thu, 23 Nov 2023 16:08:04 +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 3ANG84s7007716; Thu, 23 Nov 2023 16:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANG84vZ007713; Thu, 23 Nov 2023 16:08:04 GMT (envelope-from git) Date: Thu, 23 Nov 2023 16:08:04 GMT Message-Id: <202311231608.3ANG84vZ007713@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: 960612a19f00 - main - shutdown: tweak kproc/kthread shutdown check 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960612a19f009df602a4cb008fa90a45a6e869bb Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=960612a19f009df602a4cb008fa90a45a6e869bb commit 960612a19f009df602a4cb008fa90a45a6e869bb Author: Mitchell Horne AuthorDate: 2023-11-23 15:27:57 +0000 Commit: Mitchell Horne CommitDate: 2023-11-23 16:07:43 +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 --- 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;