From nobody Tue Nov 11 08:54:27 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 4d5L1v5nLNz6G55Y; Tue, 11 Nov 2025 08:54:27 +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 4d5L1v5CR9z3DMV; Tue, 11 Nov 2025 08:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762851267; 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=vpb+rTSgHT6SHQOvUszOvD/8rxnsElhU9hCJzEzflYM=; b=NTNMnVIjVSxUaXTkU+EsFV0FJ6xPsVrCY1QloFQh9pxfqIamseqHfx1Yg1eLkgITAzMpcL V3Yg9C9DQOE8MnsDMBgMAXEHAs+iTDiniIwx8jVZMjb5U0SXriB+ERgh4TWjmDl0X97SNe OPPcvbfmnnjU7Y1CISObm375HOC+Lv0efuG8x0mn6vw0nCZCmcx2m9pGp64g7gZ+rxVR/R 7COAE0bJRzF1T3nPn+BiEPCPn8GYtbthW+DUqY834VzNMec3MBqNrwa86KDRIasY7aB/oA Jv2TW+qN1dJ/p3nnO/4dk83YH6uUw7L6cZyL8djewxHCKX6peLaNBMKUZFJ1HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762851267; 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=vpb+rTSgHT6SHQOvUszOvD/8rxnsElhU9hCJzEzflYM=; b=hqojcQhPxx1PUZwVC6XlWge8ht4Hndw4sjqdX5d0Fv9wTz+t0ltw74+LpTAwoV2Wh7owhz Tsetu1qJh2uh6C0pM/AgBu4tNtIT58rij+pjzTfAfUMyxw3v/VeckVKW2t32R0MvuzbY9Z C4yTg6YI/M83SpJtF6fZea21GUuIQS7Ro2EqCANhlE6uN9vpeInlE/hrqAT6PzIfUgvT4h vo9vdSuulHNPT/8DsjEzJj7B5ehJAQk1PR+OSSdQ4F/ZHbkiB+FhRLETVA4R3IhMAtXip8 i6e0gS9B4IC3f2Jb0DaPtay3oUlM+iqHZVgv+qthLNLaDRo1X+ZryWSYWEWWJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762851267; a=rsa-sha256; cv=none; b=BvSnmPAaBT8fLr7/bA2+XbKxXsThNR1yJRq0+5vsgsigIVs65mUF0qYnwP9cegvcblH1rl C3pDx3Xn7b7TarceTaWZg1nIoq5AB6NWAmnAsf4sBORaGmcUzxiD2/1jon+Q9nMMMr6fHP g4Z+f4yL0TahOeNubXb5DUFX/Lu1V5hd4QTJ5xJCoemnf1U4vVTYPedv/hs53tpXeizgLH J21eV5awDkvt67k6ZHX74/jrtaUOtxKIxrF6hKokRBLhjYoT2Ty24XcX/4+D3FuXLExShS JxtEIqthVe/62eTXIFY7XGeHUdW4FswkZctpb1B1aFyfQdcTvoLp8n4vSJg87A== 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 4d5L1v4hTYzxWH; Tue, 11 Nov 2025 08:54:27 +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 5AB8sRXh073439; Tue, 11 Nov 2025 08:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AB8sRog073436; Tue, 11 Nov 2025 08:54:27 GMT (envelope-from git) Date: Tue, 11 Nov 2025 08:54:27 GMT Message-Id: <202511110854.5AB8sRog073436@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: e1c6f4cb9bd2 - main - kern_thread: thread_suspend_check(1) must never suspend 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: e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670 commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670 Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-11 08:54:05 +0000 kern_thread: thread_suspend_check(1) must never suspend Reported by: bdrewery Reviewed by: bdrewery, markj Tested by: bdrewery, pho PR: 290843 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53624 --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 3180c66cb42b..4f9053460455 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1446,6 +1446,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1481,10 +1489,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p);