From nobody Sat Aug 30 15:07:39 2025 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 4cDdmC22vhz65br6; Sat, 30 Aug 2025 15:07:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDdmC1PD1z3XhJ; Sat, 30 Aug 2025 15:07:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756566459; 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=Y8KUB45JvAVQzEbblRWG6nwIRmdtjjOKmGGQNZ/qKA8=; b=snIBgzxvCp0jtj38k8McaG2G34u7mo3fgZg/enoHW+b5gLbNRij/oKjmNbBRyGVENvpLYL iB3/8lFZPQAg0zwy93E9DmwChZSPmibREpBtJhkwddV3/ulINODbard4nnsYN4jyLjgNvY xuESRb9Kk0R9ROsDogVDCiSMEBSeSaamYR63vNqzIFaZOOgYvDzTIUPRoGAjKnEL6FtPeG vtZJ/2dBOabTKFVrRX/ip5ukLZS1e5TH1lDKpDnVmzNUd4OJuHCspw9Ud5+eqovrM24CEf coD0MVwLzCRmq9m5tN6uZKs8YODjUlrrdSFKWDKW1LbBBDD19mfMY3+hc29iZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756566459; 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=Y8KUB45JvAVQzEbblRWG6nwIRmdtjjOKmGGQNZ/qKA8=; b=ApVCYDN2eDt/ya04/FgUxUL4GjXyFtCbZOYNzaJYpdxBK6Gi4Wh9oaYbZf4byzWCz4zuWO ShTU87cgsOJOjwAB9oesKvmjSFAaCHpc0MluNerfXrQk/5fKlEjbGC0BbH5Fi8RyVg2waz k0zKeELg/Ib66ee0+VGLXH7QCeMdSLn4v8YbkiB18hb3GI93SGjGrbFJfZy3Zy2dykA89q OCf4EyOW0irgwyO2Y0qRbyFSvTdphGn77285H+8Z1T22QQErb+TJScvxN2r5jiOPVQnEtF eEmUpZrTUxtsW4SinoZR/rGazSupSIYJGj/o9AOJJJFdPZVo6r9uuD3gtQTtHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756566459; a=rsa-sha256; cv=none; b=Af4SgnT7lDMJfUdWo4v8PDqR6mKoo1+8WVZTv7yBnIr28yEpbgt3pCXgDmdWPWDFTZNJ5T +aY8F7o4vgpoesTCuCE8gp2LQgD00c4WF3APr/vF47BNMljempV0Wo0Ikt4yUQTZHP/mdn gp48ULAM/v8nwVuOLd5N+E5oGmQb1zEamiW7fDbpy6NZL8XX97IwtpPIu5tpf0zN559wGL i/LSA+t5LGX8V44uBe7rUDXGIRmTDE2LN5oVfusxRmnlcccVLKLy1dXK/tu0/0mLHG8cVo OkHA+eMe9puz1avLNLCt/RekKZQnfB8029yX8aimuHoZjCaLkMJ1XBQBS/MQZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cDdmC0nM8zXXR; Sat, 30 Aug 2025 15:07:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57UF7drm096153; Sat, 30 Aug 2025 15:07:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UF7duC096150; Sat, 30 Aug 2025 15:07:39 GMT (envelope-from git) Date: Sat, 30 Aug 2025 15:07:39 GMT Message-Id: <202508301507.57UF7duC096150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8321d0da2ce2 - main - kern/kern_thread.c: improve assert in thread_single_end() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8321d0da2ce294d83acc564f2c71fc3a023eb621 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8321d0da2ce294d83acc564f2c71fc3a023eb621 commit 8321d0da2ce294d83acc564f2c71fc3a023eb621 Author: Konstantin Belousov AuthorDate: 2025-08-29 20:14:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-30 15:07:21 +0000 kern/kern_thread.c: improve assert in thread_single_end() The process might be stopped, which is handled by the loop that unsuspends threads. But the condition is not tolerated in the assert, which insists that all threads must be unsuspended always. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52293 --- sys/kern/kern_thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 50b040132396..3180c66cb42b 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1694,8 +1694,10 @@ thread_single_end(struct proc *p, int mode) thread_unlock(td); } } - KASSERT(mode != SINGLE_BOUNDARY || p->p_boundary_count == 0, - ("inconsistent boundary count %d", p->p_boundary_count)); + KASSERT(mode != SINGLE_BOUNDARY || P_SHOULDSTOP(p) || + p->p_boundary_count == 0, + ("pid %d proc %p flags %#x inconsistent boundary count %d", + p->p_pid, p, p->p_flag, p->p_boundary_count)); PROC_SUNLOCK(p); wakeup(&p->p_flag); }